fpm-cookery 0.25.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0077d390146dfa67ba944b30cc6d2e0bc75d9290
-  data.tar.gz: 69c813e70e20ecfa9587b11d8c5ca4c69c26948f
+  metadata.gz: 1b8dcc176b33a7c7e5528cc48f2cca03f9df91ac
+  data.tar.gz: 95f2469915db560eb6e658cafb42769c1f11acf8
 SHA512:
-  metadata.gz: 66179d17020b8f94464cf92a01d9c19780506c0953fa761db56188722f05460465f419478e9f337870c79b49d8073b6313c38a42b39f6bd28e56041a3d42a06e
-  data.tar.gz: 3d677fcab730b224094c13bbdac83fd4d27ccec1dc13e529aa42b0054bb0aba54bb4031e824c7db0e4aa20b8016c934e96773d4a8e174590e9d35c4bbf166791
+  metadata.gz: 14585fd542f177e7a08367979698a6c9f39aa1cda129e79a543e07cb0e7640cc3a7d7c9e326a81d728c3ff13dddf0bb7d7a8726d0d574f79141942fc359e9682
+  data.tar.gz: 23bae9ba992f8c2f1049435e6b4bcc9da0da01c794779d5cfb661234d83713f1d155178871b743472dc697e2dfbd5ed06458cb459ea265ce6720ba51a18b6769

data/.travis.yml

@@ -1,6 +1,6 @@
+sudo: false
 script: bundle exec rake spec
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.26.1 (2015-02-22)
+* Revert "Avoid using git ls-files in gemspec".
+
+# v0.26.0 (2015-02-22)
+* Use FPM exclude code. (#102)
+* Add `osrelease` and `osmajorrelease` facts. (#98)
+* Avoid using `git ls-files` in gemspec. (beddari / #96)
+
 # v0.25.0 (2014-08-03)
 * Add `environment` method to recipe to handle environment settings.
 * Allow newer FPM versions than 1.1.

data/lib/fpm/cookery/facts.rb

@@ -15,6 +15,14 @@ module FPM
         @platform = value.downcase.to_sym
       end
 
+      def self.osrelease
+        @osrelease ||= Facter.fact(:operatingsystemrelease).value
+      end
+
+      def self.osmajorrelease
+        @osmajorrelease ||= Facter.fact(:operatingsystemmajrelease).value
+      end
+
       def self.target
         @target ||= case platform
                     when :centos, :redhat, :fedora, :amazon, :scientific then :rpm

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

@@ -33,9 +33,7 @@ module FPM
           @fpm.attributes[:rpm_group] = 'root'
           @fpm.attributes[:rpm_defattrfile] = '-'
           @fpm.attributes[:rpm_defattrdir] = '-'
-
-          # TODO replace remove_excluded_files() in packager with this.
-          @fpm.attributes[:excludes] = []
+          @fpm.attributes[:excludes] = recipe.exclude
 
           # Package type specific code should be called in package_setup.
           package_setup

data/lib/fpm/cookery/packager.rb

@@ -156,7 +156,6 @@ module FPM
           input.epoch = version.epoch if version.epoch
 
           add_scripts(recipe, input)
-          remove_excluded_files(recipe)
 
           output_class = FPM::Package.types[@target]
 
@@ -201,23 +200,6 @@ module FPM
 
         exit(1) if error
       end
-
-      # Remove all excluded files from the destdir so they do not end up in the
-      # package.
-      def remove_excluded_files(recipe)
-        if File.directory?(recipe.destdir)
-          Dir.chdir(recipe.destdir.to_s) do
-            Dir['**/*'].each do |file|
-              recipe.exclude.each do |ex|
-                if File.fnmatch(ex, file)
-                  Log.info "Exclude file: #{file}"
-                  FileUtils.rm_f(file)
-                end
-              end
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.25.0'
+    VERSION = '0.26.1'
   end
 end

data/spec/facts_spec.rb

@@ -40,6 +40,34 @@ describe "Facts" do
     end
   end
 
+  describe "osrelease" do
+    before do
+      Facter.class_eval do
+        def self.fact(v)
+          v == :operatingsystemrelease ? OpenStruct.new(:value => '6.5') : nil
+        end
+      end
+    end
+
+    it "returns the operating system release version" do
+      expect(FPM::Cookery::Facts.osrelease).to eq('6.5')
+    end
+  end
+
+  describe "osmajorrelease" do
+    before do
+      Facter.class_eval do
+        def self.fact(v)
+          v == :operatingsystemmajrelease ? OpenStruct.new(:value => '6') : nil
+        end
+      end
+    end
+
+    it "returns the operating system major release version" do
+      expect(FPM::Cookery::Facts.osmajorrelease).to eq('6')
+    end
+  end
+
   describe "target" do
 
     describe "with platform Scientific" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec