fpm-cookery 0.7.0 → 0.8.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.8.0 (2012-05-23)
+* Add /opt path helper.
+* Use the new fpm API. (requires at least fpm-0.4.x)
+* Show the fpm log output via cabin.
+* Skip git fetch if the specified sha or tag exists.
+
 # v0.7.0 (2011-11-26)
 * Add hg (mercurial) source handler.
 * Fix tags fetchting for the git source handler.

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 "fpm"
+  s.add_development_dependency "fpm", "~> 0.4"
   s.add_development_dependency "minitest"
   s.add_development_dependency "rake"
-  s.add_runtime_dependency "fpm"
+  s.add_runtime_dependency "fpm", "~> 0.4"
   s.add_runtime_dependency "facter"
 end

data/lib/fpm/cookery/log.rb

@@ -1,4 +1,5 @@
 require 'fpm/cookery/log/output/null'
+require 'cabin' # Via fpm.
 
 module FPM
   module Cookery
@@ -6,6 +7,10 @@ module FPM
       @debug = false
       @output = FPM::Cookery::Log::Output::Null.new
 
+      @channel = ::Cabin::Channel.get
+      @channel.subscribe(self)
+      @channel.level = :debug
+
       class << self
         def enable_debug(value = true)
           @debug = value
@@ -38,6 +43,19 @@ module FPM
         def puts(message)
           @output.puts(message)
         end
+
+        def <<(event)
+          level = event.fetch(:level, :info).downcase.to_sym
+
+          event.delete(:level)
+
+          data = event.clone
+
+          data.delete(:message)
+          data.delete(:timestamp)
+
+          send(level, "[FPM] #{event[:message]} #{data.to_json}")
+        end
       end
     end
   end

data/lib/fpm/cookery/packager.rb

@@ -5,6 +5,9 @@ require 'fpm/cookery/utils'
 require 'fpm/cookery/source_integrity_check'
 require 'fpm/cookery/path'
 require 'fpm/cookery/log'
+require 'fpm/package/dir'
+require 'fpm/package/deb'
+require 'fpm/package/rpm'
 
 module FPM
   module Cookery
@@ -140,68 +143,98 @@ module FPM
           maintainer = recipe.maintainer || begin
             username = `git config --get user.name`.strip
             useremail = `git config --get user.email`.strip
-            raise 'Set maintainer name/email via `git config --global user.name <name>`' if username.empty?
-            "#{username} <#{useremail}>"
+
+            username && useremail ? "#{username} <#{useremail}>" : nil
           end
 
-          # TODO(sissel): This should use an API in fpm. fpm doesn't have this
-          # yet.  fpm needs this.
-          opts = [
-            '-n', recipe.name,
-            '-v', version,
-            '-t', @target,
-            '-s', 'dir',
-            '--url', recipe.homepage || recipe.url,
-            '-C', recipe.destdir.to_s,
-            '--maintainer', maintainer,
-            '--category', recipe.section || 'optional',
-          ]
-
-          opts += [
-            '--epoch', epoch
-          ] if epoch
-
-          opts += [
-            '--description', recipe.description.strip
-          ] if recipe.description
-
-          opts += [
-            '--architecture', recipe.arch.to_s
-          ] if recipe.arch
-
-          script_map = {"pre_install" => "--pre-install", "post_install" => "--post-install", "pre_uninstall" => "--pre-uninstall", "post_uninstall" => "--post-uninstall"}
-          %w[pre_install post_install pre_uninstall post_uninstall].each do |script|
-            unless recipe.send(script).nil?
-              script_file = FPM::Cookery::Path.new(recipe.send(script))
-
-              # If the script file is an absolute path, just use that path.
-              # Otherwise consider the location relative to the recipe.
-              unless script_file.absolute?
-                script_file = File.expand_path("../#{script_file.to_s}", recipe.filename)
-              end
+          input = FPM::Package::Dir.new
+
+          input.name = recipe.name
+          input.version = version
+          input.url = recipe.homepage || recipe.url
+          input.maintainer = maintainer
+          input.category = recipe.section || 'optional'
+          input.epoch = epoch if epoch
+          input.description = recipe.description.strip if recipe.description
+          input.architecture = recipe.arch.to_s if recipe.arch
+
+          input.dependencies += recipe.depends
+          input.conflicts += recipe.conflicts
+          input.provides += recipe.provides
+          input.replaces += recipe.replaces
+          input.config_files += recipe.config_files
+
+          add_scripts(recipe, input)
+          remove_excluded_files(recipe)
+
+          input.attributes[:prefix] = '/'
+          input.attributes[:chdir] = recipe.destdir.to_s
+          input.attributes[:excludes] = [] # TODO replace remove_excluded_files() with this
+          input.input('.')
+
+          output_class = FPM::Package.types[@target]
+
+          output = input.convert(output_class)
+
+          begin
+            output.output(output.to_s)
+          rescue FPM::Package::FileAlreadyExists
+            Log.info "Removing existing package file: #{output.to_s}"
+            FileUtils.rm_f(output.to_s)
+            retry
+          ensure
+            input.cleanup if input
+            output.cleanup if output
+            Log.info "Created package: #{File.join(Dir.pwd, output.to_s)}"
+          end
+        end
+      end
 
