foreman 0.2.0 → 0.3.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = Foreman
 
-=== Procfile
+== Procfile
 
     alpha ./bin/alpha
     bravo ./bin/bravo some args
@@ -10,18 +10,26 @@
 
 === Running
 
+Log files will be output to standard out, colorized to aid in visual separation.
+
     $ foreman start
-    [foreman] [Tue May 18 01:27:08 UTC 2010] [alpha] started with pid 4393
-    [foreman] [Tue May 18 01:27:08 UTC 2010] [bravo] started with pid 4394
-    [foreman] [Tue May 18 01:27:08 UTC 2010] [charlie] started with pid 4395
+    [01:27:08] [alpha] started with pid 4393
+    [01:27:08] [bravo] started with pid 4394
+    [01:27:08] [charlie] started with pid 4395
+    [01:27:08] [bravo] initializing...
+    [01:27:08] [bravo] complete
 
-=== Standardized Logging
+=== Using Screen
+
+Launch the processes in a screen session in indivudal windows
+
+    $ foreman screen
+
+== Single Process Execution
 
-    log/alpha.log
-    log/bravo.log
-    log/charlie.log
+    $ foreman execute alpha
 
-== Upstart
+== Exporting to Upstart
 
 === Export to upstart scripts
 
@@ -74,4 +82,4 @@ MIT
 
 == Copyright
 
-(c) 2010 David Dollar
+(c) 2010 David Dollar

data/Rakefile

@@ -53,8 +53,10 @@ begin
     s.add_development_dependency 'rr',     '~> 0.10.11'
     s.add_development_dependency 'rspec',  '~> 2.0.0'
 
+    s.add_dependency 'term-ansicolor', '~> 1.0.5'
     s.add_dependency 'thor', '~> 0.13.6'
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/lib/foreman.rb

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

data/lib/foreman/engine.rb

@@ -1,12 +1,18 @@
 require "foreman"
 require "foreman/process"
+require "pty"
 require "tempfile"
+require "term/ansicolor"
 
 class Foreman::Engine
 
   attr_reader :procfile
   attr_reader :directory
 
+  extend Term::ANSIColor
+
+  COLORS = [ cyan, yellow, green, magenta, on_blue ]
+
   def initialize(procfile)
     @procfile  = read_procfile(procfile)
     @directory = File.expand_path(File.dirname(procfile))
@@ -17,6 +23,7 @@ class Foreman::Engine
       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)
       end
     end
@@ -32,7 +39,7 @@ class Foreman::Engine
     trap("TERM") { kill_and_exit("TERM") }
     trap("INT")  { kill_and_exit("INT")  }
 
-    run_loop
+    watch_for_termination
   end
 
   def screen
@@ -69,23 +76,29 @@ private ######################################################################
     Dir.chdir directory do
       FileUtils.mkdir_p "log"
       command = process.command
-      command << " >>log/#{process.name}.log 2>&1" if log_to_file
-      system command
-      exit $?.exitstatus || 255
+
+      PTY.spawn("#{process.command} 2>&1") do |stdin, stdout, pid|
+        until stdin.eof?
+          info stdin.gets, process
+        end
+      end
     end
   end
 
   def kill_and_exit(signal="TERM")
     info "termination requested"
     running_processes.each do |pid, process|
-      info "killing pid #{pid}", process
+      info "killing #{process.name} in pid #{pid}"
       Process.kill(signal, pid)
     end
     exit 0
   end
 
   def info(message, process=nil)
-    puts "[foreman] [#{Time.now.utc}] [#{process ? process.name : "system"}] #{message}"
+    print process.color if process
+    print "[#{Time.now.strftime("%H:%M:%S")}] [#{process ? process.name : "system"}] #{message.chomp}"
+    print Term::ANSIColor.reset
+    puts
   end
 
   def print_info
@@ -103,17 +116,21 @@ private ######################################################################
     File.read(procfile)
   end
 
-  def run_loop
-    while true
-      pid, status = Process.wait2
-      process = running_processes.delete(pid)
-      info "exited with code #{status}", process
-      fork process
-    end
+  def watch_for_termination
+    pid, status = Process.wait2
+    process = running_processes.delete(pid)
+    info "process terminated", process
+    kill_and_exit
   end
 
   def running_processes
     @running_processes ||= {}
   end
 
+  def next_color
+    @current_color ||= -1
+    @current_color  +=  1
+    @current_color >= COLORS.length ? "" : COLORS[@current_color]
+  end
+
 end

data/lib/foreman/export/upstart.rb

@@ -50,7 +50,7 @@ exec #{process.command} >>/var/log/#{app}/#{process.name}.log 2>&1
     end
 
     engine.processes.each do |name, process|
-      config.scale(name, 1)
+      config.processes[name] ||= 1
     end
     config.write
   end

data/lib/foreman/process.rb

@@ -4,6 +4,7 @@ class Foreman::Process
 
   attr_reader :name
   attr_reader :command
+  attr_accessor :color
 
   def initialize(name, command)
     @name    = name

data/spec/foreman/engine_spec.rb

@@ -25,7 +25,7 @@ describe "Foreman::Engine" do
       write_procfile
       mock(subject).fork(subject.processes["alpha"])
       mock(subject).fork(subject.processes["bravo"])
-      mock(subject).run_loop
+      mock(subject).watch_for_termination
       subject.start
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreman
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Dollar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 -04:00
+date: 2010-06-22 00:00:00 -04:00
 default_executable: foreman
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,9 +99,25 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: term-ansicolor
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 0
+        - 5
+        version: 1.0.5
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,7 +129,7 @@ dependencies:
         - 6
         version: 0.13.6
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables: 
@@ -141,7 +157,7 @@ files:
 - spec/foreman_spec.rb
 - spec/spec_helper.rb
 - README.rdoc
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/ddollar/foreman
 licenses: []