fpm 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 667a4cf02480d4f1e0765b61a7e10d738f97979d
-  data.tar.gz: 2876ef0ca281d507aa190f4bb51a8f36d6da2da6
+  metadata.gz: 3ed6597fd964dd4f0e04832217258a80134af1e0
+  data.tar.gz: da1d4aab01fd06e27e71d8d225f99d23ef7f7204
 SHA512:
-  metadata.gz: 9d55a2990a70e521030c5832a5bc609e83f433914e0a6bda63924cf97e0b826b4950190a58c27733559f0e06f4fc5aeb0187c3fc3ef6e5f61ec0465589320769
-  data.tar.gz: 54c20001e7840427fe4d819636131d727ef6f7c5ad729e59670893851355cb1f6313d6e398fb3321915cd90f589658e65e39111890d3e2df4b88926eb7623436
+  metadata.gz: 1722137bd9f0359ca24a390d9be83a1115f9514dbbfef2dae19b14f4f88f673d31241131fa5d998225c6d4b0dea6f1e5ca075b19b5cbc64fbaa3ddbc9b39d4ba
+  data.tar.gz: 9ebd3febbf7c703ff55c91f33bb89adc9074bb8f05c8f2595b552b10497bd1f63289d409bbe3e8aa8f4f53115830d57887d01f1075e486f5696246bad9ea46f0

data/CHANGELIST

@@ -1,7 +1,10 @@
+1.6.3 (September 15, 2016)
+  - Fix bug in fpm's release that accidentally included a few `.pyc` files (#1191)
+
 1.6.2 (July 1, 2016)
   - Reduce `json` dependency version to avoid requiring Ruby 2.0 (#1146, #1147;
     patch by Matt Hoffman)
