fpm 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a77a3aacf9169d0736145ed029fd2ab6680aedb
-  data.tar.gz: d1aa6823e333933f41f7e8acb26bcdac30882931
+  metadata.gz: 32e5de1dd66653d1c114a19665ffc0878615018c
+  data.tar.gz: 159971a71bca1eb9118aca6145e1e52eaa046495
 SHA512:
-  metadata.gz: 52bc56b7772cd9503da659c7c9eab7f3a52ed2f5e9288cb91699cbb5fb9ee27bcfcfd12c1602f600f707aac032624354a227bf2fcc987ef575fa68672b8d3d72
-  data.tar.gz: 7e7119f5906c4cc6cfa849ca0b4abd00a21c8dcdeac1cec6f1dbf58cc01fdc577f7fd7f6144dc88747048c3d5d1c5916c471930dbc2acad8e80675f3741a3acd
+  metadata.gz: e121f7c5fdd380c0e48255b5c8751c9aa1962be84611130995afc9f46e9122247ce0dd3faa8699cc5f3c68fe6a2c0b3a31934d9b32cd6eec9233e667d13376e5
+  data.tar.gz: 0a118ebc654aba513eb091d5640865d8314103b9c44b20ea6070f6c6de7d92d8001fcf2b6fa6671855960c15f766c6ef3bc11449acc7692946b812003b41c92d

data/CHANGELIST

@@ -1,3 +1,11 @@
+1.3.3 (December 11, 2014)
+  - The fpm project now uses Contributor Covenant. You can read more about this on
+    the website: http://contributor-covenant.org/
+  - npm: Fix bug causing all `-s npm` attempts to fail due to a missing method.
+    This bug was introduced in 1.3.0. (#800, #806; Jordan Sissel)
+  - rpm: fix bug in rpm input causing a crash if the input rpm did not have any triggers
+    (#801, #802; Ted Elwartowski)
+
 1.3.2 (November 4, 2014)
   - deb: conversion from another deb will automatically use any changelog found in 
     the source deb (Jordan Sissel)

data/lib/fpm/command.rb

@@ -420,7 +420,7 @@ class FPM::Command < Clamp::Command
 
     # Validate the package
     if input.name.nil? or input.name.empty?
-      logger.fatal("No name given for this package (set name with, " \
+      logger.fatal("No name given for this package (set name with '-n', " \
                     "for example, '-n packagename')")
       return 1
     end

data/lib/fpm/package/npm.rb

@@ -4,6 +4,9 @@ require "fpm/util"
 require "fileutils"
 
 class FPM::Package::NPM < FPM::Package
+  class << self
+    include FPM::Util
+  end
   # Flags '--foo' will be accessable  as attributes[:npm_foo]
   option "--bin", "NPM_EXECUTABLE",
     "The path to the npm executable you wish to run.", :default => "npm"

data/lib/fpm/package/rpm.rb

@@ -349,15 +349,17 @@ class FPM::Package::RPM < FPM::Package
     #    #!#{tags[:preinprog]}
     #    #{tags[prein]}
 
-    val = tags[:triggerindex].zip(tags[:triggername],tags[:triggerflags],tags[:triggerversion]).group_by{ |x| x[0]}
-    val = val.collect do |order,data|
-      new_data = data.collect { |x| [ x[1], rpm.operator(x[2]), x[3]].join(" ").strip}.join(", ")
-      [order, rpm_get_trigger_type(data[0][2]), new_data]
-    end
-    val.each do |order, attr,data|
-      self.attributes[attr] = [] if self.attributes[attr].nil?
-      scriptprog = (tags[:triggerscriptprog][order] == '/bin/sh') ? "" : "-p #{tags[:triggerscriptprog][order]}"
-      self.attributes[attr] << [data,tags[:triggerscripts][order],scriptprog]
+    if !tags[:triggerindex].nil?
+      val = tags[:triggerindex].zip(tags[:triggername],tags[:triggerflags],tags[:triggerversion]).group_by{ |x| x[0]}
+      val = val.collect do |order,data|
+        new_data = data.collect { |x| [ x[1], rpm.operator(x[2]), x[3]].join(" ").strip}.join(", ")
+        [order, rpm_get_trigger_type(data[0][2]), new_data]
+      end
+      val.each do |order, attr,data|
+        self.attributes[attr] = [] if self.attributes[attr].nil?
+        scriptprog = (tags[:triggerscriptprog][order] == '/bin/sh') ? "" : "-p #{tags[:triggerscriptprog][order]}"
+        self.attributes[attr] << [data,tags[:triggerscripts][order],scriptprog]
+      end
     end
 
     if !attributes[:no_auto_depends?]

data/lib/fpm/version.rb

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

data/templates/deb/postinst_upgrade.sh.erb

@@ -10,7 +10,7 @@ after_install() {
 <% end -%>
 }
 
-if [ "${1}" = "configure " -a -z "${2}" ]
+if [ "${1}" = "configure" -a -z "${2}" ]
 then
     # "after install" here
     after_install

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json