foreman 0.9.0.beta.1 → 0.9.0

data/lib/foreman.rb

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

data/lib/foreman/cli.rb

@@ -5,7 +5,7 @@ require "thor"
 
 class Foreman::CLI < Thor
 
-  class_option :pstypes, :type => :string, :aliases => "-f", :desc => "Default: Pstypes"
+  class_option :procfile, :type => :string, :aliases => "-f", :desc => "Default: Procfile"
 
   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_pstypes!
+    check_procfile!
 
     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_pstypes!
+    check_procfile!
 
     formatter = case format
       when "upstart" then Foreman::Export::Upstart
@@ -49,16 +49,16 @@ class Foreman::CLI < Thor
 
 private ######################################################################
 
-  def check_pstypes!
-    error("#{pstypes} does not exist.") unless File.exist?(pstypes)
+  def check_procfile!
+    error("#{procfile} does not exist.") unless File.exist?(procfile)
   end
 
   def engine
-    @engine ||= Foreman::Engine.new(pstypes)
+    @engine ||= Foreman::Engine.new(procfile)
   end
 
-  def pstypes
-    options[:pstypes] || "Pstypes"
+  def procfile
+    options[:procfile] || "Procfile"
   end
 
 private ######################################################################
@@ -68,8 +68,8 @@ private ######################################################################
     exit 1
   end
 
-  def pstypes_exists?(pstypes)
-    File.exist?(pstypes)
+  def procfile_exists?(procfile)
+    File.exist?(procfile)
   end
 
 end

data/lib/foreman/engine.rb

@@ -8,34 +8,47 @@ require "fileutils"
 
 class Foreman::Engine
 
-  attr_reader :pstypes
+  attr_reader :procfile
   attr_reader :directory
 
   extend Term::ANSIColor
 
   COLORS = [ cyan, yellow, green, magenta, red ]
 
-  def initialize(pstypes)
-    @pstypes   = read_pstypes(pstypes)
-    @directory = File.expand_path(File.dirname(pstypes))
+  def initialize(procfile)
+    @procfile  = read_procfile(procfile)
+    @directory = File.expand_path(File.dirname(procfile))
   end
 
   def processes
     @processes ||= begin
-      pstypes.split("\n").inject({}) do |hash, line|
+      @order = []
+      procfile.split("\n").inject({}) do |hash, line|
         next if line.strip == ""
         name, command = line.split(" ", 2)
         process = Foreman::Process.new(name, command)
         process.color = next_color
+        @order << process.name
         hash.update(process.name => process)
       end
     end
   end
 
+  def process_order
+    processes
+    @order
+  end
+
+  def processes_in_order
+    process_order.map do |name|
+      [name, processes[name]]
+    end
+  end
+
   def start(options={})
     proctitle "ruby: foreman master"
 
-    processes.each do |name, process|
+    processes_in_order.each do |name, process|
       fork process, options
     end
 
@@ -78,7 +91,7 @@ private ######################################################################
       run(process)
     end
 
-    info "started with pid #{pid}, PORT=#{port}", process
+    info "started with pid #{pid}", process
     running_processes[pid] = process
   end
 
@@ -144,8 +157,8 @@ private ######################################################################
     $0 = title
   end
 
-  def read_pstypes(pstypes)
-    File.read(pstypes)
+  def read_procfile(procfile)
+    File.read(procfile)
   end
 
   def watch_for_termination

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" "October 2010" "Foreman 0.8.0" "Foreman Manual"
+.TH "FOREMAN" "1" "October 2010" "Foreman 0.9.0.beta.1" "Foreman Manual"
 .
 .SH "NAME"
-\fBforeman\fR \- manage Pstypes\-based applications
+\fBforeman\fR \- manage Psfile\-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 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\.
+\fBForeman\fR is a manager for Psfile\-based applications\. Its aim is to abstract away the details of the Psfile 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 Pstypes\.
+If no additional parameters are passed, foreman will run one instance of each type of process defined in your Psfile\.
 .
 .P
 If a parameter is passed, foreman will run one instance of the specified application type\.
