update gems.

export: fix systemd dependencies

.travis.yml

@@ -3,8 +3,6 @@ script: bundle exec rake spec
 matrix:
   allow_failures:
     - rvm: jruby
-    - rvm: rbx
-    - rvm: ree
 
 notifications:
   email: false
@@ -19,4 +17,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby

Gemfile

@@ -18,6 +18,8 @@ group :development do
   gem 'rr',     '~> 1.0.2'
   gem 'rspec',  '~> 2.0'
   gem "simplecov", :require => false
-  gem 'timecop'
+  gem 'timecop', '0.6.1'
   gem 'yard'
+  gem 'mime-types', '~> 1.25.1'
+  gem 'rdiscount', '~> 1.6.8'
 end

Gemfile.lock

@@ -8,44 +8,46 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    aws-s3 (0.6.2)
+    aws-s3 (0.6.3)
       builder
       mime-types
       xml-simple
-    builder (3.0.0)
+    builder (3.2.2)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
-    dotenv (0.7.0)
+    docile (1.1.3)
+    dotenv (0.10.0)
     fakefs (0.3.2)
     hpricot (0.8.6)
     hpricot (0.8.6-java)
-    mime-types (1.16)
+    mime-types (1.25.1)
-    multi_json (1.0.4)
+    multi_json (1.9.0)
-    mustache (0.11.2)
+    mustache (0.99.5)
-    posix-spawn (0.3.6)
+    posix-spawn (0.3.8)
-    rake (0.9.2.2)
+    rake (10.1.1)
-    rdiscount (1.6.5)
+    rdiscount (1.6.8)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
-    rr (1.0.2)
+    rr (1.0.5)
-    rspec (2.8.0)
+    rspec (2.14.1)
-      rspec-core (~> 2.8.0)
+      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.8.0)
+      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.8.0)
+      rspec-mocks (~> 2.14.0)
-    rspec-core (2.8.0)
+    rspec-core (2.14.8)
-    rspec-expectations (2.8.0)
+    rspec-expectations (2.14.5)
-      diff-lcs (~> 1.1.2)
+      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.8.0)
+    rspec-mocks (2.14.6)
-    simplecov (0.5.4)
+    simplecov (0.8.2)
-      multi_json (~> 1.0.3)
+      docile (~> 1.1.0)
-      simplecov-html (~> 0.5.3)
+      multi_json
-    simplecov-html (0.5.3)
+      simplecov-html (~> 0.8.0)
-    thor (0.16.0)
+    simplecov-html (0.8.0)
-    timecop (0.3.5)
+    thor (0.18.1)
-    win32console (1.3.0-x86-mingw32)
+    timecop (0.6.1)
-    xml-simple (1.0.15)
+    win32console (1.3.2-x86-mingw32)
-    yard (0.8.2)
+    xml-simple (1.1.3)
+    yard (0.8.7.3)
 
 PLATFORMS
   java
@@ -56,12 +58,14 @@ DEPENDENCIES
   aws-s3
   fakefs (~> 0.3.2)
   foreman!
+  mime-types (~> 1.25.1)
   posix-spawn (~> 0.3.6)
   rake
+  rdiscount (~> 1.6.8)
   ronn
   rr (~> 1.0.2)
   rspec (~> 2.0)
   simplecov
-  timecop
+  timecop (= 0.6.1)
   win32console (~> 1.3.0)
   yard

data/export/systemd/master.target.erb

@@ -1 +1,6 @@
 [Unit]
+StopWhenUnneeded=true
+Wants=<%= process_master_names.join(' ') %>
+
+[Install]
+WantedBy=multi-user.target

data/export/systemd/process.service.erb

@@ -13,6 +13,3 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
 KillMode=process
-
-[Install]
-WantedBy=<%= app %>-<%= name %>.target

data/export/systemd/process_master.target.erb

@@ -1,5 +1,3 @@
 [Unit]
 StopWhenUnneeded=true
-
+Wants=<%= process_names.join(' ') %>
-[Install]
-WantedBy=<%= app %>.target

data/export/upstart/process.conf.erb

@@ -2,4 +2,4 @@ start on starting <%= app %>-<%= name %>
 stop on stopping <%= app %>-<%= name %>
 respawn
 
