foreman 0.67.0 → 0.69.0

data/spec/foreman/export/inittab_spec.rb

@@ -16,7 +16,7 @@ describe Foreman::Export::Inittab, :fakefs do
 
   it "exports to the filesystem" do
     inittab.export
-    File.read("/tmp/inittab").should == example_export_file("inittab/inittab.default")
+    expect(File.read("/tmp/inittab")).to eq(example_export_file("inittab/inittab.default"))
   end
 
   context "to stdout" do
@@ -33,7 +33,7 @@ describe Foreman::Export::Inittab, :fakefs do
 
     it "exports to the filesystem with concurrency" do
       inittab.export
-      File.read("/tmp/inittab").should == example_export_file("inittab/inittab.concurrency")
+      expect(File.read("/tmp/inittab")).to eq(example_export_file("inittab/inittab.concurrency"))
     end
   end
 

data/spec/foreman/export/launchd_spec.rb

@@ -14,8 +14,8 @@ describe Foreman::Export::Launchd, :fakefs do
 
   it "exports to the filesystem" do
     launchd.export
-    File.read("/tmp/init/app-alpha-1.plist").should == example_export_file("launchd/launchd-a.default")
-    File.read("/tmp/init/app-bravo-1.plist").should == example_export_file("launchd/launchd-b.default")
+    expect(File.read("/tmp/init/app-alpha-1.plist")).to eq(example_export_file("launchd/launchd-a.default"))
+    expect(File.read("/tmp/init/app-bravo-1.plist")).to eq(example_export_file("launchd/launchd-b.default"))
   end
 
   context "with multiple command arguments" do
@@ -23,7 +23,7 @@ describe Foreman::Export::Launchd, :fakefs do
 
     it "splits each command argument" do
       launchd.export
-      File.read("/tmp/init/app-alpha-1.plist").should == example_export_file("launchd/launchd-c.default")
+      expect(File.read("/tmp/init/app-alpha-1.plist")).to eq(example_export_file("launchd/launchd-c.default"))
     end
 
   end

data/spec/foreman/export/runit_spec.rb

@@ -17,20 +17,20 @@ describe Foreman::Export::Runit, :fakefs do
     engine.env["BAR"] = "baz"
     runit.export
 
-    File.read("/tmp/init/app-alpha-1/run").should      == example_export_file('runit/app-alpha-1/run')
-    File.read("/tmp/init/app-alpha-1/log/run").should  == example_export_file('runit/app-alpha-1/log/run')
-    File.read("/tmp/init/app-alpha-1/env/PORT").should == "5000\n"
-    File.read("/tmp/init/app-alpha-1/env/BAR").should  == "baz\n"
-    File.read("/tmp/init/app-alpha-2/run").should      == example_export_file('runit/app-alpha-2/run')
-    File.read("/tmp/init/app-alpha-2/log/run").should  == example_export_file('runit/app-alpha-2/log/run')
-    File.read("/tmp/init/app-alpha-2/env/PORT").should == "5001\n"
-    File.read("/tmp/init/app-alpha-2/env/BAR").should  == "baz\n"
-    File.read("/tmp/init/app-bravo-1/run").should      == example_export_file('runit/app-bravo-1/run')
-    File.read("/tmp/init/app-bravo-1/log/run").should  == example_export_file('runit/app-bravo-1/log/run')
-    File.read("/tmp/init/app-bravo-1/env/PORT").should == "5100\n"
+    expect(File.read("/tmp/init/app-alpha-1/run")).to      eq(example_export_file('runit/app-alpha-1/run'))
+    expect(File.read("/tmp/init/app-alpha-1/log/run")).to  eq(example_export_file('runit/app-alpha-1/log/run'))
+    expect(File.read("/tmp/init/app-alpha-1/env/PORT")).to eq("5000\n")
+    expect(File.read("/tmp/init/app-alpha-1/env/BAR")).to  eq("baz\n")
+    expect(File.read("/tmp/init/app-alpha-2/run")).to      eq(example_export_file('runit/app-alpha-2/run'))
+    expect(File.read("/tmp/init/app-alpha-2/log/run")).to  eq(example_export_file('runit/app-alpha-2/log/run'))
+    expect(File.read("/tmp/init/app-alpha-2/env/PORT")).to eq("5001\n")
+    expect(File.read("/tmp/init/app-alpha-2/env/BAR")).to  eq("baz\n")
+    expect(File.read("/tmp/init/app-bravo-1/run")).to      eq(example_export_file('runit/app-bravo-1/run'))
+    expect(File.read("/tmp/init/app-bravo-1/log/run")).to  eq(example_export_file('runit/app-bravo-1/log/run'))
+    expect(File.read("/tmp/init/app-bravo-1/env/PORT")).to eq("5100\n")
   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

