0.33.1

Expand template path under user's home directory (foreman export).

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foreman (0.32.0)
+    foreman (0.33.1)
       term-ansicolor (~> 1.0.5)
       thor (>= 0.13.6)
 

bin/runner

@@ -1,2 +1,2 @@
-#!/usr/bin/env ruby
+#!/bin/sh
-exec "#{ARGV.join(' ')} 2>&1"
+exec $1 2>&1

lib/foreman/engine.rb

@@ -72,16 +72,10 @@ private ######################################################################
   def kill_all(signal="SIGTERM")
     running_processes.each do |pid, process|
       info "sending #{signal} to pid #{pid}"
-      kill(signal, -pid) or kill(signal, pid)
+      Process.kill(signal, pid) rescue Errno::ESRCH
     end
   end
 
-  def kill(signal, pid)
-    Process.kill signal, pid
-  rescue Errno::ESRCH
-    false
-  end
-
   def terminate_gracefully
     info "sending SIGTERM to all processes"
     kill_all "SIGTERM"

lib/foreman/export/base.rb

@@ -26,7 +26,7 @@ private ######################################################################
   def export_template(exporter, file, template_root)
     if template_root && File.exist?(file_path = File.join(template_root, file))
       File.read(file_path)
-    elsif File.exist?(file_path = File.join("~/.foreman/templates", file))
+    elsif File.exist?(file_path = File.expand_path(File.join("~/.foreman/templates", file)))
       File.read(file_path)
     else
       File.read(File.expand_path("../../../../data/export/#{exporter}/#{file}", __FILE__))

lib/foreman/process.rb

@@ -30,13 +30,11 @@ private
   def fork_with_io(command)
     reader, writer = IO.pipe
     pid = fork do
-      Process.setpgrp
       trap("INT", "IGNORE")
       $stdout.reopen writer
       reader.close
       exec Foreman.runner, replace_command_env(command)
     end
-    Process.detach pid
     [ reader, pid ]
   end
 

lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.32.0"
+  VERSION = "0.33.1"
 
 end

spec/foreman/export/upstart_spec.rb

@@ -38,13 +38,19 @@ describe Foreman::Export::Upstart do
   end
 
   context "with alternate templates from home dir" do
-    let(:default_template_root) {File.expand_path("~/.foreman/templates")}
+    let(:default_template_root) {File.expand_path("#{ENV['HOME']}/.foreman/templates")}
 
     before do
+      ENV['_FOREMAN_SPEC_HOME'] = ENV['HOME']
+      ENV['HOME'] = "/home/appuser"
       FileUtils.mkdir_p default_template_root
       File.open("#{default_template_root}/master.conf.erb", "w") { |f| f.puts "default_alternate_template" }
     end
 
+    after do
+      ENV['HOME'] = ENV.delete('_FOREMAN_SPEC_HOME')
+    end
+
     it "can export with alternate template files" do
       upstart.export("/tmp/init")