From de62d0655efed0289ad7c5d142478bc2df210d9c Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <tyler@monkeypox.org>
Date: Tue, 10 Apr 2012 20:26:02 -0700
Subject: [PATCH] Re-name the main Foreman::Engine method to #run to avoid a
 name collision with #start(name)

---
 lib/foreman/cli.rb          |  2 +-
 lib/foreman/engine.rb       |  2 +-
 spec/foreman/cli_spec.rb    |  2 +-
 spec/foreman/engine_spec.rb | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/foreman/cli.rb b/lib/foreman/cli.rb
index f7dc59b..cf72b58 100644
--- a/lib/foreman/cli.rb
+++ b/lib/foreman/cli.rb
@@ -30,7 +30,7 @@ class Foreman::CLI < Thor
   def start(process=nil)
     check_procfile!
     engine.options[:concurrency] = "#{process}=1" if process
-    engine.start
+    engine.run
   end
 
   desc "export FORMAT LOCATION", "Export the application to another process management format"
diff --git a/lib/foreman/engine.rb b/lib/foreman/engine.rb
index 7ca47e2..a6dae6a 100644
--- a/lib/foreman/engine.rb
+++ b/lib/foreman/engine.rb
@@ -28,7 +28,7 @@ class Foreman::Engine
     @output_mutex = Mutex.new
   end
 
-  def start
+  def run
     proctitle "ruby: foreman master"
     termtitle "#{File.basename(@directory)} - foreman"
 
diff --git a/spec/foreman/cli_spec.rb b/spec/foreman/cli_spec.rb
index 405b8a2..7a4d9c1 100644
--- a/spec/foreman/cli_spec.rb
+++ b/spec/foreman/cli_spec.rb
@@ -21,7 +21,7 @@ describe "Foreman::CLI", :fakefs do
 
       it "runs successfully" do
         dont_allow(subject).error
-        mock.instance_of(Foreman::Engine).start
+        mock.instance_of(Foreman::Engine).run
         subject.start
       end
 
diff --git a/spec/foreman/engine_spec.rb b/spec/foreman/engine_spec.rb
index f64e5ba..0c5f6e0 100644
--- a/spec/foreman/engine_spec.rb
+++ b/spec/foreman/engine_spec.rb
@@ -28,7 +28,7 @@ describe "Foreman::Engine", :fakefs do
     end
   end
 
-  describe "start" do
+  describe "run" do
     it "forks the processes" do
       write_procfile
       mock.instance_of(Foreman::Process).run_process(Dir.pwd, "./alpha", is_a(IO))
@@ -36,7 +36,7 @@ describe "Foreman::Engine", :fakefs do
       mock(subject).watch_for_output
       mock(subject).watch_for_termination
       mock(subject).terminate_gracefully
-      subject.start
+      subject.run
     end
 
     it "handles concurrency" do
@@ -47,7 +47,7 @@ describe "Foreman::Engine", :fakefs do
       mock(engine).watch_for_output
       mock(engine).watch_for_termination
       mock(engine).terminate_gracefully
-      engine.start
+      engine.run
     end
   end
 
@@ -66,7 +66,7 @@ describe "Foreman::Engine", :fakefs do
       File.open("/tmp/env", "w") { |f| f.puts("FOO=baz") }
       engine = Foreman::Engine.new("Procfile", :env => "/tmp/env")
       engine.environment.should == {"FOO"=>"baz"}
-      engine.start
+      engine.run
     end
 
     it "should read more than one if specified" do
@@ -74,7 +74,7 @@ describe "Foreman::Engine", :fakefs do
       File.open("/tmp/env2", "w") { |f| f.puts("BAZ=qux") }
       engine = Foreman::Engine.new("Procfile", :env => "/tmp/env1,/tmp/env2")
       engine.environment.should == { "FOO"=>"bar", "BAZ"=>"qux" }
-      engine.start
+      engine.run
     end
 
     it "should handle quoted values" do
@@ -97,7 +97,7 @@ describe "Foreman::Engine", :fakefs do
       File.open(".env", "w") { |f| f.puts("FOO=qoo") }
       engine = Foreman::Engine.new("Procfile")
       engine.environment.should == {"FOO"=>"qoo"}
-      engine.start
+      engine.run
     end
   end
 
@@ -112,7 +112,7 @@ describe "Foreman::Engine", :fakefs do
       stub(subject).watch_for_output
       stub(subject).watch_for_termination
       stub(subject).terminate_gracefully
-      subject.start
+      subject.run
       Process.waitall
       mock(subject).info(/started with pid \d+/, "utf8.1", anything)
       mock(subject).info("\xff\x03\n", "utf8.1", anything)