-              if File.exists?(script_file)
-                p_opt = script_map[script]
-                opts += ["#{p_opt}", script_file.to_s]
-              else
-                raise "#{script} script '#{script_file}' is missing"
-              end
+      def add_scripts(recipe, input)
+        error = false
+
+        # 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|
+          unless recipe.send(script).nil?
+            script_file = FPM::Cookery::Path.new(recipe.send(script))
+
+            # If the script file is an absolute path, just use that path.
+            # Otherwise consider the location relative to the recipe.
+            unless script_file.absolute?
+              script_file = File.expand_path("../#{script_file.to_s}", recipe.filename)
             end
-          end
 
-          %w[ depends exclude provides replaces conflicts config_files ].each do |type|
-            if recipe.send(type).any?
-              recipe.send(type).each do |dep|
-                opts += ["--#{type.gsub('_','-')}", dep]
-              end
+            if File.exists?(script_file)
+              input.scripts[fpm_script] = File.read(script_file.to_s)
+            else
+              Log.error "#{script} script '#{script_file}' is missing"
+              error = true
             end
           end
+        end
 
-          opts << '.'
+        exit(1) if error
+      end
 
-          Log.info 'Calling fpm to build the package'
-          Log.debug ['fpm', opts].flatten.inspect
-          safesystem(*['fpm', opts].flatten)
+      # 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)
+              end
+            end
+          end
         end
       end
     end

data/lib/fpm/cookery/path_helper.rb

@@ -18,6 +18,10 @@ module FPM
         current_pathname_for('etc')/path
       end
 
+      def opt(path = nil)
+        current_pathname_for('opt')/path
+      end
+
       def var(path = nil)
         current_pathname_for('var')/path
       end

data/lib/fpm/cookery/recipe.rb

@@ -34,7 +34,7 @@ module FPM
         attrs.each do |attr|
           class_eval %Q{
             def self.#{attr}(*list)
-              @#{attr} ||= superclass.respond_to?(:#{attr}) ? superclass.#{attr} : []
+              @#{attr} ||= []
               @#{attr} << list
               @#{attr}.flatten!
               @#{attr}.uniq!

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

@@ -9,10 +9,16 @@ module FPM
         NAME = :git
 
         def fetch
+          rev = options[:sha] || options[:tag]
+
           if local_path.exist?
             Dir.chdir(local_path) do
-              git('fetch', url)
-              git('fetch', '--tags', url)
+              if rev and has_rev?(rev)
+                Log.info("Skipping fetch, rev #{rev} exists.")
+              else
+                git('fetch', url)
+                git('fetch', '--tags', url)
+              end
             end
           else
             Dir.chdir(cachedir) do
@@ -53,6 +59,14 @@ module FPM
           Log.debug "git #{command} #{args.join(' ')}"
           safesystem('git', command, *args)
         end
+
+        def has_rev?(rev)
+          Log.debug "git show #{rev} >/dev/null 2>&1"
+          safesystem("git show #{rev} >/dev/null 2>&1")
+          true
+        rescue
+          false
+        end
       end
     end
   end

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

data/spec/path_helper_spec.rb

@@ -13,6 +13,7 @@ describe "PathHelper" do
   describe "path helper methods" do
     [ ['prefix', '/usr'],
       ['etc', '/etc'],
+      ['opt', '/opt'],
       ['var', '/var'],
       ['bin', '/usr/bin'],
       ['doc', '/usr/share/doc'],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &81673760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *81673760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &81673550 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81673550
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &81075460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +53,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81075460
-- !ruby/object:Gem::Dependency
-  name: fpm
-  requirement: &81075040 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fpm
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *81075040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &81074500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81074500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A tool for building software packages with fpm.
 email:
 - bernd@tuneafish.de
@@ -134,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fpm-cookery
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A tool for building software packages with fpm.