fpm-cookery 0.16.2 → 0.17.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDg4YWE1MTIzYTg3NTNhYjA1NTc3OWEyMTRiYTkyNDljNjgxYTFlMQ==
+  data.tar.gz: !binary |-
+    MzFjNjY2Y2Q4NDI4YWU5MGE4YzhlYTA0MzMyMDViYzMyMWUwOTQ4YQ==
+SHA512:
+  metadata.gz: !binary |-
+    MjQ1MWQ0MDI4ODgzZTFjMjE0MWU4Y2I3YzM1OTMyYzgxMThhN2MyYzFkODM3
+    ZmQwNWEzMmViZjVlOTdhNzk4ZjRlODIwNGRhOTg2ODVkZmMzZWZlM2QxYzEz
+    YWRiMzYwYWM2ZTdkYWEyMzgyODQ3ZTRiNjIxNWNiMzU4ZWNiOWM=
+  data.tar.gz: !binary |-
+    MDc2NzgxYmZkNDA1ZDg4NDVlZTEwYjg2MmM4NjNmYjM2ZThkN2Y2ODMyMzVj
+    ZGQyMzVhZjdkZjZmOTNkYTVmMjRkNzRmOWI3NjU2ZmM4M2Y3ZDNmNjA5ZTQw
+    ODIwOGJlYTc5ZjEyNTE5MzcwNzY5ZTExM2M4NWEwMzA5NzNhNWU=

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.17.0 (2014-02-01)
+* Update fpm dependency to 1.0.0. (joschi / #62)
+* Add `-q` command line option to disable progress bars. (#58)
+* Add `directories` recipe attribute. (#53)
+* Add `autogen` build helper. (sepulworld/autogen-support / #54)
+* Add `root_prefix` and `root` path helper. (sepulworld/set-root-prefix / #52)
+* Support recursive omnibus recipes dependencies. (avishai-ish-shalom / #49)
+
 # v0.16.2 (2013-10-19)
 * Add support for submodules in git provider. (narkisr / #50)
 * Set a default maintainer.

data/fpm-cookery.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "minitest", "~> 5.0"
   s.add_development_dependency "rake"
-  s.add_runtime_dependency "fpm", "~> 0.4"
+  s.add_runtime_dependency "fpm", "~> 1.0.0"
   s.add_runtime_dependency "facter"
   s.add_runtime_dependency "puppet"
   s.add_runtime_dependency "addressable"

data/lib/fpm/cookery/cli.rb

@@ -17,6 +17,7 @@ module FPM
       option ['-D', '--debug'], :flag, 'enable debug output'
       option ['-t', '--target'], 'TARGET', 'set desired fpm output target (deb, rpm, etc)'
       option ['-p', '--platform'], 'PLATFORM', 'set the target platform (centos, ubuntu, debian)'
+      option ['-q', '--quiet'], :flag, 'Disable verbose output like progress bars'
       option ['-V', '--version'], :flag, 'show fpm-cookery and fpm version'
       option '--[no-]deps', :flag, 'enable/disable dependency checking',
         :attribute_name => 'dependency_check'
@@ -62,7 +63,7 @@ module FPM
           FPM::Cookery::BaseRecipe.send(:include, FPM::Cookery::BookHook)
 
           FPM::Cookery::Book.instance.load_recipe(recipe_file) do |recipe|
-            packager = FPM::Cookery::Packager.new(recipe, :dependency_check => config.dependency_check)
+            packager = FPM::Cookery::Packager.new(recipe, config.to_hash)
             packager.target = FPM::Cookery::Facts.target.to_s
 
             exec(config, recipe, packager)
@@ -97,9 +98,9 @@ module FPM
 
         def exec(config, recipe, packager)
           if recipe.omnibus_package == true
-            FPM::Cookery::OmnibusPackager.new(packager).run
+            FPM::Cookery::OmnibusPackager.new(packager, config.to_hash).run
           elsif recipe.chain_package == true
-            FPM::Cookery::ChainPackager.new(packager, :dependency_check => config.dependency_check).run
+            FPM::Cookery::ChainPackager.new(packager, config.to_hash).run
           else
             packager.dispense
           end

data/lib/fpm/cookery/config.rb

@@ -6,7 +6,7 @@ module FPM
     class Config
       ATTRIBUTES = [
         :color, :debug, :target, :platform, :maintainer, :vendor,
-        :skip_package, :keep_destdir, :dependency_check
+        :skip_package, :keep_destdir, :dependency_check, :quiet
       ].freeze
 
       DEFAULTS = {
@@ -14,7 +14,8 @@ module FPM
         :debug => false,
         :dependency_check => true,
         :skip_package => false,
-        :keep_destdir => false
+        :keep_destdir => false,
+        :quiet => false
       }.freeze
 
       def self.load_file(paths)

data/lib/fpm/cookery/omnibus_packager.rb

@@ -14,13 +14,11 @@ module FPM
         @depends = []
       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"
-
-        recipe.omnibus_recipes.each do |name|
+      def load_omnibus_recipes(_recipe)
+        dep_recipes = []
+        _recipe.omnibus_recipes.each do |name|
           recipe_file = build_recipe_file_path(name)
-
+          Log.info "Loading dependency recipe #{name} from #{recipe_file}"
           unless File.exists?(recipe_file)
             Log.fatal "Cannot find a recipe for #{name} at #{recipe_file}"
             exit 1
@@ -29,16 +27,29 @@ module FPM
           FPM::Cookery::Book.instance.load_recipe(recipe_file) do |dep_recipe|
             dep_recipe.destdir = "#{recipe.omnibus_dir}/embedded" if recipe.omnibus_dir
             dep_recipe.omnibus_installing = true if recipe.omnibus_dir
+            if dep_recipe.omnibus_recipes.any?
+              dep_recipes += load_omnibus_recipes(dep_recipe)
+            end
+            dep_recipes << dep_recipe
+          end
+        end
+        dep_recipes
+      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"
 
-            pkg = FPM::Cookery::Packager.new(dep_recipe, :skip_package => true, :keep_destdir => true)
-            pkg.target = FPM::Cookery::Facts.target.to_s
+        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.target = FPM::Cookery::Facts.target.to_s
 
-            Log.info "Located recipe at #{recipe_file} for child recipe #{name}; starting build"
-            pkg.dispense
+          Log.info "Located recipe for child recipe #{dep_recipe.name}; starting build"
+          pkg.dispense
 
-            @depends += dep_recipe.depends
-            Log.info "Finished building #{name}, moving on to next recipe"
-          end
+          @depends += dep_recipe.depends
+          Log.info "Finished building #{dep_recipe.name}, moving on to next recipe"
         end
 
         # Now all child recipes are built; set depends to combined set of dependencies

data/lib/fpm/cookery/package/package.rb

@@ -22,6 +22,7 @@ module FPM
           @fpm.provides += recipe.provides
           @fpm.replaces += recipe.replaces
           @fpm.config_files += recipe.config_files
+          @fpm.directories += recipe.directories
 
           @fpm.attributes[:deb_compression] = 'gzip'
           @fpm.attributes[:deb_user] = 'root'

data/lib/fpm/cookery/packager.rb

@@ -70,7 +70,7 @@ module FPM
           recipe.cachedir.mkdir
           Dir.chdir(recipe.cachedir) do
             Log.info "Fetching source: #{source.source_url}"
-            source.fetch
+            source.fetch(:quiet => config[:quiet])
 
             if source.checksum?
               SourceIntegrityCheck.new(recipe).tap do |check|
@@ -107,7 +107,8 @@ module FPM
               build_cookie = build_cookie_name(package_name)
 
               if File.exists?(build_cookie)
-                Log.info 'Skipping build (`fpm-cook clean` to rebuild)'
+                Log.warn "Skipping build of #{recipe.name} because build cookie found (#{build_cookie})," \
+                         " use \"fpm-cook clean\" to rebuild!"
               else
                 Log.info "Building in #{File.expand_path(extracted_source, recipe.builddir)}"
                 recipe.build and FileUtils.touch(build_cookie)

data/lib/fpm/cookery/path_helper.rb

@@ -30,6 +30,11 @@ module FPM
         current_pathname_for('var')/path
       end
 
+      def root(path = nil)
+        current_pathname_for(nil)/path
+      end
+      alias_method :root_prefix, :root
+
       def bin(path = nil)     prefix/'bin'/path            end
       def doc(path = nil)     prefix/'share/doc'/path      end
       def include(path = nil) prefix/'include'/path        end

data/lib/fpm/cookery/recipe.rb

@@ -62,7 +62,7 @@ module FPM
 
       attr_rw_list :build_depends, :config_files, :conflicts, :depends,
                    :exclude, :patches, :provides, :replaces, :omnibus_recipes,
-                   :omnibus_additional_paths, :chain_recipes
+                   :omnibus_additional_paths, :chain_recipes, :directories
 
       attr_reader :filename
 

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

@@ -9,18 +9,18 @@ module FPM
         NAME = :curl
         CHECKSUM = true
 
-        def fetch
+        def fetch(config = {})
           if local_path.exist?
             Log.info "Using cached file #{local_path}"
           else
             Dir.chdir(cachedir) do
-              curl(url, local_path) unless local_path.exist?
+              curl(url, local_path, config) unless local_path.exist?
             end
           end
           local_path
         end
 
-        def extract
+        def extract(config = {})
           Dir.chdir(builddir) do
             case local_path.extname
             when '.bz2', '.gz', '.tgz'
@@ -42,9 +42,11 @@ module FPM
         end
 
         private
-        def curl(url, path)
+        def curl(url, path, config)
           args = options[:args] || '-fL'
-          cmd = ['curl', args, '--progress-bar', '-o', path, url]
+          cmd = ['curl', args]
+          cmd << (config[:quiet] ? '-s' : '--progress-bar')
+          cmd += ['-o', path, url]
           safesystem(*cmd)
         rescue RuntimeError => e
           Log.error("Command failed: #{cmd.join(' ')}")

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

@@ -8,7 +8,7 @@ module FPM
         CHECKSUM = false
         NAME = :git
 
-        def fetch
+        def fetch(config = {})
           rev = options[:sha] || options[:tag]
 
           if local_path.exist?
@@ -32,7 +32,7 @@ module FPM
           local_path
         end
 
-        def extract
+        def extract(config = {})
           extracted_source = (builddir/local_path.basename('.git').to_s).to_s
 
           Dir.chdir(local_path) do

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

@@ -8,7 +8,7 @@ module FPM
         CHECKSUM = false
         NAME = :hg
 
-        def fetch
+        def fetch(config = {})
           if local_path.exist?
             Dir.chdir(local_path) do
               hg('pull')
@@ -23,7 +23,7 @@ module FPM
           local_path
         end
 
-        def extract
+        def extract(config = {})
           src = (builddir/local_path.basename('.hg').to_s).to_s
 
           Dir.chdir(local_path) do

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

@@ -9,7 +9,7 @@ module FPM
         CHECKSUM = false
         NAME = :local_path
 
-        def fetch
+        def fetch(config = {})
           if local_path.exist?
             Log.info "Using cached file #{local_path}"
           else

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

@@ -7,11 +7,11 @@ module FPM
         CHECKSUM = false
         NAME = :noop
 
-        def fetch
+        def fetch(config = {})
           Log.info "Noop source_handler; do nothing."
         end
 
-        def extract
+        def extract(config = {})
           Log.info "Not extracting - noop source handler"
           builddir
         end

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

@@ -8,7 +8,7 @@ module FPM
         CHECKSUM = false
         NAME = :svn
 
-        def fetch
+        def fetch(config = {})
           # TODO(lusis) - implement some caching using 'svn info'?
           Dir.chdir(cachedir) do
             svn(url, local_path)
@@ -16,7 +16,7 @@ module FPM
           local_path
         end
 
-        def extract
+        def extract(config = {})
           Dir.chdir(builddir) do
             safesystem('cp', '-Rp', local_path, '.')
             extracted_source

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

@@ -24,11 +24,11 @@ module FPM
           @url
         end
 
-        def fetch
+        def fetch(config = {})
           raise "#{self}#fetch not implemented!"
         end
 
-        def extract
+        def extract(config = {})
           raise "#{self}#extract not implemented!"
         end
 

data/lib/fpm/cookery/utils.rb

@@ -21,7 +21,7 @@ module FPM
       end
 
       # From brew2deb. (lib/debian_formula.rb)
-      def configure(*args)
+      def argument_build(*args)
         if args.last.is_a?(Hash)
           opts = args.pop
           args += opts.map{ |k,v|
@@ -33,10 +33,18 @@ module FPM
             end
           }
         end
+      end
 
+      def configure(*args)
+        args = argument_build(*args)
         safesystem './configure', *args
       end
 
+     def autogen(*args)
+       args =  argument_build(*args)
+       safesystem './autogen.sh', *args
+     end
+
       # From brew2deb. (lib/debian_formula.rb)
       def make(*args)
         env = args.pop if args.last.is_a?(Hash)

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.16.2'
+    VERSION = '0.17.0'
   end
 end

data/spec/config_spec.rb

@@ -74,6 +74,14 @@ describe 'Config' do
     common_tests(:vendor)
   end
 
+  describe '#quiet' do
+    it 'defaults to false' do
+      default_config.quiet.must_equal false
+    end
+
+    common_tests(:quiet)
+  end
+
   describe '#skip_package' do
     it 'defaults to false' do
       default_config.skip_package.must_equal false
@@ -109,7 +117,8 @@ describe 'Config' do
         :vendor => nil,
         :skip_package => false,
         :keep_destdir => false,
-        :dependency_check => true
+        :dependency_check => true,
+        :quiet => false
       })
     end
   end

data/spec/package_spec.rb

@@ -49,6 +49,7 @@ describe 'Package' do
       provides 'foo-package'
       replaces 'foo-old'
       config_files '/etc/foo.conf'
+      directories '/var/lib/foo', '/var/cache/foo'
     end
   end
 
@@ -101,6 +102,10 @@ describe 'Package' do
       package.fpm.config_files.must_equal ['/etc/foo.conf']
     end
 
+    it 'sets the directories' do
+      package.fpm.directories.must_equal ['/var/lib/foo', '/var/cache/foo']
+    end
+
     describe 'attributes' do
       let(:attributes) { package.fpm.attributes }
 

data/spec/path_helper_spec.rb

@@ -12,6 +12,8 @@ describe "PathHelper" do
 
   describe "path helper methods" do
     [ ['prefix', '/usr'],
+      ['root_prefix', '/'],
+      ['root', '/'],
       ['etc', '/etc'],
       ['opt', '/opt'],
       ['var', '/var'],
@@ -36,6 +38,8 @@ describe "PathHelper" do
       name, path = m
 
       describe "##{name}" do
+        def c(path); path.gsub(%r{//}, '/'); end
+
         context "without an argument" do
           it "returns #{path}" do
             helper.send(name).to_s.must_equal path
@@ -44,7 +48,7 @@ describe "PathHelper" do
 
         context "with an argument" do
           it "adds the argument to the path" do
-            helper.send(name, 'foo/bar').to_s.must_equal "#{path}/foo/bar"
+            helper.send(name, 'foo/bar').to_s.must_equal c("#{path}/foo/bar")
           end
         end
 
@@ -58,7 +62,7 @@ describe "PathHelper" do
           before { helper.installing = true}
 
           it "adds the destdir as prefix" do
-            helper.send(name, 'blah').to_s.must_equal "#{helper.destdir}#{path}/blah"
+            helper.send(name, 'blah').to_s.must_equal c("#{helper.destdir}#{path}/blah")
           end
         end
 
@@ -66,7 +70,7 @@ describe "PathHelper" do
           before { helper.omnibus_installing = true }
 
           it "does not add anything to the path" do
-            helper.send(name, 'blah').to_s.must_equal "#{path}/blah"
+            helper.send(name, 'blah').to_s.must_equal c("#{path}/blah")
           end
         end
 
@@ -74,7 +78,7 @@ describe "PathHelper" do
           before { helper.omnibus_installing = true ; helper.installing = true }
 
           it "does not add anything to the path" do
-            helper.send(name, 'blah').to_s.must_equal "#{path}/blah"
+            helper.send(name, 'blah').to_s.must_equal c("#{path}/blah")
           end
         end
       end

data/spec/path_spec.rb

@@ -6,13 +6,13 @@ describe "Path" do
   describe ".pwd" do
     it "returns the current dir" do
       Dir.chdir('/tmp') do
-        FPM::Cookery::Path.pwd.to_s.must_equal '/tmp'
+        FPM::Cookery::Path.pwd.to_s.must_match %r{/tmp|/private/tmp}
       end
     end
 
     it "adds the given path to the current dir" do
       Dir.chdir('/tmp') do
-        FPM::Cookery::Path.pwd('foo').to_s.must_equal '/tmp/foo'
+        FPM::Cookery::Path.pwd('foo').to_s.must_match %r{/tmp|/private/tmp}
       end
     end
   end

data/spec/recipe_spec.rb

@@ -223,6 +223,7 @@ describe "Recipe" do
   spec_recipe_attribute_list(:replaces, %w{one two})
   spec_recipe_attribute_list(:omnibus_recipes, %w{one two})
   spec_recipe_attribute_list(:chain_recipes, %w{one two})
+  spec_recipe_attribute_list(:directories, %w{one two})
 
   describe ".source" do
     it "sets a source url" do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.16.2
-  prerelease: 
+  version: 0.17.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -226,32 +211,25 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2714022872265180185
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2714022872265180185
 requirements: []
 rubyforge_project: fpm-cookery
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool for building software packages with fpm.
 test_files: []