fpm 0.4.0 → 0.4.1

data/CHANGELIST

@@ -1,9 +1,17 @@
-0.4.0 (???)
+0.4.1 (March 19, 2012)
+  - Fix fpm so it works in ruby 1.8 again.
+    Tests run, and passing:
+      rvm 1.8.7,1.9.2,1.9.3 do bundle exec rspec
+
+0.4.0 (March 18, 2012)
   - Complete rewrite of pretty much everything.
     * Otherwise, the 'fpm' command functionality should be the same
     * Please let me know if something broke!
   - Now has an API (see examples/api directory)
   - Also has a proper test suite
+  - Updated the rpm spec generator to disable all the ways I've found rpmbuild
+    to molest packages. This means that fpm-generated rpms will no longer
+    strip libraries, move files around, randomly mutate jar files, etc.
   - Add --license and --vendor settings (via Pieter Loubser)
   - python support: try to name python packages sanely. Some pypi packages
     are literally called 'python-foo' so make sure we generate packages named

data/CONTRIBUTORS

@@ -9,4 +9,4 @@ Michael Blume
 Pierre-Yves Ritschard
 sabowski
 Thomas Haggett
-
+Pieter Loubser

data/lib/fpm/command.rb

@@ -150,9 +150,6 @@ class FPM::Command < Clamp::Command
     " and directories you want to include in the package. For others, like " \
     "'gem', it specifies the packages to download and use as the gem input",
     :attribute_name => :args
-  def settings
-    @settings ||= {}
-  end
 
   FPM::Package.types.each do |name, klass|
     klass.apply_options(self)

data/lib/fpm/monkeypatches.rb

@@ -0,0 +1,11 @@
+# Copied from https://raw.github.com/marcandre/backports/master/lib/backports/1.9.3/io.rb
+# Also Hacked just to make it work
+# This is necessary until a newer version of backports (> 2.3.0) is available
+class << IO
+  # Standard in Ruby 1.9.3 See official documentation[http://ruby-doc.org/core-1.9.3/IO.html#method-c-write]
+  def write(name, string, offset = nil, options = Backports::Undefined)
+    File.open(name, "w") do |fd|
+      fd.write(string)
+    end
+  end unless method_defined? :write
+end

data/lib/fpm/package.rb

@@ -1,6 +1,7 @@
 require "fpm/namespace" # local
 require "fpm/util" # local
 require "tmpdir" # stdlib
+require "backports" # gem 'backports'
 require "socket" # stdlib, for Socket.gethostname
 require "shellwords" # stdlib, for Shellwords.escape
 require "cabin" # gem "cabin"
@@ -16,6 +17,7 @@ class FPM::Package
  
   # This class is raised when a file already exists when trying to write.
   class FileAlreadyExists < StandardError
+    # Get a human-readable error message
     def to_s
       return "File already exists, refusing to continue: #{super}"
     end # def to_s
@@ -221,7 +223,7 @@ class FPM::Package
   end # def output
 
   def staging_path(path=nil)
-    @staging_path ||= ::Dir.mktmpdir(File.join(::Dir.pwd, "package-#{type}-staging"))
+    @staging_path ||= ::Dir.mktmpdir("package-#{type}-staging", ::Dir.pwd)
 
     if path.nil?
       return @staging_path
@@ -231,7 +233,7 @@ class FPM::Package
   end # def staging_path
 
   def build_path(path=nil)
-    @build_path ||= ::Dir.mktmpdir(File.join(::Dir.pwd, "package-#{type}-build"))
+    @build_path ||= ::Dir.mktmpdir("package-#{type}-build", ::Dir.pwd)
 
     if path.nil?
       return @build_path
@@ -268,7 +270,10 @@ class FPM::Package
     # Find will print the path you're searching first, so skip it and return
     # the rest. Also trim the leading path such that '#{staging_path}/' is removed
     # from the path before returning.
-    return Find.find(staging_path) \
+    #
+    # Wrapping Find.find in an Enumerator is required for sane operation in ruby 1.8.7,
+    # but requires the 'backports' gem (which is used in other places in fpm)
+    return Enumerator.new { |y| Find.find(staging_path) { |path| y << path } } \
       .select { |path| path != staging_path } \
       .collect { |path| path[staging_path.length + 1.. -1] }
   end # def files

data/lib/fpm/package/deb.rb

@@ -3,6 +3,8 @@ require "fpm/namespace"
 require "fpm/package"
 require "fpm/errors"
 require "fpm/util"
+require "backports"
+require "fpm/monkeypatches" # until backports > 2.3.0
 require "fileutils"
 
 # Support for debian packages (.deb files)

data/lib/fpm/package/dir.rb

@@ -74,7 +74,7 @@ class FPM::Package::Dir < FPM::Package
   def clone(source, destination)
     # Copy all files from 'path' into staging_path
 
-    Find.find(source).each do |file|
+    Find.find(source) do |file|
       next if source == file && File.directory?(file) # ignore the directory itself
       target = File.join(destination, file)
       copy(file, target)

data/lib/fpm/package/gem.rb

@@ -128,7 +128,10 @@ class FPM::Package::Gem < FPM::Package
       self.description = description_options.find { |d| !(d.nil? or d.strip.empty?) }
 
       # Upstream rpms seem to do this, might as well share.
-      self.provides << "rubygem(#{self.name})"
+      # TODO(sissel): Figure out how to hint this only to rpm? 
+      # maybe something like attributes[:rpm_provides] for rpm specific stuff?
+      # Or just ignore it all together.
+      #self.provides << "rubygem(#{self.name})"
 
       # By default, we'll usually automatically provide this, but in the case that we are
       # composing multiple packages, it's best to explicitly include it in the provides list.

data/lib/fpm/package/rpm.rb

@@ -2,6 +2,7 @@ require "fpm/package"
 require "backports"
 require "fileutils"
 require "find"
+require "fpm/monkeypatches" # until backports > 2.3.0
 require "arr-pm/file" # gem 'arr-pm'
 
 # RPM Package type.

data/lib/fpm/package/tar.rb

@@ -4,7 +4,12 @@ require "fpm/util"
 require "fileutils"
 require "fpm/package/dir"
 
+# Use a tarball as a package.
+#
+# This provides no metadata. Both input and output are supported.
 class FPM::Package::Tar < FPM::Package
+
+  # Input a tarball. Compressed tarballs should be OK.
   def input(input_path)
     # use part of the filename as the package name
     self.name = File.basename(input_path).split(".").first
@@ -37,6 +42,10 @@ class FPM::Package::Tar < FPM::Package
     dir.cleanup_build
   end # def input
 
+  # Output a tarball.
+  #
+  # If the output path ends predictably (like in .tar.gz) it will try to obey
+  # the compression type.
   def output(output_path)
     # Unpack the tarball to the staging path
     args = ["-cf", output_path, "-C", staging_path, "."]
@@ -47,6 +56,7 @@ class FPM::Package::Tar < FPM::Package
     safesystem("tar", *args)
   end # def output
 
+  # Generate the proper tar flags based on the path name.
   def tar_compression_flag(path)
     case path
       when /\.tar\.bz2$/

metadata

@@ -1,154 +1,152 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: fpm
-version: !ruby/object:Gem::Version
-  version: 0.4.0
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
-authors:
+authors: 
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cabin
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.3
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cabin
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 4
+        - 3
         version: 0.4.3
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: backports
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: arr-pm
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.7
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: arr-pm
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 0
+        - 7
         version: 0.0.7
-- !ruby/object:Gem::Dependency
-  name: clamp
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: clamp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rush
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: insist
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: insist
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
-  solaris packages and more. Win at package management without wasting pointless hours
-  debugging bad rpm specs!
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
+        version: 0.0.5
+  type: :development
+  version_requirements: *id008
+description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs, solaris packages and more. Win at package management without wasting pointless hours debugging bad rpm specs!
 email: jls@semicomplete.com
-executables:
+executables: 
 - fpm
 - fpm-npm
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/fpm/errors.rb
 - lib/fpm/util.rb
 - lib/fpm/command.rb
@@ -166,6 +164,7 @@ files:
 - lib/fpm/package/dir.rb
 - lib/fpm/package/puppet.rb
 - lib/fpm/package/solaris.rb
+- lib/fpm/monkeypatches.rb
 - lib/fpm/package.rb
 - lib/fpm/namespace.rb
 - lib/fpm.rb
@@ -181,28 +180,37 @@ files:
 - CHANGELIST
 homepage: https://github.com/jordansissel/fpm
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling
 test_files: []
-has_rdoc: 
+