data/spec/foreman/export/supervisord_spec.rb

@@ -15,7 +15,7 @@ describe Foreman::Export::Supervisord, :fakefs do
 
   it "exports to the filesystem" do
     supervisord.export
-    File.read("/tmp/init/app.conf").should == example_export_file("supervisord/app-alpha-1.conf")
+    expect(File.read("/tmp/init/app.conf")).to eq(example_export_file("supervisord/app-alpha-1.conf"))
   end
 
   it "cleans up if exporting into an existing dir" do
@@ -29,7 +29,7 @@ describe Foreman::Export::Supervisord, :fakefs do
 
     it "exports to the filesystem with concurrency" do
       supervisord.export
-      File.read("/tmp/init/app.conf").should == example_export_file("supervisord/app-alpha-2.conf")
+      expect(File.read("/tmp/init/app.conf")).to eq(example_export_file("supervisord/app-alpha-2.conf"))
     end
   end
 

data/spec/foreman/export/systemd_spec.rb

@@ -16,11 +16,11 @@ describe Foreman::Export::Systemd, :fakefs do
   it "exports to the filesystem" do
     systemd.export
 
-    File.read("/tmp/init/app.target").should          == example_export_file("systemd/app.target")
-    File.read("/tmp/init/app-alpha.target").should    == example_export_file("systemd/app-alpha.target")
-    File.read("/tmp/init/app-alpha-1.service").should == example_export_file("systemd/app-alpha-1.service")
-    File.read("/tmp/init/app-bravo.target").should    == example_export_file("systemd/app-bravo.target")
-    File.read("/tmp/init/app-bravo-1.service").should == example_export_file("systemd/app-bravo-1.service")
+    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"))
   end
 
   it "cleans up if exporting into an existing dir" do
@@ -41,7 +41,7 @@ describe Foreman::Export::Systemd, :fakefs do
   it "includes environment variables" do
     engine.env['KEY'] = 'some "value"'
     systemd.export
-    File.read("/tmp/init/app-alpha-1.service").should =~ /KEY=some "value"$/
+    expect(File.read("/tmp/init/app-alpha-1.service")).to match(/KEY=some "value"$/)
   end
 
   context "with a formation" do
@@ -50,11 +50,11 @@ describe Foreman::Export::Systemd, :fakefs do
     it "exports to the filesystem with concurrency" do
       systemd.export
 
-      File.read("/tmp/init/app.target").should             == example_export_file("systemd/app.target")
-      File.read("/tmp/init/app-alpha.target").should       == example_export_file("systemd/app-alpha.target")
-      File.read("/tmp/init/app-alpha-1.service").should    == example_export_file("systemd/app-alpha-1.service")
-      File.read("/tmp/init/app-alpha-2.service").should    == example_export_file("systemd/app-alpha-2.service")
-      File.exists?("/tmp/init/app-bravo-1.service").should == false
+      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)
     end
   end
 
@@ -69,7 +69,7 @@ describe Foreman::Export::Systemd, :fakefs do
 
     it "can export with alternate template files" do
       systemd.export
-      File.read("/tmp/init/app.target").should == "alternate_template\n"
+      expect(File.read("/tmp/init/app.target")).to eq("alternate_template\n")
     end
   end
 
@@ -84,7 +84,7 @@ describe Foreman::Export::Systemd, :fakefs do
 
     it "can export with alternate template files" do
       systemd.export
-      File.read("/tmp/init/app.target").should == "default_alternate_template\n"
+      expect(File.read("/tmp/init/app.target")).to eq("default_alternate_template\n")
     end
   end
 

data/spec/foreman/export/upstart_spec.rb

@@ -16,11 +16,11 @@ describe Foreman::Export::Upstart, :fakefs do
   it "exports to the filesystem" do
     upstart.export
 
