foreman 0.8.0 → 0.9.0.beta.1

data/data/example/Pstypes

@@ -0,0 +1,2 @@
+ticker ./ticker $PORT
+error  ./error

data/data/example/error

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+puts "will error in 10s"
+sleep 5
+raise "Dying"

data/data/example/log/neverdie.log

@@ -0,0 +1,4 @@
+tick
+tick
+./never_die:6:in `sleep': Interrupt
+	from ./never_die:6

data/data/example/ticker

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+while true
+  puts "tick: #{ARGV.inspect}"
+  sleep 1
+end

data/lib/foreman.rb

@@ -1,6 +1,6 @@
 module Foreman
 
-  VERSION = "0.8.0"
+  VERSION = "0.9.0.beta.1"
 
   class AppDoesNotExist < Exception; end
 

data/lib/foreman/cli.rb

@@ -5,7 +5,7 @@ require "thor"
 
 class Foreman::CLI < Thor
 
-  class_option :procfile, :type => :string, :aliases => "-f", :desc => "Default: ./Procfile"
+  class_option :pstypes, :type => :string, :aliases => "-f", :desc => "Default: Pstypes"
 
   desc "start [PROCESS]", "Start the application, or a specific process"
 
@@ -14,7 +14,7 @@ class Foreman::CLI < Thor
     :banner => '"alpha=5,bar=3"'
 
   def start(process=nil)
-    check_procfile!
+    check_pstypes!
 
     if process
       engine.execute(process, options)
@@ -33,7 +33,7 @@ class Foreman::CLI < Thor
     :banner => '"alpha=5,bar=3"'
 
   def export(format, location=nil)
-    check_procfile!
+    check_pstypes!
 
     formatter = case format
       when "upstart" then Foreman::Export::Upstart
@@ -49,16 +49,16 @@ class Foreman::CLI < Thor
 
 private ######################################################################
 
-  def check_procfile!
-    error("Procfile does not exist.") unless File.exist?(procfile)
+  def check_pstypes!
+    error("#{pstypes} does not exist.") unless File.exist?(pstypes)
   end
 
   def engine
-    @engine ||= Foreman::Engine.new(procfile)
+    @engine ||= Foreman::Engine.new(pstypes)
   end
 
-  def procfile
-    options[:procfile] || "./Procfile"
+  def pstypes
+    options[:pstypes] || "Pstypes"
   end
 
 private ######################################################################
@@ -68,8 +68,8 @@ private ######################################################################
     exit 1
   end
 
-  def procfile_exists?(procfile)
-    File.exist?(procfile)
+  def pstypes_exists?(pstypes)
+    File.exist?(pstypes)
   end
 
 end

data/lib/foreman/engine.rb

@@ -8,21 +8,21 @@ require "fileutils"
 
 class Foreman::Engine
 
-  attr_reader :procfile
+  attr_reader :pstypes
   attr_reader :directory
 
   extend Term::ANSIColor
 
   COLORS = [ cyan, yellow, green, magenta, red ]
 
-  def initialize(procfile)
-    @procfile  = read_procfile(procfile)
-    @directory = File.expand_path(File.dirname(procfile))
+  def initialize(pstypes)
+    @pstypes   = read_pstypes(pstypes)
+    @directory = File.expand_path(File.dirname(pstypes))
   end
 
   def processes
     @processes ||= begin
-      procfile.split("\n").inject({}) do |hash, line|
+      pstypes.split("\n").inject({}) do |hash, line|
         next if line.strip == ""
         name, command = line.split(" ", 2)
         process = Foreman::Process.new(name, command)
@@ -66,36 +66,40 @@ private ######################################################################
     concurrency = Foreman::Utils.parse_concurrency(options[:concurrency])
 
     1.upto(concurrency[process.name]) do |num|
-      fork_individual(process, port_for(process, num, options[:port]))
+      fork_individual(process, num, port_for(process, num, options[:port]))
     end
   end
 
-  def fork_individual(process, port)
+  def fork_individual(process, num, port)
     ENV["PORT"] = port.to_s
+    ENV["PS"]   = "#{process.name}.#{num}"
 
     pid = Process.fork do
       run(process)
     end
 
-    info "started with pid #{pid}", process
+    info "started with pid #{pid}, PORT=#{port}", process
     running_processes[pid] = process
   end
 
   def run(process, log_to_file=true)
     proctitle "ruby: foreman #{process.name}"
 
-    Dir.chdir directory do
-      FileUtils.mkdir_p "log"
-      command = process.command
+    begin
+      Dir.chdir directory do
+        FileUtils.mkdir_p "log"
+        command = process.command
 
-      begin
         PTY.spawn("#{process.command} 2>&1") do |stdin, stdout, pid|
           until stdin.eof?
             info stdin.gets, process
           end
         end
-      rescue PTY::ChildExited, Interrupt
+      end
+    rescue PTY::ChildExited, Interrupt
+      begin
         info "process exiting", process
+      rescue Interrupt
       end
     end
   end
@@ -125,8 +129,8 @@ private ######################################################################
   end
 
   def pad_process_name(process)
-    name = process ? "#{process.name}:#{ENV["PORT"]}" : "system"
-    name.ljust(longest_process_name + 6) # add 6 for port padding
+    name = process ? "#{ENV["PS"]}" : "system"
+    name.ljust(longest_process_name + 3) # add 3 for process number padding
   end
 
   def print_info
@@ -140,8 +144,8 @@ private ######################################################################
     $0 = title
   end
 
-  def read_procfile(procfile)
-    File.read(procfile)
+  def read_pstypes(pstypes)
+    File.read(pstypes)
   end
 
   def watch_for_termination

data/lib/foreman/export/base.rb

@@ -24,7 +24,7 @@ private ######################################################################
   end
 
   def export_template(name)
-    File.read(File.expand_path("../../../../export/#{name}", __FILE__))
+    File.read(File.expand_path("../../../../data/export/#{name}", __FILE__))
   end
 
   def write_file(filename, contents)

data/lib/foreman/export/inittab.rb

@@ -27,8 +27,8 @@ class Foreman::Export::Inittab < Foreman::Export::Base
     inittab = inittab.join("\n") + "\n"
 
     if fname
-      FileUtils.mkdir_p(log_root)
-      FileUtils.chown(user, nil, log_root)
+      FileUtils.mkdir_p(log_root) rescue error "could not create #{log_root}"
+      FileUtils.chown(user, nil, log_root) rescue error "could not chown #{log_root} to #{user}"
       write_file(fname, inittab)
     else
       puts inittab

data/man/foreman.1

@@ -1,10 +1,10 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "June 2010" "Foreman 0.6.0" "Foreman Manual"
+.TH "FOREMAN" "1" "October 2010" "Foreman 0.8.0" "Foreman Manual"
 .
 .SH "NAME"
-\fBforeman\fR \- manage Procfile\-based applications
+\fBforeman\fR \- manage Pstypes\-based applications
 .
 .SH "SYNOPSIS"
 \fBforeman start [process]\fR
@@ -13,13 +13,13 @@
 \fBforeman export <format> [location]\fR
 .
 .SH "DESCRIPTION"
-\fBForeman\fR is a manager for Procfile\-based applications\. Its aim is to abstract away the details of the Procfile format, and allow you to either run your application directly or export it to some other process management format\.
+\fBForeman\fR is a manager for Pstypes\-based applications\. Its aim is to abstract away the details of the Pstypes format, and allow you to either run your application directly or export it to some other process management format\.
 .
 .SH "RUNNING"
 \fBforeman start\fR is used to run your application directly from the command line\.
 .
 .P
-If no additional parameters are passed, foreman will run one instance of each type of process defined in your Procfile\.
+If no additional parameters are passed, foreman will run one instance of each type of process defined in your Pstypes\.
 .
 .P
 If a parameter is passed, foreman will run one instance of the specified application type\.
@@ -28,8 +28,12 @@ If a parameter is passed, foreman will run one instance of the specified applica
 The following options control how the application is run:
 .
 .TP
-\fB\-s\fR, \fB\-\-screen\fR
-Run the application as a series of screen windows rather than interleaved in stdout\.
+\fB\-c\fR, \fB\-\-concurrency\fR
+Specify the number of each process type to run\. The value passed in should be in the format \fBprocess=num,process=num\fR
+.
+.TP
+\fB\-p\fR, \fB\-\-port\fR
+Specify which port to use as the base for this application\. Should be a multiple of 1000\.
 .
 .SH "EXPORTING"
 \fBforeman export\fR is used to export your application to another process management format\.
@@ -64,8 +68,8 @@ Specify the user the application should be run as\. Defaults to the app name
 These options control all modes of foreman\'s operation\.
 .
 .TP
-\fB\-f\fR, \fB\-\-procfile\fR
-Specify an alternate location for the application\'s Procfile\. This file\'s containing directory will be assumed to be the root directory of the application\.
+\fB\-f\fR, \fB\-\-pstypes\fR
+Specify an alternate location for the application\'s Pstypes\. This file\'s containing directory will be assumed to be the root directory of the application\.
 .
 .SH "EXPORT FORMATS"
 foreman currently supports the following output formats:
@@ -106,8 +110,8 @@ Will create a series of upstart scripts in the location you specify\. Scripts wi
 .P
 \fBrestart appname\-processname\-3\fR
 .
-.SH "PROCFILE"
-A Procfile should contain both a name for the process and the command used to run it\.
+.SH "PSTYPES"
+A Pstyes file should contain both a name for the process and the command used to run it\.
 .
 .IP "" 4
 .
@@ -147,13 +151,13 @@ $ foreman export upstart /etc/init
 .IP "" 0
 .
 .P
-Run one process type from the application defined in a specific Procfile:
+Run one process type from the application defined in a specific Pstypes:
 .
 .IP "" 4
 .
 .nf
 
-$ foreman start alpha \-p ~/app/Procfile
+$ foreman start alpha \-p ~/app/Pstypes
 .
 .fi
 .

data/spec/foreman/cli_spec.rb

@@ -5,17 +5,17 @@ describe "Foreman::CLI" do
   subject { Foreman::CLI.new }
 
   describe "start" do
-    describe "with a non-existent Procfile" do
+    describe "with a non-existent Pstypes" do
       it "prints an error" do
-        mock_error(subject, "Procfile does not exist.") do
+        mock_error(subject, "Pstypes does not exist.") do
           dont_allow.instance_of(Foreman::Engine).start
           subject.start
         end
       end
     end
 
-    describe "with a Procfile" do
-      before(:each) { write_procfile }
+    describe "with a Pstypes" do
+      before(:each) { write_pstypes }
 
       it "runs successfully" do
         dont_allow(subject).error
@@ -26,17 +26,17 @@ describe "Foreman::CLI" do
   end
 
   describe "export" do
-    describe "with a non-existent Procfile" do
+    describe "with a non-existent Pstypes" do
       it "prints an error" do
-        mock_error(subject, "Procfile does not exist.") do
+        mock_error(subject, "Pstypes does not exist.") do
           dont_allow.instance_of(Foreman::Engine).export
           subject.export("testapp")
         end
       end
     end
 
-    describe "with a Procfile" do
-      before(:each) { write_procfile }
+    describe "with a Pstypes" do
+      before(:each) { write_pstypes }
 
       describe "with an invalid formatter" do
         it "prints an error" do

data/spec/foreman/engine_spec.rb

@@ -2,18 +2,18 @@ require "spec_helper"
 require "foreman/engine"
 
 describe "Foreman::Engine" do
-  subject { Foreman::Engine.new("Procfile") }
+  subject { Foreman::Engine.new("Pstypes") }
 
   describe "initialize" do
-    describe "without an existing Procfile" do
+    describe "without an existing Pstypes" do
       it "raises an error" do
         lambda { subject }.should raise_error
       end
     end
 
-    describe "with a Procfile" do
+    describe "with a Pstypes" do
       it "reads the processes" do
-        write_procfile
+        write_pstypes
         subject.processes["alpha"].command.should == "./alpha"
         subject.processes["bravo"].command.should == "./bravo"
       end
@@ -22,7 +22,7 @@ describe "Foreman::Engine" do
 
   describe "start" do
     it "forks the processes" do
-      write_procfile
+      write_pstypes
       mock(subject).fork(subject.processes["alpha"], {})
       mock(subject).fork(subject.processes["bravo"], {})
       mock(subject).watch_for_termination
@@ -30,7 +30,7 @@ describe "Foreman::Engine" do
     end
 
     it "handles concurrency" do
-      write_procfile
+      write_pstypes
       mock(subject).fork_individual(subject.processes["alpha"], 5000)
       mock(subject).fork_individual(subject.processes["alpha"], 5001)
       mock(subject).fork_individual(subject.processes["bravo"], 5100)
@@ -41,7 +41,7 @@ describe "Foreman::Engine" do
 
   describe "execute" do
     it "runs the processes" do
-      write_procfile
+      write_pstypes
       mock(subject).fork(subject.processes["alpha"], {})
       mock(subject).watch_for_termination
       subject.execute("alpha")

data/spec/spec_helper.rb

@@ -24,8 +24,8 @@ def write_foreman_config(app)
   end
 end
 
-def write_procfile(procfile="Procfile")
-  File.open(procfile, "w") do |file|
+def write_pstypes(pstypes="Pstypes")
+  File.open(pstypes, "w") do |file|
     file.puts "alpha ./alpha"
     file.puts "bravo ./bravo"
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: foreman
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 62196273
+  prerelease: true
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  - beta
+  - 1
+  version: 0.9.0.beta.1
 platform: ruby
 authors: 
 - |
@@ -17,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -04:00
+date: 2010-10-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +52,20 @@ dependencies:
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  name: ronn
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,9 +79,9 @@ dependencies:
   type: :development
   name: fakefs
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,9 +95,9 @@ dependencies:
   type: :development
   name: rcov
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,9 +111,9 @@ dependencies:
   type: :development
   name: rr
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,9 +129,9 @@ dependencies:
   type: :development
   name: rspec
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -129,9 +145,9 @@ dependencies:
   type: :runtime
   name: term-ansicolor
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -145,7 +161,7 @@ dependencies:
   type: :runtime
   name: thor
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 description: Process manager for applications with multiple components
 email: |
   <ddollar@gmail.com>
@@ -159,10 +175,14 @@ extra_rdoc_files: []
 files: 
 - bin/foreman
 - man/foreman.1
-- export/upstart/master.conf.erb
-- export/upstart/process.conf.erb
-- export/upstart/process_master.conf.erb
 - README.markdown
+- data/example/Pstypes
+- data/example/error
+- data/example/log/neverdie.log
+- data/example/ticker
+- data/export/upstart/master.conf.erb
+- data/export/upstart/process.conf.erb
+- data/export/upstart/process_master.conf.erb
 - lib/foreman.rb
 - lib/foreman/cli.rb
 - lib/foreman/engine.rb
@@ -200,12 +220,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: nowarning