foreman 0.49.0 → 0.50.0

data/lib/foreman/engine.rb

@@ -99,7 +99,20 @@ class Foreman::Engine
   # @param [String] signal  The signal to send to each process
   #
   def killall(signal="SIGTERM")
-    Process.kill "-#{signal}", Process.pid
+    if Foreman.windows?
+      @running.each do |pid, (process, index)|
+        system "sending #{signal} to #{name_for(pid)} at pid #{pid}"
+        begin
+          Process.kill(signal, pid)
+        rescue Errno::ESRCH, Errno::EPERM
+        end
+      end
+    else
+      begin
+        Process.kill "-#{signal}", Process.pid
+      rescue Errno::ESRCH, Errno::EPERM
+      end
+    end
   end
 
   # Get the process formation
@@ -282,8 +295,13 @@ private
   def terminate_gracefully
     return if @terminating
     @terminating = true
-    system  "sending SIGTERM to all processes"
-    killall "SIGTERM"
+    if Foreman.windows?
+      system  "sending SIGKILL to all processes"
+      killall "SIGKILL"
+    else
+      system  "sending SIGTERM to all processes"
+      killall "SIGTERM"
+    end
     Timeout.timeout(5) do
       watch_for_termination while @running.length > 0
     end

data/lib/foreman/engine/cli.rb

@@ -31,6 +31,7 @@ class Foreman::Engine::CLI < Foreman::Engine
 
     def color?
       return true if @@color_force
+      return true if Foreman.windows?
       return false unless self.respond_to?(:isatty)
       self.isatty && ENV["TERM"]
     end
@@ -49,11 +50,12 @@ class Foreman::Engine::CLI < Foreman::Engine
   def startup
     @colors = map_colors
     proctitle "foreman: master"
+    require "win32console" if Foreman.windows?
+    Color.enable($stdout, options[:color]) unless $stdout.respond_to?(:color?)
   end
 
   def output(name, data)
     data.to_s.chomp.split("\n").each do |message|
-      Color.enable($stdout, options[:color]) unless $stdout.respond_to?(:color?)
       output  = ""
       output += $stdout.color(@colors[name.split(".").first].to_sym)
       output += "#{Time.now.strftime("%H:%M:%S")} #{pad_process_name(name)} | "

data/lib/foreman/process.rb

@@ -36,7 +36,11 @@ class Foreman::Process
 
     if Foreman.windows?
       Dir.chdir(cwd) do
-        Process.spawn env, command, :out => output, :err => output
+        expanded_command = command.dup
+        env.each do |key, val|
+          expanded_command.gsub!("$#{key}", val)
+        end
+        Process.spawn env, expanded_command, :out => output, :err => output
       end
     elsif Foreman.jruby?
       Dir.chdir(cwd) do
@@ -64,7 +68,11 @@ class Foreman::Process
   # @param [String] signal  The signal to send
   #
   def kill(signal)
-    pid && Process.kill("-#{signal}", pid)
+    if Foreman.windows?
+      pid && Process.kill(signal, pid)
+    else
+      pid && Process.kill("-#{signal}", pid)
+    end
   rescue Errno::ESRCH
     false
   end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.49.0"
+  VERSION = "0.50.0"
 
 end

data/man/foreman.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "April 2012" "Foreman 0.46.0" "Foreman Manual"
+.TH "FOREMAN" "1" "July 2012" "Foreman 0.50.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.50.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70206504724140 !ruby/object:Gem::Requirement
+  requirement: &70273928866960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70206504724140
+  version_requirements: *70273928866960
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables:
@@ -121,12 +121,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2988122177042669007
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2988122177042669007
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -134,3 +140,4 @@ signing_key:
 specification_version: 3
 summary: Process manager for applications with multiple components
 test_files: []
+has_rdoc: