fpm-cookery 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf794a51fecd510948128ab67bb5c795ed3e4c6
-  data.tar.gz: 7020e143e7ba574171c2ace14831df9336e40182
+  metadata.gz: 3086c69abf17303cb1bd39d5745435e2166e28a7
+  data.tar.gz: 4200c639a242f38313db74b31eb8231e749ea864
 SHA512:
-  metadata.gz: a711e293257e46fbb1b46601c96e4ee90152cb835604ab30e75fc10f204f54f2b5d19591ef9a6777ea2b085dc50097554611517a1601aa1a886e4008dbb193ff
-  data.tar.gz: 0625f2d75df8e1aaafdeedcf2796ffc4b65d57a8648cbdd655aa60ae09f353fa6eb60ee5bf8f5d6ae03207c3bdb61a12f601e611cdc62474efa32107c31d6746
+  metadata.gz: 0d85461efb89f476da92433f2394a6db4ecbfc09258018cdc7a4b4151118d663a2c52c19540ae006ad1b548bb6f2ca946fa90bc44f1e6d3e80fa50a31532e805
+  data.tar.gz: f8550d9d07dfddaa4dd74d46f62294a66d35186c49fea36c95da77f7431870d25b8c3f8f93bee0da1cd87512b12ec7906b4abad7493bed1edd3297c9660f5cad

data/CHANGELOG.md

