foreman 0.26.1 → 0.40.0

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

@@ -19,31 +19,10 @@ Bluepill.application("app", :foreground => false, :log_file => "/var/log/bluepil
     process.monitor_children do |children|
       children.stop_command "kill -QUIT {{PID}}"
     end
-    
-    process.group = "app-alpha"
-  end
-
-
-  app.process("alpha-2") do |process|
-    process.start_command = "./alpha"
-
-    process.working_dir = "/tmp/app"
-    process.daemonize = true
-    process.environment = {"PORT" => "5001"}
-    process.stop_signals = [:quit, 30.seconds, :term, 5.seconds, :kill]
 
-    process.stdout = process.stderr = "/var/log/app/app-alpha-2.log"
-
-    process.monitor_children do |children|
-      children.stop_command "kill -QUIT {{PID}}"
-    end
-    
     process.group = "app-alpha"
   end
 
-
-
-
   app.process("bravo-1") do |process|
     process.start_command = "./bravo"
 
@@ -57,7 +36,7 @@ Bluepill.application("app", :foreground => false, :log_file => "/var/log/bluepil
     process.monitor_children do |children|
       children.stop_command "kill -QUIT {{PID}}"
     end
-    
+
     process.group = "app-bravo"
   end
 

data/spec/resources/export/inittab/inittab.concurrency

@@ -0,0 +1,4 @@
+# ----- foreman app processes -----
+AP01:4:respawn:/bin/su - app -c 'PORT=5000 ./alpha >> /var/log/app/alpha-1.log 2>&1'
+AP02:4:respawn:/bin/su - app -c 'PORT=5001 ./alpha >> /var/log/app/alpha-2.log 2>&1'
+# ----- end foreman app processes -----

data/spec/resources/export/inittab/inittab.default

@@ -0,0 +1,4 @@
+# ----- foreman app processes -----
+AP01:4:respawn:/bin/su - app -c 'PORT=5000 ./alpha >> /var/log/app/alpha-1.log 2>&1'
+AP02:4:respawn:/bin/su - app -c 'PORT=5100 ./bravo >> /var/log/app/bravo-1.log 2>&1'
+# ----- end foreman app processes -----

data/spec/spec_helper.rb

@@ -1,10 +1,20 @@
 require "rubygems"
+
+require "simplecov"
+SimpleCov.start do
+  add_filter "/spec/"
+end
+
 require "rspec"
 require "fakefs/safe"
 require "fakefs/spec_helpers"
 
 $:.unshift File.expand_path("../../lib", __FILE__)
 
+def mock_export_error(message)
+  lambda { yield }.should raise_error(Foreman::Export::Exception, message)
+end
+
 def mock_error(subject, message)
   mock_exit do
     mock(subject).puts("ERROR: #{message}")
@@ -37,9 +47,11 @@ def write_procfile(procfile="Procfile", alpha_env="")
   File.expand_path(procfile)
 end
 
-def write_env(env=".env")
+def write_env(env=".env", options={"FOO"=>"bar"})
   File.open(env, "w") do |file|
-    file.puts "FOO=bar"
+    options.each do |key, val|
+      file.puts "#{key}=#{val}"
+    end
   end
 end
 
@@ -56,15 +68,35 @@ def load_export_templates_into_fakefs(type)
   end
 end
 
+def resource_path(filename)
+  File.expand_path("../resources/#{filename}", __FILE__)
+end
+
 def example_export_file(filename)
   FakeFS.deactivate!
-  data = File.read(File.expand_path("../resources/export/#{filename}", __FILE__))
+  data = File.read(File.expand_path(resource_path("export/#{filename}"), __FILE__))
   FakeFS.activate!
   data
 end
 
+def preserving_env
+  old_env = ENV.to_hash
+  begin
+    yield
+  ensure
+    ENV.clear
+    ENV.update(old_env)
+  end
+end
+
+def normalize_space(s)
+  s.gsub(/\n[\n\s]*/, "\n")
+end
+
 RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.color_enabled = true
-  config.include FakeFS::SpecHelpers
+  config.order = 'rand'
+  config.include FakeFS::SpecHelpers, :fakefs
   config.mock_with :rr
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.40.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2012-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70198523224520 !ruby/object:Gem::Requirement
+  requirement: &70330442658940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70198523224520
+  version_requirements: *70330442658940
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70198523222660 !ruby/object:Gem::Requirement
+  requirement: &70330442658420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70198523222660
+  version_requirements: *70330442658420
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables:
@@ -41,11 +41,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/foreman
+- bin/foreman-runner
 - data/example/error
 - data/example/log/neverdie.log
 - data/example/Procfile
 - data/example/Procfile.without_colon
 - data/example/ticker
+- data/example/utf8
 - data/export/bluepill/master.pill.erb
 - data/export/runit/log_run.erb
 - data/export/runit/run.erb
@@ -61,21 +63,31 @@ files:
 - lib/foreman/export/runit.rb
 - lib/foreman/export/upstart.rb
 - lib/foreman/export.rb
+- lib/foreman/helpers.rb
 - lib/foreman/process.rb
 - lib/foreman/procfile.rb
+- lib/foreman/procfile_entry.rb
 - lib/foreman/utils.rb
 - lib/foreman/version.rb
 - lib/foreman.rb
-- README.markdown
+- README.md
 - spec/foreman/cli_spec.rb
 - spec/foreman/engine_spec.rb
+- spec/foreman/export/base_spec.rb
 - spec/foreman/export/bluepill_spec.rb
+- spec/foreman/export/inittab_spec.rb
 - spec/foreman/export/runit_spec.rb
 - spec/foreman/export/upstart_spec.rb
 - spec/foreman/export_spec.rb
+- spec/foreman/helpers_spec.rb
 - spec/foreman/process_spec.rb
 - spec/foreman_spec.rb
+- spec/helper_spec.rb
+- spec/resources/bin/utf8
+- spec/resources/export/bluepill/app-concurrency.pill
 - spec/resources/export/bluepill/app.pill
+- spec/resources/export/inittab/inittab.concurrency
+- spec/resources/export/inittab/inittab.default
 - spec/resources/export/runit/app-alpha-1-log-run
 - spec/resources/export/runit/app-alpha-1-run
 - spec/resources/export/runit/app-alpha-2-log-run
@@ -104,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1174772449169708218
+      hash: 4516446218853691019
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,10 +125,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1174772449169708218
+      hash: 4516446218853691019
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Process manager for applications with multiple components

data/README.markdown

@@ -1,49 +0,0 @@
-# Foreman
-
-## Installation
-
-* Rubygems
-
-    gem install foreman
-
-* OSX
-
-    http://assets.foreman.io/foreman/foreman.pkg
-
-* Standalone Tarball
-
-    http://assets.foreman.io/foreman/foreman.tgz
-
-## Description
-
-http://blog.daviddollar.org/2011/05/06/introducing-foreman.html
-
-## Manual
-
-See the [man page](http://ddollar.github.com/foreman) for usage.
-
-## Authorship
-
-Created by David Dollar
-
-Patches contributed by:
-
-* Adam Wiggins
-* Dan Peterson
-* Hunter Nield
-* Jay Zeschin
-* Keith Rarick
-* Khaja Minhajuddin
-* Matt Haynes
-* Michael van Rooijen
-* Mike Javorski
-* Nathan L Smith
-* Nick Zadrozny
-* Ricardo Chimal, Jr
-* Thom May
-* clifff
-* Greg Reinacker
-
-## License
-
-MIT