fpm-cookery 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bc3a1f69bcffcb2a64150d54766a2816273cbd6
-  data.tar.gz: 5b77e8699f5124bef85174643f368cb17b726b33
+  metadata.gz: 0077d390146dfa67ba944b30cc6d2e0bc75d9290
+  data.tar.gz: 69c813e70e20ecfa9587b11d8c5ca4c69c26948f
 SHA512:
-  metadata.gz: 1bf422e20d2e4249c285acd5483b1522c73dcb36eb393055fe0c72d37e8f400f04fa5bc007c602735ecc60d2da6c9238b443cf53d3f5004e5efeff6d0a144ddc
-  data.tar.gz: bbeae7a0b3519aff36fb0510f27f98abf45d078a6b0e7e773a1da9e98a0a1ede060f1d6091db06dc9f0d1a8edcf79c44f97cb57c14de3a87bbef5d830e6f1338
+  metadata.gz: 66179d17020b8f94464cf92a01d9c19780506c0953fa761db56188722f05460465f419478e9f337870c79b49d8073b6313c38a42b39f6bd28e56041a3d42a06e
+  data.tar.gz: 3d677fcab730b224094c13bbdac83fd4d27ccec1dc13e529aa42b0054bb0aba54bb4031e824c7db0e4aa20b8016c934e96773d4a8e174590e9d35c4bbf166791

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.25.0 (2014-08-03)
+* Add `environment` method to recipe to handle environment settings.
+* Allow newer FPM versions than 1.1.
+* Unbreak `configure` call without arguments on Ruby 1.8. (#92)
+* Basic Scientific Linux support. (jjuarez / #93)
+* Update internal recipes. (smasset / #89)
+
 # v0.24.0 (2014-06-03)
 * Add amazon linux to the list of RPM-based distros. (skottler / #88)
 * Add support for PEAR packages. (mlafeldt / #85)

data/fpm-cookery.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec", "~> 2.14"
+  s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rake"
-  s.add_runtime_dependency "fpm", "~> 1.1.0"
+  s.add_runtime_dependency "fpm", "~> 1.1"
   s.add_runtime_dependency "facter"
   s.add_runtime_dependency "puppet", ">= 3.4.3"
   s.add_runtime_dependency "addressable"

data/lib/fpm/cookery/environment.rb

@@ -0,0 +1,49 @@
+require 'fpm/cookery/log'
+
+module FPM
+  module Cookery
+    class Environment
+      REMOVALS = %w(
+        BUNDLE_GEMFILE RUBYOPT BUNDLE_BIN_PATH GEM_HOME GEM_PATH
+      ).freeze
+
+      def initialize
+        @env = {}
+      end
+
+      def [](key)
+        @env[key.to_s]
+      end
+
+      def []=(key, value)
+        if value.nil?
+          @env.delete(key.to_s)
+        else
+          @env[key.to_s] = value.to_s
+        end
+      end
+
+      def with_clean
+        saved_env = ENV.to_hash
+
+        REMOVALS.each do |var|
+          value = ENV.delete(var)
+          Log.debug("Removing '#{var}' => '#{value}' from environment")
+        end
+
+        @env.each do |k, v|
+          Log.debug("Adding '#{k}' => '#{v}' to environment")
+          ENV[k] = v
+        end
+
+        yield
+      ensure
+        ENV.replace(saved_env.to_hash)
+      end
+
+      def to_hash
+        @env.dup
+      end
+    end
+  end
+end

data/lib/fpm/cookery/facts.rb

@@ -17,9 +17,9 @@ module FPM
 
       def self.target
         @target ||= case platform
-                    when :centos, :redhat, :fedora, :amazon then :rpm
-                    when :debian, :ubuntu                   then :deb
-                    when :darwin                            then :osxpkg
+                    when :centos, :redhat, :fedora, :amazon, :scientific then :rpm
+                    when :debian, :ubuntu                                then :deb
+                    when :darwin                                         then :osxpkg
                     end
       end
 

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

@@ -18,7 +18,7 @@ module FPM
           inputs = config.fetch(:input, nil) || '.'
 
           Array(inputs).each do |path|
-            fpm.input(path)
+            fpm.input(path.to_s)
           end
         end
       end

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

@@ -1,5 +1,6 @@
 require 'fpm/package/gem'
 require 'fpm/cookery/package/package'
+require 'fpm/cookery/utils'
 
 module FPM
   module Cookery
@@ -17,7 +18,9 @@ module FPM
         end
 
         def package_input
-          fpm.input(recipe.name)
+          recipe.environment.with_clean do
+            fpm.input(recipe.name)
+          end
         end
       end
     end

data/lib/fpm/cookery/recipe.rb

@@ -5,6 +5,7 @@ require 'fpm/cookery/source'
 require 'fpm/cookery/source_handler'
 require 'fpm/cookery/utils'
 require 'fpm/cookery/path_helper'
+require 'fpm/cookery/environment'
 require 'fpm/cookery/package/cpan'
 require 'fpm/cookery/package/dir'
 require 'fpm/cookery/package/gem'
@@ -38,6 +39,7 @@ module FPM
         # Apply class data inheritable pattern to @fpm_attributes
         # class variable.
         klass.instance_variable_set(:@fpm_attributes, self.fpm_attributes.dup)
+        klass.instance_variable_set(:@environment, self.environment.dup)
       end
 
       def self.platforms(valid_platforms)
@@ -95,8 +97,13 @@ module FPM
           end
           @fpm_attributes
         end
+
+        def environment
+          @environment
+        end
       end
       @fpm_attributes = {}
+      @environment = FPM::Cookery::Environment.new
 
       def initialize(filename, config)
         @filename = Path.new(filename).expand_path
@@ -122,6 +129,7 @@ module FPM
       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
+      def environment()        self.class.environment                      end
 
       # Resolve dependencies from omnibus package.
       def depends_all

data/lib/fpm/cookery/utils.rb

@@ -1,10 +1,13 @@
+require 'fpm/cookery/log'
+
 module FPM
   module Cookery
     module Utils
       protected
       # From fpm. (lib/fpm/util.rb)
       def safesystem(*args)
-        success = system(*args.flatten)
+        # Make sure to avoid nil elements in args. This might happen on 1.8.
+        success = system(*args.compact.flatten)
         if !success
           raise "'system(#{args.inspect})' failed with error code: #{$?.exitstatus}"
         end
@@ -12,12 +15,8 @@ module FPM
       end
 
       def cleanenv_safesystem(*args)
-        bundler_vars = %w(BUNDLE_GEMFILE RUBYOPT BUNDLE_BIN_PATH GEM_HOME GEM_PATH)
-        bundled_env = ENV.to_hash
-        bundler_vars.each {|var| ENV.delete(var)}
-        result = safesystem(*args)
-        ENV.replace(bundled_env.to_hash)
-        result
+        Log.warn("[DEPRECATED] Use `environment.with_clean { safesystem(...) }` instead of `cleanenv_safesystem(...)` in the recipe")
+        environment.with_clean { safesystem(*args) }
       end
 
       # From brew2deb. (lib/debian_formula.rb)

data/lib/fpm/cookery/version.rb

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

data/recipes/fpm-cookery-gem/arr-pm.rb

@@ -1,4 +1,4 @@
 class ArrPmRubyGem < FPM::Cookery::RubyGemRecipe
   name    "arr-pm"
-  version "0.0.8"
+  version "0.0.9"
 end

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

@@ -1,7 +1,7 @@
 class FpmRubyGem < FPM::Cookery::RubyGemRecipe
   name    "fpm"
-  version "1.0.2"
+  version "1.1.0"
 
   chain_package true
-  chain_recipes "json", "cabin", "backports", "arr-pm", "clamp", "childprocess", "ftw"
+  chain_recipes "json", "cabin", "backports", "arr-pm", "clamp", "childprocess"
 end

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

@@ -1,6 +1,6 @@
 class FpmCookeryRubyGem < FPM::Cookery::RubyGemRecipe
   name    "fpm-cookery"
-  version "0.20.1"
+  version "0.24.0"
 
   chain_package true
   chain_recipes "fpm", "facter", "puppet", "addressable", "systemu"

data/recipes/omnibustest/recipe.rb

@@ -6,9 +6,15 @@ class OmnibusTest < FPM::Cookery::Recipe
   version '1.0.0'
   description 'Testing Omnibus package'
   revision 0
+  source '', :with => :noop
 
   omnibus_package true
   omnibus_recipes "ruby", "bundler-gem"
   omnibus_dir     '/opt/omnibustest'
 
+  def build
+  end
+
+  def install
+  end
 end

data/recipes/omnibustest/ruby.rb

@@ -1,12 +1,12 @@
-class Ruby200 < FPM::Cookery::Recipe
+class Ruby210 < FPM::Cookery::Recipe
   description 'The Ruby virtual machine'
 
   name 'ruby'
-  version '2.0.0.0'
+  version '2.1.2'
   revision 0
   homepage 'http://www.ruby-lang.org/'
-  source 'http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p0.tar.bz2'
-  sha256 'c680d392ccc4901c32067576f5b474ee186def2fcd3fcbfa485739168093295f'
+  source 'http://ftp.ruby-lang.org/pub/ruby/2.1/ruby-2.1.2.tar.bz2'
+  sha256 '6948b02570cdfb89a8313675d4aa665405900e27423db408401473f30fc6e901'
 
   vendor     'fpm'
   license    'The Ruby License'

data/spec/environment_spec.rb

@@ -0,0 +1,118 @@
+require 'spec_helper'
+require 'fpm/cookery/environment'
+require 'pathname'
+
+describe FPM::Cookery::Environment do
+  let(:env) { described_class.new }
+
+  it 'behaves like a hash' do
+    env['foo'] = 'bar'
+
+    expect(env['foo']).to eq('bar')
+  end
+
+  it 'converts keys to strings on set' do
+    env[:foo] = 'bar'
+
+    expect(env['foo']).to eq('bar')
+  end
+
+  it 'converts keys to strings on get' do
+    env['foo'] = 'bar'
+
+    expect(env[:foo]).to eq('bar')
+  end
+
+  it 'converts values to string' do
+    env['foo'] = 1
+    env['bar'] = Pathname.new('/')
+
+    expect(env['foo']).to eq('1')
+    expect(env['bar']).to eq('/')
+  end
+
+  it 'deletes a key if the value is set to nil' do
+    env['foo'] = 'bar'
+    env['foo'] = nil
+
+    expect(env.to_hash).to_not have_key('foo')
+  end
+
+  describe '#to_hash' do
+    it 'returns the data as a hash' do
+      env['foo'] = 'bar'
+
+      expect(env.to_hash).to eq({'foo' => 'bar'})
+    end
+
+    it 'returns a copy of the data' do
+      env['foo'] = 'bar'
+
+      data = env.to_hash
+
+      env['foo'] = 'nope'
+
+      expect(data).to eq({'foo' => 'bar'})
+    end
+  end
+
+  describe '#with_clean' do
+    it 'returns the return value of the given block' do
+      expect(env.with_clean { 'nice' }).to eq('nice')
+    end
+
+    it 'removes BUNDLE_GEMFILE from env' do
+      env.with_clean do
+        expect(ENV).to_not have_key('BUNDLE_GEMFILE')
+      end
+    end
+
+    it 'removes RUBYOPT from env' do
+      env.with_clean do
+        expect(ENV).to_not have_key('RUBYOPT')
+      end
+    end
+
+    it 'removes BUNDLE_BIN_PATH from env' do
+      env.with_clean do
+        expect(ENV).to_not have_key('BUNDLE_BIN_PATH')
+      end
+    end
+
+    it 'removes GEM_HOME from env' do
+      env.with_clean do
+        expect(ENV).to_not have_key('GEM_HOME')
+      end
+    end
+
+    it 'removes GEM_PATH from env' do
+      env.with_clean do
+        expect(ENV).to_not have_key('GEM_PATH')
+      end
+    end
+
+    it 'restores the old environment' do
+      env.with_clean { }
+
+      expect(ENV).to have_key('GEM_HOME')
+    end
+
+    it 'adds set environment variables' do
+      env['GEM_PATH'] = '/custom/path'
+      env['FOO'] = 'bar'
+
+      env.with_clean do
+        expect(ENV['GEM_PATH']).to eq('/custom/path')
+        expect(ENV['FOO']).to eq('bar')
+      end
+    end
+
+    it 'removes custom variables as well' do
+      env['FOO'] = 'bar'
+
+      env.with_clean { }
+
+      expect(ENV).to_not have_key('FOO')
+    end
+  end
+end

data/spec/facts_spec.rb

@@ -41,6 +41,13 @@ describe "Facts" do
   end
 
   describe "target" do
+
+    describe "with platform Scientific" do
+      it "returns rpm" do
+        FPM::Cookery::Facts.platform = 'Scientific'
+        expect(FPM::Cookery::Facts.target).to eq(:rpm)
+      end
+    end
     describe "with platform CentOS" do
       it "returns rpm" do
         FPM::Cookery::Facts.platform = 'CentOS'

data/spec/package_gem_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'fpm/cookery/package/gem'
+require 'fpm/cookery/recipe'
+
+describe FPM::Cookery::Package::Gem do
+  let(:config) { {} }
+
+  let(:recipe) do
+    Class.new(FPM::Cookery::RubyGemRecipe) do
+      description 'a test package'
+      name 'foo'
+      version '1.1.1'
+    end
+  end
+
+  let(:package) do
+    described_class.new(recipe, config)
+  end
+
+  let(:fpm) do
+    double('FPM').as_null_object
+  end
+
+  before do
+    allow(FPM::Package::Gem).to receive(:new).and_return(fpm)
+  end
+
+  context '#package_input' do
+    it 'calls the fpm package creation with a clean environment' do
+      expect(fpm).to receive(:input) do |*args|
+        expect(ENV).to_not have_key('GEM_HOME')
+      end
+
+      package # Trigger object creation and package_input call.
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
@@ -8,6 +7,8 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.raise_errors_for_deprecations!
 end
 
 def fixture_path(file)

data/spec/utils_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'fpm/cookery/utils'
+
+describe FPM::Cookery::Utils do
+  class TestUtils
+    include FPM::Cookery::Utils
+
+    def run_configure_no_arg
+      configure
+    end
+  end
+
+  let(:test) { TestUtils.new }
+
+  before do
+    # Avoid shellout.
+    allow(test).to receive(:system).and_return('success')
+  end
+
+  describe '#configure' do
+    context 'without any arguments' do
+      it 'calls ./configure without any arguments' do
+        expect(test).to receive(:system).with('./configure')
+        test.run_configure_no_arg
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - lib/fpm/cookery/cli.rb
 - lib/fpm/cookery/config.rb
 - lib/fpm/cookery/dependency_inspector.rb
+- lib/fpm/cookery/environment.rb
 - lib/fpm/cookery/exceptions.rb
 - lib/fpm/cookery/facts.rb
 - lib/fpm/cookery/log.rb
@@ -179,9 +180,7 @@ files:
 - recipes/fpm-cookery-gem/facter.rb
 - recipes/fpm-cookery-gem/ffi.rb
 - recipes/fpm-cookery-gem/fpm.rb
-- recipes/fpm-cookery-gem/ftw.rb
 - recipes/fpm-cookery-gem/hiera.rb
-- recipes/fpm-cookery-gem/http_parser.rb.rb
 - recipes/fpm-cookery-gem/json.rb
 - recipes/fpm-cookery-gem/json_pure.rb
 - recipes/fpm-cookery-gem/puppet.rb
@@ -203,9 +202,11 @@ files:
 - recipes/redis/recipe.rb
 - recipes/redis/redis-server.init.d
 - spec/config_spec.rb
+- spec/environment_spec.rb
 - spec/facts_spec.rb
 - spec/fixtures/test-config-1.yml
 - spec/fixtures/test-source-1.0.tar.gz
+- spec/package_gem_spec.rb
 - spec/package_maintainer_spec.rb
 - spec/package_spec.rb
 - spec/package_version_spec.rb
@@ -215,6 +216,7 @@ files:
 - spec/source_integrity_check_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb
+- spec/utils_spec.rb
 homepage: ''
 licenses: []
 metadata: {}

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

@@ -1,7 +0,0 @@
-class FtwRubyGem < FPM::Cookery::RubyGemRecipe
-  name    "ftw"
-  version "0.0.34"
-
-  chain_package true
-  chain_recipes "http_parser.rb"
-end

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

@@ -1,4 +0,0 @@
-class HttpParserRbRubyGem < FPM::Cookery::RubyGemRecipe
-  name    "http_parser.rb"
-  version "0.5.3"
-end