fpm 1.3.3 → 1.4.0

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.3.3"
+  VERSION = "1.4.0"
 end

data/templates/deb/postinst_upgrade.sh.erb

@@ -1,18 +1,31 @@
+#!/bin/sh
 after_upgrade() {
+<%# 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_upgrade) -%>
 <%=  script(:after_upgrade) %>
 <% end -%>
 }
 
 after_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 -%>
+    :
 <% if script?(:after_install) -%>
 <%=  script(:after_install) %>
 <% end -%>
 }
 
-if [ "${1}" = "configure" -a -z "${2}" ]
+if [ "${1}" = "configure" -a -z "${2}" ] || \
+   [ "${1}" = "abort-remove" ]
 then
     # "after install" here
+    # "abort-remove" happens when the pre-removal script failed.
+    #   In that case, this script, which should be idemptoent, is run
+    #   to ensure a clean roll-back of the removal.
     after_install
 elif [ "${1}" = "configure" -a -n "${2}" ]
 then
@@ -28,4 +41,3 @@ then
     echo "Failed to install before the post-installation script was run." >&2
     exit 1
 fi
-

data/templates/deb/postrm_upgrade.sh.erb

@@ -1,16 +1,25 @@
+#!/bin/sh
 after_remove() {
+<%# 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_remove) -%>
 <%=  script(:after_remove) %>
 <% end -%>
 }
 
 dummy() {
+    :
 }
 
 
-if [ "${1}" = "remove" ]
+if [ "${1}" = "remove" -o "${1}" = "abort-install" ]
 then
     # "after remove" goes here
+    # "abort-install" happens when the pre-installation script failed.
+    #   In that case, this script, which should be idemptoent, is run
+    #   to ensure a clean roll-back of the installation.
     after_remove
 elif [ "${1}" = "purge" -a -z "${2}" ]
 then

data/templates/deb/preinst_upgrade.sh.erb

@@ -1,10 +1,19 @@
+#!/bin/sh
 before_upgrade() {
+<%# 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?(:before_upgrade) -%>
 <%=  script(:before_upgrade) %>
 <% end -%>
 }
 
 before_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 -%>
+    :
 <% if script?(:before_install) -%>
 <%=  script(:before_install) %>
 <% end -%>
@@ -16,7 +25,7 @@ then
 elif [ "${1}" = "upgrade" -a -n "${2}" ]
 then
     upgradeFromVersion="${2}"
-    before_upgrade "${2}"
+    before_upgrade "${upgradeFromVersion}"
 elif [ "${1}" = "install" -a -n "${2}" ]
 then
     upgradeFromVersion="${2}"
@@ -24,7 +33,7 @@ then
     # and a new version is installed.
     # Looks a _lot_ like an upgrade case, I say we just execute the
     # same "before upgrade" script as in the previous case
-    before_upgrade "${2}"
+    before_upgrade "${upgradeFromVersion}"
 elif echo "${1}" | grep -E -q '(fail|abort)'
 then
     echo "Failed to install before the pre-installation script was run." >&2

data/templates/deb/prerm_upgrade.sh.erb

@@ -1,10 +1,16 @@
+#!/bin/sh
 before_remove() {
+<%# 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?(:before_remove) -%>
 <%=  script(:before_remove) %>
 <% end -%>
 }
 
 dummy() {
+    :
 }
 
 if [ "${1}" = "remove" -a -z "${2}" ]
@@ -13,13 +19,12 @@ then
     before_remove
 elif [ "${1}" = "upgrade" ]
 then
-    upgradeVersionTo="${2}"
     # Executed before the old version is removed
     # upon upgrade.
     # We should generally not do anything here. The newly installed package
     # should do the upgrade, not the uninstalled one, since it can't anticipate
     # what new things it will have to do to upgrade for the new version.
-    dummy "${2}"
+    dummy
 elif echo "${1}" | grep -E -q "(fail|abort)"
 then
     echo "Failed to install before the pre-removal script was run." >&2

data/templates/p5p_metadata.erb

@@ -0,0 +1,12 @@
+set name=pkg.fmri value="<%=@name%>@<%=@version%>"
+set name=pkg.summary value="<%=@description%>"
+set name=pkg.human-version value="<%=@version%>"
+set name=pkg.description value="<%=@description%>"
+set name=info.classification value="org.opensolaris.category.2008:<%=@category%>"
+set name=variant.opensolaris.zone <%= attributes[:p5p_zonetype] %>
+set name=variant.arch value=<%=@architecture%>
+<transform file dir -> set owner <%= attributes[:p5p_user] %>>
+<transform file dir -> set group <%= attributes[:p5p_group] %>>
+<transform dir path=opt$->drop>
+<transform dir path=etc$->drop>
+<transform dir path=usr(?:|/bin)$->drop>

data/templates/rpm.erb

@@ -17,8 +17,11 @@
 # Disable checking for unpackaged files ?
 #%undefine __check_files
 