-    File.read("/tmp/init/app.conf").should         == example_export_file("upstart/app.conf")
-    File.read("/tmp/init/app-alpha.conf").should   == example_export_file("upstart/app-alpha.conf")
-    File.read("/tmp/init/app-alpha-1.conf").should == example_export_file("upstart/app-alpha-1.conf")
-    File.read("/tmp/init/app-bravo.conf").should   == example_export_file("upstart/app-bravo.conf")
-    File.read("/tmp/init/app-bravo-1.conf").should == example_export_file("upstart/app-bravo-1.conf")
+    expect(File.read("/tmp/init/app.conf")).to         eq(example_export_file("upstart/app.conf"))
+    expect(File.read("/tmp/init/app-alpha.conf")).to   eq(example_export_file("upstart/app-alpha.conf"))
+    expect(File.read("/tmp/init/app-alpha-1.conf")).to eq(example_export_file("upstart/app-alpha-1.conf"))
+    expect(File.read("/tmp/init/app-bravo.conf")).to   eq(example_export_file("upstart/app-bravo.conf"))
+    expect(File.read("/tmp/init/app-bravo-1.conf")).to eq(example_export_file("upstart/app-bravo-1.conf"))
   end
 
   it "cleans up if exporting into an existing dir" do
@@ -53,8 +53,8 @@ describe Foreman::Export::Upstart, :fakefs do
   it "quotes and escapes environment variables" do
     engine.env['KEY'] = 'd"\|d'
     upstart.export
-    "foobarfoo".should include "bar"
-    File.read("/tmp/init/app-alpha-1.conf").should =~ /KEY=d\\"\\\\\\\|d/
+    expect("foobarfoo").to include "bar"
+    expect(File.read("/tmp/init/app-alpha-1.conf")).to match(/KEY='d"\\\|d'/)
   end
 
   context "with a formation" do
@@ -63,11 +63,11 @@ describe Foreman::Export::Upstart, :fakefs do
     it "exports to the filesystem with concurrency" do
       upstart.export
 
-      File.read("/tmp/init/app.conf").should            == example_export_file("upstart/app.conf")
-      File.read("/tmp/init/app-alpha.conf").should      == example_export_file("upstart/app-alpha.conf")
-      File.read("/tmp/init/app-alpha-1.conf").should    == example_export_file("upstart/app-alpha-1.conf")
-      File.read("/tmp/init/app-alpha-2.conf").should    == example_export_file("upstart/app-alpha-2.conf")
-      File.exists?("/tmp/init/app-bravo-1.conf").should == false
+      expect(File.read("/tmp/init/app.conf")).to            eq(example_export_file("upstart/app.conf"))
+      expect(File.read("/tmp/init/app-alpha.conf")).to      eq(example_export_file("upstart/app-alpha.conf"))
+      expect(File.read("/tmp/init/app-alpha-1.conf")).to    eq(example_export_file("upstart/app-alpha-1.conf"))
+      expect(File.read("/tmp/init/app-alpha-2.conf")).to    eq(example_export_file("upstart/app-alpha-2.conf"))
+      expect(File.exists?("/tmp/init/app-bravo-1.conf")).to eq(false)
     end
   end
 
@@ -82,7 +82,7 @@ describe Foreman::Export::Upstart, :fakefs do
 
     it "can export with alternate template files" do
       upstart.export
-      File.read("/tmp/init/app.conf").should == "alternate_template\n"
+      expect(File.read("/tmp/init/app.conf")).to eq("alternate_template\n")
     end
   end
 
@@ -97,7 +97,7 @@ describe Foreman::Export::Upstart, :fakefs do
 
     it "can export with alternate template files" do
       upstart.export
-      File.read("/tmp/init/app.conf").should == "default_alternate_template\n"
+      expect(File.read("/tmp/init/app.conf")).to eq("default_alternate_template\n")
     end
   end
 

data/spec/foreman/helpers_spec.rb

@@ -15,12 +15,12 @@ describe "Foreman::Helpers" do
   subject { o = Object.new; o.extend(Foreman::Helpers); o }
 
   it "should classify words" do
-    subject.classify("foo").should == "Foo"
-    subject.classify("foo-bar").should == "FooBar"
+    expect(subject.classify("foo")).to eq("Foo")
+    expect(subject.classify("foo-bar")).to eq("FooBar")
   end
 
   it "should constantize words" do
