ypadlyak-foreman 0.81.0 → 0.85.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7295387a8caf93d8d5b19abcd78aa75b81c3cb757496cfce0031e71935e43ded
-  data.tar.gz: 8b092d5f7ac71bd544c61cd6a8592d2de9d7642c00c3d896e98d546ea8e77cca
+  metadata.gz: 145db4820cded60b98a0289d128818f2c9817447bef82bfc9aff99f5226c93eb
+  data.tar.gz: 9be7423b6e0eacf6d360f3b6d4f963cee48201fdc303cbaf45e329f486e0b6d4
 SHA512:
-  metadata.gz: b910868bd8e1fa49314246654d5dbb4b747398f8aba4b90626958da6eab0291b7025d9528e4b4799d751d40a4a4f077e449d9cf122941b5cd0e2e47f2a13f724
-  data.tar.gz: 1ba0b3cfa6c651d84d183d01d0a5b9ae1489920c48f91c7948c099430eb964684d00cb9dee5648ce57f786435cafaf0e8597fbe59a3bb8c41b506532a072b547
+  metadata.gz: 3f41f1bbfe899665826b451c919d097082ac6127fe027f2b82a4ffc02af04627a3e066cf964cafc278b8bff94b5a0c45932f2245ea949c547f62e0689e796d87
+  data.tar.gz: 55881e86f94ae5ece01f23a72720ed4e21857dd009a31181c10e7bb5dda57ccb0692d641115000228074c669958b0d600d65cec55feaffbdd119ef5bc0a1916b

data/README.md

@@ -1,7 +1,7 @@
 # Foreman
 
 [![Build Status](https://travis-ci.org/ddollar/foreman.svg?branch=master)](https://travis-ci.org/ddollar/foreman)
-[![Code Climate](https://codeclimate.com/github/ddollar/foreman.png)](https://codeclimate.com/github/ddollar/foreman)
+[![Code Climate](https://codeclimate.com/github/ddollar/foreman.svg)](https://codeclimate.com/github/ddollar/foreman)
 [![Inline docs](http://inch-ci.org/github/ddollar/foreman.svg?branch=master)](http://inch-ci.org/github/ddollar/foreman)
 
 Manage Procfile-based applications
@@ -37,6 +37,7 @@ See [.travis.yml](.travis.yml) for a list of Ruby versions against which Foreman
 * [shoreman](https://github.com/chrismytton/shoreman) - shell
 * [crank](https://github.com/arktisklada/crank) - Crystal
 * [houseman](https://github.com/fujimura/houseman) - Haskell
+* [spm](https://github.com/bytegust/spm) - Go
 
 ## Authors
 

data/data/export/daemon/process.conf.erb

@@ -3,6 +3,6 @@ stop on stopping <%= app %>-<%= name.gsub('_', '-') %>
 respawn
 
 env PORT=<%= port %><% engine.env.each_pair do |var, env| %>
-env <%= var.upcase %>=<%= env %><% end %>
+env <%= var %>=<%= env %><% end %>
 
 exec start-stop-daemon --start --chuid <%= user %> --chdir <%= engine.root %> --make-pidfile --pidfile <%= run %>/<%= app %>-<%= name %>-<%= num %>.pid --exec <%= executable %><%= arguments %> >> <%= log %>/<%= app %>-<%= name %>-<%= num %>.log 2>&1

data/data/export/launchd/launchd.plist.erb

@@ -7,7 +7,7 @@
     <key>EnvironmentVariables</key>
     <dict>
     <%- engine.env.merge("PORT" => port).each_pair do |var,env| -%>
-        <key><%= var.upcase %></key>
+        <key><%= var %></key>
         <string><%= env %></string>
     <%- end -%>
     </dict>

data/data/export/supervisord/app.conf.erb

@@ -17,7 +17,6 @@ engine.each_process do |name, process|
 command=<%= process.command %>
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=<%= log %>/<%= name %>-<%= num %>.log
 stderr_logfile=<%= log %>/<%= name %>-<%= num %>.error.log
 user=<%= user %>

data/data/export/systemd/process.service.erb

@@ -4,12 +4,15 @@ PartOf=<%= app %>-<%= name %>.target
 [Service]
 User=<%= user %>
 WorkingDirectory=<%= engine.root %>
-Environment=PORT=<%= port %><% engine.env.each_pair do |var,env| %>
-Environment=<%= var.upcase %>=<%= env %><% end %>
-ExecStart=/bin/bash -lc '<%= process.command %>'
+Environment=PORT=%i
+<% engine.env.each_pair do |var,env| -%>
+Environment="<%= var %>=<%= env %>"
+<% end -%>
+ExecStart=/bin/bash -lc 'exec <%= process.command %>'
 Restart=always
 StandardInput=null
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
-KillMode=process
+KillMode=mixed
+TimeoutStopSec=<%= engine.options[:timeout] %>

data/data/export/systemd/process_master.target.erb

@@ -1,3 +1,2 @@
 [Unit]
 PartOf=<%= app %>.target
-Wants=<%= process_names.join(' ') %>

data/data/export/upstart/process.conf.erb

@@ -8,7 +8,8 @@ respawn
 
 env PORT=<%= port %>
 <% engine.env.each do |name,value| -%>
-env <%= name.upcase %>='<%= value.gsub(/'/, "'\"'\"'") %>'
+<% next if name.upcase == "PORT" -%>
+env <%= name %>='<%= value.gsub(/'/, "'\"'\"'") %>'
 <% end -%>
 
 setuid <%= user %>

data/lib/foreman/cli.rb

@@ -24,6 +24,7 @@ class Foreman::CLI < Thor
   method_option :formation, :type => :string,  :aliases => "-m", :banner => '"alpha=5,bar=3"', :desc => 'Specify what processes will run and how many. Default: "all=1"'
   method_option :port,      :type => :numeric, :aliases => "-p"
   method_option :timeout,   :type => :numeric, :aliases => "-t", :desc => "Specify the amount of time (in seconds) processes have to shutdown gracefully before receiving a SIGKILL, defaults to 5."
+  method_option :timestamp, :type => :boolean, :default => true, :desc => "Include timestamp in output"
 
   class << self
     # Hackery. Take the run method away from Thor so that we can redefine it.
@@ -50,7 +51,8 @@ class Foreman::CLI < Thor
   method_option :port,        :type => :numeric, :aliases => "-p"
   method_option :user,        :type => :string,  :aliases => "-u"
   method_option :template,    :type => :string,  :aliases => "-t"
-  method_option :concurrency, :type => :string,  :aliases => "-c", :banner => '"alpha=5,bar=3"', :desc => 'Specify what processes will run and how many. Default: "all=1"'
+  method_option :formation, :type => :string,  :aliases => "-m", :banner => '"alpha=5,bar=3"', :desc => 'Specify what processes will run and how many. Default: "all=1"'
+  method_option :timeout,     :type => :numeric, :aliases => "-t", :desc => "Specify the amount of time (in seconds) processes have to shutdown gracefully before receiving a SIGKILL, defaults to 5."
 
   def export(format, location=nil)
     check_procfile!

data/lib/foreman/engine.rb

@@ -10,7 +10,7 @@ class Foreman::Engine
 
   # The signals that the engine cares about.
   #
-  HANDLED_SIGNALS = [ :TERM, :INT, :HUP ]
+  HANDLED_SIGNALS = [ :TERM, :INT, :HUP, :USR1, :USR2 ]
 
   attr_reader :env
   attr_reader :options
@@ -27,7 +27,7 @@ class Foreman::Engine
   def initialize(options={})
     @options = options.dup
 
-    @options[:formation] ||= (options[:concurrency] || "all=1")
+    @options[:formation] ||= "all=1"
     @options[:timeout] ||= 5
 
     @env       = {}
@@ -104,6 +104,8 @@ class Foreman::Engine
       handle_interrupt
     when :HUP
       handle_hangup
+    when *HANDLED_SIGNALS
+      handle_signal_forward(sig)
     else
       system "unhandled signal #{sig}"
     end
@@ -130,6 +132,11 @@ class Foreman::Engine
     @shutdown = true
   end
 
+  def handle_signal_forward(signal)
+    system "#{signal} received, forwarding it to children"
+    kill_children signal
+  end
+
   # Register a process to be run by this +Engine+
   #
   # @param [String] name     A name for this process
@@ -190,7 +197,8 @@ class Foreman::Engine
       end
     else
       begin
-        Process.kill signal, *@running.keys unless @running.empty?
+        pids = @running.keys.compact
+        Process.kill signal, *pids unless pids.empty?
       rescue Errno::ESRCH, Errno::EPERM
       end
     end

data/lib/foreman/engine/cli.rb

@@ -57,7 +57,8 @@ class Foreman::Engine::CLI < Foreman::Engine
     data.to_s.lines.map(&:chomp).each do |message|
       output  = ""
       output += $stdout.color(@colors[name.split(".").first].to_sym)
-      output += "#{Time.now.strftime("%H:%M:%S")} #{pad_process_name(name)} | "
+      output += "#{Time.now.strftime("%H:%M:%S")} " if options[:timestamp]
+      output += "#{pad_process_name(name)} | "
       output += $stdout.color(:reset)
       output += message
       $stdout.puts output

data/lib/foreman/export/base.rb

@@ -100,6 +100,12 @@ private ######################################################################
     FileUtils.rm(filename)
   end
 
+  def clean_dir(dirname)
+    return unless File.exists?(dirname)
+    say "cleaning up directory: #{dirname}"
+    FileUtils.rm_r(dirname)
+  end
+
   def shell_quote(value)
     Shellwords.escape(value)
   end
@@ -129,7 +135,11 @@ private ######################################################################
   end
 
   def write_template(name, target, binding)
-    compiled = ERB.new(export_template(name), nil, '-').result(binding)
+    compiled = if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+                 ERB.new(export_template(name), trim_mode: '-').result(binding)
+               else
+                 ERB.new(export_template(name), nil, '-').result(binding)
+               end
     write_file target, compiled
   end
 
@@ -143,6 +153,11 @@ private ######################################################################
     FileUtils.mkdir_p(File.join(location, dir))
   end
 
+  def create_symlink(link, target)
+    say "symlinking: #{link} -> #{target}"
+    FileUtils.symlink(target, File.join(location, link))
+  end
+
   def write_file(filename, contents)
     say "writing: #{filename}"
 

data/lib/foreman/export/systemd.rb

@@ -6,21 +6,29 @@ class Foreman::Export::Systemd < Foreman::Export::Base
   def export
     super
 
-    Dir["#{location}/#{app}*.target"].concat(Dir["#{location}/#{app}*.service"]).each do |file|
+    Dir["#{location}/#{app}*.target"]
+      .concat(Dir["#{location}/#{app}*.service"])
+      .concat(Dir["#{location}/#{app}*.target.wants/#{app}*.service"])
+      .each do |file|
       clean file
     end
 
+    Dir["#{location}/#{app}*.target.wants"].each do |file|
+      clean_dir file
+    end
+
     process_master_names = []
 
     engine.each_process do |name, process|
-      next if engine.formation[name] < 1
-
-      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"
+      service_fn = "#{app}-#{name}@.service"
+      write_template "systemd/process.service.erb", service_fn, binding
+
+      create_directory("#{app}-#{name}.target.wants")
+      1.upto(engine.formation[name])
+        .collect { |num| engine.port_for(process, num) }
+        .collect { |port| "#{app}-#{name}@#{port}.service" }
+        .each do |process_name|
+        create_symlink("#{app}-#{name}.target.wants/#{process_name}", "../#{service_fn}") rescue Errno::EEXIST # This is needed because rr-mocks do not call the origial cleanup
       end
 
       write_template "systemd/process_master.target.erb", "#{app}-#{name}.target", binding

data/lib/foreman/export/upstart.rb

@@ -13,16 +13,19 @@ class Foreman::Export::Upstart < Foreman::Export::Base
 
     engine.each_process do |name, process|
       process_master_file = "#{app}-#{name}.conf"
-      clean File.join(location, process_master_file)
+      process_file = "#{app}-#{name}-%s.conf"
+
+      Dir[
+        File.join(location, process_master_file),
+        File.join(location, process_file % "*")
+      ].each { |f| clean(f) }
 
       next if engine.formation[name] < 1
       write_template process_master_template, process_master_file, binding
 
       1.upto(engine.formation[name]) do |num|
         port = engine.port_for(process, num)
-        process_file = "#{app}-#{name}-#{num}.conf"
-        clean File.join(location, process_file)
-        write_template process_template, process_file, binding
+        write_template process_template, process_file % num, binding
       end
     end
   end

data/lib/foreman/procfile.rb

@@ -21,7 +21,7 @@ class Foreman::Procfile
 
   # Yield each +Procfile+ entry in order
   #
-  def entries(&blk)
+  def entries
     @entries.each do |(name, command)|
       yield name, command
     end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.81.0"
+  VERSION = "0.85.0"
 
 end

data/man/foreman.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "April 2016" "Foreman 0.81.0" "Foreman Manual"
+.TH "FOREMAN" "1" "January 2017" "Foreman 0.84.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications
@@ -57,7 +57,7 @@ Specify the amount of time (in seconds) processes have to shutdown gracefully be
 \fBforeman export\fR is used to export your application to another process management format\.
 .
 .P
-An location to export can be passed as an argument\. This argument may be either required or optional depending on the export format\.
+A location to export can be passed as an argument\. This argument may be either required or optional depending on the export format\.
 .
 .P
 The following options control how the application is run:

data/spec/foreman/cli_spec.rb

@@ -21,7 +21,7 @@ describe "Foreman::CLI", :fakefs do
     describe "when a Procfile doesnt exist", :fakefs do
       it "displays an error" do
         mock_error(subject, "Procfile does not exist.") do
-          dont_allow.instance_of(Foreman::Engine).start
+          expect_any_instance_of(Foreman::Engine).to_not receive(:start)
           subject.start
         end
       end

data/spec/foreman/engine_spec.rb

@@ -35,19 +35,19 @@ describe "Foreman::Engine", :fakefs do
 
   describe "start" do
     it "forks the processes" do
-      mock(subject.process("alpha")).run(anything)
-      mock(subject.process("bravo")).run(anything)
-      mock(subject).watch_for_output
-      mock(subject).wait_for_shutdown_or_child_termination
+      expect(subject.process("alpha")).to receive(:run)
+      expect(subject.process("bravo")).to receive(:run)
+      expect(subject).to receive(:watch_for_output)
+      expect(subject).to receive(:wait_for_shutdown_or_child_termination)
       subject.start
     end
 
     it "handles concurrency" do
       subject.options[:formation] = "alpha=2"
-      mock(subject.process("alpha")).run(anything).twice
-      mock(subject.process("bravo")).run(anything).never
-      mock(subject).watch_for_output
-      mock(subject).wait_for_shutdown_or_child_termination
+      expect(subject.process("alpha")).to receive(:run).twice
+      expect(subject.process("bravo")).to_not receive(:run)
+      expect(subject).to receive(:watch_for_output)
+      expect(subject).to receive(:wait_for_shutdown_or_child_termination)
       subject.start
     end
   end

data/spec/foreman/export/base_spec.rb

@@ -9,7 +9,7 @@ describe "Foreman::Export::Base", :fakefs do
   let(:subject)  { Foreman::Export::Base.new(location, engine) }
 
   it "has a say method for displaying info" do
-    mock(subject).puts("[foreman export] foo")
+    expect(subject).to receive(:puts).with("[foreman export] foo")
     subject.send(:say, "foo")
   end
 

data/spec/foreman/export/bluepill_spec.rb

@@ -11,7 +11,7 @@ describe Foreman::Export::Bluepill, :fakefs do
   let(:bluepill)  { Foreman::Export::Bluepill.new("/tmp/init", engine, options) }
 
   before(:each) { load_export_templates_into_fakefs("bluepill") }
-  before(:each) { stub(bluepill).say }
+  before(:each) { allow(bluepill).to receive(:say) }
 
   it "exports to the filesystem" do
     bluepill.export
@@ -19,7 +19,7 @@ describe Foreman::Export::Bluepill, :fakefs do
   end
 
   it "cleans up if exporting into an existing dir" do
-    mock(FileUtils).rm("/tmp/init/app.pill")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app.pill")
 
     bluepill.export
     bluepill.export

data/spec/foreman/export/daemon_spec.rb

@@ -11,7 +11,7 @@ describe Foreman::Export::Daemon, :fakefs do
   let(:daemon)   { Foreman::Export::Daemon.new("/tmp/init", engine, options) }
 
   before(:each) { load_export_templates_into_fakefs("daemon") }
-  before(:each) { stub(daemon).say }
+  before(:each) { allow(daemon).to receive(:say) }
 
   it "exports to the filesystem" do
     daemon.export
@@ -24,15 +24,15 @@ describe Foreman::Export::Daemon, :fakefs do
   end
 
   it "cleans up if exporting into an existing dir" do
-    mock(FileUtils).rm("/tmp/init/app.conf")
-    mock(FileUtils).rm("/tmp/init/app-alpha.conf")
-    mock(FileUtils).rm("/tmp/init/app-alpha-1.conf")
-    mock(FileUtils).rm("/tmp/init/app-bravo.conf")
-    mock(FileUtils).rm("/tmp/init/app-bravo-1.conf")
-    mock(FileUtils).rm("/tmp/init/app-foo-bar.conf")
-    mock(FileUtils).rm("/tmp/init/app-foo-bar-1.conf")
-    mock(FileUtils).rm("/tmp/init/app-foo_bar.conf")
-    mock(FileUtils).rm("/tmp/init/app-foo_bar-1.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-alpha.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-alpha-1.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-bravo.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-bravo-1.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo-bar.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo-bar-1.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo_bar.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo_bar-1.conf")
 
     daemon.export
     daemon.export
@@ -44,7 +44,7 @@ describe Foreman::Export::Daemon, :fakefs do
     ["app2", "app2-alpha", "app2-alpha-1"].each do |name|
       path = "/tmp/init/#{name}.conf"
       FileUtils.touch(path)
-      dont_allow(FileUtils).rm(path)
+      expect(FileUtils).to_not receive(:rm).with(path)
     end
 
     daemon.export

data/spec/foreman/export/inittab_spec.rb

@@ -12,7 +12,7 @@ describe Foreman::Export::Inittab, :fakefs do
   let(:inittab)   { Foreman::Export::Inittab.new(location, engine, options) }
 
   before(:each) { load_export_templates_into_fakefs("inittab") }
-  before(:each) { stub(inittab).say }
+  before(:each) { allow(inittab).to receive(:say) }
 
   it "exports to the filesystem" do
     inittab.export
@@ -23,7 +23,7 @@ describe Foreman::Export::Inittab, :fakefs do
     let(:location) { "-" }
 
     it "exports to stdout" do
-      mock(inittab).puts example_export_file("inittab/inittab.default")
+      expect(inittab).to receive(:puts).with(example_export_file("inittab/inittab.default"))
       inittab.export
     end
   end

data/spec/foreman/export/launchd_spec.rb

@@ -10,7 +10,7 @@ describe Foreman::Export::Launchd, :fakefs do
   let(:launchd)  { Foreman::Export::Launchd.new("/tmp/init", engine, options) }
 
   before(:each) { load_export_templates_into_fakefs("launchd") }
-  before(:each) { stub(launchd).say }
+  before(:each) { allow(launchd).to receive(:say) }
 
   it "exports to the filesystem" do
     launchd.export

data/spec/foreman/export/runit_spec.rb

@@ -10,8 +10,8 @@ describe Foreman::Export::Runit, :fakefs do
   let(:runit)    { Foreman::Export::Runit.new('/tmp/init', engine, options) }
 
   before(:each) { load_export_templates_into_fakefs("runit") }
-  before(:each) { stub(runit).say }
-  before(:each) { stub(FakeFS::FileUtils).chmod }
+  before(:each) { allow(runit).to receive(:say) }
+  before(:each) { allow(FakeFS::FileUtils).to receive(:chmod) }
 
   it "exports to the filesystem" do
     engine.env["BAR"] = "baz"

data/spec/foreman/export/supervisord_spec.rb

@@ -11,7 +11,7 @@ describe Foreman::Export::Supervisord, :fakefs do
   let(:supervisord) { Foreman::Export::Supervisord.new("/tmp/init", engine, options) }
 
   before(:each) { load_export_templates_into_fakefs("supervisord") }
-  before(:each) { stub(supervisord).say }
+  before(:each) { allow(supervisord).to receive(:say) }
 
   it "exports to the filesystem" do
     write_env(".env", "FOO"=>"bar", "URL"=>"http://example.com/api?foo=bar&baz=1")
@@ -21,7 +21,7 @@ describe Foreman::Export::Supervisord, :fakefs do
   end
 
   it "cleans up if exporting into an existing dir" do
-    mock(FileUtils).rm("/tmp/init/app.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app.conf")
     supervisord.export
     supervisord.export
   end

data/spec/foreman/export/systemd_spec.rb

@@ -11,28 +11,44 @@ describe Foreman::Export::Systemd, :fakefs do
   let(:systemd)   { Foreman::Export::Systemd.new("/tmp/init", engine, options) }
 
   before(:each) { load_export_templates_into_fakefs("systemd") }
-  before(:each) { stub(systemd).say }
+  before(:each) { allow(systemd).to receive(:say) }
 
   it "exports to the filesystem" do
     systemd.export
 
-    expect(File.read("/tmp/init/app.target")).to          eq(example_export_file("systemd/standard/app.target"))
-    expect(File.read("/tmp/init/app-alpha.target")).to    eq(example_export_file("systemd/standard/app-alpha.target"))
-    expect(File.read("/tmp/init/app-alpha-1.service")).to eq(example_export_file("systemd/standard/app-alpha-1.service"))
-    expect(File.read("/tmp/init/app-bravo.target")).to    eq(example_export_file("systemd/standard/app-bravo.target"))
-    expect(File.read("/tmp/init/app-bravo-1.service")).to eq(example_export_file("systemd/standard/app-bravo-1.service"))
+    expect(File.read("/tmp/init/app.target")).to          eq(example_export_file("systemd/app.target"))
+    expect(File.read("/tmp/init/app-alpha.target")).to    eq(example_export_file("systemd/app-alpha.target"))
+    expect(File.read("/tmp/init/app-alpha@.service")).to  eq(example_export_file("systemd/app-alpha@.service"))
+    expect(File.read("/tmp/init/app-bravo.target")).to    eq(example_export_file("systemd/app-bravo.target"))
+    expect(File.read("/tmp/init/app-bravo@.service")).to  eq(example_export_file("systemd/app-bravo@.service"))
+
+    expect(File.directory?("/tmp/init/app-alpha.target.wants")).to                      be_truthy
+    expect(File.symlink?("/tmp/init/app-alpha.target.wants/app-alpha@5000.service")).to be_truthy
   end
 
   it "cleans up if exporting into an existing dir" do
-    mock(FileUtils).rm("/tmp/init/app.target")
-    mock(FileUtils).rm("/tmp/init/app-alpha.target")
-    mock(FileUtils).rm("/tmp/init/app-alpha-1.service")
-    mock(FileUtils).rm("/tmp/init/app-bravo.target")
-    mock(FileUtils).rm("/tmp/init/app-bravo-1.service")
-    mock(FileUtils).rm("/tmp/init/app-foo-bar.target")
-    mock(FileUtils).rm("/tmp/init/app-foo-bar-1.service")
-    mock(FileUtils).rm("/tmp/init/app-foo_bar.target")
-    mock(FileUtils).rm("/tmp/init/app-foo_bar-1.service")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app.target")
+
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-alpha@.service")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-alpha.target")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-alpha.target.wants/app-alpha@5000.service")
+    expect(FileUtils).to receive(:rm_r).with("/tmp/init/app-alpha.target.wants")
+
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-bravo.target")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-bravo@.service")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-bravo.target.wants/app-bravo@5100.service")
+    expect(FileUtils).to receive(:rm_r).with("/tmp/init/app-bravo.target.wants")
+
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo_bar.target")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo_bar@.service")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo_bar.target.wants/app-foo_bar@5200.service")
+    expect(FileUtils).to receive(:rm_r).with("/tmp/init/app-foo_bar.target.wants")
+
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo-bar.target")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo-bar@.service")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo-bar.target.wants/app-foo-bar@5300.service")
+    expect(FileUtils).to receive(:rm_r).with("/tmp/init/app-foo-bar.target.wants")
+
 
     systemd.export
     systemd.export
@@ -41,7 +57,13 @@ describe Foreman::Export::Systemd, :fakefs do
   it "includes environment variables" do
     engine.env['KEY'] = 'some "value"'
     systemd.export
-    expect(File.read("/tmp/init/app-alpha-1.service")).to match(/KEY=some "value"$/)
+    expect(File.read("/tmp/init/app-alpha@.service")).to match(/KEY=some "value"/)
+  end
+
+  it "includes ExecStart line" do
+    engine.env['KEY'] = 'some "value"'
+    systemd.export
+    expect(File.read("/tmp/init/app-alpha@.service")).to match(/^ExecStart=/)
   end
 
   context "with a formation" do
@@ -50,11 +72,11 @@ describe Foreman::Export::Systemd, :fakefs do
     it "exports to the filesystem with concurrency" do
       systemd.export
 
-      expect(File.read("/tmp/init/app.target")).to             eq(example_export_file("systemd/concurrency/app.target"))
-      expect(File.read("/tmp/init/app-alpha.target")).to       eq(example_export_file("systemd/concurrency/app-alpha.target"))
-      expect(File.read("/tmp/init/app-alpha-1.service")).to    eq(example_export_file("systemd/concurrency/app-alpha-1.service"))
-      expect(File.read("/tmp/init/app-alpha-2.service")).to    eq(example_export_file("systemd/concurrency/app-alpha-2.service"))
-      expect(File.exists?("/tmp/init/app-bravo-1.service")).to eq(false)
+      expect(File.read("/tmp/init/app.target")).to             eq(example_export_file("systemd/app.target"))
+      expect(File.read("/tmp/init/app-alpha.target")).to       eq(example_export_file("systemd/app-alpha.target"))
+      expect(File.read("/tmp/init/app-alpha@.service")).to     eq(example_export_file("systemd/app-alpha@.service"))
+      expect(File.read("/tmp/init/app-bravo.target")).to       eq(example_export_file("systemd/app-bravo.target"))
+      expect(File.read("/tmp/init/app-bravo@.service")).to     eq(example_export_file("systemd/app-bravo@.service"))
     end
   end
 

data/spec/foreman/export/upstart_spec.rb

@@ -11,7 +11,7 @@ describe Foreman::Export::Upstart, :fakefs do
   let(:upstart)   { Foreman::Export::Upstart.new("/tmp/init", engine, options) }
 
   before(:each) { load_export_templates_into_fakefs("upstart") }
-  before(:each) { stub(upstart).say }
+  before(:each) { allow(upstart).to receive(:say) }
 
   it "exports to the filesystem" do
     upstart.export
@@ -24,15 +24,15 @@ describe Foreman::Export::Upstart, :fakefs do
   end
 
   it "cleans up if exporting into an existing dir" do
-    mock(FileUtils).rm("/tmp/init/app.conf")
-    mock(FileUtils).rm("/tmp/init/app-alpha.conf")
-    mock(FileUtils).rm("/tmp/init/app-alpha-1.conf")
-    mock(FileUtils).rm("/tmp/init/app-bravo.conf")
-    mock(FileUtils).rm("/tmp/init/app-bravo-1.conf")
-    mock(FileUtils).rm("/tmp/init/app-foo-bar.conf")
-    mock(FileUtils).rm("/tmp/init/app-foo-bar-1.conf")
-    mock(FileUtils).rm("/tmp/init/app-foo_bar.conf")
-    mock(FileUtils).rm("/tmp/init/app-foo_bar-1.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-alpha.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-alpha-1.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-bravo.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-bravo-1.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo-bar.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo-bar-1.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo_bar.conf")
+    expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo_bar-1.conf")
 
     upstart.export
     upstart.export
@@ -44,7 +44,7 @@ describe Foreman::Export::Upstart, :fakefs do
     ["app2", "app2-alpha", "app2-alpha-1"].each do |name|
       path = "/tmp/init/#{name}.conf"
       FileUtils.touch(path)
-      dont_allow(FileUtils).rm(path)
+      expect(FileUtils).to_not receive(:rm).with(path)
     end
 
     upstart.export
@@ -56,7 +56,7 @@ describe Foreman::Export::Upstart, :fakefs do
     ["app-worker", "app-worker-worker", "app-worker-worker-1"].each do |name|
       path = "/tmp/init/#{name}.conf"
       FileUtils.touch(path)
-      dont_allow(FileUtils).rm(path)
+      expect(FileUtils).to_not receive(:rm).with(path)
     end
 
     upstart.export

data/spec/foreman/export_spec.rb

@@ -6,7 +6,7 @@ describe "Foreman::Export" do
 
   describe "with a formatter that doesn't declare the appropriate class" do
     it "prints an error" do
-      mock(subject).require("foreman/export/invalidformatter")
+      expect(subject).to receive(:require).with("foreman/export/invalidformatter")
       mock_export_error("Unknown export format: invalidformatter (no class Foreman::Export::Invalidformatter).") do
         subject.formatter("invalidformatter") 
       end

data/spec/foreman/process_spec.rb

@@ -55,13 +55,13 @@ describe Foreman::Process do
     end
 
     it "can execute" do
-      mock(Kernel).exec "bin/command"
+      expect(Kernel).to receive(:exec).with("bin/command")
       process = Foreman::Process.new("bin/command")
       process.exec
     end
 
     it "can execute with env" do
-      mock(Kernel).exec "bin/command bar"
+      expect(Kernel).to receive(:exec).with("bin/command bar")
       process = Foreman::Process.new("bin/command $FOO")
       process.exec(:env => { "FOO" => "bar" })
     end

data/spec/foreman/procfile_spec.rb

@@ -22,6 +22,13 @@ describe Foreman::Procfile, :fakefs do
     expect(procfile["foo_bar"]).to eq("./foo_bar")
   end
 
+  it 'only creates Procfile entries for lines matching regex' do
+    write_procfile
+    procfile = Foreman::Procfile.new("Procfile")
+    keys = procfile.instance_variable_get(:@entries).map(&:first)
+    expect(keys).to match_array(%w[alpha bravo foo-bar foo_bar])
+  end
+
   it "returns nil when attempting to retrieve an non-existing entry" do
     write_procfile
     procfile = Foreman::Procfile.new("Procfile")

data/spec/foreman_spec.rb

@@ -5,7 +5,7 @@ describe Foreman do
 
   describe "VERSION" do
     subject { Foreman::VERSION }
-    it { should be_a String }
+    it { is_expected.to be_a String }
   end
 
   describe "runner" do

data/spec/resources/export/supervisord/app-alpha-1.conf

@@ -2,7 +2,6 @@
 command=./alpha
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/alpha-1.log
 stderr_logfile=/var/log/app/alpha-1.error.log
 user=app
@@ -13,7 +12,6 @@ environment=FOO="bar",URL="http://example.com/api?foo=bar&baz=1",PORT="5000"
 command=./bravo
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/bravo-1.log
 stderr_logfile=/var/log/app/bravo-1.error.log
 user=app
@@ -24,7 +22,6 @@ environment=FOO="bar",URL="http://example.com/api?foo=bar&baz=1",PORT="5100"
 command=./foo_bar
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/foo_bar-1.log
 stderr_logfile=/var/log/app/foo_bar-1.error.log
 user=app
@@ -35,7 +32,6 @@ environment=FOO="bar",URL="http://example.com/api?foo=bar&baz=1",PORT="5200"
 command=./foo-bar
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/foo-bar-1.log
 stderr_logfile=/var/log/app/foo-bar-1.error.log
 user=app

data/spec/resources/export/supervisord/app-alpha-2.conf

@@ -2,7 +2,6 @@
 command=./alpha
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/alpha-1.log
 stderr_logfile=/var/log/app/alpha-1.error.log
 user=app
@@ -13,7 +12,6 @@ environment=PORT="5000"
 command=./alpha
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=/var/log/app/alpha-2.log
 stderr_logfile=/var/log/app/alpha-2.error.log
 user=app

data/spec/resources/export/systemd/app-alpha.target

@@ -0,0 +1,2 @@
+[Unit]
+PartOf=app.target

data/spec/resources/export/systemd/{concurrency/app-alpha-1.service → app-alpha@.service}

@@ -4,11 +4,12 @@ PartOf=app-alpha.target
 [Service]
 User=app
 WorkingDirectory=/tmp/app
-Environment=PORT=5000
-ExecStart=/bin/bash -lc './alpha'
+Environment=PORT=%i
+ExecStart=/bin/bash -lc 'exec ./alpha'
 Restart=always
 StandardInput=null
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
-KillMode=process
+KillMode=mixed
+TimeoutStopSec=5

data/spec/resources/export/systemd/app-bravo.target

@@ -0,0 +1,2 @@
+[Unit]
+PartOf=app.target

data/spec/resources/export/systemd/{standard/app-bravo-1.service → app-bravo@.service}

@@ -4,11 +4,12 @@ PartOf=app-bravo.target
 [Service]
 User=app
 WorkingDirectory=/tmp/app
-Environment=PORT=5100
-ExecStart=/bin/bash -lc './bravo'
+Environment=PORT=%i
+ExecStart=/bin/bash -lc 'exec ./bravo'
 Restart=always
 StandardInput=null
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
-KillMode=process
+KillMode=mixed
+TimeoutStopSec=5

data/spec/spec_helper.rb

@@ -1,5 +1,12 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+# it throws following message:
+# W, [2018-02-06T18:16:06.360071 #72025]  WARN -- :       This usage of the Code Climate Test Reporter is now deprecated. Since version
+#       1.0, we now require you to run `SimpleCov` in your test/spec helper, and then
+#       run the provided `codeclimate-test-reporter` binary separately to report your
+#       results to Code Climate.
+#
+#       More information here: https://github.com/codeclimate/ruby-test-reporter/blob/master/README.md
+# require "codeclimate-test-reporter"
+# CodeClimate::TestReporter.start
 
 require "simplecov"
 SimpleCov.start do
@@ -8,6 +15,7 @@ end
 
 require "rspec"
 require "timecop"
+require "pp"
 require "fakefs/safe"
 require "fakefs/spec_helpers"
 
@@ -19,7 +27,7 @@ end
 
 def mock_error(subject, message)
   mock_exit do
-    mock(subject).puts("ERROR: #{message}")
+    expect(subject).to receive(:puts).with("ERROR: #{message}")
     yield
   end
 end
@@ -89,6 +97,7 @@ def write_procfile(procfile="Procfile", alpha_env="")
     file.puts "bravo:\t./bravo"
     file.puts "foo_bar:\t./foo_bar"
     file.puts "foo-bar:\t./foo-bar"
+    file.puts "# baz:\t./baz"
   end
   File.expand_path(procfile)
 end
@@ -166,11 +175,9 @@ ensure
 end
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.color = true
   config.order = 'rand'
   config.include FakeFS::SpecHelpers, :fakefs
-  config.mock_with :rr
   config.before(:each) do
     FileUtils.mkdir_p('/tmp')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ypadlyak-foreman
 version: !ruby/object:Gem::Version
-  version: 0.81.0
+  version: 0.85.0
 platform: ruby
 authors:
 - David Dollar
@@ -121,15 +121,11 @@ files:
 - spec/resources/export/runit/app-bravo-1/run
 - spec/resources/export/supervisord/app-alpha-1.conf
 - spec/resources/export/supervisord/app-alpha-2.conf
-- spec/resources/export/systemd/concurrency/app-alpha-1.service
-- spec/resources/export/systemd/concurrency/app-alpha-2.service
-- spec/resources/export/systemd/concurrency/app-alpha.target
-- spec/resources/export/systemd/concurrency/app.target
-- spec/resources/export/systemd/standard/app-alpha-1.service
-- spec/resources/export/systemd/standard/app-alpha.target
-- spec/resources/export/systemd/standard/app-bravo-1.service
-- spec/resources/export/systemd/standard/app-bravo.target
-- spec/resources/export/systemd/standard/app.target
+- spec/resources/export/systemd/app-alpha.target
+- spec/resources/export/systemd/app-alpha@.service
+- spec/resources/export/systemd/app-bravo.target
+- spec/resources/export/systemd/app-bravo@.service
+- spec/resources/export/systemd/app.target
 - spec/resources/export/upstart/app-alpha-1.conf
 - spec/resources/export/upstart/app-alpha-2.conf
 - spec/resources/export/upstart/app-alpha.conf

data/spec/resources/export/systemd/concurrency/app-alpha-2.service

@@ -1,14 +0,0 @@
-[Unit]
-PartOf=app-alpha.target
-
-[Service]
-User=app
-WorkingDirectory=/tmp/app
-Environment=PORT=5001
-ExecStart=/bin/bash -lc './alpha'
-Restart=always
-StandardInput=null
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=%n
-KillMode=process

data/spec/resources/export/systemd/concurrency/app-alpha.target

@@ -1,3 +0,0 @@
-[Unit]
-PartOf=app.target
-Wants=app-alpha-1.service app-alpha-2.service

data/spec/resources/export/systemd/concurrency/app.target

@@ -1,5 +0,0 @@
-[Unit]
-Wants=app-alpha.target
-
-[Install]
-WantedBy=multi-user.target

data/spec/resources/export/systemd/standard/app-alpha-1.service

@@ -1,14 +0,0 @@
-[Unit]
-PartOf=app-alpha.target
-
-[Service]
-User=app
-WorkingDirectory=/tmp/app
-Environment=PORT=5000
-ExecStart=/bin/bash -lc './alpha'
-Restart=always
-StandardInput=null
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=%n
-KillMode=process

data/spec/resources/export/systemd/standard/app-alpha.target

@@ -1,3 +0,0 @@
-[Unit]
-PartOf=app.target
-Wants=app-alpha-1.service

data/spec/resources/export/systemd/standard/app-bravo.target

@@ -1,3 +0,0 @@
-[Unit]
-PartOf=app.target
-Wants=app-bravo-1.service