fpm 1.9.3 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5615d2c9718bda8c319b0bcb73a2dd78ad6a27d
-  data.tar.gz: 4de9f492b1362ff219e8fd7fb66c8e383f234500
+  metadata.gz: 824ec3106d694f1d5255fca89d94623a327b108e
+  data.tar.gz: 5c9b1395dc9f49c29de9550f59df4efefae77ab9
 SHA512:
-  metadata.gz: 94a52dec3c70f4e49389d136a9922b315534bbbbb9728eee1eb97d5a60813d8664ae718eb464c4164df11011ef9634d0a1f878416d4d6bbcd3bfefe653c733c6
-  data.tar.gz: ca134fd3b9321671862de426002f8b924727fac05f8124a0be831fc69595b2d66a0abdaebb4a279f5c645612ab74cb636680825b17e332a9aea1bcd6c88fb2cf
+  metadata.gz: 4c9df69a9c986277fcba302920d920dd8833fb70b66f06278702d6ffc208bfaff201507db4df29036883f845e2fc0474927ec5f8b4dd3db48410465adf546021
+  data.tar.gz: 4db630cd9769205dd8c21fef6f846467ab98625ab584c5b9f2e30fa6de4101000fa572f269663169c8c70c5479ac6575bcdc19d5778614b66c1a3340fddbf92c

data/CHANGELOG.rst

@@ -1,6 +1,23 @@
 Release Notes and Change Log
 ============================
 
+1.10.0 (May 21, 2018)
+^^^^^^^^^^^^^^^^^^^^
+
+* Pin `ruby-xz` dependency to one which allows Ruby versions older than 2.3.0 (`#1494`_; Marat Sharafutdinov)
+* Documentation improvements: `#1488`_; Arthur Burkart. `#1384`_; Justin Kolberg. `#1452`_; Anatoli Babenia.
+* python: Improve support for the `~=` dependency comparison. (`#1482`_; Roman Vasilyev)
+* deb: Add `--deb-generate-changes` flag to have fpm output a `.changes` file (`#1492`_; Spida)
+* deb: Add `--deb-dist` flag to set the target distribution (similar to `--rpm-dist`). (`#1492`_; Spida)
+* apk: Make --before-install, --before-upgrade, and --after-upgrade work correctly. (`#1422`_; Charles R. Portwood II)
+* rpm: add `xzmt` for multithreaded xz compression (Amnon BC)
+* rpm: fix shell function name `install` conflicting with `install` program. In
+  postinst (after-install), the function is now called `_install` to avoid
+  conflicting with `/usr/bin/install` (`#1434`_; Torsten Schmidt)
+* - deb: --config-files ? (`#1440`_, `#1443`_; NoBodyCam)
+* FPM source repo now contains a Brewfile for use with Homebrew.
+* FPM source repo has a Dockerfile for invoking fpm with docker. (`#1484`_, ;Allan Lewis
+
 1.9.3 (September 11, 2017)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 

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/package.rb

@@ -3,7 +3,8 @@ require "fpm/util" # local
 require "pathname" # stdlib
 require "find"
 require "tmpdir" # stdlib
-require "backports" # gem 'backports'
+require "ostruct"
+require "backports/2.0.0/stdlib/ostruct"
 require "socket" # stdlib, for Socket.gethostname
 require "shellwords" # stdlib, for Shellwords.escape
 require "erb" # stdlib, for template processing
@@ -118,7 +119,10 @@ class FPM::Package
 
   def initialize
     # Attributes for this specific package
-    @attributes = {}
+    @attributes = {
+      # Default work location
+      :workdir => ::Dir.tmpdir
+    }
 
     # Reference
     # http://www.debian.org/doc/manuals/maint-guide/first.en.html
@@ -507,7 +511,7 @@ class FPM::Package
       end
     end
   end
-  
+
   # Get the contents of the script by a given name.
   #
   # If template_scripts? is set in attributes (often by the --template-scripts

data/lib/fpm/package/apk.rb

@@ -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)
 

data/lib/fpm/package/deb.rb

@@ -50,6 +50,8 @@ class FPM::Package::Deb < FPM::Package
     value
   end
 
