pkgr 1.1.7 → 1.1.8

data/lib/pkgr/builder.rb

@@ -76,9 +76,10 @@ module Pkgr
 
         FileUtils.mkdir_p(compile_cache_dir)
 
-        run_hook config.before_precompile
+        run_hook config.before_hook
         buildpack_for_app.compile(source_dir, compile_cache_dir)
         buildpack_for_app.release(source_dir, compile_cache_dir)
+        run_hook config.after_hook
       else
         raise Errors::UnknownAppType, "Can't find a buildpack for your app"
       end
@@ -219,6 +220,7 @@ module Pkgr
 
       cmd = %{env -i PATH="$PATH"#{config.env} bash '#{file}' 2>&1}
 
+      Pkgr.logger.debug "Running hook in #{source_dir}: #{file.inspect}"
       puts "-----> Running hook: #{file.inspect}"
 
       Dir.chdir(source_dir) do

data/lib/pkgr/config.rb

@@ -90,6 +90,40 @@ module Pkgr
       @errors ||= []
     end
 
+    def before_hook
+      if before_precompile.nil? || before_precompile.empty?
+        before_steps = self.before || []
+
+        if before_steps.empty?
+          nil
+        else
+          tmpfile = Tempfile.new(["before_hook", ".sh"])
+          before_steps.each{|step| tmpfile.puts step}
+          tmpfile.close
+          tmpfile.path
+        end
+      else
+        before_precompile
+      end
+    end
+
+    def after_hook
+      if after_precompile.nil? || after_precompile.empty?
+        after_steps = self.after || []
+
+        if after_steps.empty?
+          nil
+        else
+          tmpfile = Tempfile.new(["after_hook", ".sh"])
+          after_steps.each{|step| tmpfile.puts step}
+          tmpfile.close
+          tmpfile.path
+        end
+      else
+        after_precompile
+      end
+    end
+
     def to_args
       args = [
         "--name \"#{name}\"",

data/lib/pkgr/data/distributions/debian/upstart/master.conf.erb

@@ -2,6 +2,7 @@ start on (started network-interface
           or started network-manager
           or started networking)
 
-stop on (stopping network-interface
-         or stopping network-manager
-         or stopping networking)
+# The `networking` job is a task, which means it will be stopped after the network interfaces have been configured.
+# That's why we don't stop on "stopping networking".
+# See <https://github.com/ddollar/foreman/issues/263>
+stop on runlevel [!2345]

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake