fpm 1.0.1 → 1.0.2

data/CHANGELIST

@@ -1,3 +1,15 @@
+1.0.2 (January 10, 2013)
+  - rpm: No longer converts - to _ in dependency strings (#603, Bulat
+    Shakirzyanov)
+  - Handle Darwin/OSX tar invocations (now tries 'gnutar' and 'gtar'). (Jordan
+    Sissel)
+  - Process $HOME/.fpm, and $PWD/.fpm in the correct order and allow CLI flags
+    to override fpm config file settings. (#615, Jordan Sissel)
+  - Don't leave empty gem bin paths in packages that don't need them (#612,
+    Jordan Sissel)
+  - deb: Make --deb-compression=gz work correctly (#616, #617; Evan Krall,
+    Jason Yan)
+
 1.0.1 (December 7, 2013)
   - deb: Correctly handle --config-files given with a leading / (Jordan Sissel)
 

data/lib/fpm/command.rb

@@ -420,14 +420,18 @@ class FPM::Command < Clamp::Command
     # fpm initialization files, note the order of the following array is
     # important, try .fpm in users home directory first and then the current
     # directory
-    rc_files = [File.join(ENV['HOME'],'.fpm'), '.fpm']
+    rc_files = [ ".fpm" ]
+    rc_files << File.join(ENV["HOME"], ".fpm") if ENV["HOME"]
 
     rc_files.each do |rc_file|
       if File.readable? rc_file
         @logger.warn("Loading flags from rc file #{rc_file}")
         File.readlines(rc_file).each do |line|
-          Shellwords.shellsplit(line).each do |e|
-            ARGV << e
+          # reverse becasue 'unshift' pushes onto the left side of the array.
+          Shellwords.shellsplit(line).reverse.each do |arg|
+            # Put '.fpm'-file flags *before* the command line flags
+            # so that we the CLI can override the .fpm flags
+            ARGV.unshift(arg)
           end
         end
       end

data/lib/fpm/package/deb.rb

@@ -41,7 +41,7 @@ class FPM::Package::Deb < FPM::Package
   end
 
   option "--compression", "COMPRESSION", "The compression type to use, must " \
-    "be one of #{COMPRESSION_TYPES.join(", ")}.", :default => "gzip" do |value|
+    "be one of #{COMPRESSION_TYPES.join(", ")}.", :default => "gz" do |value|
     if !COMPRESSION_TYPES.include?(value)
       raise ArgumentError, "deb compression value of '#{value}' is invalid. " \
         "Must be one of #{COMPRESSION_TYPES.join(", ")}"
@@ -328,7 +328,7 @@ class FPM::Package::Deb < FPM::Package
 
     # Tar up the staging_path into data.tar.{compression type}
     case self.attributes[:deb_compression]
-      when "gzip", nil
+      when "gz", nil
         datatar = build_path("data.tar.gz")
         compression = "-z"
       when "bzip2" 

data/lib/fpm/package/gem.rb

@@ -186,6 +186,18 @@ class FPM::Package::Gem < FPM::Package
     ::FileUtils.mkdir_p(bin_path)
     args << gem_path
     safesystem(*args)
+
+    # Delete bin_path if it's empty, and any empty parents (#612)
+    # Above, we mkdir_p bin_path because rubygems aborts if the parent
+    # directory doesn't exist, for example:
+    #   ERROR:  While executing gem ... (Errno::ENOENT)
+    #       No such file or directory - /tmp/something/weird/bin
+    tmp = bin_path
+    while ::Dir.entries(tmp).size == 2 || tmp == "/"  # just [ "..", "." ] is an empty directory
+      @logger.info("Deleting empty bin_path", :path => tmp)
+      ::Dir.rmdir(tmp)
+      tmp = File.dirname(tmp)
+    end
   end # def install_to_staging
   
   # Sanitize package name.

data/lib/fpm/package/pear.rb

@@ -106,8 +106,8 @@ class FPM::Package::PEAR < FPM::Package
         begin
           content = File.read(path).gsub(/#{Regexp.escape(staging_path)}/, "")
           File.write(path, content)
-        rescue ArgumentError
-          @logger.warn("error replacing staging_path in file", :replace_in => path)
+        rescue ArgumentError => e
+          @logger.warn("error replacing staging_path in file", :replace_in => path, :error => e)
         end
       end
       FileUtils.rm_r(path) if delete_these.include?(File.basename(path))

data/lib/fpm/package/rpm.rb

@@ -223,19 +223,6 @@ class FPM::Package::RPM < FPM::Package
       dep_ok
     end
 
-    # Convert any dashes in version strings to underscores.
-    self.dependencies = self.dependencies.collect do |dep|
-      name, op, version = dep.split(/\s+/)
-      if !version.nil? and version.include?("-")
-        @logger.warn("Dependency package '#{name}' version '#{version}' " \
-                     "includes dashes, converting to underscores")
-        version = version.gsub(/-/, "_")
-        "#{name} #{op} #{version}"
-      else
-        dep
-      end
-    end
-
     # if --ignore-iteration-in-dependencies is true convert foo = X, to
     # foo >= X , foo < X+1
     if self.attributes[:rpm_ignore_iteration_in_dependencies?]

data/lib/fpm/util.rb

@@ -117,7 +117,11 @@ module FPM::Util
     when "SunOS"
       return "gtar"
     when "Darwin"
-      return "gnutar"
+      # Try running gnutar, it was renamed(??) in homebrew to 'gtar' at some point, I guess? I don't know.
+      ["gnutar", "gtar"].each do |tar|
+        system("#{tar} > /dev/null 2> /dev/null")
+        return tar unless $?.exitstatus == 127
+      end
     else
       return "tar"
     end

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: arr-pm
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ftw
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: insist
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: stud
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -188,6 +214,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -241,26 +268,27 @@ files:
 homepage: https://github.com/jordansissel/fpm
 licenses:
 - MIT-like
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: fpm - package building and mangling
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjQyZmUyN2NhNjAxNjEzYjAyZWM2NDdkMDQ4NGY3ZmVhYjU5M2Q5OQ==
-  data.tar.gz: !binary |-
-    MWVkMWM1YjE1Mjk4NTU4MjJhM2FhNzI3YjEyMjUyMTA2Y2U2ZDNlNw==
-SHA512:
-  metadata.gz: !binary |-
-    YjkyZWUyN2I5NjI4Y2ZiOThmYmQwZjI3YTRjNmNhODlhODYyODhhNmFjN2Uz
-    YTc4MTExYWM2YzQ0ZTFkYWE5MWIwMWJlNTAzNzYxYmU2ODM2ODNlMzFmN2Mz
-    N2I0ZTZhYThkZGY0NzIzZTIyN2RhNjMxNjM3YmNlZmM0ZTdkMzM=
-  data.tar.gz: !binary |-
-    MzNlNGU3YWFhMTRmYjc3ZThkYTMwNjFlZmE2NmVmZjhiOWU5MzJkZDNhMDdm
-    N2RiMDhiYmQ5NDJkMTY5ODNlMzU3N2Y2ODNmZTdjOGZkYTk5MzczNGEyYTIz
-    MmQyYjNmNmQ0OGExNTY5YjI0M2U4MjMwNmMyN2YzNzc0ZDNjNzA=