fpm-cookery 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf8725d7f5c012b6be0b89abc7209dffbf02be84
-  data.tar.gz: 1dca9003a4f4100cb5e09e139845a3d0ffdfc506
+  metadata.gz: ca1bc459382a35ea29c576382a16a6ff45db5892
+  data.tar.gz: 225becfa5a63531f7cc40fe697ddfcc58225a936
 SHA512:
-  metadata.gz: a15c22968d8e574370a13b09a8b4609d6fc6faf5430b5f618b15d8a7c7821624d994bd2f3405acd298489b165372e5b5943100977a3611cf64b96899334bbbe4
-  data.tar.gz: 267f5de36d79f2bb3b52e038cada34086c2e88b8ae729074ed93866d8e9988d8c6826b8079ed0ca3c78a31bf2204416aac0c47a12d70a8ffdc8eaefa3dd5552a
+  metadata.gz: ee50ff26886d0550452f6ca8f82f771f7da0bf16c0a704b4ac05ef7aa71e039cf66737a1114cdf15bbf14fa127a466c453a74ff733242c4f7190f79471b0b4e8
+  data.tar.gz: e6e47f70041d2a30beddca5dd50c28194352ed8af314fa26c08f536bb114bcceb8a7605c620006bee9fdd66f4db553890621f14926a432f0996a43f4a4ae0abc

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.22.0 (2014-05-26)
+* Add support to set arbitrary fpm attributes via `fpm_attributes`.
+  (unakatsuo / #75, #80)
+* Require fpm `~> 1.1.0`. (ryansch / #84)
+
 # v0.21.0 (2014-04-07)
 * Unbreak rpm packages by reverting the `%files` change from #67.
 * Remove default revision. (smasset / #76)

data/fpm-cookery.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec", "~> 2.14"
   s.add_development_dependency "rake"
-  s.add_runtime_dependency "fpm", "~> 1.0.0"
+  s.add_runtime_dependency "fpm", "~> 1.1.0"
   s.add_runtime_dependency "facter"
   s.add_runtime_dependency "puppet", ">= 3.4.3"
   s.add_runtime_dependency "addressable"

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

@@ -40,6 +40,10 @@ module FPM
           # Package type specific code should be called in package_setup.
           package_setup
 
+          # combine recipe specific fpm attributes. here allows to
+          # overwrite the values from package_setup().
+          @fpm.attributes.merge!(recipe.fpm_attributes)
+
           # The input for the FPM package will be set here.
           package_input
 

data/lib/fpm/cookery/recipe.rb

@@ -31,6 +31,13 @@ module FPM
         end
       end
 
+      def self.inherited(klass)
+        super
+        # Apply class data inheritable pattern to @fpm_attributes
+        # class variable.
+        klass.instance_variable_set(:@fpm_attributes, self.fpm_attributes.dup)
+      end
+
       def self.platforms(valid_platforms)
         Array(valid_platforms).member?(self.platform) and block_given? ? yield : false
       end
@@ -76,7 +83,18 @@ module FPM
         def depends_all
           (depends + build_depends).uniq
         end
+
+        # Supports both hash and argument assignment
+        #   fpm_attributes[:attr1] = xxxx
+        #   fpm_attributes :xxxx=>1, :yyyy=>2
+        def fpm_attributes(args=nil)
+          if args.is_a?(Hash)
+            @fpm_attributes.merge!(args)
+          end
+          @fpm_attributes
+        end
       end
+      @fpm_attributes = {}
 
       def initialize(filename, config)
         @filename = Path.new(filename).expand_path
@@ -101,6 +119,7 @@ module FPM
       def builddir(path = nil) (@builddir || tmp_root('tmp-build'))/path   end
       def pkgdir(path = nil)   (@pkgdir   || workdir('pkg'))/path         end
       def cachedir(path = nil) (@cachedir || workdir('cache'))/path       end
+      def fpm_attributes() self.class.fpm_attributes end
 
       # Resolve dependencies from omnibus package.
       def depends_all

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.21.0'
+    VERSION = '0.22.0'
   end
 end

data/recipes/fpm-cookery-gem/puppet.rb

@@ -1,6 +1,6 @@
 class PuppetRubyGem < FPM::Cookery::RubyGemRecipe
   name    "puppet"
-  version "3.2.2"
+  version "3.4.3"
 
   chain_package true
   chain_recipes "hiera", "rgen"

data/spec/package_spec.rb

@@ -150,6 +150,21 @@ describe 'Package' do
       end
     end
 
+    describe '.fpm_attributes' do
+      let(:recipe) do
+        # Ensure Recipe.inherited() to be called before handling fpm_attributes.
+        recipe_class = Class.new(FPM::Cookery::Recipe)
+        recipe_class.instance_eval do
+          fpm_attributes :deb_user=>'deb_user', :rpm_user=>'rpm_user'
+        end
+        recipe_class
+      end
+
+      it 'overwrites default fpm attributes in Package class' do
+        expect(package.fpm.attributes).to include({:deb_user=>'deb_user', :rpm_user=>'rpm_user'})
+      end
+    end
+
     it 'calls the package_setup method' do
       expect(package.test_package_setup_run).to eq(true)
     end

data/spec/recipe_spec.rb

@@ -516,4 +516,27 @@ describe "Recipe" do
       }).to eq(true)
     end
   end
+
+  describe ".fpm_attributes" do
+    it "returns hash object as default" do
+      expect(klass.fpm_attributes).to be_a(Hash)
+    end
+
+    it "returns same value from instance method with hash assignment" do
+      expect(recipe.fpm_attributes).to include({})
+
+      klass.fpm_attributes[:rpm_user] = 'httpd'
+      klass.fpm_attributes[:deb_user] = 'apache'
+
+      expect(recipe.fpm_attributes).to include({:rpm_user=>'httpd', :deb_user=>'apache'})
+    end
+
+    it "returns same value from instance method with argument assignment" do
+      expect(recipe.fpm_attributes).to include({})
+
+      klass.fpm_attributes :rpm_user => 'httpd', :deb_user => 'apache'
+
+      expect(recipe.fpm_attributes).to include({:rpm_user=>'httpd', :deb_user=>'apache'})
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement