fpm-cookery 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.0 (2011-10-25)
+* Select vendor string delimiter based on the package target. (lusis)
+* Add pre/post install/uninstall script support. (lusis)
+
 # v0.2.0 (2011-10-22)
 * Add flag for package target. (deb, rpm) (jordansissel)
 * Improve recipe detection. (jordansissel)

data/lib/fpm/cookery/packager.rb

@@ -113,7 +113,15 @@ Filename:          #{check.filename}
           # Build a version including vendor and revision.
           vendor = config[:vendor] || recipe.vendor
           vendor_rev = "#{vendor}#{recipe.revision}"
-          version = [ver, vendor_rev].join('+')
+          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 --get user.name`.strip
@@ -147,20 +155,19 @@ Filename:          #{check.filename}
             '--architecture', recipe.arch.to_s
           ] if recipe.arch
 
-#          if self.postinst
-#            postinst_file = Tempfile.open('postinst')
-#            postinst_file.puts(postinst)
-#            chmod 0755, postinst_file.path
-#            postinst_file.close
-#            opts += ['--post-install', postinst_file.path]
-#          end
-#          if self.postrm
-#            postrm_file = Tempfile.open('postrm')
-#            postrm_file.puts(postrm)
-#            chmod 0755, postrm_file.path
-#            postrm_file.close
-#            opts += ['--post-uninstall', postrm_file.path]
-#          end
+          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 = File.expand_path("../#{recipe.send(script)}", recipe.filename)
+
+              if File.exists?(script_file)
+                p_opt = script_map[script]
+                opts += ["#{p_opt}", script_file]
+              else
+                raise "#{script} script '#{script_file}' is missing"
+              end
+            end
+          end
 
           %w[ depends exclude provides replaces conflicts config_files ].each do |type|
             if recipe.send(type).any?

data/lib/fpm/cookery/recipe.rb

@@ -44,7 +44,8 @@ module FPM
       end
 
       attr_rw :arch, :description, :homepage, :maintainer, :md5, :name,
-              :revision, :section, :sha1, :sha256, :spec, :vendor, :version
+              :revision, :section, :sha1, :sha256, :spec, :vendor, :version,
+              :pre_install, :post_install, :pre_uninstall, :post_uninstall
 
       attr_rw_list :build_depends, :config_files, :conflicts, :depends,
                    :exclude, :patches, :provides, :replaces

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/spec/recipe_spec.rb

@@ -75,6 +75,10 @@ describe "Recipe" do
   spec_recipe_attribute(:spec, {:foo => true})
   spec_recipe_attribute(:vendor, 'myvendor')
   spec_recipe_attribute(:version, '1.2')
+  spec_recipe_attribute(:pre_install, 'preinstall')
+  spec_recipe_attribute(:post_install, 'postinstall')
+  spec_recipe_attribute(:pre_uninstall, 'preuninstall')
+  spec_recipe_attribute(:post_uninstall, 'postuninstall')
 
   describe "#revision" do
     it "sets a default revision" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-22 00:00:00.000000000 Z
+date: 2011-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &84285390 !ruby/object:Gem::Requirement
+  requirement: &71291120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84285390
+  version_requirements: *71291120
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &84285150 !ruby/object:Gem::Requirement
+  requirement: &71290880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84285150
+  version_requirements: *71290880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &84284930 !ruby/object:Gem::Requirement
+  requirement: &71290650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84284930
+  version_requirements: *71290650
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &84284710 !ruby/object:Gem::Requirement
+  requirement: &71290430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84284710
+  version_requirements: *71290430
 description: A tool for building software packages with fpm.
 email:
 - bernd@tuneafish.de