foreman 0.85.0 → 0.87.0

data/spec/foreman/export/systemd_spec.rb

@@ -3,7 +3,7 @@ require "foreman/engine"
 require "foreman/export/systemd"
 require "tmpdir"
 
-describe Foreman::Export::Systemd, :fakefs do
+describe Foreman::Export::Systemd, :fakefs, :aggregate_failures do
   let(:procfile)  { write_procfile("/tmp/app/Procfile") }
   let(:formation) { nil }
   let(:engine)    { Foreman::Engine.new(:formation => formation).load_procfile(procfile) }
@@ -16,71 +16,101 @@ 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/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
+    expect(File.read("/tmp/init/app.target")).to eq(example_export_file("systemd/app.target"))
+    expect(File.read("/tmp/init/app-alpha.1.service")).to eq(example_export_file("systemd/app-alpha.1.service"))
+    expect(File.read("/tmp/init/app-bravo.1.service")).to eq(example_export_file("systemd/app-bravo.1.service"))
   end
 
-  it "cleans up if exporting into an existing dir" do
-    expect(FileUtils).to receive(:rm).with("/tmp/init/app.target")
+  context "when systemd export was run using the previous version of systemd export" do
+    before do
+     write_file("/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")
+     write_file("/tmp/init/app-alpha@.service")
+     write_file("/tmp/init/app-alpha.target")
+     write_file("/tmp/init/app-alpha.target.wants/app-alpha@5000.service")
 
-    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")
+     write_file("/tmp/init/app-bravo.target")
+     write_file("/tmp/init/app-bravo@.service")
+     write_file("/tmp/init/app-bravo.target.wants/app-bravo@5100.service")
 
-    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")
+     write_file("/tmp/init/app-foo_bar.target")
+     write_file("/tmp/init/app-foo_bar@.service")
+     write_file("/tmp/init/app-foo_bar.target.wants/app-foo_bar@5200.service")
 
-    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")
+     write_file("/tmp/init/app-foo-bar.target")
+     write_file("/tmp/init/app-foo-bar@.service")
+     write_file("/tmp/init/app-foo-bar.target.wants/app-foo-bar@5300.service")
+    end
 
+    it "cleans up service files created by systemd export" do
+      expect(FileUtils).to receive(:rm).with("/tmp/init/app.target")
 
-    systemd.export
-    systemd.export
+      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
+    end
+  end
+
+  context "when systemd export was run using the current version of systemd export" do
+    before do
+      systemd.export
+    end
+
+    it "cleans up service files created by systemd export" do
+      expect(FileUtils).to receive(:rm).with("/tmp/init/app.target")
+      expect(FileUtils).to receive(:rm).with("/tmp/init/app-alpha.1.service")
+      expect(FileUtils).to receive(:rm).with("/tmp/init/app-bravo.1.service")
+      expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo_bar.1.service")
+      expect(FileUtils).to receive(:rm).with("/tmp/init/app-foo-bar.1.service")
+
+      systemd.export
+    end
   end
 
   it "includes environment variables" do
     engine.env['KEY'] = 'some "value"'
     systemd.export