+  option "--dist", "DIST-TAG", "Set the deb distribution.", :default => "unstable"
+
   # Take care about the case when we want custom control file but still use fpm ...
   option "--custom-control", "FILEPATH",
     "Custom version of the Debian control file." do |control|
@@ -88,6 +90,10 @@ class FPM::Package::Deb < FPM::Package
     File.expand_path(file)
   end
 
+  option "--generate-changes", :flag,
+    "Generate PACKAGENAME.changes file.",
+    :default => false
+
   option "--upstream-changelog", "FILEPATH", "Add FILEPATH as upstream changelog" do |file|
     File.expand_path(file)
   end
@@ -574,6 +580,30 @@ class FPM::Package::Deb < FPM::Package
         safesystem(*ar_cmd, output_path, "debian-binary", "control.tar.gz", datatar)
       end
     end
+
+    # if a PACKAGENAME.changes file is to be created
+    if self.attributes[:deb_generate_changes?]
+      distribution = self.attributes[:deb_dist]
+
+      # gather information about the files to distribute
+      files = [ output_path ]
+      changes_files = []
+      files.each do |path|
+        changes_files.push({
+          :name => path,
+          :size => File.size?(path),
+          :md5sum => Digest::MD5.file(path).hexdigest,
+          :sha1sum => Digest::SHA1.file(path).hexdigest,
+          :sha256sum => Digest::SHA2.file(path).hexdigest,
+        })
+      end
+
+      # write change infos to .changes file
+      changes_path = File.basename(output_path, '.deb') + '.changes'
+      changes_data = template("deb/deb.changes.erb").result(binding)
+      File.write(changes_path, changes_data)
+      logger.log("Created changes", :path => changes_path)
+    end # if deb_generate_changes
   end # def output
 
   def converted_from(origin)
@@ -827,11 +857,25 @@ class FPM::Package::Deb < FPM::Package
 
     # scan all conf file paths for files and add them
     config_files.each do |path|
+      logger.debug("Checking if #{path} exists")
+      cfe = File.exist?("#{path}")
+      logger.debug("Check result #{cfe}")
       begin
         add_path(path, allconfigs)
       rescue Errno::ENOENT
-        raise FPM::InvalidPackageConfiguration,
-          "Error trying to use '#{path}' as a config file in the package. Does it exist?"
+        if !cfe
+          raise FPM::InvalidPackageConfiguration,
+            "Error trying to use '#{path}' as a config file in the package. Does it exist?"
+        else
+          dcl = File.join(staging_path, path)
+          if !File.exist?("#{dcl}")
+            logger.debug("Adding config file #{path} to Staging area #{staging_path}")
+            FileUtils.mkdir_p(File.dirname(dcl))
+            FileUtils.cp_r path, dcl
+          else
+            logger.debug("Config file aready exists in staging area.")
+          end
+        end
       end
     end
 

data/lib/fpm/package/pyfpm/get_metadata.py

@@ -47,6 +47,11 @@ class get_metadata(Command):
 
     def process_dep(self, dep):
         deps = []
