fpm 1.2.0 → 1.3.0

data/templates/deb/preinst_upgrade.sh.erb

@@ -0,0 +1,32 @@
+before_upgrade() {
+<% if script?(:before_upgrade) -%>
+<%=  script(:before_upgrade) %>
+<% end -%>
+}
+
+before_install() {
+<% if script?(:before_install) -%>
+<%=  script(:before_install) %>
+<% end -%>
+}
+
+if [ "${1}" = "install" -a -z "${2}" ]
+then
+    before_install
+elif [ "${1}" = "upgrade" -a -n "${2}" ]
+then
+    upgradeFromVersion="${2}"
+    before_upgrade "${2}"
+elif [ "${1}" = "install" -a -n "${2}" ]
+then
+    upgradeFromVersion="${2}"
+    # Executed when a package is removed but its config files aren't,
+    # 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}"
+elif echo "${1}" | grep -E -q '(fail|abort)'
+then
+    echo "Failed to install before the pre-installation script was run." >&2
+    exit 1
+fi

data/templates/deb/prerm_upgrade.sh.erb

@@ -0,0 +1,27 @@
+before_remove() {
+<% if script?(:before_remove) -%>
+<%=  script(:before_remove) %>
+<% end -%>
+}
+
+dummy() {
+}
+
+if [ "${1}" = "remove" -a -z "${2}" ]
+then
+    # "before remove" goes here
+    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}"
+elif echo "${1}" | grep -E -q "(fail|abort)"
+then
+    echo "Failed to install before the pre-removal script was run." >&2
+    exit 1
+fi

data/templates/rpm.erb

@@ -109,22 +109,99 @@ Obsoletes: <%= repl %>
 # noop
 
 <%# This next section puts any %pre, %post, %preun, %postun, %verifyscript, %pretrans or %posttrans scripts %>
-<% 
+<%
   scriptmap = {
-    :before_install => "pre",
-    :after_install => "post",
-    :before_remove => "preun",
-    :after_remove => "postun",
     :rpm_verifyscript => "verifyscript",
     :rpm_posttrans => "posttrans",
     :rpm_pretrans => "pretrans"
   }
-  scriptmap.each do |name, rpmname| 
 -%>
+<% if script?(:before_upgrade) or script?(:after_upgrade) -%>
+<%   if script?(:before_upgrade) or script?(:before_install) -%>
+%pre
+upgrade() {
+<%     if script?(:before_upgrade) -%>
+<%=      script(:before_upgrade) %>
+<%     end -%>
+}
+install() {
+<%     if script?(:before_install) -%>
+<%=      script(:before_install) %>
+<%     end -%>
+}
+if [ "${1}" -eq 1 ]
+then
+    install
+    # "before install" goes here
+elif [ "${1}" -gt 1 ]
+then
+    upgrade
+fi
+<%   end -%>
+<%   if script?(:after_upgrade) or script?(:after_install) -%>
+%pre
+upgrade() {
+<%     if script?(:after_upgrade) -%>
+<%=      script(:after_upgrade) %>
+<%     end -%>
+}
+install() {
+<%     if script?(:after_install) -%>
+<%=      script(:after_install) %>
+<%     end -%>
+}
+if [ "${1}" -eq 1 ]
+then
+    install
+    # "before install" goes here
+elif [ "${1}" -gt 1 ]
+then
+    upgrade
+fi
+<%   end -%>
+<%   if script?(:before_remove) -%>
+%preun
+if [ "${1}" -eq 0 ]
+then
+<%=    script(:before_remove) %>
+fi
+<%   end -%>
+<%   if script?(:after_remove) -%>
+%postun
+if [ "${1}" -eq 0 ]
+then
+<%=    script(:after_remove) %>
+fi
+<%   end -%>
+<% else
+     other_scriptmap = {
+       :before_install => "pre",
+       :after_install => "post",
+       :before_remove => "preun",
+       :after_remove => "postun"
+     }
+     scriptmap.merge!(other_scriptmap)
+   end
+-%>
+<% scriptmap.each do |name, rpmname| -%>
 <%   if script?(name) -%>