-    expect(File.read("/tmp/init/app-alpha@.service")).to match(/KEY=some "value"/)
+    expect(File.read("/tmp/init/app-alpha.1.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=/)
+    expect(File.read("/tmp/init/app-alpha.1.service")).to match(/^ExecStart=/)
   end
 
-  context "with a formation" do
+  context "with a custom formation specified" do
     let(:formation) { "alpha=2" }
 
-    it "exports to the filesystem with concurrency" do
+    it "exports only those services that are specified in the formation" do
       systemd.export
 
-      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.read("/tmp/init/app.target")).to include("Wants=app-alpha.1.service app-alpha.2.service\n")
+      expect(File.read("/tmp/init/app-alpha.1.service")).to eq(example_export_file("systemd/app-alpha.1.service"))
+      expect(File.read("/tmp/init/app-alpha.2.service")).to eq(example_export_file("systemd/app-alpha.2.service"))
+      expect(File.exist?("/tmp/init/app-bravo.1.service")).to be_falsey
     end
   end
 
-  context "with alternate templates" do
+  context "with alternate template directory specified" do
     let(:template) { "/tmp/alternate" }
     let(:options)  { { :app => "app", :template => template } }
 
@@ -89,25 +119,37 @@ describe Foreman::Export::Systemd, :fakefs do
       File.open("#{template}/master.target.erb", "w") { |f| f.puts "alternate_template" }
     end
 
-    it "can export with alternate template files" do
+    it "uses template files found in the alternate directory" do
       systemd.export
       expect(File.read("/tmp/init/app.target")).to eq("alternate_template\n")
     end
-  end
 
-  context "with alternate templates from home dir" do
+    context "with alternate templates in the user home directory" do
+      before do
+        FileUtils.mkdir_p File.expand_path("~/.foreman/templates/systemd")
+        File.open(File.expand_path("~/.foreman/templates/systemd/master.target.erb"), "w") do |file|
+          file.puts "home_dir_template"
+        end
+      end
+
+      it "uses template files found in the alternate directory" do
+        systemd.export
+        expect(File.read("/tmp/init/app.target")).to eq("alternate_template\n")
+      end
+    end
+  end
 
+  context "with alternate templates in the user home directory" do
     before do
       FileUtils.mkdir_p File.expand_path("~/.foreman/templates/systemd")
       File.open(File.expand_path("~/.foreman/templates/systemd/master.target.erb"), "w") do |file|
-        file.puts "default_alternate_template"
+        file.puts "home_dir_template"
       end
     end
 
-    it "can export with alternate template files" do
+    it "uses template files found in the user home directory" do
       systemd.export
-      expect(File.read("/tmp/init/app.target")).to eq("default_alternate_template\n")
+      expect(File.read("/tmp/init/app.target")).to eq("home_dir_template\n")
     end
   end
-
 end

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

@@ -1,12 +1,15 @@
 [Unit]
-PartOf=app-alpha.target
+PartOf=app.target
+StopWhenUnneeded=yes
 
 [Service]
 User=app
 WorkingDirectory=/tmp/app
-Environment=PORT=%i
-ExecStart=/bin/bash -lc 'exec ./alpha'
+Environment=PORT=5000
+Environment=PS=alpha.1
+ExecStart=/bin/bash -lc 'exec -a "app-alpha.1" ./alpha'
 Restart=always
+RestartSec=14s
 StandardInput=null
 StandardOutput=syslog
 StandardError=syslog

data/spec/resources/export/systemd/{app-bravo@.service → app-alpha.2.service}

@@ -1,12 +1,15 @@
 [Unit]
-PartOf=app-bravo.target
+PartOf=app.target
+StopWhenUnneeded=yes
 
 [Service]
 User=app
 WorkingDirectory=/tmp/app
-Environment=PORT=%i
-ExecStart=/bin/bash -lc 'exec ./bravo'
+Environment=PORT=5001
+Environment=PS=alpha.2
+ExecStart=/bin/bash -lc 'exec -a "app-alpha.2" ./alpha'
 Restart=always
+RestartSec=14s
 StandardInput=null
 StandardOutput=syslog
 StandardError=syslog

data/spec/resources/export/systemd/app-bravo.1.service

@@ -0,0 +1,18 @@
+[Unit]
+PartOf=app.target
+StopWhenUnneeded=yes
+
+[Service]
+User=app
+WorkingDirectory=/tmp/app
+Environment=PORT=5100
+Environment=PS=bravo.1
+ExecStart=/bin/bash -lc 'exec -a "app-bravo.1" ./bravo'
+Restart=always
+RestartSec=14s
+StandardInput=null
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=%n
+KillMode=mixed
+TimeoutStopSec=5

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

@@ -1,5 +1,5 @@
 [Unit]
-Wants=app-alpha.target app-bravo.target app-foo_bar.target app-foo-bar.target
+Wants=app-alpha.1.service app-bravo.1.service app-foo_bar.1.service app-foo-bar.1.service
 
 [Install]
 WantedBy=multi-user.target

data/spec/spec_helper.rb

@@ -105,7 +105,7 @@ end
 def write_file(file)
   FileUtils.mkdir_p(File.dirname(file))
   File.open(file, 'w') do |f|
-    yield(f)
+    yield(f) if block_given?
   end
 end
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.85.0
+  version: 0.87.0
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.1
+date: 2020-01-07 00:00:00.000000000 Z
+dependencies: []
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables:
@@ -52,7 +38,6 @@ files:
 - data/export/supervisord/app.conf.erb
 - data/export/systemd/master.target.erb
 - data/export/systemd/process.service.erb
-- data/export/systemd/process_master.target.erb
 - data/export/upstart/master.conf.erb
 - data/export/upstart/process.conf.erb
 - data/export/upstart/process_master.conf.erb
@@ -75,6 +60,38 @@ files:
 - lib/foreman/helpers.rb
 - lib/foreman/process.rb
 - lib/foreman/procfile.rb
+- lib/foreman/vendor/thor/lib/thor.rb
+- lib/foreman/vendor/thor/lib/thor/actions.rb
+- lib/foreman/vendor/thor/lib/thor/actions/create_file.rb
+- lib/foreman/vendor/thor/lib/thor/actions/create_link.rb
+- lib/foreman/vendor/thor/lib/thor/actions/directory.rb
+- lib/foreman/vendor/thor/lib/thor/actions/empty_directory.rb
+- lib/foreman/vendor/thor/lib/thor/actions/file_manipulation.rb
+- lib/foreman/vendor/thor/lib/thor/actions/inject_into_file.rb
+- lib/foreman/vendor/thor/lib/thor/base.rb
+- lib/foreman/vendor/thor/lib/thor/command.rb
+- lib/foreman/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
+- lib/foreman/vendor/thor/lib/thor/core_ext/io_binary_read.rb
+- lib/foreman/vendor/thor/lib/thor/core_ext/ordered_hash.rb
+- lib/foreman/vendor/thor/lib/thor/error.rb
+- lib/foreman/vendor/thor/lib/thor/group.rb
+- lib/foreman/vendor/thor/lib/thor/invocation.rb
+- lib/foreman/vendor/thor/lib/thor/line_editor.rb
+- lib/foreman/vendor/thor/lib/thor/line_editor/basic.rb
+- lib/foreman/vendor/thor/lib/thor/line_editor/readline.rb
+- lib/foreman/vendor/thor/lib/thor/parser.rb
+- lib/foreman/vendor/thor/lib/thor/parser/argument.rb
+- lib/foreman/vendor/thor/lib/thor/parser/arguments.rb
+- lib/foreman/vendor/thor/lib/thor/parser/option.rb
+- lib/foreman/vendor/thor/lib/thor/parser/options.rb
+- lib/foreman/vendor/thor/lib/thor/rake_compat.rb
+- lib/foreman/vendor/thor/lib/thor/runner.rb
+- lib/foreman/vendor/thor/lib/thor/shell.rb
+- lib/foreman/vendor/thor/lib/thor/shell/basic.rb
+- lib/foreman/vendor/thor/lib/thor/shell/color.rb
+- lib/foreman/vendor/thor/lib/thor/shell/html.rb
+- lib/foreman/vendor/thor/lib/thor/util.rb
+- lib/foreman/vendor/thor/lib/thor/version.rb
 - lib/foreman/version.rb
 - man/foreman.1
 - spec/foreman/cli_spec.rb
@@ -121,10 +138,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/app-alpha.1.service
+- spec/resources/export/systemd/app-alpha.2.service
 - spec/resources/export/systemd/app-alpha.target
-- spec/resources/export/systemd/app-alpha@.service
+- spec/resources/export/systemd/app-bravo.1.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
@@ -152,8 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Process manager for applications with multiple components

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

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