fix up specs

spec/foreman/export/systemd_spec.rb

@@ -16,11 +16,11 @@
   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-1.service")).to eq(example_export_file("systemd/app-alpha-1.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-1.service")).to eq(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
@@ -50,10 +50,10 @@
     it "exports to the filesystem with concurrency" 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-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.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

spec/foreman/export/upstart_spec.rb

@@ -54,7 +54,7 @@
     engine.env['KEY'] = 'd"\|d'
     upstart.export
     expect("foobarfoo").to include "bar"
-    expect(File.read("/tmp/init/app-alpha-1.conf")).to match(/KEY=d\\"\\\\\\\|d/)
+    expect(File.read("/tmp/init/app-alpha-1.conf")).to match(/KEY='d"\\\|d'/)
   end
 
   context "with a formation" do

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,14 @@
+[Unit]
+StopWhenUnneeded=true
+
+[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

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

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

spec/resources/export/systemd/app-bravo-1.service → spec/resources/export/systemd/standard/app-bravo-1.service

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

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

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

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

@@ -0,0 +1,6 @@
+[Unit]
+StopWhenUnneeded=true
+Wants=app-alpha.target app-bravo.target app-foo_bar.target app-foo-bar.target
+
+[Install]
+WantedBy=multi-user.target

spec/resources/export/upstart/app-alpha-1.conf

@@ -2,4 +2,10 @@ start on starting app-alpha
 stop on stopping app-alpha
 respawn
 
-exec su - app -c 'cd /tmp/app; export PORT=5000; ./alpha >> /var/log/app/alpha-1.log 2>&1'
+env PORT=5000
+
+setuid app
+
+chdir /tmp/app
+
+exec ./alpha

spec/resources/export/upstart/app-alpha-2.conf

@@ -2,4 +2,10 @@ start on starting app-alpha
 stop on stopping app-alpha
 respawn
 
-exec su - app -c 'cd /tmp/app; export PORT=5001; ./alpha >> /var/log/app/alpha-2.log 2>&1'
+env PORT=5001
+
+setuid app
+
+chdir /tmp/app
+
+exec ./alpha

spec/resources/export/upstart/app-bravo-1.conf

@@ -2,4 +2,10 @@ start on starting app-bravo
 stop on stopping app-bravo
 respawn
 
-exec su - app -c 'cd /tmp/app; export PORT=5100; ./bravo >> /var/log/app/bravo-1.log 2>&1'
+env PORT=5100
+
+setuid app
+
+chdir /tmp/app
+
+exec ./bravo

spec/resources/export/upstart/app.conf

@@ -1,12 +1,2 @@
-pre-start script
-
-bash << "EOF"
-  mkdir -p /var/log/app
-  chown -R app /var/log/app
-EOF
-
-end script
-
 start on runlevel [2345]
-
-stop on runlevel [016]
+stop on runlevel [!2345]

spec/spec_helper.rb

@@ -177,5 +177,4 @@ def capture_stdout
   config.order = 'rand'
   config.include FakeFS::SpecHelpers, :fakefs
   config.mock_with :rr
-  config.backtrace_clean_patterns = []
 end