fpm-cookery 0.15.0 → 0.16.0

data/lib/fpm/cookery/exceptions.rb

@@ -0,0 +1,11 @@
+module FPM
+  module Cookery
+    class Error < StandardError
+      MethodNotImplemented = Class.new(self)
+
+      class InvalidConfigKey < self
+        attr_accessor :invalid_keys
+      end
+    end
+  end
+end

data/lib/fpm/cookery/facts.rb

@@ -19,6 +19,7 @@ module FPM
         @target ||= case platform
                     when :centos, :redhat, :fedora then :rpm
                     when :debian, :ubuntu          then :deb
+                    when :darwin                   then :osxpkg
                     end
       end
 

data/lib/fpm/cookery/log.rb

@@ -10,7 +10,7 @@ module FPM
 
       @channel = ::Cabin::Channel.get
       @channel.subscribe(self)
-      @channel.level = :debug
+      @channel.level = :info
 
       class << self
         def enable_debug(value = true)

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

@@ -1,49 +1,25 @@
 require 'fpm/package/dir'
-require 'delegate'
+require 'fpm/cookery/package/package'
 
 module FPM
   module Cookery
     module Package
-      class Dir < SimpleDelegator
-        def initialize(recipe, config = {})
-          super(FPM::Package::Dir.new)
-
-          self.name = recipe.name
-          self.url = recipe.homepage || recipe.source
-          self.category = recipe.section || 'optional'
-          self.description = recipe.description.strip if recipe.description
-          self.architecture = recipe.arch.to_s if recipe.arch
-
-          self.dependencies += recipe.depends
-          self.conflicts += recipe.conflicts
-          self.provides += recipe.provides
-          self.replaces += recipe.replaces
-          self.config_files += recipe.config_files
-
-          attributes[:prefix] = '/'
-          attributes[:chdir] = recipe.destdir.to_s
-          attributes[:deb_compression] = 'gzip'
-          attributes[:deb_user] = 'root'
-          attributes[:deb_group] = 'root'
-          attributes[:rpm_compression] = 'gzip'
-          attributes[:rpm_digest] = 'md5'
-          attributes[:rpm_user] = 'root'
-          attributes[:rpm_group] = 'root'
-          attributes[:rpm_defattrfile] = '-'
-          attributes[:rpm_defattrdir] = '-'
+      class Dir < FPM::Cookery::Package::Package
+        def fpm_object
+          FPM::Package::Dir.new
+        end
 
-          # TODO replace remove_excluded_files() in packager with this.
-          attributes[:excludes] = []
+        def package_setup
+          fpm.attributes[:prefix] = '/'
+          fpm.attributes[:chdir] = recipe.destdir.to_s
+        end
 
+        def package_input
           inputs = config.fetch(:input, nil) || '.'
 
           Array(inputs).each do |path|
-            input(path)
+            fpm.input(path)
           end
-
-          # The call to input() overwrites the license and vendor attributes.
-          # XXX Needs to be fixed in fpm/package/dir.rb.
-          self.license = recipe.license if recipe.license
         end
       end
     end

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

@@ -0,0 +1,25 @@
+require 'fpm/package/gem'
+require 'fpm/cookery/package/package'
+
+module FPM
+  module Cookery
+    module Package
+      class Gem < FPM::Cookery::Package::Package
+        def fpm_object
+          FPM::Package::Gem.new
+        end
+
+        def package_setup
+          fpm.version = recipe.version
+
+          fpm.attributes[:gem_fix_name?] = true
+          fpm.attributes[:gem_fix_dependencies?] = true
+        end
+
+        def package_input
+          fpm.input(recipe.name)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'fpm/cookery/shellout'
+
+module FPM
+  module Cookery
+    module Package
+      class Maintainer < Struct.new(:recipe, :config)
+        def maintainer
+          config_maintainer || recipe_maintainer || git_maintainer
+        end
+
+        def to_s
+          maintainer
+        end
+        alias_method :to_str, :to_s
+
+        private
+
+        def config_maintainer
+          config[:maintainer]
+        end
+
+        def recipe_maintainer
+          recipe.maintainer
+        end
+
+        def git_maintainer
+          username = git_config('user.name')
+          useremail = git_config('user.email')
+
+          username && useremail ? "#{username} <#{useremail}>" : nil
+        end
+
+        def git_config(key)
+          FPM::Cookery::Shellout.git_config_get(key)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,100 @@
+require 'fpm/cookery/exceptions'
+
+module FPM
+  module Cookery
+    module Package
+      class Package
+        attr_reader :recipe, :config, :fpm
+
+        def initialize(recipe, config = {})
+          @recipe = recipe
+          @config = config
+          @fpm = fpm_object
+
+          @fpm.name = recipe.name
+          @fpm.url = recipe.homepage
+          @fpm.category = recipe.section || 'optional'
+          @fpm.description = recipe.description.strip if recipe.description
+          @fpm.architecture = recipe.arch.to_s if recipe.arch
+
+          @fpm.dependencies += recipe.depends
+          @fpm.conflicts += recipe.conflicts
+          @fpm.provides += recipe.provides
+          @fpm.replaces += recipe.replaces
+          @fpm.config_files += recipe.config_files
+
+          @fpm.attributes[:deb_compression] = 'gzip'
+          @fpm.attributes[:deb_user] = 'root'
+          @fpm.attributes[:deb_group] = 'root'
+          @fpm.attributes[:rpm_compression] = 'gzip'
+          @fpm.attributes[:rpm_digest] = 'md5'
+          @fpm.attributes[:rpm_user] = 'root'
+          @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] = []
+
+          # Package type specific code should be called in package_setup.
+          package_setup
+
+          # The input for the FPM package will be set here.
+          package_input
+
+          # The call to input() overwrites the license and vendor attributes.
+          # XXX Needs to be fixed in fpm/package/dir.rb.
+          fpm.license = recipe.license if recipe.license
+        end
+
+        def fpm_object
+          # Has to be overwritten in a subclass.
+          raise Error::MethodNotImplemented, "The #fpm_object method has not been implemented in #{self.class}"
+        end
+
+        def package_setup
+          # Can be overwritten in a subclass.
+        end
+
+        def package_input
+          # Has to be overwritten in a subclass.
+          raise Error::MethodNotImplemented, "The #package_input method has not been implemented in #{self.class}"
+        end
+
+        def convert(output_class)
+          fpm.convert(output_class)
+        end
+
+        def cleanup
+          fpm.cleanup
+        end
+
+        def add_script(type, content)
+          case type.to_sym
+          when :pre_install
+            fpm.scripts[:before_install] = content
+          when :post_install
+            fpm.scripts[:after_install] = content
+          when :pre_uninstall
+            fpm.scripts[:before_remove] = content
+          when :post_uninstall
+            fpm.scripts[:after_remove] = content
+          end
+        end
+
+        # XXX should go away and set in initializer
+        def version=(value)
+          fpm.version = value
+        end
+
+        def maintainer=(value)
+          fpm.maintainer = value
+        end
+
+        def vendor=(value)
+          fpm.vendor = value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module FPM
+  module Cookery
+    module Package
+      class Version
+        VENDOR_DELIMITER = {
+          :deb     => '+',
+          :rpm     => '.',
+          :default => '-'
+        }
+
+        attr_reader :version, :epoch, :revision
+
+        def initialize(recipe, target, config)
+          @recipe = recipe
+          @target = target
+          @config = config
+          @revision = recipe.revision
+          @version, @epoch = split_version(@recipe.version)
+        end
+
+        def vendor
+          @config[:vendor] || @recipe.vendor
+        end
+
+        def vendor_delimiter
+          VENDOR_DELIMITER[@target.to_sym] || VENDOR_DELIMITER[:default]
+        end
+
+        def to_s
+          if vendor
+            "#{version}#{vendor_delimiter}#{vendor}#{revision}"
+          else
+            "#{version}-#{revision}"
+          end
+        end
+        alias_method :to_str, :to_s
+
+        private
+
+        def split_version(version)
+          epoch, version = version.split(':', 2)
+
+          version.nil? ? [epoch, nil] : [version, epoch]
+        end
+      end
+    end
+  end
+end

data/lib/fpm/cookery/packager.rb

@@ -6,6 +6,8 @@ require 'fpm/cookery/source_integrity_check'
 require 'fpm/cookery/path'
 require 'fpm/cookery/log'
 require 'fpm/cookery/package/dir'
+require 'fpm/cookery/package/version'
+require 'fpm/cookery/package/maintainer'
 require 'fpm'
 
 module FPM
@@ -62,66 +64,68 @@ module FPM
 
         recipe.installing = false
 
-        source = recipe.source_handler
+        if defined? recipe.source_handler()
+          source = recipe.source_handler
 
-        recipe.cachedir.mkdir
-        Dir.chdir(recipe.cachedir) do
-          Log.info "Fetching source: #{source.source_url}"
-          source.fetch
+          recipe.cachedir.mkdir
+          Dir.chdir(recipe.cachedir) do
+            Log.info "Fetching source: #{source.source_url}"
+            source.fetch
 
-          if source.checksum?
-            SourceIntegrityCheck.new(recipe).tap do |check|
-              if check.checksum_missing?
-                Log.warn 'Recipe does not provide a checksum. (sha256, sha1 or md5)'
-                Log.puts <<-__WARN
+            if source.checksum?
+              SourceIntegrityCheck.new(recipe).tap do |check|
+                if check.checksum_missing?
+                  Log.warn 'Recipe does not provide a checksum. (sha256, sha1 or md5)'
+                  Log.puts <<-__WARN
   Digest:   #{check.digest}
   Checksum: #{check.checksum_actual}
   Filename: #{check.filename}
 
-                __WARN
-              elsif check.error?
-                Log.error 'Integrity check failed!'
-                Log.puts <<-__ERROR
+                  __WARN
+                elsif check.error?
+                  Log.error 'Integrity check failed!'
+                  Log.puts <<-__ERROR
   Digest:            #{check.digest}
   Checksum expected: #{check.checksum_expected}
   Checksum actual:   #{check.checksum_actual}
   Filename:          #{check.filename}
 
