foreman 0.1.1 → 0.2.0

data/Rakefile

@@ -1,5 +1,5 @@
-require "rubygems"
 require "rake"
+require "rspec"
 require "rspec/core/rake_task"
 
 $:.unshift File.expand_path("../lib", __FILE__)
@@ -55,7 +55,6 @@ begin
 
     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.1.1"
+  VERSION = "0.2.0"
 
   class AppDoesNotExist < Exception; end
 

data/lib/foreman/cli.rb

@@ -13,6 +13,20 @@ class Foreman::CLI < Thor
     Foreman::Engine.new(procfile).start
   end
 
+  desc "execute PROCESS [PROCFILE]", "Run an instance of the specified process from PROCFILE"
+
+  def execute(process, procfile="Procfile")
+    error "#{procfile} does not exist." unless procfile_exists?(procfile)
+    Foreman::Engine.new(procfile).execute(process)
+  end
+
+  desc "screen [PROCFILE]", "Run the app described in PROCFILE as screen windows"
+
+  def screen(procfile="Procfile")
+    error "#{procfile} does not exist." unless procfile_exists?(procfile)
+    Foreman::Engine.new(procfile).screen
+  end
+
   desc "export APP [PROCFILE] [FORMAT]", "Export the app described in PROCFILE as APP to another FORMAT"
 
   def export(app, procfile="Procfile", format="upstart")

data/lib/foreman/engine.rb

@@ -1,5 +1,6 @@
 require "foreman"
 require "foreman/process"
+require "tempfile"
 
 class Foreman::Engine
 
@@ -34,23 +35,46 @@ class Foreman::Engine
     run_loop
   end
 
+  def screen
+    tempfile = Tempfile.new("foreman")
+    tempfile.puts "sessionname foreman"
+    processes.each do |name, process|
+      tempfile.puts "screen -t #{name} #{process.command}"
+    end
+    tempfile.close
+
+    system "screen -c #{tempfile.path}"
+
+    tempfile.delete
+  end
+
+  def execute(name)
+    run(processes[name], false)
+  end
+
 private ######################################################################
 
   def fork(process)
     pid = Process.fork do
-      proctitle "ruby: foreman #{process.name}"
-
-      Dir.chdir directory do
-        FileUtils.mkdir_p "log"
-        system "#{process.command} >>log/#{process.name}.log 2>&1"
-        exit $?.exitstatus || 255
-      end
+      run(process)
     end
 
     info "started with pid #{pid}", 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
+      command << " >>log/#{process.name}.log 2>&1" if log_to_file
+      system command
+      exit $?.exitstatus || 255
+    end
+  end
+
   def kill_and_exit(signal="TERM")
     info "termination requested"
     running_processes.each do |pid, process|

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.processes[name] ||= 1
+      config.scale(name, 1)
     end
     config.write
   end

data/spec/foreman/cli_spec.rb

@@ -5,9 +5,7 @@ describe "Foreman::CLI" do
   subject { Foreman::CLI.new }
 
   describe "start" do
-    #let(:engine) { stub_engine }
-
-    describe "with a non-existent Procifile" do
+    describe "with a non-existent Procfile" do
       it "prints an error" do
         mock_error(subject, "Procfile does not exist.") do
           dont_allow.instance_of(Foreman::Engine).start
@@ -27,8 +25,29 @@ describe "Foreman::CLI" do
     end
   end
 
+  describe "execute" do
+    describe "with a non-existent Procfile" do
+      it "prints an error" do
+        mock_error(subject, "Procfile does not exist.") do
+          dont_allow.instance_of(Foreman::Engine).start
+          subject.execute("alpha")
+        end
+      end
+    end
+
+    describe "with a Procfile" do
+      before(:each) { write_procfile }
+
+      it "runs successfully" do
+        dont_allow(subject).error
+        mock.instance_of(Foreman::Engine).execute("alpha")
+        subject.execute("alpha")
+      end
+    end
+  end
+
   describe "export" do
-    describe "with a non-existent Procifile" do
+    describe "with a non-existent Procfile" do
       it "prints an error" do
         mock_error(subject, "Procfile does not exist.") do
           dont_allow.instance_of(Foreman::Engine).export

data/spec/foreman/engine_spec.rb

@@ -29,4 +29,12 @@ describe "Foreman::Engine" do
       subject.start
     end
   end
+
+  describe "execute" do
+    it "runs the processes" do
+      write_procfile
+      mock(subject).run(subject.processes["alpha"], false)
+      subject.execute("alpha")
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require "fakefs/spec_helpers"
+require "rubygems"
 require "rspec"
+require "fakefs/safe"
+require "fakefs/spec_helpers"
 
 $:.unshift "lib"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreman
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - David Dollar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 -04:00
+date: 2010-06-09 00:00:00 -04:00
 default_executable: foreman
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,7 +141,7 @@ files:
 - spec/foreman_spec.rb
 - spec/spec_helper.rb
 - README.rdoc
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/ddollar/foreman
 licenses: []