foreman 0.67.0 → 0.69.0

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

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

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

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

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

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

data/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

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

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

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

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

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

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

data/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

data/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 >> /var/log/app/alpha-1.log 2>&1

data/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 >> /var/log/app/alpha-2.log 2>&1

data/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 >> /var/log/app/bravo-1.log 2>&1

data/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]

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require "simplecov"
 SimpleCov.start do
   add_filter "/spec/"
@@ -10,17 +13,8 @@ require "fakefs/spec_helpers"
 
 $:.unshift File.expand_path("../../lib", __FILE__)
 
-begin
-  def running_ruby_18?
-    defined?(RUBY_VERSION) and RUBY_VERSION =~ /^1\.8\.\d+/
-  end
-  require 'posix/spawn' if running_ruby_18?
-rescue LoadError
-  STDERR.puts "WARNING: foreman requires gem `posix-spawn` on Ruby #{RUBY_VERSION}. Please `gem install posix-spawn`."
-end
-
 def mock_export_error(message)
-  lambda { yield }.should raise_error(Foreman::Export::Exception, message)
+  expect { yield }.to raise_error(Foreman::Export::Exception, message)
 end
 
 def mock_error(subject, message)
@@ -45,11 +39,7 @@ end
 
 def forked_foreman(args)
   rd, wr = make_pipe
-  if running_ruby_18?
-    POSIX::Spawn.spawn({}, "bundle exec bin/foreman #{args}", :out => wr, :err => wr)
-  else
-    Process.spawn("bundle exec bin/foreman #{args}", :out => wr, :err => wr)
-  end
+  Process.spawn("bundle exec bin/foreman #{args}", :out => wr, :err => wr)
   wr.close
   rd.read
 end
@@ -74,17 +64,13 @@ def fork_and_capture(&blk)
 end
 
 def fork_and_get_exitstatus(args)
-  pid = if running_ruby_18?
-    POSIX::Spawn.spawn({}, "bundle exec bin/foreman #{args}", :out => "/dev/null", :err => "/dev/null")
-  else
-    Process.spawn("bundle exec bin/foreman #{args}", :out => "/dev/null", :err => "/dev/null")
-  end
+  pid = Process.spawn("bundle exec bin/foreman #{args}", :out => "/dev/null", :err => "/dev/null")
   Process.wait(pid)
   $?.exitstatus
 end
 
 def mock_exit(&block)
-  block.should raise_error(SystemExit)
+  expect(block).to raise_error(SystemExit)
 end
 
 def write_foreman_config(app)
@@ -173,9 +159,8 @@ end
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.color_enabled = true
+  config.color = true
   config.order = 'rand'
   config.include FakeFS::SpecHelpers, :fakefs
   config.mock_with :rr
-  config.backtrace_clean_patterns = []
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.67.0
-  prerelease: 
+  version: 0.69.0
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -136,12 +131,15 @@ 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-bravo-1.service
-- spec/resources/export/systemd/app-bravo.target
-- spec/resources/export/systemd/app.target
+- 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/upstart/app-alpha-1.conf
 - spec/resources/export/upstart/app-alpha-2.conf
 - spec/resources/export/upstart/app-alpha.conf
@@ -154,33 +152,26 @@ files:
 homepage: http://github.com/ddollar/foreman
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2084842679123985083
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2084842679123985083
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Process manager for applications with multiple components
 test_files: []
 has_rdoc: 

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

@@ -1,5 +0,0 @@
-[Unit]
-StopWhenUnneeded=true
-
-[Install]
-WantedBy=app.target

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

@@ -1,5 +0,0 @@
-[Unit]
-StopWhenUnneeded=true
-
-[Install]
-WantedBy=app.target

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

@@ -1 +0,0 @@
-[Unit]