fpm-cookery 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e13450b36139981c3b9700c05e8a1cdd307a7d15
-  data.tar.gz: 36cbf763dd3217ee377eba4e6301d3f74d3825d6
+  metadata.gz: 5d4a540ee8894e347b9b30df41f55735f670f565
+  data.tar.gz: 974940d490281d11761d8e079e6c0f49df7f968b
 SHA512:
-  metadata.gz: 431ea4562cea0993d46c3b05b6f841d933d5263831106b9080c11dee93c735cecb3851ed23b7a6c52f74ca1454e129b94b94d3034cdbe40c342d64976d33e832
-  data.tar.gz: e5f23c74e1358f45f0bcfb7e35caddfe8c5ac85eb81dfff5bff7016c0ba1c1082e5c1cf64246aea80e6496616f72cfe0ad49e438d1a1668a6718b2d38086b010
+  metadata.gz: 6b287616baef2e572014cf0ba9736191b0e50a363e25c54ae05d6f96854e8cf3774b74dc0b6a6c72cf43185798eedcc98bf8c88c359a3e48c9eededb1df73948
+  data.tar.gz: 22e6f563aa586c7e771f3fa9c1c172bde1a0fdd5ae420e4c2ea5352f2a83d31136beef972a57f6e5d737f8e4af95a0ebb780bc9eb0fa8d5a91be64414191e27b

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# v0.30.0 (2015-09-10)
+* Add more lifecylce hooks:
+  * `before_package_create`
+  * `after_package_create`
+  * `before_source_download`
+  * `after_source_download`
+  * `before_source_extraction`
+  * `after_source_extraction`
+  * `before_build`
+  * `after_build`
+  * `before_install`
+  * `after_install`
+* Remove some duplication in dependency handling. (glensc / #114)
+* Add `:externals` option to SVN source handler. (glensc / #117)
+* Use heredoc when calling hook script in fpm-cookery recipe. (glensc / #121)
+* Add `sh()` method as an alias for `safesystem()`.
+* Add `install-build-deps` CLI command to install all build dependencies. (cas-ei / #126)
+* Fix no-deps CLI flags for omnibus style builds. (cas-ei / #124 / #125)
+
 # v0.29.0 (2015-07-25)
 * Start documentation at https://fpm-cookery.readthedocs.org/.
   The documentation is now included in the source code (`docs/` directory) and

data/README.md

@@ -24,6 +24,8 @@ It is using __fpm__ to create the actual packages.
 
 Please find the documentation page here: https://fpm-cookery.readthedocs.org/
 
+The documentation source is located in the `docs/` folder. Pull requests welcome! :)
+
 Hosting and building of the documentation is provided by the great [Read the Docs project](https://readthedocs.org/)!
 
 ## Why?

data/lib/fpm/cookery/chain_packager.rb

@@ -14,6 +14,33 @@ module FPM
         @config = config
       end
 
+      def install_build_deps
+        recipe.run_lifecycle_hook(:before_dependency_installation)
+        DependencyInspector.verify!([], recipe.build_depends)
+        recipe.chain_recipes.each do |name|
+          recipe_file = build_recipe_file_path(name)
+          unless File.exists?(recipe_file)
+            Log.fatal "Cannot find a recipe for #{name} at #{recipe_file}"
+            exit 1
+          end
+          FPM::Cookery::Book.instance.load_recipe(recipe_file, config) do |dep_recipe|
+            depPackager = FPM::Cookery::Packager.new(dep_recipe, config.to_hash)
+            depPackager.target = FPM::Cookery::Facts.target.to_s
+
+            #Chain, chain, chain ...
+            if dep_recipe.omnibus_package == true
+              FPM::Cookery::OmnibusPackager.new(depPackager, config).install_build_deps
+            elsif dep_recipe.chain_package == true
+              FPM::Cookery::ChainPackager.new(depPackager, config).install_build_deps
+            else
+              depPackager.install_build_deps
+            end
+          end
+          recipe.run_lifecycle_hook(:after_dependency_installation)
+          Log.info("Build dependencies installed!")
+        end
+      end
+
       def run
         Log.info "Recipe #{recipe.name} is a chain package; looking for child recipes to build"
 

data/lib/fpm/cookery/cli.rb

@@ -131,6 +131,20 @@ module FPM
         end
       end
 
+      class InstallBuildDepsCmd < Command
+        parameter '[RECIPE]', 'the recipe file', :default => 'recipe.rb'
+
+        def exec(config, recipe, packager)
+          if recipe.omnibus_package == true
+            FPM::Cookery::OmnibusPackager.new(packager, config).install_build_deps
+          elsif recipe.chain_package == true
+            FPM::Cookery::ChainPackager.new(packager, config).install_build_deps
+          else
+            packager.install_build_deps
+          end
+        end
+      end
+
       class ShowDepsCmd < Command
         parameter '[RECIPE]', 'the recipe file', :default => 'recipe.rb'
 
@@ -144,6 +158,7 @@ module FPM
       subcommand 'package', 'builds the package', PackageCmd
       subcommand 'clean', 'cleans up', CleanCmd
       subcommand 'install-deps', 'installs build and runtime dependencies', InstallDepsCmd
+      subcommand 'install-build-deps', 'installs build dependencies', InstallBuildDepsCmd
       subcommand 'show-deps', 'show build and runtime dependencies', ShowDepsCmd
     end
   end

data/lib/fpm/cookery/dependency_inspector.rb

@@ -70,7 +70,7 @@ module FPM
           :ensure => "present"
         })
         result = Puppet::Resource.indirection.save(resource)[1]
-        failed = Puppet::Resource.indirection.save(resource)[1].resource_statuses.values.first.failed
+        failed = result.resource_statuses.values.first.failed
         if failed
           Log.fatal "While processing depends package '#{package}':"
           result.logs.each {|log_line| Log.fatal log_line}

data/lib/fpm/cookery/lifecycle_hooks.rb

@@ -3,9 +3,9 @@ require 'fpm/cookery/log'
 module FPM
   module Cookery
     module LifecycleHooks
-      def run_lifecycle_hook(hook_name)
-        Log.debug("Run lifecycle hook: #{hook_name}")
-        self.__send__(hook_name)
+      def run_lifecycle_hook(hook_name, *args)
+        Log.debug("Run lifecycle hook: #{hook_name} (args: #{args.inspect})")
+        self.__send__(hook_name, *args)
       end
 
       def before_dependency_installation
@@ -13,6 +13,39 @@ module FPM
 
       def after_dependency_installation
       end
+
+      def before_source_download
+      end
+
+      def after_source_download
+      end
+
+      def before_source_extraction
+      end
+
+      # Gets a FPM::Cookery::Path object pointing to the extracted source as argument.
+      def after_source_extraction(extracted_source)
+      end
+
+      def before_build
+      end
+
+      def after_build
+      end
+
+      def before_install
+      end
+
+      def after_install
+      end
+
+      # Gets a FPM::Package object as argument.
+      def before_package_create(package)
+      end
+
+      # Gets a FPM::Package object as argument.
+      def after_package_create(package)
+      end
     end
   end
 end

data/lib/fpm/cookery/log.rb

@@ -45,6 +45,10 @@ module FPM
           @output.puts(message)
         end
 
+        def deprecated(message)
+          warn("[DEPRECATED] #{message}")
+        end
+
         def <<(event)
           level = event.fetch(:level, :info).downcase.to_sym
 

data/lib/fpm/cookery/omnibus_packager.rb

@@ -37,13 +37,23 @@ module FPM
         dep_recipes
       end
 
+
+      def install_build_deps
+        build_deps = load_omnibus_recipes(recipe).map(&:build_depends).flatten.uniq
+        recipe.run_lifecycle_hook(:before_dependency_installation)
+        DependencyInspector.verify!([], build_deps)
+        recipe.run_lifecycle_hook(:after_dependency_installation)
+        Log.info("Build dependencies installed!")
+      end
+
       def run
         # Omnibus packages are many builds in one package; e.g. Ruby + Puppet together.
         Log.info "Recipe #{recipe.name} is an Omnibus package; looking for child recipes to build"
 
         dep_recipes = load_omnibus_recipes(recipe)
         dep_recipes.uniq.each do |dep_recipe|
-          pkg = FPM::Cookery::Packager.new(dep_recipe, :skip_package => true, :keep_destdir => true)
+          pkg = FPM::Cookery::Packager.new(dep_recipe, :skip_package => true,
+                                          :keep_destdir => true, :dependency_check => config.dependency_check )
           pkg.target = FPM::Cookery::Facts.target.to_s
 
           Log.info "Located recipe for child recipe #{dep_recipe.name}; starting build"

data/lib/fpm/cookery/packager.rb

@@ -43,6 +43,13 @@ module FPM
         FileUtils.rm_rf(recipe.destdir)
       end
 
+      def install_build_deps
+        recipe.run_lifecycle_hook(:before_dependency_installation)
+        DependencyInspector.verify!([], recipe.build_depends)
+        recipe.run_lifecycle_hook(:after_dependency_installation)
+        Log.info("Build dependencies installed!")
+      end
+
       def install_deps
         recipe.run_lifecycle_hook(:before_dependency_installation)
         DependencyInspector.verify!(recipe.depends, recipe.build_depends)
@@ -50,6 +57,7 @@ module FPM
         Log.info("All dependencies installed!")
       end
 
+
       def dispense
         env = ENV.to_hash
         package_name = "#{recipe.name}-#{recipe.version}"
@@ -73,8 +81,10 @@ module FPM
 
           recipe.cachedir.mkdir
           Dir.chdir(recipe.cachedir) do
+            recipe.run_lifecycle_hook(:before_source_download)
             Log.info "Fetching source: #{source.source_url}"
             source.fetch(:quiet => config[:quiet])
+            recipe.run_lifecycle_hook(:after_source_download)
 
             if source.checksum?
               SourceIntegrityCheck.new(recipe).tap do |check|
@@ -103,6 +113,7 @@ module FPM
 
           recipe.builddir.mkdir
           Dir.chdir(recipe.builddir) do
+            recipe.run_lifecycle_hook(:before_source_extraction)
             extracted_source = source.extract
 
             if recipe.extracted_source
@@ -110,6 +121,8 @@ module FPM
               extracted_source = recipe.extracted_source
             end
 
+            recipe.run_lifecycle_hook(:after_source_extraction, recipe.builddir(extracted_source))
+
             Dir.chdir(extracted_source) do
               #Source::Patches.new(recipe.patches).apply!
 
@@ -119,8 +132,10 @@ module FPM
                 Log.warn "Skipping build of #{recipe.name} because build cookie found (#{build_cookie})," \
                          " use \"fpm-cook clean\" to rebuild!"
               else
+                recipe.run_lifecycle_hook(:before_build)
                 Log.info "Building in #{File.expand_path(extracted_source, recipe.builddir)}"
                 recipe.build and FileUtils.touch(build_cookie)
+                recipe.run_lifecycle_hook(:after_build)
               end
 
               FileUtils.rm_rf(recipe.destdir) unless keep_destdir?
@@ -129,7 +144,9 @@ module FPM
               begin
                 recipe.installing = true
                 Log.info "Installing into #{recipe.destdir}"
+                recipe.run_lifecycle_hook(:before_install)
                 recipe.install
+                recipe.run_lifecycle_hook(:after_install)
               ensure
                 recipe.installing = false
               end
@@ -170,8 +187,10 @@ module FPM
 
           output = input.convert(output_class)
 
+          recipe.run_lifecycle_hook(:before_package_create, output)
           begin
             output.output(output.to_s)
+            recipe.run_lifecycle_hook(:after_package_create, output)
           rescue FPM::Package::FileAlreadyExists
             Log.info "Removing existing package file: #{output.to_s}"
             FileUtils.rm_f(output.to_s)

data/lib/fpm/cookery/source_handler/svn.rb

@@ -26,7 +26,8 @@ module FPM
         private
         def svn(url, path)
           revision = options[:revision] || 'HEAD'
-          safesystem('svn', 'export', '--force', '-q', '-r', revision, url, path)
+          externals = '--ignore-externals' if !options[:externals]
+          safesystem('svn', 'export', '--force', externals, '-q', '-r', revision, url, path)
         end
 
         def extracted_source

data/lib/fpm/cookery/utils.rb

@@ -14,8 +14,13 @@ module FPM
         return success
       end
 
+      # Alias for safesystem.
+      def sh(*args)
+        safesystem(*args)
+      end
+
       def cleanenv_safesystem(*args)
-        Log.warn("[DEPRECATED] Use `environment.with_clean { safesystem(...) }` instead of `cleanenv_safesystem(...)` in the recipe")
+        Log.deprecated("Use `environment.with_clean { safesystem(...) }` instead of `cleanenv_safesystem(...)` in the recipe")
         environment.with_clean { safesystem(*args) }
       end
 

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.29.0'
+    VERSION = '0.30.0'
   end
 end

data/recipes/fpm-cookery/recipe.rb

@@ -21,8 +21,29 @@ class FPMCookery < FPM::Cookery::Recipe
     destdir('bin').install workdir('fpm-cook.bin'), 'fpm-cook'
 
     with_trueprefix do
-      create_post_install_hook
-      create_pre_uninstall_hook
+      create_post_install_hook <<-EOF
+        set -e
+
+        BIN_PATH="#{destdir}/bin"
+        BIN="fpm-cook"
+
+        update-alternatives --install /usr/bin/$BIN $BIN $BIN_PATH/$BIN 100
+
+        exit 0
+      EOF
+
+      create_pre_uninstall_hook <<-EOF
+        set -e
+
+        BIN_PATH="#{destdir}/bin"
+        BIN="fpm-cook"
+
+        if [ "$1" != "upgrade" ]; then
+          update-alternatives --remove $BIN $BIN_PATH/$BIN
+        fi
+
+        exit 0
+      EOF
     end
   end
 
@@ -33,40 +54,16 @@ class FPMCookery < FPM::Cookery::Recipe
     cleanenv_safesystem "#{destdir}/embedded/bin/gem install --no-ri --no-rdoc #{v} #{name}"
   end
 
-  def create_post_install_hook
+  def create_post_install_hook(script, interpreter = "/bin/sh")
     File.open(builddir('post-install'), 'w', 0755) do |f|
-      f.write <<-__POSTINST
-#!/bin/sh
-set -e
-
-BIN_PATH="#{destdir}/bin"
-BIN="fpm-cook"
-
-update-alternatives --install /usr/bin/$BIN $BIN $BIN_PATH/$BIN 100
-
-exit 0
-      __POSTINST
-
+      f.write "#!#{interpreter}\n" + script.gsub(/^\s+/, '')
       self.class.post_install(File.expand_path(f.path))
     end
   end
 
-  def create_pre_uninstall_hook
+  def create_pre_uninstall_hook(script, interpreter = "/bin/sh")
     File.open(builddir('pre-uninstall'), 'w', 0755) do |f|
-      f.write <<-__PRERM
-#!/bin/sh
-set -e
-
-BIN_PATH="#{destdir}/bin"
-BIN="fpm-cook"
-
-if [ "$1" != "upgrade" ]; then
-  update-alternatives --remove $BIN $BIN_PATH/$BIN
-fi
-
-exit 0
-        __PRERM
-
+      f.write "#!#{interpreter}\n" + script.gsub(/^\s+/, '')
       self.class.pre_uninstall(File.expand_path(f.path))
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fpm-cookery
-rubygems_version: 2.2.3
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: A tool for building software packages with fpm.