-# Use <%= attributes[:rpm_digest] %> file digest method
+# 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 %>
+# This is the macro I find on OSX when Homebrew provides rpmbuild (rpm v5.4.14)
+%define _build_binary_file_digest_algo <%= digest_algorithm %>
 
 # Use <%= attributes[:rpm_compression] %> payload compression
 %define _binary_payload <%= payload_compression %> 
@@ -38,7 +41,7 @@ Version: <%= version %>
 <% if epoch -%>
 Epoch: <%= epoch %>
 <% end -%>
-Release: <%= iteration or 1 %>
+Release: <%= iteration or 1 %><%= "%{?dist}" if attributes[:rpm_dist] %>
 <%# use the first line of the description as the summary -%>
 Summary: <%= description.split("\n").first.empty? ? "_" :  description.split("\n").first %>
 <% if !attributes[:rpm_autoreqprov?] -%>
@@ -120,42 +123,60 @@ Obsoletes: <%= repl %>
 <%   if script?(:before_upgrade) or script?(:before_install) -%>
 %pre
 upgrade() {
+<%# 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?(:before_upgrade) -%>
 <%=      script(:before_upgrade) %>
 <%     end -%>
 }
 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 -%>
+    :
 <%     if script?(:before_install) -%>
 <%=      script(:before_install) %>
 <%     end -%>
 }
 if [ "${1}" -eq 1 ]
 then
-    install
     # "before install" goes here
+    install
 elif [ "${1}" -gt 1 ]
 then
+    # "before upgrade" goes here
     upgrade
 fi
 <%   end -%>
 <%   if script?(:after_upgrade) or script?(:after_install) -%>
-%pre
+%post
 upgrade() {
+<%# 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_upgrade) -%>
 <%=      script(:after_upgrade) %>
 <%     end -%>
 }
 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 -%>
+    :
 <%     if script?(:after_install) -%>
 <%=      script(:after_install) %>
 <%     end -%>
 }
 if [ "${1}" -eq 1 ]
 then
+    # "after install" goes here
     install
-    # "before install" goes here
 elif [ "${1}" -gt 1 ]
 then
+    # "after upgrade" goes here
     upgrade
 fi
 <%   end -%>
@@ -163,6 +184,10 @@ fi
 %preun
 if [ "${1}" -eq 0 ]
 then
+<%# 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 -%>
+    :
 <%=    script(:before_remove) %>
 fi
 <%   end -%>
@@ -170,6 +195,10 @@ fi
 %postun
 if [ "${1}" -eq 0 ]
 then
+<%# 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 -%>
+    :
 <%=    script(:after_remove) %>
 fi
 <%   end -%>

data/templates/sh.erb

@@ -27,6 +27,7 @@ function main() {
       wait_for_others
       kill_others
       set_owner
+      pre_install
       unpack_payload
 
       if [ "$UNPACK_ONLY" == "1" ] ; then
@@ -173,6 +174,14 @@ function set_owner(){
     log "Installing as user $OWNER"
 }
 
+function pre_install() {
+    # for rationale on the `:`, see #871
+    :
+<% if script?(:before_install) -%>
+<%=    script(:before_install) %>
+<% end %>
+}
+
 function unpack_payload(){
     if [ "$FORCE" == "1" ] || [ ! "$(ls -A $INSTALL_DIR)" ] ; then
         log "Unpacking payload . . ."
@@ -242,6 +251,12 @@ function clean_out_old_releases(){
     fi
 }
 
+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
+}
+
 function print_usage(){
     echo "Usage: `basename $0` [options]"
     echo "Install this package"
@@ -275,7 +290,7 @@ function log(){
 }
 
 function parse_args() {
-    args=`getopt i:o:rfuyvh $*`
+    args=`getopt mi:o:rfuyvh $*`
 
     if [ $? != 0 ] ; then
         print_usage
@@ -286,6 +301,10 @@ function parse_args() {
     do
         case "$i"
             in
+            -m)
+                print_package_metadata
+                exit 0
+                shift;;
             -r)
                 USE_FLAT_RELEASE_DIRECTORY=1
                 shift;;
@@ -331,4 +350,6 @@ main
 save_environment $(fpm_metadata_file)
 exit 0
 
+__METADATA__
+<%= package_metadata if respond_to?(:package_metadata) %>
 __ARCHIVE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -189,18 +189,18 @@ files:
 - lib/fpm/package/gem.rb
 - lib/fpm/package/npm.rb
 - lib/fpm/package/osxpkg.rb
+- lib/fpm/package/p5p.rb
 - lib/fpm/package/pear.rb
 - lib/fpm/package/pkgin.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
 - lib/fpm/package/solaris.rb
 - lib/fpm/package/tar.rb
+- lib/fpm/package/virtualenv.rb
 - lib/fpm/package/zip.rb
 - lib/fpm/util.rb
 - lib/fpm/version.rb
@@ -212,6 +212,7 @@ files:
 - templates/deb/preinst_upgrade.sh.erb
 - templates/deb/prerm_upgrade.sh.erb
 - templates/osxpkg.erb
+- templates/p5p_metadata.erb
 - templates/puppet/package.pp.erb
 - templates/puppet/package/remove.pp.erb
 - templates/rpm.erb
@@ -239,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: fpm - package building and mangling