fpm-cookery 0.32.0 → 0.33.0

data/lib/fpm/cookery/source.rb

@@ -20,21 +20,19 @@ module FPM
         @url.scheme.to_s.downcase == 'file'
       end
 
+      # If the Addressable::URI is empty, there's nothing to fetch
+      def fetchable?
+        !@url.empty?
+      end
+
       def url
         @url.to_s
       end
+      [:to_s, :to_str].each { |m| alias_method m, :url }
 
       def path
         @url.path
       end
-
-      def to_s
-        @url.to_s
-      end
-
-      def to_str
-        @url.to_s
-      end
     end
   end
 end

data/lib/fpm/cookery/source_handler.rb

@@ -7,15 +7,18 @@ require 'fpm/cookery/source_handler/local_path'
 require 'fpm/cookery/source_handler/noop'
 require 'fpm/cookery/source_handler/directory'
 require 'fpm/cookery/log'
+require 'fpm/cookery/exceptions'
 
 module FPM
   module Cookery
     class SourceHandler
       DEFAULT_HANDLER = :curl
       LOCAL_HANDLER = :local_path
+      REQUIRED_METHODS = [:fetch, :extract]
 
       extend Forwardable
       def_delegators :@handler, :fetch, :extract, :local_path, :checksum?
+      def_delegators :@source, :fetchable?
 
       attr_reader :source_url
 
@@ -44,10 +47,22 @@ module FPM
 
       def handler_to_class(provider)
         begin
-          self.class.const_get(provider.to_s.split('_').map(&:capitalize).join)
-        rescue NameError
+          maybe_klass = self.class.const_get(provider.to_s.split('_').map(&:capitalize).join)
+
+          instance_method_map = Hash[maybe_klass.instance_methods.map { |m| [m, true] }]
+          missing_methods = REQUIRED_METHODS.find_all { |m| !instance_method_map.key?(m) }
+
+          unless missing_methods.empty?
+            formatted_missing = missing_methods.map { |m| "`#{m}'" }.join(', ')
+            message = %{#{maybe_klass} does not implement required method(s): #{formatted_missing}}
+            Log.error message
+            raise Error::Misconfiguration, message
+          end
+
+          maybe_klass
+        rescue NameError => e
           Log.error "Specified provider #{provider} does not exist."
-          exit(1)
+          raise Error::Misconfiguration, e.message
         end
       end
     end

data/lib/fpm/cookery/source_handler/curl.rb

@@ -37,7 +37,7 @@ module FPM
 
               FileUtils.cp_r(local_path, local_path.basename)
             end
-            extracted_source
+            (builddir/extracted_source).to_s
           end
         end
 
@@ -61,7 +61,7 @@ module FPM
             files = Dir['*'].select {|dir| File.file?(dir) }
 
             if files.size > 0
-              builddir
+              ''
             else
               raise "Empty archive! (#{local_path})"
             end

data/lib/fpm/cookery/source_handler/directory.rb

@@ -1,5 +1,6 @@
 require 'fpm/cookery/source_handler/template'
 require 'fpm/cookery/log'
+require 'fpm/cookery/path'
 require 'fileutils'
 
 module FPM
@@ -10,21 +11,19 @@ module FPM
         NAME = :directory
 
         def fetch(config = {})
-            path = source.path
-            cached_file = File.join(@cachedir, path)
-            if File.exist? cached_file
-              Log.info "Using cached file #{cached_file}"
-            else
-              # Exclude source directory
-              path = File.join(path,'.')
-              Log.info "Copying #{path} to cache"
-              FileUtils.cp_r(path, cachedir)
-            end
           cachedir
         end
 
         def extract(config = {})
-          FileUtils.cp_r(File.join(cachedir,'.'), builddir)
+          path = FPM::Cookery::Path.new(source.path)
+
+          unless path.absolute?
+            Log.error("Source path needs to be absolute: #{source.path}")
+            raise "Source path needs to be absolute: #{source.path}"
+          end
+
+          Log.info("Copying files from #{path}")
+          FileUtils.cp_r(path, builddir)
           builddir
         end
       end

data/lib/fpm/cookery/source_handler/noop.rb

@@ -13,9 +13,8 @@ module FPM
 
         def extract(config = {})
           Log.info "Not extracting - noop source handler"
-          builddir
+          builddir.to_s
         end
-
       end
     end
   end

data/lib/fpm/cookery/source_handler/svn.rb

@@ -19,7 +19,7 @@ module FPM
         def extract(config = {})
           Dir.chdir(builddir) do
             safesystem('cp', '-Rp', local_path, '.')
-            extracted_source
+            (builddir/extracted_source).to_s
           end
         end
 

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.32.0'
+    VERSION = '0.33.0'
   end
 end

data/lib/hiera/fpm_cookery_logger.rb

@@ -0,0 +1,12 @@
+require 'fpm/cookery/log/hiera'
+
+# Note: this file exists because hiera runs +require "hiera/#{logger}_logger",
+# where +logger+ refers to the name passed as the +:logger+ option to the
+# +Hiera+ class' constructor.
+
+# Note: This weird name is due to the relationship between how Hiera looks for the
+# module to load ("require "#{logger}_logger") and how it infers the class
+# name of its logger (Hiera.const_get("#{logger.capitalize}_logger") This
+# class name is what would be constructed if the hiera object were created
+# as follows: Hiera.new(:config => {:logger => "fpm_cookery"}).
+Hiera::Fpm_cookery_logger = FPM::Cookery::Log::Hiera

data/recipes/redis/config/common.yaml

@@ -0,0 +1,11 @@
+homepage: 'http://redis.io'
+
+source: 'http://redis.googlecode.com/files/redis-%{hiera("version")}.tar.gz'
+md5: 'c4b0b5e4953a11a503cb54cf6b09670e'
+name: 'redis-server'
+version: '2.4.2'
+revision: '0' # => redis-server-2.2.5+fpm1
+description: 'An advanced key-value store.'
+conflicts: '%{hiera("name")}'
+config_files: '/etc/redis/redis.conf'
+patches: 'patches/test.patch'

data/recipes/redis/config/git_2.4.2_tag.yaml

@@ -0,0 +1,4 @@
+source:
+   - 'https://github.com/antirez/redis'
+   - :with: :git
+     :tag: '2.4.2'

data/recipes/redis/config/git_2.4.yaml

@@ -0,0 +1,4 @@
+source:
+   - 'https://github.com/antirez/redis'
+   - :with: :git
+     :branch: '2.4'

data/recipes/redis/config/git_sha_072a905.yaml

@@ -0,0 +1,4 @@
+source:
+   - 'https://github.com/antirez/redis'
+   - :with: :git
+     :sha: '072a905'

data/recipes/redis/config/svn_r2400.yaml

@@ -0,0 +1,4 @@
+source:
+   - 'https://github.com/antirez/redis/trunk'
+   - :with :svn
+     :revision: '2400'

data/recipes/redis/config/svn_trunk.yaml

@@ -0,0 +1,3 @@
+source:
+   - 'https://github.com/antirez/redis/trunk'
+   - :with: :svn

data/recipes/redis/recipe.rb

@@ -1,30 +1,4 @@
 class Redis < FPM::Cookery::Recipe
-  homepage 'http://redis.io'
-
-  # Different source methods.
-  #
-  #source   'https://github.com/antirez/redis/trunk', :with => :svn
-  #source   'https://github.com/antirez/redis/trunk', :with => :svn, :revision => '2400'
-  #
-  #source   'https://github.com/antirez/redis', :with => :git, :tag => '2.4.2
-  #source   'https://github.com/antirez/redis', :with => :git, :branch => '2.4'
-  #source   'https://github.com/antirez/redis', :with => :git, :sha => '072a905'
-
-  source    'http://redis.googlecode.com/files/redis-2.4.2.tar.gz'
-  md5      'c4b0b5e4953a11a503cb54cf6b09670e'
-
-  name     'redis-server'
-  version  '2.4.2'
-#  revision '0' # => redis-server-2.2.5+fpm1
-
-  description 'An advanced key-value store.'
-
-  conflicts 'redis-server'
-
-  config_files '/etc/redis/redis.conf'
-
-  patches 'patches/test.patch'
-
   def build
     make
 
@@ -34,7 +8,8 @@ class Redis < FPM::Cookery::Recipe
   end
 
   def install
-    # make :install, 'DESTDIR' => destdir
+    # C'mon, redis, what's up with not respecting DESTDIR?
+    make :install, 'PREFIX' => destdir / 'usr'
 
     var('lib/redis').mkdir
 

data/spec/book_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+require 'fpm/cookery/book'
+
+describe "Book" do
+  let(:book) { FPM::Cookery::Book.instance }
+  let(:config) do
+    attrs = {
+      :debug        => false,
+      :hiera_config => {
+        # Silence logging
+        :logger => :noop
+      }
+    }
+
+    double('Config', attrs).as_null_object
+  end
+
+  describe ".instance" do
+    describe ".load_recipe" do
+      context "given an existing file" do
+        include_context "temporary recipe", "recipe.rb", <<-RECIPE
+          class FakeRecipe < FPM::Cookery::Recipe
+            print 'Hello, world!'
+          end
+        RECIPE
+
+        it "loads the file" do
+          expect { book.load_recipe('recipe.rb', config) { } }.to output('Hello, world!').to_stdout
+        end
+      end
+    end
+  end
+end

data/spec/config_spec.rb

@@ -131,10 +131,28 @@ describe 'Config' do
     common_tests(:cache_dir)
   end
 
+  describe '#data_dir' do
+    it 'defaults to nil' do
+      expect(default_config.data_dir).to be_nil
+    end
+
+    common_tests(:data_dir)
+  end
+
+  describe '#hiera_config' do
+    it 'defaults to nil' do
+      expect(default_config.hiera_config).to be_nil
+    end
+
+    common_tests(:hiera_config)
+  end
+
   describe '#to_hash' do
     it 'returns a hash representation of the object' do
       expect(default_config.to_hash).to eq({
         :color => true,
+        :data_dir => nil,
+        :hiera_config => nil,
         :debug => false,
         :target => nil,
         :platform => nil,
@@ -143,6 +161,7 @@ describe 'Config' do
         :pkg_dir => nil,
         :cache_dir => nil,
         :vendor => nil,
+        :vendor_delimiter => nil,
         :skip_package => false,
         :keep_destdir => false,
         :dependency_check => true,

data/spec/environment_spec.rb

@@ -38,11 +38,30 @@ describe FPM::Cookery::Environment do
     expect(env.to_hash).to_not have_key('foo')
   end
 
+  describe '.[]' do
+    context 'given a Hash' do
+      it 'returns an new instance with keys and values coerced to Strings' do
+        expect(described_class[:this => :that]).to eq({"this" => "that"})
+      end
+    end
+
+    context 'given an array of two-member arrays' do
+      it 'returns an new instance with keys and values coerced to Strings' do
+        expected = {"this" => "that", "foo" => "bar"}
+        expect(described_class[[[:this, :that], [:foo, :bar]]]).to eq(expected)
+      end
+    end
+  end
+
   describe '#to_hash' do
     it 'returns the data as a hash' do
       env['foo'] = 'bar'
 
       expect(env.to_hash).to eq({'foo' => 'bar'})
+      # Note: not using +be_a+ because +Environment+ inherits from +Hash+, and
+      # we want to test that +env.to_hash+ actually is an instance of +Hash+
+      # and not an instance of a subclass of +Hash+.
+      expect(env.to_hash.class).to eq(Hash)
     end
 
     it 'returns a copy of the data' do
@@ -56,6 +75,24 @@ describe FPM::Cookery::Environment do
     end
   end
 
+  describe '#merge' do
+    context 'given a Hash' do
+      it 'returns a new instance with merged contents' do
+        expect(env.merge({:this => :that})).to eq({"this" => "that"})
+      end
+    end
+  end
+
+  describe '#merge!' do
+    context 'given a Hash' do
+      let(:env_dup) { env.dup }
+      it 'merges their contents in-place' do
+        env.merge!({:this => :that})
+        expect(env).to eq({"this" => "that"})
+      end
+    end
+  end
+
   describe '#with_clean' do
     it 'returns the return value of the given block' do
       expect(env.with_clean { 'nice' }).to eq('nice')

data/spec/facts_spec.rb

@@ -1,35 +1,48 @@
 require 'spec_helper'
-require 'ostruct'
 require 'fpm/cookery/facts'
 
+shared_context "mock facts" do |facts = {}|
+  before do
+    facts.each_pair do |k, v|
+      allow(Facter).to receive(:value).with(k).and_return(v)
+    end
+  end
+end
+
 describe "Facts" do
   before 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
+    include_context "mock facts", { :architecture => 'x86_64' }
 
-    it "is returns the current platform" do
+    it "returns the current architecture" do
       expect(FPM::Cookery::Facts.arch).to eq(:x86_64)
     end
   end
 
-  describe "platform" do
-    before do
-      Facter.class_eval do
-        def self.fact(v)
-          v == :operatingsystem ? OpenStruct.new(:value => 'CentOS') : nil
-        end
+  describe "lsbcodename" do
+    context "where lsbcodename is present" do
+      include_context "mock facts", { :lsbcodename => 'trusty' }
+
+      it "returns the current platforms codename" do
+        expect(FPM::Cookery::Facts.lsbcodename).to eq :trusty
       end
     end
 
+    context "where lsbcodename is not present" do
+      include_context "mock facts", { :lsbcodename => nil }
+
+      it "returns nil" do
+        expect(FPM::Cookery::Facts.lsbcodename).to be_nil
+      end
+    end
+  end
+
+  describe "platform" do
+    include_context "mock facts", { :operatingsystem => 'CentOS' }
+
     it "is using Facter to autodetect the platform" do
       expect(FPM::Cookery::Facts.platform).to eq(:centos)
     end
@@ -41,13 +54,7 @@ describe "Facts" do
   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
+    include_context "mock facts", { :operatingsystemrelease => '6.5' }
 
     it "returns the operating system release version" do
       expect(FPM::Cookery::Facts.osrelease).to eq('6.5')
@@ -55,13 +62,7 @@ describe "Facts" do
   end
 
   describe "osmajorrelease" do
-    before do
-      Facter.class_eval do
-        def self.fact(v)
-          v == :operatingsystemmajrelease ? OpenStruct.new(:value => '6') : nil
-        end
-      end
-    end
+    include_context "mock facts", { :operatingsystemmajrelease => '6' }
 
     it "returns the operating system major release version" do
       expect(FPM::Cookery::Facts.osmajorrelease).to eq('6')
@@ -76,6 +77,7 @@ describe "Facts" do
         expect(FPM::Cookery::Facts.target).to eq(:rpm)
       end
     end
+
     describe "with platform CentOS" do
       it "returns rpm" do
         FPM::Cookery::Facts.platform = 'CentOS'
@@ -97,15 +99,29 @@ describe "Facts" do
       end
     end
 
-    describe "with platform Debian" do
+    describe "with platform Amazon" do
+      it "returns rpm" do
+        FPM::Cookery::Facts.platform = 'Amazon'
+        expect(FPM::Cookery::Facts.target).to eq(:rpm)
+      end
+    end
+
+    describe "with platform OracleLinux" do
       it "returns rpm" do
+        FPM::Cookery::Facts.platform = 'OracleLinux'
+        expect(FPM::Cookery::Facts.target).to eq(:rpm)
+      end
+    end
+
+    describe "with platform Debian" do
+      it "returns deb" do
         FPM::Cookery::Facts.platform = 'Debian'
         expect(FPM::Cookery::Facts.target).to eq(:deb)
       end
     end
 
     describe "with platform Ubuntu" do
-      it "returns rpm" do
+      it "returns deb" do
         FPM::Cookery::Facts.platform = 'Ubuntu'
         expect(FPM::Cookery::Facts.target).to eq(:deb)
       end
@@ -118,6 +134,13 @@ describe "Facts" do
       end
     end
 
+    describe "with platform Alpine" do
+      it "returns apk" do
+        FPM::Cookery::Facts.platform = 'Alpine'
+        expect(FPM::Cookery::Facts.target).to eq(:apk)
+      end
+    end
+
     describe "with an unknown platform" do
       it "returns nil" do
         FPM::Cookery::Facts.platform = '___X___'