-    subject.constantize("Object").should == Object
-    subject.constantize("Foo::Bar").should == Foo::Bar
+    expect(subject.constantize("Object")).to eq(Object)
+    expect(subject.constantize("Foo::Bar")).to eq(Foo::Bar)
   end
 end

data/spec/foreman/process_spec.rb

@@ -16,33 +16,56 @@ describe Foreman::Process do
 
     it "runs the process" do
       process = Foreman::Process.new(resource_path("bin/test"))
-      run(process).should == "testing\n"
+      expect(run(process)).to eq("testing\n")
     end
 
     it "can set environment" do
       process = Foreman::Process.new(resource_path("bin/env FOO"), :env => { "FOO" => "bar" })
-      run(process).should == "bar\n"
+      expect(run(process)).to eq("bar\n")
     end
 
     it "can set per-run environment" do
       process = Foreman::Process.new(resource_path("bin/env FOO"))
-      run(process, :env => { "FOO" => "bar "}).should == "bar\n"
+      expect(run(process, :env => { "FOO" => "bar "})).to eq("bar\n")
     end
 
     it "can handle env vars in the command" do
       process = Foreman::Process.new(resource_path("bin/echo $FOO"), :env => { "FOO" => "bar" })
-      run(process).should == "bar\n"
+      expect(run(process)).to eq("bar\n")
     end
 
     it "can handle per-run env vars in the command" do
       process = Foreman::Process.new(resource_path("bin/echo $FOO"))
-      run(process, :env => { "FOO" => "bar" }).should == "bar\n"
+      expect(run(process, :env => { "FOO" => "bar" })).to eq("bar\n")
     end
 
     it "should output utf8 properly" do
       process = Foreman::Process.new(resource_path("bin/utf8"))
-      run(process).should == (Foreman.ruby_18? ? "\xFF\x03\n" : "\xFF\x03\n".force_encoding('binary'))
+      expect(run(process)).to eq(Foreman.ruby_18? ? "\xFF\x03\n" : "\xFF\x03\n".force_encoding('binary'))
     end
+
+    it "can expand env in the command" do
+      process = Foreman::Process.new("command $FOO $BAR", :env => { "FOO" => "bar" })
+      expect(process.expanded_command).to eq("command bar $BAR")
+    end
+
+    it "can expand extra env in the command" do
+      process = Foreman::Process.new("command $FOO $BAR", :env => { "FOO" => "bar" })
+      expect(process.expanded_command("BAR" => "qux")).to eq("command bar qux")
+    end
+
+    it "can execute" do
+      mock(Kernel).exec "bin/command"
+      process = Foreman::Process.new("bin/command")
+      process.exec
+    end
+
+    it "can execute with env" do
+      mock(Kernel).exec "bin/command bar"
+      process = Foreman::Process.new("bin/command $FOO")
+      process.exec(:env => { "FOO" => "bar" })
+    end
+
   end
 
 end

data/spec/foreman/procfile_spec.rb

@@ -9,35 +9,35 @@ describe Foreman::Procfile, :fakefs do
   it "can load from a file" do
     write_procfile
     subject.load "Procfile"
-    subject["alpha"].should == "./alpha"
-    subject["bravo"].should == "./bravo"
+    expect(subject["alpha"]).to eq("./alpha")
+    expect(subject["bravo"]).to eq("./bravo")
   end
 
   it "loads a passed-in Procfile" do
     write_procfile
     procfile = Foreman::Procfile.new("Procfile")
-    procfile["alpha"].should   == "./alpha"
-    procfile["bravo"].should   == "./bravo"
-    procfile["foo-bar"].should == "./foo-bar"
-    procfile["foo_bar"].should == "./foo_bar"
+    expect(procfile["alpha"]).to   eq("./alpha")
+    expect(procfile["bravo"]).to   eq("./bravo")
+    expect(procfile["foo-bar"]).to eq("./foo-bar")
+    expect(procfile["foo_bar"]).to eq("./foo_bar")
   end
 
   it "can have a process appended to it" do
     subject["charlie"] = "./charlie"
-    subject["charlie"].should == "./charlie"
+    expect(subject["charlie"]).to eq("./charlie")
   end
 
   it "can write to a string" do
     subject["foo"] = "./foo"
     subject["bar"] = "./bar"
-    subject.to_s.should == "foo: ./foo\nbar: ./bar"
+    expect(subject.to_s).to eq("foo: ./foo\nbar: ./bar")
   end
 
   it "can write to a file" do
     subject["foo"] = "./foo"
     subject["bar"] = "./bar"
     subject.save "/tmp/proc"
-    File.read("/tmp/proc").should == "foo: ./foo\nbar: ./bar\n"
+    expect(File.read("/tmp/proc")).to eq("foo: ./foo\nbar: ./bar\n")
   end
 
 end

data/spec/foreman_spec.rb

@@ -10,7 +10,7 @@ describe Foreman do
 
   describe "runner" do
     it "should exist" do
-      File.exists?(Foreman.runner).should == true
+      expect(File.exists?(Foreman.runner)).to eq(true)
     end
   end
 end

data/spec/helper_spec.rb

@@ -5,14 +5,15 @@ describe "spec helpers" do
     after { ENV.delete "FOO" }
 
     it "should remove added environment vars" do
+      old = ENV["FOO"]
       preserving_env { ENV["FOO"] = "baz" }
-      ENV["FOO"].should == nil
+      expect(ENV["FOO"]).to eq(old)
     end
 
     it "should reset modified environment vars" do
       ENV["FOO"] = "bar"
       preserving_env { ENV["FOO"] = "baz"}
-      ENV["FOO"].should == "bar"
+      expect(ENV["FOO"]).to eq("bar")
     end
   end
 end

data/spec/resources/export/bluepill/app-concurrency.pill

@@ -7,7 +7,7 @@ Bluepill.application("app", :foreground => false, :log_file => "/var/log/bluepil
 
 
   app.process("alpha-1") do |process|
-    process.start_command = "./alpha"
+    process.start_command = %Q{./alpha}
 
     process.working_dir = "/tmp/app"
     process.daemonize = true
@@ -26,7 +26,7 @@ Bluepill.application("app", :foreground => false, :log_file => "/var/log/bluepil
 
 
   app.process("alpha-2") do |process|
-    process.start_command = "./alpha"
+    process.start_command = %Q{./alpha}
 
     process.working_dir = "/tmp/app"
     process.daemonize = true

data/spec/resources/export/bluepill/app.pill

@@ -7,7 +7,7 @@ Bluepill.application("app", :foreground => false, :log_file => "/var/log/bluepil
 
 
   app.process("alpha-1") do |process|
-    process.start_command = "./alpha"
+    process.start_command = %Q{./alpha}
 
     process.working_dir = "/tmp/app"
     process.daemonize = true
@@ -25,7 +25,7 @@ Bluepill.application("app", :foreground => false, :log_file => "/var/log/bluepil
   end
 
   app.process("bravo-1") do |process|
-    process.start_command = "./bravo"
+    process.start_command = %Q{./bravo}
 
     process.working_dir = "/tmp/app"
     process.daemonize = true
@@ -43,7 +43,7 @@ Bluepill.application("app", :foreground => false, :log_file => "/var/log/bluepil
   end
 
   app.process("foo_bar-1") do |process|
-    process.start_command = "./foo_bar"
+    process.start_command = %Q{./foo_bar}
 
     process.working_dir = "/tmp/app"
     process.daemonize = true
@@ -61,7 +61,7 @@ Bluepill.application("app", :foreground => false, :log_file => "/var/log/bluepil
   end
 
   app.process("foo-bar-1") do |process|
-    process.start_command = "./foo-bar"
+    process.start_command = %Q{./foo-bar}
 
     process.working_dir = "/tmp/app"
     process.daemonize = true

data/spec/resources/export/runit/app-alpha-1/run

@@ -1,3 +1,4 @@
 #!/bin/sh
 cd /tmp/app
+exec 2>&1
 exec chpst -u app -e /tmp/init/app-alpha-1/env ./alpha bar=baz

data/spec/resources/export/runit/app-alpha-2/run

@@ -1,3 +1,4 @@
 #!/bin/sh
 cd /tmp/app
+exec 2>&1
 exec chpst -u app -e /tmp/init/app-alpha-2/env ./alpha bar=baz

data/spec/resources/export/runit/app-bravo-1/run

@@ -1,3 +1,4 @@
 #!/bin/sh
 cd /tmp/app
+exec 2>&1
 exec chpst -u app -e /tmp/init/app-bravo-1/env ./bravo

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

@@ -12,6 +12,3 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
 KillMode=process
-
-[Install]
-WantedBy=app-alpha.target