fpm-cookery 0.9.0 → 0.10.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.10.0 (2012-08-12)
+* Add support for shar and bin files to curl source handler. (brandonmartin)
+* Support an optional basename parameter for the `install` helper.
+* Deprecate public usage of the `install_p` helper.
+* Add license option to the recipe class.
+
 # v0.9.0 (2012-07-21)
 * Allow architecture specific settings via the `architectures` method.
 * Unbreak RPM creation on RHEL5. (brandonmartin)

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

@@ -0,0 +1,43 @@
+require 'fpm/package/dir'
+require 'delegate'
+
+module FPM
+  module Cookery
+    module Package
+      class Dir < SimpleDelegator
+        def initialize(recipe)
+          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[:rpm_compression] = 'gzip'
+          attributes[:rpm_digest] = 'md5'
+          attributes[:rpm_user] = 'root'
+          attributes[:rpm_group] = 'root'
+
+          # TODO replace remove_excluded_files() in packager with this.
+          attributes[:excludes] = []
+
+          input('.')
+
+          # 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
+  end
+end

data/lib/fpm/cookery/packager.rb

@@ -5,7 +5,7 @@ require 'fpm/cookery/utils'
 require 'fpm/cookery/source_integrity_check'
 require 'fpm/cookery/path'
 require 'fpm/cookery/log'
-require 'fpm/package/dir'
+require 'fpm/cookery/package/dir'
 require 'fpm/package/deb'
 require 'fpm/package/rpm'
 
@@ -147,36 +147,15 @@ module FPM
             username && useremail ? "#{username} <#{useremail}>" : nil
           end
 
-          input = FPM::Package::Dir.new
+          input = FPM::Cookery::Package::Dir.new(recipe)
 
-          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.attributes[:rpm_compression] = "gzip"
-          input.attributes[:rpm_digest] = "md5"
-          input.attributes[:rpm_user] = "root"
-          input.attributes[:rpm_group] = "root"
-
-          input.input('.')
-
           output_class = FPM::Package.types[@target]
 
           output = input.convert(output_class)

data/lib/fpm/cookery/path.rb

@@ -25,17 +25,19 @@ module FPM
         FileUtils.mkdir_p(self.to_s)
       end
 
-      def install(src)
+      def install(src, new_basename = nil)
         case src
         when Array
           src.collect {|src| install_p(src) }
         when Hash
           src.collect {|src, new_basename| install_p(src, new_basename) }
         else
-          install_p(src)
+          install_p(src, new_basename)
         end
       end
 
+      # @deprecated Will be made private in the future.
+      # @private
       def install_p(src, new_basename = nil)
         if new_basename
           new_basename = File.basename(new_basename) # rationale: see Pathname.+

data/lib/fpm/cookery/recipe.rb

@@ -54,7 +54,8 @@ 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
+              :pre_install, :post_install, :pre_uninstall, :post_uninstall,
+              :license
 
       attr_rw_list :build_depends, :config_files, :conflicts, :depends,
                    :exclude, :patches, :provides, :replaces

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

@@ -25,6 +25,9 @@ module FPM
             case local_path.extname
             when '.bz2', '.gz', '.tgz'
               safesystem('tar', 'xf', local_path)
+            when '.shar', '.bin'
+              File.chmod(0755, local_path)
+              safesystem(local_path)
             when '.zip'
               safesystem('unzip', '-d', local_path.basename('.zip'), local_path)
             end

data/lib/fpm/cookery/source_handler.rb

@@ -20,7 +20,7 @@ module FPM
         # Test cases for individual recipe attributes
         # are not setting spec before hand (due to delegation chain?)
         # Additionally, one test actually has options being sent as a String
-        if ( options.nil? || options.class == String || options.has_key?(:with) == false)
+        if (options.nil? || options.class == String || options.has_key?(:with) == false)
           @source_provider = DEFAULT_HANDLER
         else
           @source_provider = options[:with]

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.9.0'
+    VERSION = '0.10.0'
   end
 end

data/spec/path_spec.rb

@@ -119,5 +119,16 @@ describe "Path" do
         end
       end
     end
+
+    describe "with a new basename argument" do
+      it "installs the file with a new basename" do
+        Dir.mktmpdir do |dir|
+          path = FPM::Cookery::Path.new(dir)
+          path.install(File.expand_path('../spec_helper.rb', __FILE__), 'foo.rb')
+
+          File.exist?(path/'foo.rb').must_equal true
+        end
+      end
+    end
   end
 end

data/spec/recipe_spec.rb

@@ -67,6 +67,7 @@ describe "Recipe" do
   spec_recipe_attribute(:arch, 'i386')
   spec_recipe_attribute(:description, 'A nice program.')
   spec_recipe_attribute(:homepage, 'http://example.com')
+  spec_recipe_attribute(:license, 'MIT')
   spec_recipe_attribute(:maintainer, 'John Doe <john@example.com>')
   spec_recipe_attribute(:sha256, '123456789abcdef')
   spec_recipe_attribute(:sha1, '123456789abcdef')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
@@ -116,6 +116,7 @@ files:
 - lib/fpm/cookery/log/output/console.rb
 - lib/fpm/cookery/log/output/console_color.rb
 - lib/fpm/cookery/log/output/null.rb
+- lib/fpm/cookery/package/dir.rb
 - lib/fpm/cookery/packager.rb
 - lib/fpm/cookery/path.rb
 - lib/fpm/cookery/path_helper.rb
@@ -151,12 +152,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4411516552651280522
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4411516552651280522
 requirements: []
 rubyforge_project: fpm-cookery
 rubygems_version: 1.8.24