0.32.0

Support for complex cmds in Procfile

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foreman (0.30.0)
+    foreman (0.32.0)
       term-ansicolor (~> 1.0.5)
       thor (>= 0.13.6)
 

README.markdown

@@ -20,7 +20,8 @@ http://blog.daviddollar.org/2011/05/06/introducing-foreman.html
 
 ## Manual
 
-See the [man page](http://ddollar.github.com/foreman) for usage.
+* [man page](http://ddollar.github.com/foreman)
+* [wiki](http://github.com/ddollar/foreman/wiki)
 
 ## Authorship
 

bin/runner

@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env ruby
-exec $1 2>&1
+exec "#{ARGV.join(' ')} 2>&1"

lib/foreman/cli.rb

@@ -5,15 +5,23 @@ require "thor"
 require "yaml"
 
 class Foreman::CLI < Thor
-
+  
   class_option :procfile, :type => :string, :aliases => "-f", :desc => "Default: Procfile"
-
+  
   desc "start", "Start the application"
 
   method_option :env,         :type => :string,  :aliases => "-e", :desc => "Specify an environment file to load, defaults to .env"
   method_option :port,        :type => :numeric, :aliases => "-p"
   method_option :concurrency, :type => :string,  :aliases => "-c", :banner => '"alpha=5,bar=3"'
 
+  class << self
+    # Hackery. Take the run method away from Thor so that we can redefine it.
+    def is_thor_reserved_word?(word, type)
+      return false if word == 'run'
+      super
+    end
+  end
+  
   def start
     check_procfile!
     engine.start
@@ -53,7 +61,20 @@ class Foreman::CLI < Thor
     error "no processes defined" unless engine.procfile.entries.length > 0
     display "valid procfile detected (#{engine.procfile.process_names.join(', ')})"
   end
+  
+  desc "run COMMAND", "Run a command using your application's environment"
 
+  def run(*args)
+    engine.apply_environment!
+    begin
+      exec args.join(" ")
+    rescue Errno::EACCES
+      error "not executable: #{args.first}"
+    rescue Errno::ENOENT
+      error "command not found: #{args.first}"
+    end
+  end
+  
 private ######################################################################
 
   def check_procfile!
@@ -87,5 +108,4 @@ private ######################################################################
     defaults = YAML::load_file(".foreman") || {}
     Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options))
   end
-
 end

lib/foreman/engine.rb

@@ -7,6 +7,7 @@ require "tempfile"
 require "timeout"
 require "term/ansicolor"
 require "fileutils"
+require "thread"
 
 class Foreman::Engine
 
@@ -57,7 +58,7 @@ private ######################################################################
 
     procfile.entries.each do |entry|
       reader, writer = IO.pipe
-      entry.spawn(concurrency[entry.name], writer, @directory, @environment, base_port).each do |process|
+      entry.spawn(concurrency[entry.name], writer, @directory, @environment, port_for(entry, 1, base_port)).each do |process|
         running_processes[process.pid] = process
         readers[process] = reader
       end
@@ -70,10 +71,17 @@ private ######################################################################
 
   def kill_all(signal="SIGTERM")
     running_processes.each do |pid, process|
-      Process.kill(signal, pid) rescue Errno::ESRCH
+      info "sending #{signal} to pid #{pid}"
+      kill(signal, -pid) or kill(signal, pid)
     end
   end
 
+  def kill(signal, pid)
+    Process.kill signal, pid
+  rescue Errno::ESRCH
+    false
+  end
+
   def terminate_gracefully
     info "sending SIGTERM to all processes"
     kill_all "SIGTERM"

lib/foreman/process.rb

@@ -28,21 +28,20 @@ class Foreman::Process
 private
 
   def fork_with_io(command)
-    io = case RUBY_VERSION
+    reader, writer = IO.pipe
-    when /^1\.9\./
+    pid = fork do
-      IO.popen([Foreman.runner, replace_command_env(command)], "w+")
+      Process.setpgrp
-    when /^1\.8\./
+      trap("INT", "IGNORE")
-      full_command = replace_command_env(command).gsub("'", "\\'")
+      $stdout.reopen writer
-      IO.popen("#{Foreman.runner} '#{full_command}'", "w+")
+      reader.close
-    else
+      exec Foreman.runner, replace_command_env(command)
-      raise "Unknown Ruby version: #{RUBY_VERSION}"
     end
-    [ io, io.pid ]
+    Process.detach pid
+    [ reader, pid ]
   end
 
   def run_process(command, pipe)
     io, @pid = fork_with_io(command)
-    trap("SIGTERM") { "got sigterm for %d" % @pid }
     output pipe, "started with pid %d" % @pid
     Thread.new do
       until io.eof?

lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.30.0"
+  VERSION = "0.32.0"
 
 end

spec/foreman/cli_spec.rb

@@ -89,5 +89,54 @@ describe "Foreman::CLI" do
       end
     end
   end
+  
+  describe "run" do
+    describe "with a valid Procfile" do
+      before { write_procfile }
+
+      describe "and a command" do
+        let(:command) { ["ls", "-l"] }
+        
+        before(:each) do
+          stub(subject).exec
+        end
+        
+        it "should load the environment file" do
+          write_env
+          preserving_env do
+            subject.run *command
+            ENV["FOO"].should == "bar"
+          end
+          
+          ENV["FOO"].should be_nil
+        end
+        
+        it "should runute the command as a string" do
+          mock(subject).exec(command.join(" "))
+          subject.run *command
+        end
+      end
+      
+      describe "and a non-existent command" do
+        let(:command) { "iuhtngrglhulhdfg" }
+        
+        it "should print an error" do
+          mock_error(subject, "command not found: #{command}") do
+            subject.run command
+          end
+        end
+      end
+      
+      describe "and a non-executable command" do
+        let(:command) { __FILE__ }
+        
+        it "should print an error" do
+          mock_error(subject, "not executable: #{command}") do
+            subject.run command
+          end
+        end
+      end
+    end
+  end
 
 end

spec/helper_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe "spec helpers" do
+  describe "#preserving_env" do
+    after { ENV.delete "FOO" }
+    
+    it "should remove added environment vars" do
+      preserving_env { ENV["FOO"] = "baz" }
+      ENV["FOO"].should == nil
+    end
+    
+    it "should reset modified environment vars" do
+      ENV["FOO"] = "bar"
+      preserving_env { ENV["FOO"] = "baz"}
+      ENV["FOO"].should == "bar"
+    end
+  end
+end

spec/spec_helper.rb

@@ -63,6 +63,16 @@ def example_export_file(filename)
   data
 end
 
+def preserving_env
+  old_env = ENV.to_hash
+  begin
+    yield
+  ensure
+    ENV.clear
+    ENV.update(old_env)
+  end
+end
+
 RSpec.configure do |config|
   config.color_enabled = true
   config.include FakeFS::SpecHelpers