+        if hasattr(dep, 'marker') and dep.marker:
+            # PEP0508 marker present
+            if not dep.marker.evaluate():
+                return deps
+
         if dep.specs:
             for operator, version in dep.specs:
                 deps.append("%s %s %s" % (dep.project_name,

data/lib/fpm/package/python.rb

@@ -229,7 +229,7 @@ class FPM::Package::Python < FPM::Package
 
     if !attributes[:no_auto_depends?] and attributes[:python_dependencies?]
       metadata["dependencies"].each do |dep|
-        dep_re = /^([^<>!= ]+)\s*(?:([<>!=]{1,2})\s*(.*))?$/
+        dep_re = /^([^<>!= ]+)\s*(?:([~<>!=]{1,2})\s*(.*))?$/
         match = dep_re.match(dep)
         if match.nil?
           logger.error("Unable to parse dependency", :dependency => dep)
@@ -240,7 +240,7 @@ class FPM::Package::Python < FPM::Package
         next if attributes[:python_disable_dependency].include?(name)
 
         # convert == to =
-        if cmp == "=="
+        if cmp == "==" or cmp == "~="
           logger.info("Converting == dependency requirement to =", :dependency => dep )
           cmp = "="
         end

data/lib/fpm/package/rpm.rb

@@ -25,6 +25,7 @@ class FPM::Package::RPM < FPM::Package
   COMPRESSION_MAP = {
     "none" => "w0.gzdio",
     "xz" => "w9.xzdio",
+    "xzmt" => "w9T.xzdio",
     "gzip" => "w9.gzdio",
     "bzip2" => "w9.bzdio"
   } unless defined?(COMPRESSION_MAP)

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.9.3"
+  VERSION = "1.10.0"
 end

data/templates/deb/deb.changes.erb

@@ -0,0 +1,31 @@
+Format: 1.8
+Date: <%= (if attributes[:source_date_epoch].nil? then Time.now() else Time.at(attributes[:source_date_epoch].to_i) end).strftime("%a, %d %b %Y %T %z") %>
+Source: <%= name %>
+Binary: <%= name %>
+Architecture: <%= architecture %>
+Version: <%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>
+Distribution: <%= distribution %>
+Urgency: medium
+Maintainer: <%= maintainer %>
+<% lines = (description or "no description given").split("\n") -%>
+<% firstline, *remainder = lines -%>
+Description: <%= firstline %>
+<% if remainder.any? -%>
+<%= remainder.collect { |l| l =~ /^ *$/ ? " ." : " #{l}" }.join("\n") %>
+<% end -%>
+Changes:
+<%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) whatever; urgency=medium
+ .
+   * Package created with FPM.
+Checksums-Sha1:
+<% changes_files.each do |file| -%>
+ <%= file[:sha1sum] %> <%= file[:size] %> <%= file[:name] %>
+<% end -%>
+Checksums-Sha256:
+<% changes_files.each do |file| -%>
+ <%= file[:sha256sum] %> <%= file[:size] %> <%= file[:name] %>
+<% end -%>
+Files:
+<% changes_files.each do |file| -%>
+ <%= file[:md5sum] %> <%= file[:size] %> default <%= attributes[:deb_priority] %> <%= file[:name] %>
+<% end -%>

data/templates/rpm.erb

@@ -17,6 +17,9 @@
 # Disable checking for unpackaged files ?
 #%undefine __check_files
 
+# Allow building noarch packages that contain binaries
+%define _binaries_in_noarch_packages_terminate_build 0
+
 # Use <%= attributes[:rpm_digest] %> file digest method. 
 # The first macro is the one used in RPM v4.9.1.1
 %define _binary_filedigest_algorithm <%= digest_algorithm %>
@@ -133,7 +136,7 @@ upgrade() {
 <%=      script(:before_upgrade) %>
 <%     end -%>
 }
-install() {
+_install() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>
 <%# the script is non-empty, but just whitespace and/or comments -%>
@@ -145,7 +148,7 @@ install() {
 if [ "${1}" -eq 1 ]
 then
     # "before install" goes here
-    install
+    _install
 elif [ "${1}" -gt 1 ]
 then
     # "before upgrade" goes here
@@ -163,7 +166,7 @@ upgrade() {
 <%=      script(:after_upgrade) %>
 <%     end -%>
 }
-install() {
+_install() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>
 <%# the script is non-empty, but just whitespace and/or comments -%>
@@ -175,7 +178,7 @@ install() {
 if [ "${1}" -eq 1 ]
 then
     # "after install" goes here
-    install
+    _install
 elif [ "${1}" -gt 1 ]
 then
     # "after upgrade" goes here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.0
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-20 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -132,16 +132,16 @@ dependencies:
   name: ruby-xz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: pleaserun
   requirement: !ruby/object:Gem::Requirement
@@ -260,6 +260,7 @@ files:
 - lib/fpm/version.rb
 - templates/deb.erb
 - templates/deb/changelog.erb
+- templates/deb/deb.changes.erb
 - templates/deb/ldconfig.sh.erb
 - templates/deb/postinst_upgrade.sh.erb
 - templates/deb/postrm_upgrade.sh.erb
@@ -293,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="