fpm 1.9.3 → 1.12.0

data/lib/fpm/package/tar.rb

@@ -1,4 +1,4 @@
-require "backports" # gem backports
+require "backports/latest" # gem backports/latest
 require "fpm/package"
 require "fpm/util"
 require "fileutils"

data/lib/fpm/package/virtualenv.rb

@@ -111,8 +111,7 @@ class FPM::Package::Virtualenv < FPM::Package
     # Why is this hack here? It looks important, so I'll keep it in.
     safesystem(python_exe, pip_exe, "install", "-U", "-i",
                attributes[:virtualenv_pypi],
-               "pip", "distribute")
-    safesystem(python_exe, pip_exe, "uninstall", "-y", "distribute")
+               "pip")
 
     extra_index_url_args = []
     if attributes[:virtualenv_pypi_extra_index_urls]

data/lib/fpm/package/zip.rb

@@ -1,4 +1,4 @@
-require "backports" # gem backports
+require "backports/latest" # gem backports/latest
 require "fpm/package"
 require "fpm/util"
 require "fileutils"

data/lib/fpm/util/tar_writer.rb

@@ -29,7 +29,7 @@ end # module FPM
 
 module FPM; module Util; end; end
 
-# Like the ::Gem::Package::TarWriter but contains some backports and bug fixes
+# Like the ::Gem::Package::TarWriter but contains some backports/latest and bug fixes
 class FPM::Util::TarWriter < ::Gem::Package::TarWriter
   if FPM::Issues::TarWriter.has_issues_with_split_name?
     def split_name(name)

data/lib/fpm/version.rb

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

data/templates/deb.erb

