fpm 1.6.1 → 1.14.1

data/CONTRIBUTORS

@@ -20,6 +20,8 @@ llasram
 sbuss
 Brett Gailey (github: dnbert)
 Daniel Haskin (github: djhaskin987)
+Richard Grainger (github: liger1978)
+seph (github: directionless)
 
 If you have contributed (bug reports, feature requests, help in IRC, blog
 posts, code, etc) and aren't listed here, please let me know if you wish to be

data/LICENSE

@@ -1,6 +1,6 @@
 (This is an MIT-style license)
 
-Copyright (c) 2011-2016 Jordan Sissel and contributors.
+Copyright (c) 2011-2021 Jordan Sissel and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/fpm

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rubygems"
 $: << File.join(File.dirname(__FILE__), "..", "lib")
 require "fpm"
 require "fpm/command"

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",
@@ -233,6 +233,20 @@ class FPM::Command < Clamp::Command
     "copying, downloading, etc. Roughly any scratch space fpm needs to build " \
     "your package.", :default => Dir.tmpdir
 
+  option "--source-date-epoch-from-changelog", :flag,
+    "Use release date from changelog as timestamp on generated files to reduce nondeterminism. " \
+    "Experimental; only implemented for gem so far. ",
+    :default => false
+
+  option "--source-date-epoch-default", "SOURCE_DATE_EPOCH_DEFAULT",
+    "If no release date otherwise specified, use this value as timestamp on generated files to reduce nondeterminism. " \
+    "Reproducible build environments such as dpkg-dev and rpmbuild set this via envionment variable SOURCE_DATE_EPOCH " \
+    "variable to the integer unix timestamp to use in generated archives, " \
+    "and expect tools like fpm to use it as a hint to avoid nondeterministic output. " \
+    "This is a Unix timestamp, i.e. number of seconds since 1 Jan 1970 UTC. " \
+    "See https://reproducible-builds.org/specs/source-date-epoch ",
+    :environment_variable => "SOURCE_DATE_EPOCH"
+
   parameter "[ARGS] ...",
     "Inputs to the source package type. For the 'dir' type, this is the files" \
     " and directories you want to include in the package. For others, like " \
@@ -256,12 +270,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 +277,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 +521,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 +571,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/apk.rb

@@ -3,12 +3,12 @@ require "fpm/namespace"
 require "fpm/package"
 require "fpm/errors"
 require "fpm/util"
-require "backports"
+require "backports/latest"
 require "fileutils"
 require "digest"
 require 'digest/sha1'
 
-# Support for debian packages (.deb files)
+# Support for Alpine packages (.apk files)
 #
 # This class supports both input and output of packages.
 class FPM::Package::APK< FPM::Package
@@ -144,9 +144,9 @@ class FPM::Package::APK< FPM::Package
     scripts = {}
 
     scripts = register_script('post-install',   :after_install,   scripts)
-    scripts = register_script('post-install',   :before_install,  scripts)
-    scripts = register_script('post-install',   :before_upgrade,  scripts)
-    scripts = register_script('post-install',   :after_upgrade,  scripts)
+    scripts = register_script('pre-install',   :before_install,  scripts)
+    scripts = register_script('pre-upgrade',   :before_upgrade,  scripts)
+    scripts = register_script('post-upgrade',   :after_upgrade,  scripts)
     scripts = register_script('pre-deinstall',  :before_remove,   scripts)
     scripts = register_script('post-deinstall', :after_remove,    scripts)
 
@@ -238,7 +238,7 @@ class FPM::Package::APK< FPM::Package
         record_length = determine_record_length(record_length)
 
         until(data.length == record_length)
-          data += file.read(TAR_CHUNK_SIZE)
+          data << file.read(TAR_CHUNK_SIZE)
         end
 
         # Clear ownership fields

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]
@@ -24,6 +25,9 @@ class FPM::Package::CPAN < FPM::Package
   option "--test", :flag,
     "Run the tests before packaging?", :default => true
 
+  option "--verbose", :flag,
+    "Produce verbose output from cpanm?", :default => false
+
   option "--perl-lib-path", "PERL_LIB_PATH",
     "Path of target Perl Libraries"
 
@@ -48,6 +52,7 @@ class FPM::Package::CPAN < FPM::Package
 
     if File.exist?(package)
       moduledir = package
+      result = {}
     else
       result = search(package)
       tarball = download(result, version)
@@ -97,6 +102,12 @@ class FPM::Package::CPAN < FPM::Package
       self.name = fix_name(metadata["name"])
     end
 
+    unless metadata["module"].nil?
+      metadata["module"].each do |m|
+        self.provides << cap_name(m["name"]) + " = #{self.version}"
+      end
+    end
+
     # author is not always set or it may be a string instead of an array
     self.vendor = case metadata["author"]
       when String; metadata["author"]
@@ -129,24 +140,36 @@ class FPM::Package::CPAN < FPM::Package
     cpanm_flags += ["--mirror", "#{attributes[:cpan_mirror]}"] if !attributes[:cpan_mirror].nil?
     cpanm_flags += ["--mirror-only"] if attributes[:cpan_mirror_only?] && !attributes[:cpan_mirror].nil?
     cpanm_flags += ["--force"] if attributes[:cpan_cpanm_force?]
+    cpanm_flags += ["--verbose"] if attributes[:cpan_verbose?]
 
     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"
+            m = version.to_s.match(/^(\d)\.(\d{3})(\d{3})$/)
+            if m
+               version = m[1] + '.' + m[2].sub(/^0*/, '') + '.' + m[3].sub(/^0*/, '')
+            end
             self.dependencies << "#{dep_name} >= #{version}"
             next
           end
           dep = search(dep_name)
 
