pkgr 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4957e699c5faccb2beb397df7d38bbdc4bf0fb9
-  data.tar.gz: 8519e2b2f524e20c44a4df5353551c56f37f8e3f
+  metadata.gz: 8286cde02aee6871c83a01b3e4bde67d7e2c064d
+  data.tar.gz: 7e835d88af2324a41ec228e5493acf6f4e1b52cf
 SHA512:
-  metadata.gz: 11d14b4e33696c5a7dbcafe08f65847a4524f153022829f5b29c37b21f2f8739fda1659b80fd4f0b51050be8a75e4c1028d004ac92304d7f0dbffcf3b80b1fc7
-  data.tar.gz: 99bb15a764f2716e7cddac6e5cd9ce852ff070c8b5237df322e762118110ce5ddf550c09b06057d361682483ff7992226fc2814753c98c9c67f5f0a8e71e23af
+  metadata.gz: 7a275a87b5c5b14ffbf62d0740dfae27474b4dab84ed184c06a456170a8b5758b22fa7f0329f847f06901d3e521c1f46a3c9430512f07af09db84acdc0d58d2d
+  data.tar.gz: 20d5a23367770c6aab4a61f0d73fb4829c98d1f55258d59647642777e60e165c3dda87730e00d3f8b3d7b4ba5afe75d5fdeec81b239a11b4647f352761209bd4

data/data/cli/cli.sh.erb

@@ -183,7 +183,7 @@ scale_down() {
     PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
 
     if [ "${APP_RUNNER_TYPE}" = "upstart" ]; then
-      $APP_RUNNER_CLI stop "${PROCESS_ID}"
+      $APP_RUNNER_CLI stop "${PROCESS_ID}" || /bin/true # dont fail if server stopped differently
       rm -f $(_p "/etc/init/${PROCESS_ID}.conf")
     else
       $(_p "/etc/init.d/${PROCESS_ID}") stop

data/lib/pkgr/builder.rb

@@ -36,7 +36,6 @@ module Pkgr
       write_init
       setup_crons
       package
-      verify
       store_cache
     ensure
       teardown if config.clean
@@ -188,11 +187,20 @@ module Pkgr
 
 
     # Launch the FPM command that will generate the package.
-    def package
+    def package(remaining_attempts = 3)
       app_package = Mixlib::ShellOut.new(fpm_command)
       app_package.logger = Pkgr.logger
       app_package.run_command
       app_package.error!
+      begin
+        verify
+      rescue Mixlib::ShellOut::ShellCommandFailed => e
+        if remaining_attempts > 0
+          package(remaining_attempts - 1)
+        else
+          raise
+        end
+      end
     end
 
     def verify

data/lib/pkgr/cli.rb

@@ -84,6 +84,14 @@ module Pkgr
     method_option :after_install,
       :type => :string,
       :desc => "Provide a script to run just after a package gets installated or updated, on the target machine."
+#Before and after Remove
+    method_option :before_remove,
+      :type => :string,
+      :desc => "Provide a script to run just before a package gets uninstallated, on the target machine."
+    method_option :after_remove,
+      :type => :string,
+      :desc => "Provide a script to run just after a package gets uninstallated, on the target machine."
+
     method_option :dependencies,
       :type => :array,
       :default => [],

data/lib/pkgr/distributions/debian.rb

@@ -74,9 +74,9 @@ module Pkgr
       class DebianFpmCommand < FpmCommand
         def args
           list = super
-          list << "-t deb"
-          list << %{--deb-user "root"}
-          list << %{--deb-group "root"}
+          list << "-t" << "deb"
+          list << "--deb-user" << "root"
+          list << "--deb-group" << "root"
           list
         end
       end

data/lib/pkgr/distributions/fedora.rb

@@ -35,7 +35,7 @@ module Pkgr
       class FedoraFpmCommand < FpmCommand
         def args
           list = super
-          list << "-t rpm"
+          list << "-t" << "rpm"
           list
         end
       end

data/lib/pkgr/distributions/sles.rb

@@ -35,7 +35,7 @@ module Pkgr
       class SlesFpmCommand < FpmCommand
         def args
           list = super
-          list << "-t rpm"
+          list << "-t" << "rpm"
           list
         end
       end

data/lib/pkgr/fpm_command.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Pkgr
   class FpmCommand
     attr_reader :distribution, :build_dir, :config
@@ -9,32 +11,32 @@ module Pkgr
     end
 
     def command
-      %{fpm #{args.join(" ")} .}
+      %{fpm #{Shellwords.join(args)} .}
     end
 
     def args
       list = []
-      list << "-s dir"
+      list << "-s" << "dir"
       list << "--verbose"
       list << "--force"
-      list << "--exclude '**/.git**'"
-      list << %{-C "#{build_dir}"}
-      list << %{-n "#{config.name}"}
-      list << %{--version "#{config.version}"}
-      list << %{--iteration "#{config.iteration}"}
-      list << %{--url "#{config.homepage}"}
-      list << %{--provides "#{config.name}"}
-      list << %{--license "#{config.license}"} unless config.license.nil?
-      list << %{-a "#{config.architecture}"}
-      list << %{--description "#{config.description}"}
-      list << %{--maintainer "#{config.maintainer}"}
-      list << %{--vendor "#{config.vendor}"}
+      list << "--exclude" << "**/.git**"
+      list << "-C" << build_dir
+      list << "-n" << config.name
+      list << "--version" << config.version
+      list << "--iteration" << config.iteration
+      list << "--url" << config.homepage
+      list << "--provides" << config.name
+      list << "--license" << config.license unless config.license.nil?
+      list << "-a" << config.architecture
+      list << "--description" << config.description
+      list << "--maintainer" << config.maintainer
+      list << "--vendor" << config.vendor
       list << %{--template-scripts}
-      list << %{--before-install #{distribution.preinstall_file}}
-      list << %{--after-install #{distribution.postinstall_file}}
-      list << %{--before-remove #{distribution.preuninstall_file}}
-      list << %{--after-remove #{distribution.postuninstall_file}}
-      distribution.dependencies(config.dependencies).each{|d| list << "-d '#{d}'"}
+      list << "--before-install" << distribution.preinstall_file
+      list << "--after-install" << distribution.postinstall_file
+      list << "--before-remove" << distribution.preuninstall_file
+      list << "--after-remove" << distribution.postuninstall_file
+      distribution.dependencies(config.dependencies).each{|d| list << "-d" << d}
       list.compact
     end
   end

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement