foreman 0.81.0 → 0.82.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fdde51adad323e0a4c3687d58aa3fd9a83fcbea
-  data.tar.gz: b9cbfb3dd2784599d8177ecdca3c6f1803d2e505
+  metadata.gz: 6efd570b3be7d73416c5abf3ea05d1b77a542287
+  data.tar.gz: 9ffd849979688997a60c50584e8f43cdb5183c09
 SHA512:
-  metadata.gz: 3a5f907888b451e93666d8335406e37dce3ea8e286b6282a9300b9eb27a1bd3cff6869f68480e305204f79e0cb1a45ce936d6987b18d183236999aa184c5dfc9
-  data.tar.gz: c3324384ef24aa90905b8d4eb8f5cc0fd4baa710eb3b51d20bcc7a7d81f0cc33d16f0ba4ed269beb877d9046014593c9733d6ebc79bc1eb2148e0d9704026594
+  metadata.gz: 196e4cdae6b750681ffae628c3315dfe256c1014cd60230495c66df36c006cfd5f263c8eebef61c6193d9fc5a977275133d4e2fa5a82c7da3e02c8f8d5a19a76
+  data.tar.gz: 2af37ab2769f9bde851d2946eaf3950ef9ce37c710bc3734efd6ad9726dbbb1faa96ef885d05a56ec76ec26c0312c234c497ecd590e5be79366ef8fbf4f81583

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

@@ -4,7 +4,7 @@ PartOf=<%= app %>-<%= name %>.target
 [Service]
 User=<%= user %>
 WorkingDirectory=<%= engine.root %>
-Environment=PORT=<%= port %><% engine.env.each_pair do |var,env| %>
+Environment=PORT=%i<% engine.env.each_pair do |var,env| %>
 Environment=<%= var.upcase %>=<%= env %><% end %>
 ExecStart=/bin/bash -lc '<%= process.command %>'
 Restart=always
@@ -13,3 +13,4 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
 KillMode=process
+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/lib/foreman/cli.rb

@@ -50,7 +50,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

@@ -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       = {}

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
@@ -143,6 +149,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/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.81.0"
+  VERSION = "0.82.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" "April 2016" "Foreman 0.82.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications

data/spec/foreman/export/systemd_spec.rb

@@ -16,23 +16,39 @@ describe Foreman::Export::Systemd, :fakefs do
   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@.service")
     mock(FileUtils).rm("/tmp/init/app-alpha.target")
-    mock(FileUtils).rm("/tmp/init/app-alpha-1.service")
+    mock(FileUtils).rm("/tmp/init/app-alpha.target.wants/app-alpha@5000.service")
+    mock(FileUtils).rm_r("/tmp/init/app-alpha.target.wants")
+
     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-bravo@.service")
+    mock(FileUtils).rm("/tmp/init/app-bravo.target.wants/app-bravo@5100.service")
+    mock(FileUtils).rm_r("/tmp/init/app-bravo.target.wants")
+
     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@.service")
+    mock(FileUtils).rm("/tmp/init/app-foo_bar.target.wants/app-foo_bar@5200.service")
+    mock(FileUtils).rm_r("/tmp/init/app-foo_bar.target.wants")
+
+    mock(FileUtils).rm("/tmp/init/app-foo-bar.target")
+    mock(FileUtils).rm("/tmp/init/app-foo-bar@.service")
+    mock(FileUtils).rm("/tmp/init/app-foo-bar.target.wants/app-foo-bar@5300.service")
+    mock(FileUtils).rm_r("/tmp/init/app-foo-bar.target.wants")
+
 
     systemd.export
     systemd.export
@@ -41,7 +57,7 @@ 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
 
   context "with a formation" do
@@ -50,11 +66,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/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,7 +4,7 @@ PartOf=app-alpha.target
 [Service]
 User=app
 WorkingDirectory=/tmp/app
-Environment=PORT=5000
+Environment=PORT=%i
 ExecStart=/bin/bash -lc './alpha'
 Restart=always
 StandardInput=null
@@ -12,3 +12,4 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
 KillMode=process
+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,7 +4,7 @@ PartOf=app-bravo.target
 [Service]
 User=app
 WorkingDirectory=/tmp/app
-Environment=PORT=5100
+Environment=PORT=%i
 ExecStart=/bin/bash -lc './bravo'
 Restart=always
 StandardInput=null
@@ -12,3 +12,4 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
 KillMode=process
+TimeoutStopSec=5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.81.0
+  version: 0.82.0
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -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