-  - pacman: skip automatic dependnecies if --no-auto-depends is given (Leo P)
+  - pacman: skip automatic dependencies if --no-auto-depends is given (Leo P)
   - rpm: Fix bug where --rpm-tag was accidentally ignored (#1134, Michal Mach)
   - deb: Omit certain fields from control file if (Breaks, Depends, Recommends,
     etc) if there are no values to put in that field. (#1113, TomyLobo)

data/lib/fpm.rb

@@ -17,3 +17,4 @@ require "fpm/package/solaris"
 require "fpm/package/p5p"
 require "fpm/package/pkgin"
 require "fpm/package/freebsd"
+require "fpm/package/apk"

data/lib/fpm/command.rb

@@ -45,13 +45,13 @@ class FPM::Command < Clamp::Command
     return lines.join("\n")
   end # def help
 
-  option "-t", "OUTPUT_TYPE",
+  option ["-t", "--output-type"], "OUTPUT_TYPE",
     "the type of package you want to create (deb, rpm, solaris, etc)",
     :attribute_name => :output_type
-  option "-s", "INPUT_TYPE",
+  option ["-s", "--input-type"], "INPUT_TYPE",
     "the package type to use as input (gem, rpm, python, etc)",
     :attribute_name => :input_type
-  option "-C", "CHDIR",
+  option ["-C", "--chdir"], "CHDIR",
     "Change directory to here before searching for files",
     :attribute_name => :chdir
   option "--prefix", "PREFIX",
@@ -256,12 +256,6 @@ class FPM::Command < Clamp::Command
 
   # Execute this command. See Clamp::Command#execute and Clamp's documentation
   def execute
-    # Short-circuit if someone simply runs `fpm --version`
-    if ARGV == [ "--version" ]
-      puts FPM::VERSION
-      return 0
-    end
-
     logger.level = :warn
     logger.level = :info if verbose? # --verbose
     logger.level = :debug if debug? # --debug
@@ -269,7 +263,6 @@ class FPM::Command < Clamp::Command
       logger.level = log_level.to_sym
     end
 
-
     if (stray_flags = args.grep(/^-/); stray_flags.any?)
       logger.warn("All flags should be before the first argument " \
                    "(stray flags found: #{stray_flags}")
@@ -514,9 +507,16 @@ class FPM::Command < Clamp::Command
     end
   end # def execute
 
-  def run(*run_args)
+  def run(run_args)
     logger.subscribe(STDOUT)
 
+    # Short circuit for a `fpm --version` or `fpm -v` short invocation that 
+    # is the user asking us for the version of fpm.
+    if run_args == [ "-v" ] || run_args == [ "--version" ]
+      puts FPM::VERSION
+      return 0
+    end
+
     # fpm initialization files, note the order of the following array is
     # important, try .fpm in users home directory first and then the current
     # directory
@@ -557,7 +557,7 @@ class FPM::Command < Clamp::Command
 
     ARGV.unshift(*flags)
     ARGV.push(*args)
-    super(*run_args)
+    super(run_args)
   rescue FPM::Package::InvalidArgument => e
     logger.error("Invalid package argument: #{e}")
     return 1

data/lib/fpm/package.rb

@@ -8,6 +8,7 @@ require "socket" # stdlib, for Socket.gethostname
 require "shellwords" # stdlib, for Shellwords.escape
 require "erb" # stdlib, for template processing
 require "cabin" # gem "cabin"
+require "stud/temporary"
 
 # This class is the parent of all packages.
 # If you want to implement an FPM package type, you'll inherit from this.
@@ -249,7 +250,7 @@ class FPM::Package
   end # def output
 
   def staging_path(path=nil)
-    @staging_path ||= ::Dir.mktmpdir("package-#{type}-staging") #, ::Dir.pwd)
+    @staging_path ||= Stud::Temporary.directory("package-#{type}-staging")
 
     if path.nil?
       return @staging_path
@@ -259,7 +260,7 @@ class FPM::Package
   end # def staging_path
 
   def build_path(path=nil)
-    @build_path ||= ::Dir.mktmpdir("package-#{type}-build") #, ::Dir.pwd)
+    @build_path ||= Stud::Temporary.directory("package-#{type}-build")
 
     if path.nil?
       return @build_path

data/lib/fpm/package/cpan.rb

@@ -3,6 +3,7 @@ require "fpm/package"
 require "fpm/util"
 require "fileutils"
 require "find"
+require "pathname"
 
 class FPM::Package::CPAN < FPM::Package
   # Flags '--foo' will be accessable  as attributes[:npm_foo]
@@ -133,8 +134,19 @@ class FPM::Package::CPAN < FPM::Package
     safesystem(attributes[:cpan_cpanm_bin], *cpanm_flags)
 
     if !attributes[:no_auto_depends?]
-      unless metadata["requires"].nil?
-        metadata["requires"].each do |dep_name, version|
+     found_dependencies = {}
+     if metadata["requires"]
+       found_dependencies.merge!(metadata["requires"])
+     end
+     if metadata["prereqs"]
+       if metadata["prereqs"]["runtime"]
+         if metadata["prereqs"]["runtime"]["requires"]
+           found_dependencies.merge!(metadata["prereqs"]["runtime"]["requires"])
+         end
+       end
+     end
+     unless found_dependencies.empty?
+       found_dependencies.each do |dep_name, version|
           # Special case for representing perl core as a version.
           if dep_name == "perl"
             self.dependencies << "#{dep_name} >= #{version}"
@@ -246,6 +258,21 @@ class FPM::Package::CPAN < FPM::Package
                       :path => path.gsub(staging_path, ""))
         File.unlink(path)
       end
+      
+      # Remove useless .packlist files and their empty parent folders
+      # https://github.com/jordansissel/fpm/issues/1179
+      ::Dir.glob(File.join(staging_path, glob_prefix, "**/.packlist")).each do |path|
+        logger.debug("Removing useless file.",
+                      :path => path.gsub(staging_path, ""))
+        File.unlink(path)
+        Pathname.new(path).parent.ascend do |parent|
+          if ::Dir.entries(parent).sort == ['.', '..'].sort
+            FileUtils.rmdir parent
+          else
+            break
+          end
+        end
+      end
     end
 
 

data/lib/fpm/package/gem.rb

@@ -30,6 +30,9 @@ class FPM::Package::Gem < FPM::Package
   option "--gem", "PATH_TO_GEM",
           "The path to the 'gem' tool (defaults to 'gem' and searches " \
           "your $PATH)", :default => "gem"
+  option "--shebang", "SHEBANG",
+          "Replace the shebang in the executables in the bin path with a " \
+          "custom string", :default => nil
   option "--fix-name", :flag, "Should the target package name be prefixed?",
     :default => true
   option "--fix-dependencies", :flag, "Should the package dependencies be " \
@@ -196,6 +199,22 @@ class FPM::Package::Gem < FPM::Package
     args << gem_path
     safesystem(*args)
 
+    # Replace the shebangs in the executables
+    if attributes[:gem_shebang]
+      ::Dir.entries(bin_path).each do |file_name|
+        # exclude . and ..
+        next if ['.', '..'].include?(file_name)
+        # exclude everything which is not a file
+        file_path = File.join(bin_path, file_name)
+        next unless File.ftype(file_path) == 'file'
+        # replace shebang in files if there is one
+        file = File.read(file_path)
+        if file.gsub!(/\A#!.*$/, "#!#{attributes[:gem_shebang]}")
+          File.open(file_path, 'w'){|f| f << file}
+        end
+      end
+    end
+
     # 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:

data/lib/fpm/package/pacman.rb

@@ -58,7 +58,7 @@ class FPM::Package::Pacman < FPM::Package
   end # def config_files
 
   def dependencies
-    bogus_regex = /[^\sA-Za-z0-9><=-]/
+    bogus_regex = /[^\sA-Za-z0-9><=+._@-]/
     # Actually modifies depencies if they are not right
     bogus_dependencies = @dependencies.grep bogus_regex
     if bogus_dependencies.any?

data/lib/fpm/package/rpm.rb

@@ -537,7 +537,7 @@ class FPM::Package::RPM < FPM::Package
 
   def summary
     if !attributes[:rpm_summary]
-      return @description.split("\n").first || "_"
+      return @description.split("\n").find { |line| !line.strip.empty? } || "_"
     end
 
     return attributes[:rpm_summary]

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -260,9 +260,7 @@ files:
 - lib/fpm/package/pleaserun.rb
 - lib/fpm/package/puppet.rb
 - lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/package/pyfpm/__init__.pyc
 - lib/fpm/package/pyfpm/get_metadata.py
-- lib/fpm/package/pyfpm/get_metadata.pyc
 - lib/fpm/package/python.rb
 - lib/fpm/package/rpm.rb
 - lib/fpm/package/sh.rb
@@ -322,3 +320,4 @@ signing_key:
 specification_version: 4
 summary: fpm - package building and mangling
 test_files: []
+has_rdoc: