fpm-cookery 0.17.0 → 0.17.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDg4YWE1MTIzYTg3NTNhYjA1NTc3OWEyMTRiYTkyNDljNjgxYTFlMQ==
+    ZWMwNGZiYzMzOWE5Yzk2ODVhZmVhNjUyZWJlNjllNGYzMmRlYmY1Nw==
   data.tar.gz: !binary |-
-    MzFjNjY2Y2Q4NDI4YWU5MGE4YzhlYTA0MzMyMDViYzMyMWUwOTQ4YQ==
+    ZmI4ZWU1OGUyMjAzNGI2MTk5MTcwODE5N2FjMTA0ZjQ0YTE2ZWQyZg==
 SHA512:
   metadata.gz: !binary |-
-    MjQ1MWQ0MDI4ODgzZTFjMjE0MWU4Y2I3YzM1OTMyYzgxMThhN2MyYzFkODM3
-    ZmQwNWEzMmViZjVlOTdhNzk4ZjRlODIwNGRhOTg2ODVkZmMzZWZlM2QxYzEz
-    YWRiMzYwYWM2ZTdkYWEyMzgyODQ3ZTRiNjIxNWNiMzU4ZWNiOWM=
+    MjdlODY3MWUwMjE2M2ZjNjE3MTg5ZDE3NmY5M2M3MzkzN2ExMGRiOTIwZDM5
+    NDY3YTBlMWQ5OGE3ZDk2YmMyNDMxMWFlZmU4N2M3MTc3NTI2OWM0OWE3MzZi
+    MDI4YzE2YTRmNDkwZGNiN2FjNTRmMTFkYzdiN2M3Yjk4OTk5MTU=
   data.tar.gz: !binary |-
-    MDc2NzgxYmZkNDA1ZDg4NDVlZTEwYjg2MmM4NjNmYjM2ZThkN2Y2ODMyMzVj
-    ZGQyMzVhZjdkZjZmOTNkYTVmMjRkNzRmOWI3NjU2ZmM4M2Y3ZDNmNjA5ZTQw
-    ODIwOGJlYTc5ZjEyNTE5MzcwNzY5ZTExM2M4NWEwMzA5NzNhNWU=
+    YmU0ODYxNzdlZTU0MDdmNzlhZjNlYTM4YjE1ZmRjMzA3N2Y0OGQ5NjQ2NTcz
+    YjIzNmU4MGU5NTA3Mjk3NWRmZjI1YWE1MDZmNTkzNGZjNTkxM2IxYWY4MWM1
+    YjgxYjg2NWYxNzY4NDIzNzUyYTkzM2YwMGNiMzU4Mzc5ZjI1YTQ=

data/.travis.yml

@@ -1,11 +1,11 @@
-script: rake test
+script: bundle exec rake test
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.0
   - ruby-head
 
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: 2.1.0 # Problem with puppet monkey patch... waiting for >3.4.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.17.1 (2014-02-07)
+* Unbreak deb package building.
+
 # 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)

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

@@ -24,7 +24,7 @@ module FPM
           @fpm.config_files += recipe.config_files
           @fpm.directories += recipe.directories
 
-          @fpm.attributes[:deb_compression] = 'gzip'
+          @fpm.attributes[:deb_compression] = 'gz'
           @fpm.attributes[:deb_user] = 'root'
           @fpm.attributes[:deb_group] = 'root'
           @fpm.attributes[:rpm_compression] = 'gzip'

data/lib/fpm/cookery/path.rb

@@ -26,7 +26,8 @@ module FPM
       end
 
       def mkdir
-        FileUtils.mkdir_p(self.to_s)
+        # FileUtils.mkdir_p in Ruby 1.8.7 does not return an array.
+        Array(FileUtils.mkdir_p(self.to_s))
       end
 
       def install(src, new_basename = nil)

data/lib/fpm/cookery/version.rb

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

data/spec/config_spec.rb

@@ -137,7 +137,8 @@ describe 'Config' do
 
       begin; config; rescue => e; error = e; end
 
-      error.invalid_keys.must_equal [:__foo__, :__bar__]
+      # Sort array for Ruby 1.8.7 compat.
+      error.invalid_keys.sort.must_equal [:__bar__, :__foo__]
     end
 
     it 'works with strings' do

data/spec/package_version_spec.rb

@@ -3,10 +3,11 @@ require 'fpm/cookery/package/version'
 require 'ostruct'
 
 describe 'Version' do
+  def target; 'deb'; end
+
   let(:klass) { FPM::Cookery::Package::Version }
 
   let(:recipe) { OpenStruct.new(:version => '1.2.0') }
-  let(:target) { 'deb' }
   let(:config) { {} }
 
   let(:version) { klass.new(recipe, target, config) }
@@ -19,7 +20,7 @@ describe 'Version' do
     end
 
     context 'with target rpm' do
-      let(:target) { 'rpm' }
+      def target; 'rpm'; end
 
       it 'returns "."' do
         version.vendor_delimiter.must_equal '.'
@@ -27,7 +28,7 @@ describe 'Version' do
     end
 
     context 'with unknown target' do
-      let(:target) { '_foo_' }
+      def target; '_foo_'; end
 
       it 'returns "-"' do
         version.vendor_delimiter.must_equal '-'
@@ -106,7 +107,7 @@ describe 'Version' do
   end
 
   describe '#to_str' do
-    let(:target) { 'rpm' }
+      def target; 'rpm'; end
 
     it 'returns a string representation of the version' do
       recipe.version = '1.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest