fpm-cookery 0.8.0 → 0.9.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.9.0 (2012-07-21)
+* Allow architecture specific settings via the `architectures` method.
+* Unbreak RPM creation on RHEL5. (brandonmartin)
+
 # v0.8.0 (2012-05-23)
 * Add /opt path helper.
 * Use the new fpm API. (requires at least fpm-0.4.x)

data/lib/fpm/cookery/facts.rb

@@ -3,6 +3,10 @@ require 'facter'
 module FPM
   module Cookery
     class Facts
+      def self.arch
+        @arch ||= Facter.fact(:architecture).value.downcase.to_sym
+      end
+
       def self.platform
         @platform ||= Facter.fact(:operatingsystem).value.downcase.to_sym
       end

data/lib/fpm/cookery/packager.rb

@@ -170,6 +170,11 @@ module FPM
           input.attributes[:prefix] = '/'
           input.attributes[:chdir] = recipe.destdir.to_s
           input.attributes[:excludes] = [] # TODO replace remove_excluded_files() with this
+          input.attributes[:rpm_compression] = "gzip"
+          input.attributes[:rpm_digest] = "md5"
+          input.attributes[:rpm_user] = "root"
+          input.attributes[:rpm_group] = "root"
+
           input.input('.')
 
           output_class = FPM::Package.types[@target]

data/lib/fpm/cookery/recipe.rb

@@ -30,6 +30,10 @@ module FPM
         Array(valid_platforms).member?(self.platform) and block_given? ? yield : false
       end
 
+      def self.architectures(archs)
+        Array(archs).member?(FPM::Cookery::Facts.arch) and block_given? ? yield : false
+      end
+
       def self.attr_rw_list(*attrs)
         attrs.each do |attr|
           class_eval %Q{

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.8.0'
+    VERSION = '0.9.0'
   end
 end

data/spec/facts_spec.rb

@@ -7,6 +7,20 @@ describe "Facts" do
     FPM::Cookery::Facts.reset!
   end
 
+  describe "arch" do
+    before do
+      Facter.class_eval do
+        def self.fact(v)
+          v == :architecture ? OpenStruct.new(:value => 'x86_64') : nil
+        end
+      end
+    end
+
+    it "is returns the current platform" do
+      FPM::Cookery::Facts.arch.must_equal :x86_64
+    end
+  end
+
   describe "platform" do
     before do
       Facter.class_eval do

data/spec/recipe_spec.rb

@@ -228,6 +228,56 @@ describe "Recipe" do
     end
   end
 
+  describe ".architectures" do
+    before do
+      FPM::Cookery::Facts.class_eval do
+        def self.arch; :x86_64; end
+      end
+    end
+
+    describe "with a list of architectures" do
+      it "allows arch specific settings" do
+        klass.class_eval do
+          vendor 'a'
+
+          architectures [:i386, :x86_64] do
+            vendor 'b'
+          end
+        end
+
+        klass.new(__FILE__).vendor.must_equal 'b'
+      end
+    end
+
+    describe "with a single architecture" do
+      it "allows arch specific settings" do
+        klass.class_eval do
+          vendor 'a'
+
+          architectures :x86_64 do
+            vendor 'b'
+          end
+        end
+
+        klass.new(__FILE__).vendor.must_equal 'b'
+      end
+    end
+
+    describe "without a matching architecture" do
+      it "does not set arch specific settings" do
+        klass.class_eval do
+          vendor 'a'
+
+          architectures :i386 do
+            vendor 'b'
+          end
+        end
+
+        klass.new(__FILE__).vendor.must_equal 'a'
+      end
+    end
+  end
+
 
   #############################################################################
   # Directories

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm