fpm-cookery 0.15.0 → 0.16.0

data/lib/fpm/cookery/path.rb

@@ -21,6 +21,10 @@ module FPM
         self + (path || '').gsub(%r{^/}, '')
       end
 
+      def =~(regex)
+        @path =~ regex
+      end
+
       def mkdir
         FileUtils.mkdir_p(self.to_s)
       end

data/lib/fpm/cookery/recipe.rb

@@ -5,10 +5,12 @@ require 'fpm/cookery/source'
 require 'fpm/cookery/source_handler'
 require 'fpm/cookery/utils'
 require 'fpm/cookery/path_helper'
+require 'fpm/cookery/package/dir'
+require 'fpm/cookery/package/gem'
 
 module FPM
   module Cookery
-    class Recipe
+    class BaseRecipe
       include FileUtils
       include FPM::Cookery::Utils
       include FPM::Cookery::PathHelper
@@ -56,43 +58,32 @@ module FPM
       attr_rw :arch, :description, :homepage, :maintainer, :md5, :name,
               :revision, :section, :sha1, :sha256, :spec, :vendor, :version,
               :pre_install, :post_install, :pre_uninstall, :post_uninstall,
-              :license, :omnibus_package, :omnibus_dir
+              :license, :omnibus_package, :omnibus_dir, :chain_package
 
       attr_rw_list :build_depends, :config_files, :conflicts, :depends,
                    :exclude, :patches, :provides, :replaces, :omnibus_recipes,
-                   :omnibus_additional_paths
+                   :omnibus_additional_paths, :chain_recipes
 
-      class << self
-        def source(source = nil, spec = {})
-          return @source if source.nil?
-          @source = source
-          @spec = spec
-        end
-        alias_method :url, :source
+      attr_reader :filename
 
+      class << self
         def platform
           FPM::Cookery::Facts.platform
         end
-      end
 
-      def source
-        self.class.source
+        def depends_all
+          (depends + build_depends).uniq
+        end
       end
 
       def initialize(filename)
         @filename = Path.new(filename).expand_path
-        @source_handler = SourceHandler.new(Source.new(source, spec), cachedir, builddir)
 
         # Set some defaults.
         vendor || self.class.vendor('fpm')
         revision || self.class.revision(0)
       end
 
-      attr_reader :filename, :source_handler
-
-      extend Forwardable
-      def_delegator :@source_handler, :local_path
-
       def workdir=(value)  @workdir  = Path.new(value) end
       def destdir=(value)  @destdir  = Path.new(value) end
       def builddir=(value) @builddir = Path.new(value) end
@@ -104,6 +95,55 @@ module FPM
       def builddir(path = nil) (@builddir ||= workdir('tmp-build'))/path   end
       def pkgdir(path = nil)   (@pkgdir   ||= workdir('pkg'))/path         end
       def cachedir(path = nil) (@cachedir ||= workdir('cache'))/path       end
+
+      # Resolve dependencies from omnibus package.
+      def depends_all
+        pkg_depends = self.class.depends_all
+        if self.class.omnibus_package
+          self.class.omnibus_recipes.each { |omni_recipe|
+            Book.instance.load_recipe(File.expand_path(omni_recipe + '.rb', File.dirname(filename))) do |recipe|
+              pkg_depends << recipe.depends_all
+            end
+          }
+        end
+
+        pkg_depends.flatten.uniq
+      end
+    end
+
+    class Recipe < BaseRecipe
+      def input(config)
+        FPM::Cookery::Package::Dir.new(self, config)
+      end
+
+      def initialize(filename)
+        super(filename)
+        @source_handler = SourceHandler.new(Source.new(source, spec), cachedir, builddir)
+      end
+
+      class << self
+        def source(source = nil, spec = {})
+          return @source if source.nil?
+          @source = source
+          @spec = spec
+        end
+        alias_method :url, :source
+      end
+
+      def source
+        self.class.source
+      end
+
+      attr_reader :source_handler
+
+      extend Forwardable
+      def_delegator :@source_handler, :local_path
+    end
+
+    class RubyGemRecipe < BaseRecipe
+      def input(config)
+        FPM::Cookery::Package::Gem.new(self, config)
+      end
     end
   end
 end

data/lib/fpm/cookery/shellout.rb

