fpm-aeppert 1.6.2 → 1.11.0

data/lib/fpm/util/tar_writer.rb

@@ -1,5 +1,7 @@
 require 'rubygems/package'
 
+require 'stringio'
+
 module FPM
   module Issues
     module TarWriter

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.6.2"
+  VERSION = "1.11.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/changelog.erb

@@ -2,4 +2,4 @@
 
   * Package created with FPM.
 
- -- <%= maintainer %>  <%= Time.now.strftime("%a, %d %b %Y %T %z") %>
+ -- <%= maintainer %>  <%= (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") %>

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

@@ -8,18 +8,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 +39,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

@@ -9,6 +9,16 @@ after_remove() {
 <% end -%>
 }
 
+after_purge() {
+<%# 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 -%>
+    :
+<% if script?(:after_purge) -%>
+<%=  script(:after_purge) %>
+<% end -%>
+}
+
 dummy() {
     :
 }
@@ -25,11 +35,8 @@ elif [ "${1}" = "purge" -a -z "${2}" ]
 then
     # like "on remove", but executes after dpkg deletes config files
     # 'apt-get purge' runs 'on remove' section, then this section.
-    # Maybe we ignore this; it seems really fine-grained.
-    # There is no equivalent in RPM or ARCH. A debian-specific argument
-    # might perhaps be used here, but most people
-    # probably don't need it.
-    dummy
+    # There is no equivalent in RPM or ARCH.
+    after_purge
 elif [ "${1}" = "upgrade" ]
 then
     # This represents the case where the old package's postrm is called after

data/templates/deb/prerm_upgrade.sh.erb

@@ -8,10 +8,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 -%>

metadata

@@ -1,243 +1,255 @@
 --- !ruby/object:Gem::Specification
 name: fpm-aeppert
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.11.0
 platform: ruby
 authors:
-- Aaron Eppert
+- Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: arr-pm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
-  name: archive-tar-minitar
+  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: ruby-xz
+  name: pleaserun
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.29
 - !ruby/object:Gem::Dependency
-  name: pleaserun
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        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: 0.0.24
+        version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: insist
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: insist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: stud
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
   solaris packages and more. Win at package management without wasting pointless hours
   debugging bad rpm specs!
-email: aeppert@gmail.com
+email: jls@semicomplete.com
 executables:
 - fpm
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.rst
+- CONTRIBUTORS
+- LICENSE
+- bin/fpm
+- lib/fpm.rb
 - lib/fpm/command.rb
 - lib/fpm/errors.rb
 - lib/fpm/namespace.rb
+- lib/fpm/package.rb
 - lib/fpm/package/apk.rb
 - lib/fpm/package/cpan.rb
 - lib/fpm/package/deb.rb
@@ -258,43 +270,39 @@ 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
 - lib/fpm/package/zip.rb
-- lib/fpm/package.rb
 - lib/fpm/rake_task.rb
-- lib/fpm/util/tar_writer.rb
 - lib/fpm/util.rb
+- lib/fpm/util/tar_writer.rb
 - lib/fpm/version.rb
-- lib/fpm.rb
-- bin/fpm
+- 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
 - templates/deb/preinst_upgrade.sh.erb
 - templates/deb/prerm_upgrade.sh.erb
-- templates/deb.erb
 - templates/osxpkg.erb
 - templates/p5p_metadata.erb
-- templates/pacman/INSTALL.erb
 - templates/pacman.erb
+- templates/pacman/INSTALL.erb
 - templates/pleaserun/generate-cleanup.sh
 - templates/pleaserun/install-path.sh
 - templates/pleaserun/install.sh
 - templates/pleaserun/scripts/after-install.sh
 - templates/pleaserun/scripts/before-remove.sh
-- templates/puppet/package/remove.pp.erb
 - templates/puppet/package.pp.erb
-- templates/rpm/filesystem_list
+- templates/puppet/package/remove.pp.erb
 - templates/rpm.erb
+- templates/rpm/filesystem_list
 - templates/sh.erb
 - templates/solaris.erb
-- LICENSE
-- CONTRIBUTORS
-- CHANGELIST
-homepage: https://github.com/aeppert/fpm
+homepage: https://github.com/jordansissel/fpm
 licenses:
 - MIT-like
 metadata: {}
@@ -305,17 +313,17 @@ require_paths:
 - lib
 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:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: fpm - package building and mangling