-          if dep.include?("distribution")
-            name = fix_name(dep["distribution"])
-          else
-            name = fix_name(dep_name)
-          end
+          name = cap_name(dep_name)
 
           if version.to_s == "0"
             # Assume 'Foo = 0' means any version?
@@ -154,12 +177,14 @@ class FPM::Package::CPAN < FPM::Package
           else
             # The 'version' string can be something complex like:
             #   ">= 0, != 1.0, != 1.2"
+            # If it is not specified explicitly, require the given
+            # version or newer, as that is all CPAN itself enforces
             if version.is_a?(String)
               version.split(/\s*,\s*/).each do |v|
                 if v =~ /\s*[><=]/
                   self.dependencies << "#{name} #{v}"
                 else
-                  self.dependencies << "#{name} = #{v}"
+                  self.dependencies << "#{name} >= #{v}"
                 end
               end
             else
@@ -220,11 +245,7 @@ class FPM::Package::CPAN < FPM::Package
                      # Empty install_base to avoid local::lib being used.
                      "INSTALL_BASE=")
         end
-        if attributes[:cpan_test?]
-          make = [ "env", "PERL5LIB=#{build_path("cpan/lib/perl5")}", "make" ]
-        else
-          make = [ "make" ]
-        end
+        make = [ "env", "PERL5LIB=#{build_path("cpan/lib/perl5")}", "make" ]
         safesystem(*make)
         safesystem(*(make + ["test"])) if attributes[:cpan_test?]
         safesystem(*(make + ["DESTDIR=#{staging_path}", "install"]))
@@ -246,6 +267,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
 
 
@@ -281,38 +317,35 @@ class FPM::Package::CPAN < FPM::Package
                  :distribution => distribution,
                  :version => cpan_version)
 
-    # default to latest versionunless we specify one
+    # default to latest version unless we specify one
     if cpan_version.nil?
-      self.version = metadata["version"]
+      self.version = "#{metadata["version"]}"
     else
-      if metadata["version"] =~ /^v\d/
-        self.version = "v#{cpan_version}"
-      else
-        self.version = cpan_version
-      end
+      self.version = "#{cpan_version}"
     end
 
-    metacpan_release_url = "http://api.metacpan.org/v0/release/#{author}/#{distribution}-#{self.version}"
+    # Search metacpan to get download URL for this version of the module
+    metacpan_search_url = "https://fastapi.metacpan.org/v1/release/_search"
+    metacpan_search_query = '{"fields":["download_url"],"filter":{"term":{"name":"' + "#{distribution}-#{self.version}" + '"}}}'
     begin
-      release_response = httpfetch(metacpan_release_url)
+      search_response = httppost(metacpan_search_url,metacpan_search_query)
     rescue Net::HTTPServerException => e
       logger.error("metacpan release query failed.", :error => e.message,
-                    :url => metacpan_release_url)
+                    :url => metacpan_search_url)
       raise FPM::InvalidPackageConfiguration, "metacpan release query failed"
     end
 
-    data = release_response.body
+    data = search_response.body
     release_metadata = JSON.parse(data)
-    archive = release_metadata["archive"]
 
-    # should probably be basepathed from the url
-    tarball = File.basename(archive)
+    download_url = release_metadata['hits']['hits'][0]['fields']['download_url']
+    download_path = URI.parse(download_url).path
+    tarball = File.basename(download_path)
 
     url_base = "http://www.cpan.org/"
     url_base = "#{attributes[:cpan_mirror]}" if !attributes[:cpan_mirror].nil?
 
-    #url = "http://www.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
-    url = "#{url_base}/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{archive}"
+    url = "#{url_base}#{download_path}"
     logger.debug("Fetching perl module", :url => url)
 
     begin
@@ -333,7 +366,7 @@ class FPM::Package::CPAN < FPM::Package
 
   def search(package)
     logger.info("Asking metacpan about a module", :module => package)
-    metacpan_url = "http://api.metacpan.org/v0/module/" + package
+    metacpan_url = "https://fastapi.metacpan.org/v1/module/" + package
     begin
       response = httpfetch(metacpan_url)
     rescue Net::HTTPServerException => e
@@ -351,6 +384,10 @@ class FPM::Package::CPAN < FPM::Package
     return metadata
   end # def metadata
 
+  def cap_name(name)
+    return "perl(" + name.gsub("-", "::") + ")"
+  end # def cap_name
+
   def fix_name(name)
     case name
       when "perl"; return "perl"
@@ -366,6 +403,7 @@ class FPM::Package::CPAN < FPM::Package
     else
       http = Net::HTTP.new(uri.host, uri.port)
     end
+    http.use_ssl = uri.scheme == 'https'
     response = http.request(Net::HTTP::Get.new(uri.request_uri))
     case response
       when Net::HTTPSuccess; return response
@@ -374,5 +412,22 @@ class FPM::Package::CPAN < FPM::Package
     end
   end
 
+  def httppost(url, body)
+    uri = URI.parse(url)
+    if ENV['http_proxy']
+      proxy = URI.parse(ENV['http_proxy'])
+      http = Net::HTTP.Proxy(proxy.host,proxy.port,proxy.user,proxy.password).new(uri.host, uri.port)
+    else
+      http = Net::HTTP.new(uri.host, uri.port)
+    end
+    http.use_ssl = uri.scheme == 'https'
+    response = http.post(uri.request_uri, body)
+    case response
+      when Net::HTTPSuccess; return response
+      when Net::HTTPRedirection; return httppost(response["location"])
+      else; response.error!
+    end
+  end
+
   public(:input)
 end # class FPM::Package::NPM