-                __ERROR
-                exit 1
-              end
-            end
-          end
-        end
+                  __ERROR
+                  exit 1
+                end #end checksum missing
+              end #end check
+            end #end checksum
+          end #end chdir cachedir
 
-        recipe.builddir.mkdir
-        Dir.chdir(recipe.builddir) do
-          extracted_source = source.extract
+          recipe.builddir.mkdir
+          Dir.chdir(recipe.builddir) do
+            extracted_source = source.extract
 
-          Dir.chdir(extracted_source) do
-            #Source::Patches.new(recipe.patches).apply!
+            Dir.chdir(extracted_source) do
+              #Source::Patches.new(recipe.patches).apply!
 
-            build_cookie = build_cookie_name(package_name)
+              build_cookie = build_cookie_name(package_name)
 
-            if File.exists?(build_cookie)
-              Log.info 'Skipping build (`fpm-cook clean` to rebuild)'
-            else
-              Log.info "Building in #{File.expand_path(extracted_source, recipe.builddir)}"
-              recipe.build and FileUtils.touch(build_cookie)
-            end
+              if File.exists?(build_cookie)
+                Log.info 'Skipping build (`fpm-cook clean` to rebuild)'
+              else
+                Log.info "Building in #{File.expand_path(extracted_source, recipe.builddir)}"
+                recipe.build and FileUtils.touch(build_cookie)
+              end
 
-            FileUtils.rm_rf(recipe.destdir) unless keep_destdir?
-            recipe.destdir.mkdir unless File.exists?(recipe.destdir)
+              FileUtils.rm_rf(recipe.destdir) unless keep_destdir?
+              recipe.destdir.mkdir unless File.exists?(recipe.destdir)
 
-            begin
-              recipe.installing = true
-              Log.info "Installing into #{recipe.destdir}"
-              recipe.install
-            ensure
-              recipe.installing = false
-            end
-          end
-        end
+              begin
+                recipe.installing = true
+                Log.info "Installing into #{recipe.destdir}"
+                recipe.install
+              ensure
+                recipe.installing = false
+              end
+            end #end chdir extracted_source
+          end #end chdir builddir
+        end #end defined source_handler
 
         if skip_package?
           Log.info "Package building disabled"
@@ -140,37 +144,15 @@ module FPM
       def build_package(recipe, config)
         recipe.pkgdir.mkdir
         Dir.chdir(recipe.pkgdir) do
-          epoch, ver = recipe.version.split(':', 2)
-          if ver.nil?
-            ver, epoch = epoch, nil
-          end
-
-          # Build a version including vendor and revision.
-          vendor = config[:vendor] || recipe.vendor
-          vendor_rev = "#{vendor}#{recipe.revision}"
-          case @target
-          when "deb"
-            vendor_delimiter = "+"
-          when "rpm"
-            vendor_delimiter = "."
-          else
-            vendor_delimiter = "-"
-          end
-          version = [ver, vendor_rev].join(vendor_delimiter)
-
-          maintainer = recipe.maintainer || begin
-            username = git_config('user.name')
-            useremail = git_config('user.email')
-
-            username && useremail ? "#{username} <#{useremail}>" : nil
-          end
+          version = FPM::Cookery::Package::Version.new(recipe, @target, config)
+          maintainer = FPM::Cookery::Package::Maintainer.new(recipe, config)
 
-          input = FPM::Cookery::Package::Dir.new(recipe, :input => config[:input])
+          input = recipe.input(config)
 
-          input.version = version
-          input.maintainer = maintainer
-          input.vendor = vendor if vendor
-          input.epoch = epoch if epoch
+          input.version = version.to_s
+          input.maintainer = maintainer.to_s
+          input.vendor = version.vendor if version.vendor
+          input.epoch = version.epoch if version.epoch
 
           add_scripts(recipe, input)
           remove_excluded_files(recipe)
@@ -195,16 +177,9 @@ module FPM
 
       def add_scripts(recipe, input)
         error = false
+        scripts = [:pre_install, :post_install, :pre_uninstall, :post_uninstall]
 
-        # Map script names to fpm method names.
-        script_map = {
-          'pre_install' => :before_install,
-          'post_install' => :after_install,
-          'pre_uninstall' => :before_remove,
-          'post_uninstall' => :after_remove
-        }
-
-        script_map.each do |script, fpm_script|
+        scripts.each do |script|
           unless recipe.send(script).nil?
             script_file = FPM::Cookery::Path.new(recipe.send(script))
 
@@ -215,7 +190,7 @@ module FPM
             end
 
             if File.exists?(script_file)
-              input.scripts[fpm_script] = File.read(script_file.to_s)
+              input.add_script(script, File.read(script_file.to_s))
             else
               Log.error "#{script} script '#{script_file}' is missing"
               error = true
@@ -229,26 +204,19 @@ module FPM
       # Remove all excluded files from the destdir so they do not end up in the
       # package.
       def remove_excluded_files(recipe)
-        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)
+        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
-
-      private
-
-      def git_config(key)
-        %x(git config --get #{key}).strip
-      rescue
-        Log.warn "Git config command for key '#{key}' failed."
-        nil
-      end
     end
   end
 end