@@ -28,7 +28,7 @@ Build-Depends: <%= attributes[:deb_build_depends].collect { |d| fix_dependency(d
 Provides: <%= provides.map {|p| p.split(" ").first}.join ", " %>
 <% end -%>
 <% if !replaces.empty? -%>
-Replaces: <%= replaces.join(", ") %>
+Replaces: <%= replaces.collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>
 <% if attributes[:deb_recommends] and !attributes[:deb_recommends].empty? -%>
 Recommends: <%= attributes[:deb_recommends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>

data/templates/deb/deb.changes.erb

@@ -0,0 +1,30 @@
+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/deb/postinst_upgrade.sh.erb

@@ -1,4 +1,9 @@
 #!/bin/sh
+
+<% if attributes[:deb_maintainerscripts_force_errorchecks?] -%>
+set -e
+<% end -%>
+
 after_upgrade() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>
@@ -8,18 +13,26 @@ after_upgrade() {
 <%=  script(:after_upgrade) %>
 <% end -%>
 
-<% if attributes[:deb_systemd] -%>
+<%# if any systemd services specified, loop through and start them -%>
+<% if attributes[:deb_systemd].any? -%>
 systemctl --system daemon-reload >/dev/null || true
-if ! systemctl is-enabled <%= attributes[:deb_systemd] %> >/dev/null 
+debsystemctl=$(command -v deb-systemd-invoke || echo systemctl)
+<% attributes[:deb_systemd].each do |service| -%>
+if ! systemctl is-enabled <%= service %> >/dev/null 
 then
-    systemctl enable <%= attributes[:deb_systemd] %> >/dev/null || true
-    systemctl start <%= attributes[:deb_systemd] %> >/dev/null || true
+<% if attributes[:deb_systemd_enable?]-%>
+    systemctl enable <%= service %> >/dev/null || true
+<% end -%>
+<% if attributes[:deb_systemd_auto_start?]-%>
+    $debsystemctl start <%= service %> >/dev/null || true
+<% end -%>
 <% if attributes[:deb_systemd_restart_after_upgrade?] -%>
 else
-    systemctl restart <%= attributes[:deb_systemd] %> >/dev/null || true
+    $debsystemctl restart <%= service %> >/dev/null || true
 <% end -%>
 fi
 <% end -%>
+<% end -%>
 }
 
 after_install() {
@@ -31,10 +44,18 @@ after_install() {
 <%=  script(:after_install) %>
 <% end -%>
 
-<% if attributes[:deb_systemd] -%>
+<%# if any systemd services specified, loop through and start them -%>
+<% if attributes[:deb_systemd].any? -%>
 systemctl --system daemon-reload >/dev/null || true
-systemctl enable <%= attributes[:deb_systemd] %> >/dev/null || true
-systemctl start <%= attributes[:deb_systemd] %> >/dev/null || true
+debsystemctl=$(command -v deb-systemd-invoke || echo systemctl)
+<% attributes[:deb_systemd].each do |service| -%>
+<% if attributes[:deb_systemd_enable?]-%>
+systemctl enable <%= service %> >/dev/null || true
+<% end -%>
+<% if attributes[:deb_systemd_auto_start?]-%>
+$debsystemctl start <%= service %> >/dev/null || true
+<% end -%>
+<% end -%>
 <% end -%>
 }
 

data/templates/deb/postrm_upgrade.sh.erb

@@ -1,4 +1,9 @@
 #!/bin/sh
+
+<% if attributes[:deb_maintainerscripts_force_errorchecks?] -%>
+set -e
+<% end -%>
+
 after_remove() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>

data/templates/deb/preinst_upgrade.sh.erb

@@ -1,4 +1,9 @@
 #!/bin/sh
+
+<% if attributes[:deb_maintainerscripts_force_errorchecks?] -%>
+set -e
+<% end -%>
+
 before_upgrade() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>

data/templates/deb/prerm_upgrade.sh.erb

@@ -1,4 +1,9 @@
 #!/bin/sh
+
+<% if attributes[:deb_maintainerscripts_force_errorchecks?] -%>
+set -e
+<% end -%>
+
 before_remove() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>
@@ -8,10 +13,13 @@ before_remove() {
 <%=  script(:before_remove) %>
 <% end -%>
 
-<%# Removing the systemd service-%>
-<% if attributes[:deb_systemd] -%>
-systemctl stop <%= attributes[:deb_systemd] %> >/dev/null || true
-systemctl disable <%= attributes[:deb_systemd] %> >/dev/null || true
+<%# Stop and remove any systemd services that were installed-%>
+<% if attributes[:deb_systemd].any? -%>
+debsystemctl=$(command -v deb-systemd-invoke || echo systemctl)
+<% attributes[:deb_systemd].each do |service| -%>
+$debsystemctl stop <%= service %> >/dev/null || true
+systemctl disable <%= service %> >/dev/null || true
+<% end -%>
 systemctl --system daemon-reload >/dev/null || true
 <% 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 %>
@@ -123,7 +126,7 @@ Obsoletes: <%= repl %>
 -%>
 <% if script?(:before_upgrade) or script?(:after_upgrade) -%>
 <%   if script?(:before_upgrade) or script?(:before_install) -%>
-%pre
+%pre <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %> <% end -%>
 upgrade() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>
@@ -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
@@ -153,7 +156,7 @@ then
 fi
 <%   end -%>
 <%   if script?(:after_upgrade) or script?(:after_install) -%>
-%post
+%post <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %>  <% end -%>
 upgrade() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>
@@ -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
@@ -183,7 +186,7 @@ then
 fi
 <%   end -%>
 <%   if script?(:before_remove) -%>
-%preun
+%preun <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %>  <% end -%>
 if [ "${1}" -eq 0 ]
 then
 <%# Making sure that at least one command is in the function -%>
@@ -194,7 +197,7 @@ then
 fi
 <%   end -%>
 <%   if script?(:after_remove) -%>
-%postun
+%postun <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %>  <% end -%>
 if [ "${1}" -eq 0 ]
 then
 <%# Making sure that at least one command is in the function -%>
@@ -216,7 +219,7 @@ fi
 -%>
 <% scriptmap.each do |name, rpmname| -%>
 <%   if script?(name) -%>
-%<%=   rpmname %>
+%<%=   rpmname -%> <%= ' -e' if attributes[:rpm_macro_expansion?] %>
 <%=    script(name) %>
 <%   end -%>
 <% end -%>

data/templates/sh.erb

@@ -268,7 +268,12 @@ function clean_out_old_releases(){
 function print_package_metadata(){
     local metadata_line=$(grep -a -n -m1 '__METADATA__$' $0 | sed 's/:.*//')
     local archive_line=$(grep -a -n -m1 '__ARCHIVE__$' $0 | sed 's/:.*//')
-    sed -n "$((metadata_line + 1)),$((archive_line - 1)) p" $0
+
+    # This used to be a sed call but it was taking _forever_ and this method is super fast
+    local start_at=$((metadata_line + 1))
+    local take_num=$((archive_line - start_at))
+
+    head -n${start_at} $0 | tail -n${take_num}
 }
 
 function print_usage(){

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-20 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -19,7 +19,7 @@ dependencies:
         version: 1.7.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 1.7.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement
@@ -90,30 +90,30 @@ dependencies:
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -156,6 +156,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.29
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: stud
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +270,7 @@ files:
 - lib/fpm/package/python.rb
 - lib/fpm/package/rpm.rb
 - lib/fpm/package/sh.rb
+- lib/fpm/package/snap.rb
 - lib/fpm/package/solaris.rb
 - lib/fpm/package/tar.rb
 - lib/fpm/package/virtualenv.rb
@@ -260,6 +281,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 +315,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:
   - - ">="
@@ -301,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: fpm - package building and mangling