@@ -68,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\-\-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\.
+\fB\-f\fR, \fB\-\-psfile\fR
+Specify an alternate location for the application\'s Psfile\. 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:
@@ -110,8 +110,8 @@ Will create a series of upstart scripts in the location you specify\. Scripts wi
 .P
 \fBrestart appname\-processname\-3\fR
 .
-.SH "PSTYPES"
-A Pstyes file should contain both a name for the process and the command used to run it\.
+.SH "PSFILE"
+A Psfile should contain both a name for the process and the command used to run it\.
 .
 .IP "" 4
 .
@@ -151,13 +151,13 @@ $ foreman export upstart /etc/init
 .IP "" 0
 .
 .P
-Run one process type from the application defined in a specific Pstypes:
+Run one process type from the application defined in a specific Psfile:
 .
 .IP "" 4
 .
 .nf
 
-$ foreman start alpha \-p ~/app/Pstypes
+$ foreman start alpha \-p ~/myapp/Psfile
 .
 .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 Pstypes" do
+    describe "with a non-existent Procfile" do
       it "prints an error" do
-        mock_error(subject, "Pstypes does not exist.") do
+        mock_error(subject, "Procfile does not exist.") do
           dont_allow.instance_of(Foreman::Engine).start
           subject.start
         end
       end
     end
 
-    describe "with a Pstypes" do
-      before(:each) { write_pstypes }
+    describe "with a Procfile" do
+      before(:each) { write_procfile }
 
       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 Pstypes" do
+    describe "with a non-existent Procfile" do
       it "prints an error" do
-        mock_error(subject, "Pstypes does not exist.") do
+        mock_error(subject, "Procfile does not exist.") do
           dont_allow.instance_of(Foreman::Engine).export
           subject.export("testapp")
         end
       end
     end
 
-    describe "with a Pstypes" do
-      before(:each) { write_pstypes }
+    describe "with a Procfile" do
+      before(:each) { write_procfile }
 
       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("Pstypes") }
+  subject { Foreman::Engine.new("Procfile") }
 
   describe "initialize" do
-    describe "without an existing Pstypes" do
+    describe "without an existing Procfile" do
       it "raises an error" do
         lambda { subject }.should raise_error
       end
     end
 
-    describe "with a Pstypes" do
+    describe "with a Procfile" do
       it "reads the processes" do
-        write_pstypes
+        write_procfile
         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_pstypes
+      write_procfile
       mock(subject).fork(subject.processes["alpha"], {})
       mock(subject).fork(subject.processes["bravo"], {})
       mock(subject).watch_for_termination
@@ -30,10 +30,10 @@ describe "Foreman::Engine" do
     end
 
     it "handles concurrency" do
-      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)
+      write_procfile
+      mock(subject).fork_individual(subject.processes["alpha"], 1, 5000)
+      mock(subject).fork_individual(subject.processes["alpha"], 2, 5001)
+      mock(subject).fork_individual(subject.processes["bravo"], 1, 5100)
       mock(subject).watch_for_termination
       subject.start(:concurrency => "alpha=2")
     end
@@ -41,7 +41,7 @@ describe "Foreman::Engine" do
 
   describe "execute" do
     it "runs the processes" do
-      write_pstypes
+      write_procfile
       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_pstypes(pstypes="Pstypes")
-  File.open(pstypes, "w") do |file|
+def write_procfile(procfile="Procfile")
+  File.open(procfile, "w") do |file|
     file.puts "alpha ./alpha"
     file.puts "bravo ./bravo"
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreman
 version: !ruby/object:Gem::Version 
-  hash: 62196273
-  prerelease: true
+  hash: 59
+  prerelease: false
   segments: 
   - 0
   - 9
   - 0
-  - beta
-  - 1
-  version: 0.9.0.beta.1
+  version: 0.9.0
 platform: ruby
 authors: 
 - |
@@ -19,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 -07:00
+date: 2010-11-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -176,7 +174,7 @@ files:
 - bin/foreman
 - man/foreman.1
 - README.markdown
-- data/example/Pstypes
+- data/example/Procfile
 - data/example/error
 - data/example/log/neverdie.log
 - data/example/ticker
@@ -220,14 +218,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: nowarning