-%<%= rpmname %>
-<%= script(name) %>
+%<%=   rpmname %>
+<%=    script(name) %>
+<%   end -%>
+<% end -%>
 
+<%# This section adds any triggers, as ordered in the command line -%>
+<%
+  triggermap = {
+    :before_install => "prein",
+    :after_install => "in",
+    :before_uninstall => "un",
+    :after_target_uninstall => "postun"
+  } 
+  triggermap.each do |name, rpmtype|
+    (attributes["rpm_trigger_#{name}".to_sym] or []).each do |trigger_name, trigger_script, trigger_scriptprog| -%>
+%trigger<%= rpmtype -%> <%= trigger_scriptprog -%> -- <%= trigger_name %>
+<%= trigger_script %>
 <%   end -%>
 <% end -%>
 

data/templates/sh.erb

@@ -21,31 +21,57 @@ set -e
 function main() {
     set_install_dir
 
-    create_pid
+    if ! slug_already_current ; then
+
+      create_pid
+      wait_for_others
+      kill_others
+      set_owner
+      unpack_payload
+
+      if [ "$UNPACK_ONLY" == "1" ] ; then
+          echo "Unpacking complete, not moving symlinks or restarting because unpack only was specified."
+      else
+          create_symlinks
+
+          set +e # don't exit on errors to allow us to clean up
+          if ! run_post_install ; then
+              revert_symlinks
+              log "Installation failed."
+              exit 1
+          else
+              clean_out_old_releases
+              log "Installation complete."
+          fi
+      fi
 
-    wait_for_others
-
-    kill_others
-
-    set_owner
-
-    unpack_payload
-
-    if [ "$UNPACK_ONLY" == "1" ] ; then
-        echo "Unpacking complete, not moving symlinks or restarting because unpack only was specified."
     else
-        create_symlinks
+        echo "This slug is already installed in 'current'. Specify -f to force reinstall. Exiting."
+    fi
+}
 
-        set +e # don't exit on errors to allow us to clean up
-        if ! run_post_install ; then
-            revert_symlinks
-            log "Installation failed."
-            exit 1
+# check if this slug is already running and exit unless `force` specified
+# Note: this only works with RELEASE_ID is used
+function slug_already_current(){
+    local this_slug=$(basename $0 .slug)
+    local current=$(basename "$(readlink ${INSTALL_ROOT}/current)")
+    log "'current' symlink points to slug: ${current}"
+
+    if [ "$this_slug" == "$current" ] ; then
+        if [ "$FORCE" == "1" ] ; then
+        log "Force was specified. Proceeding with install after renaming live directory to allow running service to shutdown correctly."
+            local real_dir=$(readlink ${INSTALL_ROOT}/current)
+            if [ -f ${real_dir}.old ] ; then
+                # remove that .old directory, if needed
+                rm -rf ${real_dir}.old
+            fi
+            mv ${real_dir} ${real_dir}.old
+            mkdir -p ${real_dir}
         else
-            clean_out_old_releases
-            log "Installation complete."
+            return 0;
         fi
     fi
+    return 1;
 }
 
 # deletes the PID file for this installation