@@ -0,0 +1,35 @@
+require 'fpm/cookery/log'
+require 'systemu'
+
+module FPM
+  module Cookery
+    class Shellout
+      class CommandFailed < StandardError
+        attr_reader :output
+
+        def initialize(message, output)
+          super(message)
+          @output = output
+        end
+      end
+
+      def self.git_config_get(key)
+        new('git config --get %s', key).run.chomp
+      end
+
+      def initialize(command, *args)
+        @command = command.to_s % args
+      end
+
+      def run
+        status, stdout, stderr = systemu(@command)
+
+        if status.success?
+          stdout
+        else
+          raise CommandFailed.new("Shellout command failed: #{@command}", stderr)
+        end
+      end
+    end
+  end
+end

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

@@ -44,7 +44,11 @@ module FPM
         private
         def curl(url, path)
           args = options[:args] || '-fL'
-          safesystem('curl', args, '--progress-bar', '-o', path, url)
+          cmd = ['curl', args, '--progress-bar', '-o', path, url]
+          safesystem(*cmd)
+        rescue RuntimeError => e
+          Log.error("Command failed: #{cmd.join(' ')}")
+          raise
         end
 
         def extracted_source
@@ -52,7 +56,13 @@ module FPM
 
           case entries.size
           when 0
-            raise "Empty archive! (#{local_path})"
+            files = Dir['*'].select {|dir| File.file?(dir) }
+
+            if files.size > 0
+              builddir
+            else
+              raise "Empty archive! (#{local_path})"
+            end
           when 1
             entries.first
           else

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.15.0'
+    VERSION = '0.16.0'
   end
 end

data/recipes/arr-pm/recipe.rb

@@ -0,0 +1,4 @@
+class ArrPmRubyGem < FPM::Cookery::RubyGemRecipe
+  name    'arr-pm'
+  version '0.0.7'
+end

data/recipes/backports/recipe.rb

@@ -0,0 +1,4 @@
+class BackportsRubyGem < FPM::Cookery::RubyGemRecipe
+  name    'backports'
+  version '2.6.2'
+end

data/recipes/cabin/recipe.rb

@@ -0,0 +1,4 @@
+class CabinRubyGem < FPM::Cookery::RubyGemRecipe
+  name    'cabin'
+  version '0.6.0'
+end

data/recipes/clamp/recipe.rb

@@ -0,0 +1,4 @@
+class ClampRubyGem < FPM::Cookery::RubyGemRecipe
+  name    'clamp'
+  version '0.3.1'
+end

data/recipes/facter/recipe.rb

@@ -0,0 +1,4 @@
+class FacterRubyGem < FPM::Cookery::RubyGemRecipe
+  name    'facter'
+  version '1.6.16'
+end

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

@@ -0,0 +1,4 @@
+class AddressableRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "addressable"
+  version "2.3.5"
+end

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

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

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

@@ -0,0 +1,4 @@
+class BackportsRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "backports"
+  version "2.6.2"
+end

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

@@ -0,0 +1,4 @@
+class CabinRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "cabin"
+  version "0.6.0"
+end

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

@@ -0,0 +1,7 @@
+class ChildprocessRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "childprocess"
+  version "0.3.9"
+
+  chain_package true
+  chain_recipes "ffi"
+end

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

@@ -0,0 +1,4 @@
+class ClampRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "clamp"
+  version "0.6.0"
+end

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

@@ -0,0 +1,4 @@
+class FacterRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "facter"
+  version "1.7.1"
+end

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

@@ -0,0 +1,4 @@
+class FfiRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "ffi"
+  version "1.0.11"
+end

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

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

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

@@ -0,0 +1,7 @@
+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/hiera.rb

@@ -0,0 +1,7 @@
+class HieraRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "hiera"
+  version "1.2.1"
+
+  chain_package true
+  chain_recipes "json_pure"
+end

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

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

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

@@ -0,0 +1,4 @@
+class JsonRubyGem < FPM::Cookery::RubyGemRecipe
+  name    'json'
+  version '1.7.7'
+end

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

@@ -0,0 +1,4 @@
+class JsonPureRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "json_pure"
+  version "1.7.7"
+end

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

@@ -0,0 +1,7 @@
+class PuppetRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "puppet"
+  version "3.2.2"
+
+  chain_package true
+  chain_recipes "hiera", "rgen"
+end

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

@@ -0,0 +1,7 @@
+class FpmCookeryRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "fpm-cookery"
+  version "0.15.0"
+
+  chain_package true
+  chain_recipes "fpm", "facter", "puppet", "addressable"
+end

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

@@ -0,0 +1,4 @@
+class RgenRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "rgen"
+  version "0.6.5"
+end

data/recipes/fpm-cookery/recipe.rb

@@ -2,7 +2,7 @@ class FPMCookery < FPM::Cookery::Recipe
   description 'building packages'
 
   name     'fpm-cookery'
-  version  '0.14.0'
+  version  '0.15.0'
   revision 0
   homepage 'https://github.com/bernd/fpm-cookery'
   license  'MIT'

data/recipes/fpm-cookery/ruby.rb

@@ -2,22 +2,32 @@ class Ruby200 < FPM::Cookery::Recipe
   description 'The Ruby virtual machine'
 
   name    'ruby'
-  version '2.0.0.195'
+  version '2.0.0.247'
   revision 0
   homepage 'http://www.ruby-lang.org/'
-  source   'http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p195.tar.bz2'
-  sha256   '0be32aef7a7ab6e3708cc1d65cd3e0a99fa801597194bbedd5799c11d652eb5b'
+  source   'http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p247.tar.bz2'
+  sha256   '08e3d4b85b8a1118a8e81261f59dd8b4ddcfd70b6ae554e0ec5ceb99c3185e8a'
 
   license 'The Ruby License'
   section 'interpreters'
 
-  build_depends 'autoconf', 'libreadline6-dev', 'bison', 'zlib1g-dev',
-                'libssl-dev', 'libyaml-dev', 'libffi-dev', 'libgdbm-dev',
-                'libncurses5-dev', 'libreadline6-dev'
+  platforms [:ubuntu, :debian] do
+    build_depends 'autoconf', 'libreadline6-dev', 'bison', 'zlib1g-dev',
+                  'libssl-dev', 'libyaml-dev', 'libffi-dev', 'libgdbm-dev',
+                  'libncurses5-dev', 'libreadline6-dev'
+    depends 'libffi6', 'libncurses5', 'libreadline6', 'libssl1.0.0',
+            'libtinfo5', 'libyaml-0-2', 'zlib1g', 'libffi6', 'libgdbm3',
+            'libncurses5', 'libreadline6'
+  end
 
-  depends 'libffi6', 'libncurses5', 'libreadline6', 'libssl1.0.0',
-          'libtinfo5', 'libyaml-0-2', 'zlib1g', 'libffi6', 'libgdbm3',
-          'libncurses5', 'libreadline6'
+  platforms [:fedora, :redhat, :centos] do
+    build_depends 'rpmdevtools', 'libffi-devel', 'autoconf', 'bison',
+                  'libxml2-devel', 'libxslt-devel', 'openssl-devel',
+                  'gdbm-devel', 'zlib-devel'
+    depends 'zlib', 'libffi', 'gdbm'
+  end
+  platforms [:fedora] do depends.push('openssl-libs') end
+  platforms [:redhat, :centos] do depends.push('openssl') end
 
   def build
     configure :prefix => destdir,
@@ -32,6 +42,6 @@ class Ruby200 < FPM::Cookery::Recipe
     # Shrink package.
     rm_f "#{destdir}/lib/libruby-static.a"
     safesystem "strip #{destdir}/bin/ruby"
-    safesystem "find #{destdir} -name '*.so*' | xargs strip"
+    safesystem "find #{destdir} -name '*.so' -or -name '*.so.*' | xargs strip"
   end
 end

data/recipes/fpm/recipe.rb

@@ -0,0 +1,4 @@
+class FpmRubyGem < FPM::Cookery::RubyGemRecipe
+  name    'fpm'
+  version '0.4.29'
+end

data/recipes/json/recipe.rb

@@ -0,0 +1,4 @@
+class JsonRubyGem < FPM::Cookery::RubyGemRecipe
+  name    'json'
+  version '1.6.6'
+end

data/recipes/open4/recipe.rb