@@ -1,4 +1,18 @@
-# v0.33.0
+# v0.34.0 (2019-06-01)
+* Use factor defaults for `platform` and `target` values. (FooBarQuaxx / #189)
+* Add `:username` and `:password` parameters to the SVN source handler. (tomeon / #191)
+* Add `Recipe#extract` method to allow custom extraction logic.
+* Fix tmux location in getting started guide. (cvhbsk / #195)
+* Use RPM target for SLES platform. (FooBarQuaxx / #198)
+* Add `targets` block for target specific setting in recipe. (FooBarQuaxx / #199)
+* Ensure `:noop` sources are always treated as fetchable. (tomeon / #200)
+* Allow usage of newer puppet versions. (lukasz-e / #201)
+* Add sha512 checksum support. (b00ga / #202)
+* Remove duplicate require. (FooBarQuaxx / #204)
+* Automatically gunzip gzipped patch files. (davewongillies / #208)
+* Add a golang util. (davewongillies / #209)
+
+# v0.33.0 (2017-07-09)
 * Hiera lookups of recipe data from templated YAML files. (BaxterStockman / #150)
 * Travis-CI build matrix improvements. (thedrow / #155)
 * Expose `lsbcodename` fact. (thedrow / #158)
@@ -17,7 +31,7 @@
 * Add "safe\_yaml" dependency. (davewongillies / #186, #154)
 * Add `rpm_dist` method. (sfzylad / #190)
 
-# v0.32.0
+# v0.32.0 (2016-06-14)
 * Add `sourcedir` accessor that holds the path to the extracted source. (#132)
 * Add support for DirRecipe and Directory Handler. (cas-ei / #147)
 * Extend virtualenv support. (MrPrimate / #146)

data/docs/pages/getting-started.rst

@@ -67,8 +67,8 @@ afterwards. Use your text editor to add the code to the ``recipe.rb`` file.
 
     name     'tmux'
     version  '1.9a'
-    homepage 'http://tmux.sourceforce.net/'
-    source   'http://freefr.dl.sourceforge.net/project/tmux/tmux/tmux-1.9/tmux-1.9a.tar.gz'
+    homepage 'http://tmux.github.io'
+    source   'https://github.com/tmux/tmux/releases/download/1.9a/tmux-1.9a.tar.gz'
 
     build_depends 'libevent-dev', 'libncurses5-dev'
     depends       'libevent-2.0-5'

data/fpm-cookery.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov", "~> 0.11"
   s.add_runtime_dependency "fpm", "~> 1.1"
   s.add_runtime_dependency "facter"
-  s.add_runtime_dependency "puppet", "~> 3.4"
+  s.add_runtime_dependency "puppet", ">= 3.4", "< 6.0"
   s.add_runtime_dependency "addressable", "~> 2.3.8"
   s.add_runtime_dependency "systemu"
   s.add_runtime_dependency "json", ">= 1.7.7", "< 2.0"

data/lib/fpm/cookery/cli.rb

@@ -59,18 +59,17 @@ module FPM
           end
 
           # Override the detected platform.
-          if platform
+          if platform.nil?
+            config.platform = FPM::Cookery::Facts.platform
+          else
             FPM::Cookery::Facts.platform = platform
           end
 
-          if target
+          if target.nil?
+            config.target = FPM::Cookery::Facts.target
+          else
             FPM::Cookery::Facts.target = target
           end
-
-          if FPM::Cookery::Facts.target.nil?
-            Log.error "No target given and we're unable to detect your platform"
-            exit 1
-          end
         end
 
         def execute

data/lib/fpm/cookery/facts.rb

@@ -31,7 +31,7 @@ module FPM
         def target
           @target ||= case platform
                       when :centos, :redhat, :fedora, :amazon,
-                           :scientific, :oraclelinux           then :rpm
+                           :scientific, :oraclelinux, :sles    then :rpm
                       when :debian, :ubuntu                    then :deb
                       when :darwin                             then :osxpkg
                       when :alpine                             then :apk

data/lib/fpm/cookery/hiera.rb

@@ -1,4 +1,5 @@
 require 'hiera'
+require 'hiera/version'
 require 'fpm/cookery/hiera/defaults'
 require 'fpm/cookery/hiera/scope'
 require 'fpm/cookery/log/hiera'
@@ -26,7 +27,10 @@ module FPM
         # Provides a default scope, and attempts to look up the key both as a
         # string and as a symbol.
         def lookup(key, default = nil, scope = self.scope, *rest)
-          super(key.to_sym, default, scope, *rest) || super(key.to_s, default, scope, *rest)
+          
+          (Gem::Version.new(::Hiera.version) < Gem::Version.new('2.0.0') &&
+               super(key.to_sym, default, scope, *rest)) ||
+            super(key.to_s, default, scope, *rest)
         end
         alias_method :[], :lookup
       end

data/lib/fpm/cookery/hiera/scope.rb

@@ -29,6 +29,16 @@ module FPM
             result.value
           end
         end
+
+        # Newer versions of Hiera requires also +#include?+ method for context
+        def include?(name)
+          [recipe, FPM::Cookery::Facts].each do |source|
+            return true if source.respond_to?(name)
+          end
+
+          # If not found, check in +Facter+.
+          ! Facter[name].nil?
+        end
       end
     end
   end

data/lib/fpm/cookery/packager.rb

@@ -90,7 +90,7 @@ module FPM
             if source.checksum?
               SourceIntegrityCheck.new(recipe).tap do |check|
                 if check.checksum_missing?
-                  Log.warn 'Recipe does not provide a checksum. (sha256, sha1 or md5)'
+                  Log.warn 'Recipe does not provide a checksum. (sha512, sha256, sha1 or md5)'
                   Log.puts <<-__WARN
   Digest:   #{check.digest}
   Checksum: #{check.checksum_actual}
@@ -123,7 +123,13 @@ module FPM
               extracted_source = File.read(extract_cookie).chomp
               Log.debug "Extract cookie exists, using existing source directory: #{extracted_source}"
             else
-              extracted_source = source.extract
+              # First check if the Recipe#extract method returns a source location
+              extracted_source = recipe.extract
+              if extracted_source.nil?
+                # Recipe extraction method didn't return the extracted source
+                # so we use the extraction method of the source handler
+                extracted_source = source.extract
+              end
               File.open(extract_cookie, 'w', 0644) {|f| f.puts(extracted_source) }
             end
 
@@ -168,7 +174,7 @@ module FPM
               end
             end #end chdir extracted_source
           end #end chdir builddir
-        end #end defined source_handler
+        end #end source_handler.fetchable?
 
         if skip_package?
           Log.info "Package building disabled"

data/lib/fpm/cookery/recipe.rb

@@ -19,7 +19,6 @@ require 'fpm/cookery/package/npm'
 require 'fpm/cookery/package/pear'
 require 'fpm/cookery/package/python'
 require 'fpm/cookery/package/virtualenv'
-require 'fpm/cookery/log'
 
 module FPM
   module Cookery
@@ -32,7 +31,7 @@ module FPM
       extend FPM::Cookery::InheritableAttr
 
       attr_rw :arch, :description, :rpm_dist, :homepage, :maintainer, :md5, :name,
-              :revision, :section, :sha1, :sha256, :spec, :vendor, :version,
+              :revision, :section, :sha1, :sha256, :sha512, :spec, :vendor, :version,
               :pre_install, :post_install, :pre_uninstall, :post_uninstall,
               :license, :omnibus_package, :omnibus_dir, :chain_package,
               :default_prefix
@@ -65,6 +64,10 @@ module FPM
           Array(archs).member?(FPM::Cookery::Facts.arch) and block_given? ? yield : false
         end
 
+        def targets(valid_targets)
+          Array(valid_targets).member?(FPM::Cookery::Facts.target) and block_given? ? yield : false
+        end
+
         def platform
           FPM::Cookery::Facts.platform
         end
@@ -143,6 +146,11 @@ module FPM
         apply unless defer_application
       end
 
+      # Custom source extraction code, must return the extracted source directory.
+      def extract
+        nil
+      end
+
       def to_h
         attr_registry.values.flatten.each_with_object({}) do |m, a|
           a[m] = send(m) unless m == :attr_registry

data/lib/fpm/cookery/source_handler.rb

@@ -17,8 +17,7 @@ module FPM
       REQUIRED_METHODS = [:fetch, :extract]
 
       extend Forwardable
-      def_delegators :@handler, :fetch, :extract, :local_path, :checksum?
-      def_delegators :@source, :fetchable?
+      def_delegators :@handler, :fetch, :extract, :local_path, :checksum?, :fetchable?
 
       attr_reader :source_url
 

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

@@ -15,6 +15,10 @@ module FPM
           Log.info "Not extracting - noop source handler"
           builddir.to_s
         end
+
+        def fetchable?
+          true
+        end
       end
     end
   end

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

@@ -25,9 +25,19 @@ module FPM
 
         private
         def svn(url, path)
+          extra_args = []
+
+          extra_args << '--ignore-externals' if !options[:externals]
+
+          [:username, :password].each do |opt|
+            if options.key? opt
+              extra_args << "--#{opt}" << options[opt]
+            end
+          end
+
           revision = options[:revision] || 'HEAD'
-          externals = '--ignore-externals' if !options[:externals]
-          safesystem('svn', 'export', '--force', externals, '-q', '-r', revision, url, path)
+
+          safesystem('svn', 'export', '--force', *extra_args, '-q', '-r', revision, url, path)
         end
 
         def extracted_source

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

@@ -28,6 +28,10 @@ module FPM
           raise "#{self}#fetch not implemented!"
         end
 
+        def fetchable?
+          @url.fetchable?
+        end
+
         def extract(config = {})
           raise "#{self}#extract not implemented!"
         end

data/lib/fpm/cookery/source_integrity_check.rb

@@ -43,7 +43,7 @@ module FPM
       end
 
       def get_checksum
-        type = [:sha256, :sha1, :md5].find do |digest|
+        type = [:sha512, :sha256, :sha1, :md5].find do |digest|
           @recipe.respond_to?(digest) and
           @recipe.send(digest) and
           !@recipe.send(digest).empty?

data/lib/fpm/cookery/utils.rb

@@ -6,8 +6,13 @@ module FPM
       protected
       # From fpm. (lib/fpm/util.rb)
       def safesystem(*args)
-        # Make sure to avoid nil elements in args. This might happen on 1.8.
-        success = system(*args.compact.flatten)
+        # Process the arguments:
+        #   - Convert all arguments to strings because "system" cannot handle
+        #     keys (avoids TypeError)
+        #   - Make sure to avoid nil elements in args. This might happen on 1.8.
+        safe_args = args.map(&:to_s).compact.flatten
+        Log.debug("Executing command: #{safe_args.inspect}")
+        success = system(*safe_args)
         if !success
           raise "'system(#{args.inspect})' failed with error code: #{$?.exitstatus}"
         end
@@ -83,7 +88,18 @@ module FPM
       def patch(src, level = 0)
         raise "patch level must be integer" unless level.is_a?(Fixnum)
         raise "#{src} does not exist" unless File.exist? src
-        safesystem "patch -p#{level} --batch < #{src}"
+
+        if "#{src}".end_with?('.gz')
+          safesystem "gunzip -c #{src} | patch -p#{level} --batch"
+        else
+          safesystem "patch -p#{level} --batch < #{src}"
+        end
+      end
+
+      def go(*args)
+        args = argument_build(*args)
+        args.each {|a| a == '--mod=vendor' && ENV['GO111MODULE'] = 'on' }
+        safesystem 'go', *args
       end
     end
   end

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.33.0'
+    VERSION = '0.34.0'
   end
 end

data/recipes/activemq/recipe.rb

@@ -0,0 +1,15 @@
+class ActiveMQ < FPM::Cookery::Recipe
+  name 'apache-activemq'
+  version '5.15.6'
+  url 'http://archive.apache.org/dist/activemq/5.15.6/apache-activemq-5.15.6-bin.tar.gz'
+  # Checksum from http://archive.apache.org/dist/activemq/5.15.6/apache-activemq-5.15.6-bin.tar.gz.sha512
+  sha512 'a1b931a25c513f83f4f712cc126ee67a2b196ea23a243aa6cafe357ea03f721fba6cb566701e5c0e1f2f7ad8954807361364635c45d5069ec2dbf0ba5c6b588b'
+
+  def build
+  end
+
+  def install
+    opt.install Dir["#{builddir}/*"]
+  end
+
+end

data/spec/recipe_spec.rb

@@ -111,6 +111,12 @@ describe "Recipe" do
     end
   end
 
+  describe "#sha512" do
+    it "can be set" do
+      check_attribute(:sha512, '123456789abcdef')
+    end
+  end
+
   describe "#sha256" do
     it "can be set" do
       check_attribute(:sha256, '123456789abcdef')
@@ -465,6 +471,67 @@ describe "Recipe" do
     end
   end
 
+  describe ".targets" do
+    before do
+      FPM::Cookery::Facts.class_eval do
+        class << self
+          alias_method :target_orig, :target
+          def target; :rpm; end
+        end
+      end
+    end
+
+    after do
+      FPM::Cookery::Facts.class_eval do
+        class << self
+          alias_method :target, :target_orig
+        end
+      end
+    end
+
+    describe "with a list of targets" do
+      it "allows target specific settings" do
+        recipe_klass.class_eval do
+          vendor 'a'
+
+          targets [:rpm, :deb] do
+            vendor 'b'
+          end
+        end
+
+        expect(recipe_klass.new.vendor).to eq('b')
+      end
+    end
+
+    describe "with a single target" do
+      it "allows target specific settings" do
+        recipe_klass.class_eval do
+          vendor 'a'
+
+          targets :rpm do
+            vendor 'b'
+          end
+        end
+
+        expect(recipe_klass.new.vendor).to eq('b')
+      end
+    end
+
+    describe "without a matching target" do
+      it "does not set target specific settings" do
+        recipe_klass.class_eval do
+          vendor 'a'
+
+          targets :deb do
+            vendor 'b'
+          end
+        end
+
+        expect(recipe_klass.new.vendor).to eq('a')
+      end
+    end
+  end
+
   describe ".platform" do
     it 'matches the current platform from FPM::Cookery::Facts' do
       expect(recipe_klass.platform).to eq(FPM::Cookery::Facts.platform)
@@ -667,4 +734,10 @@ describe "Recipe" do
       end
     end
   end
+
+  describe "#extract" do
+    it "returns nil by default" do
+      expect(recipe.extract).to be_nil
+    end
+  end
 end

data/spec/source_handler_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'fpm/cookery/source'
+require 'fpm/cookery/source_handler'
+
+describe 'SourceHandler' do
+  let(:cachedir) { FPM::Cookery::Path.new('/tmp/cache') }
+  let(:builddir) { FPM::Cookery::Path.new('/tmp/build') }
+
+  describe "#fetchable?" do
+    context "when using the noop source handler" do
+      it "always returns true" do
+        nil_source = FPM::Cookery::Source.new(nil, :with => :noop)
+        empty_source = FPM::Cookery::Source.new('', :with => :noop)
+
+        nil_handler = FPM::Cookery::SourceHandler.new(nil_source, cachedir, builddir)
+        empty_handler = FPM::Cookery::SourceHandler.new(empty_source, cachedir, builddir)
+
+        expect(nil_handler.fetchable?).to eq(true)
+        expect(empty_handler.fetchable?).to eq(true)
+      end
+    end
+
+    context "otherwise" do
+      it "returns true when the source URI is non-empty" do
+        fetchable_sources = [
+          ['https://somedomain.io/project-1.2-3.tar.xz'],
+          ['https://git.mysite.cat/atonic.git', :with => :git],
+          ['/var/src', :with => :directory],
+        ].map { |s| FPM::Cookery::Source.new(*s) }
+
+        unfetchable_sources = [
+          [''],
+          [nil, :with => :git],
+          ['', :with => :directory],
+        ].map { |s| FPM::Cookery::Source.new(*s) }
+
+        fetchable_handlers = fetchable_sources.map { |fs| FPM::Cookery::SourceHandler.new(fs, cachedir, builddir) }
+        unfetchable_handlers = unfetchable_sources.map { |us| FPM::Cookery::SourceHandler.new(us, cachedir, builddir) }
+
+        expect(fetchable_handlers.map(&:fetchable?)).to all(eq(true))
+        expect(unfetchable_handlers.map(&:fetchable?)).to all(eq(false))
+      end
+    end
+  end
+end

data/spec/source_integrity_check_spec.rb

@@ -48,6 +48,44 @@ describe "SourceIntegrityCheck" do
     end
   end
 
+  describe "with a correct sha512 checksum defined" do
+    describe "#error?" do
+      it "returns false" do
+        allow(recipe).to receive(:sha512).and_return('488f02db910d6a12f194ed62d7e6a89d9e408c8354acb875cf81c5fb284022cd320d4803a968f8754f5cc53797d515994619f669d359e3b4f989801a39ee6ffd')
+
+        expect(check.error?).to eq(false)
+      end
+    end
+  end
+
+  describe "with a wrong sha512 checksum defined" do
+    before do
+      allow(recipe).to receive(:sha512).and_return('xxxx02db910d6a12f194ed62d7e6a89d9e408c8354acb875cf81c5fb284022cd320d4803a968f8754f5cc53797d515994619f669d359e3b4f989801a39ee6ffd')
+    end
+
+    describe "#error?" do
+      it "returns true" do
+        expect(check.error?).to eq(true)
+      end
+    end
+
+    it "has checksum_expected set to the expected checksum" do
+      expect(check.checksum_expected).to eq('xxxx02db910d6a12f194ed62d7e6a89d9e408c8354acb875cf81c5fb284022cd320d4803a968f8754f5cc53797d515994619f669d359e3b4f989801a39ee6ffd')
+    end
+
+    it "has checksum_actual set to the actual checksum" do
+      expect(check.checksum_actual).to eq('488f02db910d6a12f194ed62d7e6a89d9e408c8354acb875cf81c5fb284022cd320d4803a968f8754f5cc53797d515994619f669d359e3b4f989801a39ee6ffd')
+    end
+
+    it "has filename set" do
+      expect(check.filename).to eq(fixture_path('test-source-1.0.tar.gz'))
+    end
+
+    it "has digest set to :sha512" do
+      expect(check.digest).to eq(:sha512)
+    end
+  end
+
   describe "with a correct sha256 checksum defined" do
     describe "#error?" do
       it "returns false" do

data/spec/utils_spec.rb

@@ -20,6 +20,14 @@ describe FPM::Cookery::Utils do
     def run_configure_mix
       configure '--first=okay', '--second=okay', :hello_world => true, :prefix => '/usr', 'a-dash' => 1
     end
+
+    def run_go_build
+      go 'build', '-mod=vendor', '-v'
+    end
+
+    def run_go_build_hash
+      go :build, :mod => 'vendor', :v => true
+    end
   end
 
   let(:test) { TestUtils.new }
@@ -58,4 +66,19 @@ describe FPM::Cookery::Utils do
       end
     end
   end
+  describe '#go' do
+    context 'with a list of string arguments' do
+      it 'calls go with the correct arguments' do
+        expect(test).to receive(:system).with('go', 'build', '-mod=vendor', '-v')
+        test.run_go_build
+      end
+    end
+
+    context 'with hash arguments' do
+      it 'calls go with the correct arguments' do
+        expect(test).to receive(:system).with('go', 'build', '--mod=vendor', '--v')
+        test.run_go_build_hash
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-09 00:00:00.000000000 Z
+date: 2019-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -98,16 +98,22 @@ dependencies:
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -263,6 +269,7 @@ files:
 - lib/fpm/cookery/utils.rb
 - lib/fpm/cookery/version.rb
 - lib/hiera/fpm_cookery_logger.rb
+- recipes/activemq/recipe.rb
 - recipes/arr-pm/recipe.rb
 - recipes/backports/recipe.rb
 - recipes/cabin/recipe.rb
@@ -325,6 +332,7 @@ files:
 - spec/path_helper_spec.rb
 - spec/path_spec.rb
 - spec/recipe_spec.rb
+- spec/source_handler_spec.rb
 - spec/source_integrity_check_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb
@@ -349,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fpm-cookery
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: A tool for building software packages with fpm.