@@ -108,8 +134,8 @@ function save_environment(){
     echo -n "" > ${METADATA} # empty file
 
     # just piping env to a file doesn't quote the variables. This does
-    # filter out multiline junk and _. _ is a readonly variable
-    env | egrep "^[^ ]+=.*" | grep -v "^_=" | while read ENVVAR ; do
+    # filter out multiline junk, _, and functions. _ is a readonly variable.
+    env | grep -v "^_=" | grep -v "^[^=(]*()=" | egrep "^[^ ]+=" | while read ENVVAR ; do
         local NAME=${ENVVAR%%=*}
         # sed is to preserve variable values with dollars (for escaped variables or $() style command replacement),
         # and command replacement backticks

metadata

@@ -1,241 +1,198 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: fpm
-version: !ruby/object:Gem::Version
-  version: 1.2.0
+version: !ruby/object:Gem::Version 
+  version: 1.3.0
 platform: ruby
-authors:
+authors: 
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-10-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.7.7
-- !ruby/object:Gem::Dependency
-  name: cabin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cabin
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !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
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: backports
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !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.9
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: arr-pm
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 0.0.9
-- !ruby/object:Gem::Dependency
-  name: clamp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: clamp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: childprocess
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.6"
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: childprocess
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id007 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ffi
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id007
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: insist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.5
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: insist
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: pry
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: stud
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id007
   type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: stud
   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!
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id007
+  type: :development
+  version_requirements: *id012
+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: jls@semicomplete.com
-executables:
+executables: 
 - fpm
 extensions: []
+
 extra_rdoc_files: []
-files:
-- CHANGELIST
-- CONTRIBUTORS
-- LICENSE
-- bin/fpm
+
+files: 
 - lib/fpm.rb
+- lib/fpm/version.rb
 - lib/fpm/command.rb
-- lib/fpm/errors.rb
-- lib/fpm/namespace.rb
-- lib/fpm/package.rb
-- lib/fpm/package/cpan.rb
-- lib/fpm/package/deb.rb
+- lib/fpm/package/pkgin.rb
+- lib/fpm/package/zip.rb
 - lib/fpm/package/dir.rb
-- lib/fpm/package/empty.rb
-- lib/fpm/package/gem.rb
 - lib/fpm/package/npm.rb
-- lib/fpm/package/osxpkg.rb
+- lib/fpm/package/sh.rb
+- lib/fpm/package/cpan.rb
+- lib/fpm/package/rpm.rb
 - lib/fpm/package/pear.rb
-- lib/fpm/package/pkgin.rb
-- lib/fpm/package/puppet.rb
+- lib/fpm/package/pyfpm/get_metadata.pyc
 - 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/pyfpm/__init__.pyc
+- lib/fpm/package/gem.rb
+- lib/fpm/package/deb.rb
+- lib/fpm/package/osxpkg.rb
 - lib/fpm/package/solaris.rb
 - lib/fpm/package/tar.rb
-- lib/fpm/package/zip.rb
+- lib/fpm/package/puppet.rb
+- lib/fpm/package/empty.rb
+- lib/fpm/package/python.rb
 - lib/fpm/util.rb
-- lib/fpm/version.rb
-- templates/deb.erb
-- templates/deb/ldconfig.sh.erb
-- templates/osxpkg.erb
-- templates/puppet/package.pp.erb
-- templates/puppet/package/remove.pp.erb
-- templates/rpm.erb
+- lib/fpm/errors.rb
+- lib/fpm/namespace.rb
+- lib/fpm/package.rb
+- bin/fpm
 - templates/rpm/filesystem_list
 - templates/sh.erb
+- templates/puppet/package/remove.pp.erb
+- templates/puppet/package.pp.erb
+- templates/osxpkg.erb
+- templates/rpm.erb
 - templates/solaris.erb
+- templates/deb/changelog.erb
+- templates/deb/postrm_upgrade.sh.erb
+- templates/deb/preinst_upgrade.sh.erb
+- templates/deb/prerm_upgrade.sh.erb
+- templates/deb/ldconfig.sh.erb
+- templates/deb/postinst_upgrade.sh.erb
+- templates/deb.erb
+- LICENSE
+- CONTRIBUTORS
+- CHANGELIST
 homepage: https://github.com/jordansissel/fpm
-licenses:
+licenses: 
 - MIT-like
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id007
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id007
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: fpm - package building and mangling
 test_files: []
+