foreman 0.6.0 → 0.7.0

data/lib/foreman.rb

@@ -1,6 +1,6 @@
 module Foreman
 
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 
   class AppDoesNotExist < Exception; end
 

data/lib/foreman/cli.rb

@@ -9,17 +9,16 @@ class Foreman::CLI < Thor
 
   desc "start [PROCESS]", "Start the application, or a specific process"
 
-  method_option :screen,   :type => :boolean, :aliases => "-s"
+  method_option :concurrency, :type => :string,  :aliases => "-c",
+    :banner => '"alpha=5,bar=3"'
 
   def start(process=nil)
     check_procfile!
 
     if process
-      engine.execute(process)
-    elsif options[:screen]
-      engine.screen
+      engine.execute(process, options)
     else
-      engine.start
+      engine.start(options)
     end
   end
 

data/lib/foreman/engine.rb

@@ -1,5 +1,6 @@
 require "foreman"
 require "foreman/process"
+require "foreman/utils"
 require "pty"
 require "tempfile"
 require "term/ansicolor"
@@ -12,28 +13,42 @@ class Foreman::Engine
 
   extend Term::ANSIColor
 
-  COLORS = [ cyan, yellow, green, magenta, on_blue ]
+  COLORS = [ cyan, yellow, green, magenta, red ]
 
   def initialize(procfile)
     @procfile  = read_procfile(procfile)
     @directory = File.expand_path(File.dirname(procfile))
   end
 
-  def processes
+  def processes(concurrency=nil)
     @processes ||= begin
+      concurrency = Foreman::Utils.parse_concurrency(concurrency)
+
       procfile.split("\n").inject({}) do |hash, line|
         next if line.strip == ""
-        process = Foreman::Process.new(*line.split(" ", 2))
-        process.color = next_color
-        hash.update(process.name => process)
+        name, command = line.split(" ", 2)
+
+        if concurrency[name] > 1 then
+          1.upto(concurrency[name]) do |num|
+            process = Foreman::Process.new("#{name}.#{num}", command)
+            process.color = next_color
+            hash[process.name] = process
+          end
+        else
+          process = Foreman::Process.new(name, command)
+          process.color = next_color
+          hash[process.name] = process
+        end
+
+        hash
       end
     end
   end
 
-  def start
+  def start(options={})
     proctitle "ruby: foreman master"
 
-    processes.each do |name, process|
+    processes(options[:concurrency]).each do |name, process|
       fork process
     end
 
@@ -43,21 +58,17 @@ class Foreman::Engine
     watch_for_termination
   end
 
-  def screen
-    tempfile = Tempfile.new("foreman")
-    tempfile.puts "sessionname foreman"
-    processes.each do |name, process|
-      tempfile.puts "screen -t #{name} #{process.command}"
+  def execute(name, options={})
+    processes(options[:concurrency]).values.select do |process|
+      process.name =~ /\A#{name}\.?\d*\Z/
+    end.each do |process|
+      fork process
     end
-    tempfile.close
 
-    system "screen -c #{tempfile.path}"
-
-    tempfile.delete
-  end
+    trap("TERM") { kill_and_exit("TERM") }
+    trap("INT")  { kill_and_exit("INT")  }
 
-  def execute(name)
-    run(processes[name], false)
+    watch_for_termination
   end
 
 private ######################################################################

data/lib/foreman/export/base.rb

@@ -1,4 +1,5 @@
 require "foreman/export"
+require "foreman/utils"
 
 class Foreman::Export::Base
 
@@ -26,16 +27,6 @@ private ######################################################################
     File.read(File.expand_path("../../../../export/#{name}", __FILE__))
   end
 
-  def parse_concurrency(concurrency)
-    @concurrency ||= begin
-      pairs = concurrency.to_s.gsub(/\s/, "").split(",")
-      pairs.inject(Hash.new(1)) do |hash, pair|
-        process, amount = pair.split("=")
-        hash.update(process => amount.to_i)        
-      end
-    end
-  end
-
   def port_for(base_port, app, num)
     base_port ||= 5000
     offset = engine.processes.keys.sort.index(app) * 100

data/lib/foreman/utils.rb

@@ -0,0 +1,15 @@
+require "foreman"
+
+class Foreman::Utils
+
+  def self.parse_concurrency(concurrency)
+    @concurrency ||= begin
+      pairs = concurrency.to_s.gsub(/\s/, "").split(",")
+      pairs.inject(Hash.new(1)) do |hash, pair|
+        process, amount = pair.split("=")
+        hash.update(process => amount.to_i)        
+      end
+    end
+  end
+
+end

data/spec/foreman/cli_spec.rb

@@ -19,7 +19,7 @@ describe "Foreman::CLI" do
 
       it "runs successfully" do
         dont_allow(subject).error
-        mock.instance_of(Foreman::Engine).start
+        mock.instance_of(Foreman::Engine).start({})
         subject.start
       end
     end
@@ -51,10 +51,7 @@ describe "Foreman::CLI" do
 
         it "runs successfully" do
           dont_allow(subject).error
-          mock.instance_of(Foreman::Export::Upstart).export("/tmp/foo", {
-            :concurrency => nil,
-            :name => nil
-          })
+          mock.instance_of(Foreman::Export::Upstart).export("/tmp/foo", {})
           subject.export("upstart", "/tmp/foo")
         end
       end

data/spec/foreman/engine_spec.rb

@@ -10,7 +10,7 @@ describe "Foreman::Engine" do
         lambda { subject }.should raise_error
       end
     end
-    
+
     describe "with a Procfile" do
       it "reads the processes" do
         write_procfile
@@ -19,7 +19,7 @@ describe "Foreman::Engine" do
       end
     end
   end
-  
+
   describe "start" do
     it "forks the processes" do
       write_procfile
@@ -33,7 +33,8 @@ describe "Foreman::Engine" do
   describe "execute" do
     it "runs the processes" do
       write_procfile
-      mock(subject).run(subject.processes["alpha"], false)
+      mock(subject).fork(subject.processes["alpha"])
+      mock(subject).watch_for_termination
       subject.execute("alpha")
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreman
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - David Dollar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 -04:00
+date: 2010-07-19 00:00:00 -07:00
 default_executable: foreman
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,6 +152,7 @@ files:
 - lib/foreman/export/inittab.rb
 - lib/foreman/export/upstart.rb
 - lib/foreman/process.rb
+- lib/foreman/utils.rb
 - spec/foreman/cli_spec.rb
 - spec/foreman/engine_spec.rb
 - spec/foreman/export/upstart_spec.rb
@@ -160,7 +161,7 @@ files:
 - spec/foreman_spec.rb
 - spec/spec_helper.rb
 - README.markdown
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/ddollar/foreman
 licenses: []