-exec su - <%= user %> -c 'cd <%= engine.root %>; export PORT=<%= port %>;<% engine.env.each_pair do |var,env| %> export <%= var.upcase %>=<%= shell_quote(env) %>; <% end %> <%= process.command %> >> <%= log %>/<%=name%>-<%=num%>.log 2>&1'
+exec su - <%= user %> -s /bin/sh -c 'cd <%= engine.root %>; export PORT=<%= port %>;<% engine.env.each_pair do |var,env| %> export <%= var.upcase %>=<%= shell_quote(env) %>; <% end %> exec <%= process.command %> >> <%= log %>/<%=name%>-<%=num%>.log 2>&1'

lib/foreman/cli.rb

@@ -83,22 +83,18 @@ class Foreman::CLI < Thor
       engine.load_procfile(procfile)
     end
 
-    pid = fork do
+    begin
-      begin
+      engine.env.each { |k,v| ENV[k] = v }
-        engine.env.each { |k,v| ENV[k] = v }
+      if args.size == 1 && process = engine.process(args.first)
-        if args.size == 1 && process = engine.process(args.first)
+        process.exec(:env => engine.env)
-          process.exec(:env => engine.env)
+      else
-        else
+        exec args.shelljoin
-          exec args.shelljoin
-        end
-      rescue Errno::EACCES
-        error "not executable: #{args.first}"
-      rescue Errno::ENOENT
-        error "command not found: #{args.first}"
       end
+    rescue Errno::EACCES
+      error "not executable: #{args.first}"
+    rescue Errno::ENOENT
+      error "command not found: #{args.first}"
     end
-    Process.wait(pid)
-    exit $?.exitstatus
   end
 
   desc "version", "Display Foreman gem version"

lib/foreman/engine.rb

@@ -176,19 +176,14 @@ class Foreman::Engine
   #
   # @param [String] signal  The signal to send to each process
   #
-  def kill_children(signal="SIGTERM")
+  def kill_children( signal="SIGTERM" )
-    if Foreman.windows?
+    @running.each do |pid, (process, index)|
-      @running.each do |pid, (process, index)|
+      system "sending #{signal} to #{name_for(pid)} at pid #{pid}"
-        system "sending #{signal} to #{name_for(pid)} at pid #{pid}"
-        begin
-          Process.kill(signal, pid)
-        rescue Errno::ESRCH, Errno::EPERM
-        end
-      end
-    else
       begin
-        Process.kill signal, *@running.keys unless @running.empty?
+        Process.kill( signal, pid )
-      rescue Errno::ESRCH, Errno::EPERM
+      rescue Errno::ESRCH, Errno::EPERM => err
+        system "  %p when sending signal %p to pid %d: %s" %
+          [ err.class, signal, pid, err.message ]
       end
     end
   end
@@ -198,14 +193,7 @@ class Foreman::Engine
   # @param [String] signal  The signal to send
   #
   def killall(signal="SIGTERM")
-    if Foreman.windows?
+    kill_children(signal)
-      kill_children(signal)
-    else
-      begin
-        Process.kill "-#{signal}", Process.pid
-      rescue Errno::ESRCH, Errno::EPERM
-      end
-    end
   end
 
   # Get the process formation

lib/foreman/export/systemd.rb

@@ -10,16 +10,23 @@ class Foreman::Export::Systemd < Foreman::Export::Base
       clean file
     end
 
-    write_template "systemd/master.target.erb", "#{app}.target", binding
+    process_master_names = []
 
     engine.each_process do |name, process|
       next if engine.formation[name] < 1
-      write_template "systemd/process_master.target.erb", "#{app}-#{name}.target", binding
+
+      process_names = []
 
       1.upto(engine.formation[name]) do |num|
         port = engine.port_for(process, num)
         write_template "systemd/process.service.erb", "#{app}-#{name}-#{num}.service", binding
+        process_names << "#{app}-#{name}-#{num}.service"
       end
+
+      write_template "systemd/process_master.target.erb", "#{app}-#{name}.target", binding
+      process_master_names << "#{app}-#{name}.target"
     end
+
+    write_template "systemd/master.target.erb", "#{app}.target", binding
   end
 end

spec/foreman/export/runit_spec.rb

@@ -31,6 +31,6 @@ describe Foreman::Export::Runit, :fakefs do
   end
 
   it "creates a full path to the export directory" do
-    expect { runit.export }.to_not raise_error(Errno::ENOENT)
+    expect { runit.export }.to_not raise_error
   end
 end

spec/spec_helper.rb

@@ -177,5 +177,5 @@ RSpec.configure do |config|
   config.order = 'rand'
   config.include FakeFS::SpecHelpers, :fakefs
   config.mock_with :rr
-  config.backtrace_clean_patterns = []
+  config.backtrace_exclusion_patterns = []
 end