@@ -0,0 +1,4 @@
+class Open4RubyGem < FPM::Cookery::RubyGemRecipe
+  name    'open4'
+  version '1.3.0'
+end

data/spec/config_spec.rb

@@ -0,0 +1,167 @@
+require 'spec_helper'
+require 'fpm/cookery/config'
+require 'fpm/cookery/cli'
+
+describe 'Config' do
+  let(:data) { {} }
+  let(:default_config) { FPM::Cookery::Config.new }
+  let(:config) { FPM::Cookery::Config.new(data) }
+
+  def self.common_tests(name)
+    it 'can be set on init' do
+      data[name.to_sym] = '__set__'
+
+      config.__send__(name).must_equal '__set__'
+    end
+
+    it 'can be set' do
+      config.__send__("#{name}=", '__SET__')
+      config.__send__(name).must_equal '__SET__'
+    end
+
+    it 'provides a ? method' do
+      data[name.to_sym] = false
+
+      config.__send__("#{name}?").must_equal false
+    end
+  end
+
+  describe '#color' do
+    it 'defaults to true' do
+      default_config.color.must_equal true
+    end
+
+    common_tests(:color)
+  end
+
+  describe '#debug' do
+    it 'defaults to true' do
+      default_config.debug.must_equal false
+    end
+
+    common_tests(:debug)
+  end
+
+  describe '#target' do
+    it 'defaults to nil' do
+      default_config.target.must_equal nil
+    end
+
+    common_tests(:target)
+  end
+
+  describe '#platform' do
+    it 'defaults to nil' do
+      default_config.platform.must_equal nil
+    end
+
+    common_tests(:platform)
+  end
+
+  describe '#maintainer' do
+    it 'defaults to nil' do
+      default_config.maintainer.must_equal nil
+    end
+
+    common_tests(:maintainer)
+  end
+
+  describe '#vendor' do
+    it 'defaults to nil' do
+      default_config.vendor.must_equal nil
+    end
+
+    common_tests(:vendor)
+  end
+
+  describe '#skip_package' do
+    it 'defaults to false' do
+      default_config.skip_package.must_equal false
+    end
+
+    common_tests(:skip_package)
+  end
+
+  describe '#keep_destdir' do
+    it 'defaults to false' do
+      default_config.keep_destdir.must_equal false
+    end
+
+    common_tests(:keep_destdir)
+  end
+
+  describe '#dependency_check' do
+    it 'defaults to false' do
+      default_config.dependency_check.must_equal true
+    end
+
+    common_tests(:dependency_check)
+  end
+
+  describe '#to_hash' do
+    it 'returns a hash representation of the object' do
+      default_config.to_hash.must_equal({
+        :color => true,
+        :debug => false,
+        :target => nil,
+        :platform => nil,
+        :maintainer => nil,
+        :vendor => nil,
+        :skip_package => false,
+        :keep_destdir => false,
+        :dependency_check => true
+      })
+    end
+  end
+
+  describe 'with an invalid config key' do
+    it 'raises an error' do
+      data[:__foo__] = true
+
+      proc { config }.must_raise FPM::Cookery::Error::InvalidConfigKey
+    end
+
+    it 'adds the invalid keys' do
+      data[:__foo__] = true
+      data[:__bar__] = true
+      error = nil
+
+      begin; config; rescue => e; error = e; end
+
+      error.invalid_keys.must_equal [:__foo__, :__bar__]
+    end
+
+    it 'works with strings' do
+      data['maintainer'] = 'John'
+
+      config.maintainer.must_equal 'John'
+    end
+  end
+
+  describe '.load_file' do
+    let(:paths) do
+      [
+        '/tmp/__abc__',
+        File.expand_path('../fixtures/test-config-1.yml', __FILE__)
+      ]
+    end
+
+    it 'loads first found file' do
+      config = FPM::Cookery::Config.load_file(paths)
+
+      config.maintainer.must_equal 'John Doe <john@example.com>'
+    end
+  end
+
+  describe '.from_cli' do
+    it 'loads the config from cli options' do
+      cli = FPM::Cookery::CLI.new('path', {})
+      cli.parse(%w(-D -t rpm))
+
+      config = FPM::Cookery::Config.from_cli(cli)
+
+      config.debug.must_equal true
+      config.target.must_equal 'rpm'
+    end
+  end
+end