Capturing all

Author: joelmoss

app/models/job.rb

@@ -18,10 +18,15 @@ def run_task
     success = true
 
     FileUtils.chdir project.repo.path do
-      out = capture_stdout do
+      out = capture(:stderr) do
         success = Strano::CLI.parse(Strano::Logger.new(self), full_command.flatten).execute!
       end
-      puts "\n  \e[1;32m> #{out.string}\e" unless out.string.blank?
+
+      if out.is_a?(String)
+        puts "\n  \e[33m> #{out}\e" unless out.blank?
+      elsif !out.string.blank?
+        puts "\n  \e[1;32m> #{out.string}\e"
+      end
     end
 
     !!success
@@ -49,13 +54,11 @@ def results
   private
 
     def full_command
-      %W(-f #{Rails.root.join('Capfile.repos')} -f Capfile -Xx#{verbosity}) + mapped_variables + command.split(' ')
+      %W(-f #{Rails.root.join('Capfile.repos')} -f Capfile -Xx#{verbosity}) + branch_setting + command.split(' ')
     end
 
-    def mapped_variables
-      variables.map do |k,v|
-        %W(-s #{k}=#{v}) unless v.blank?
-      end
+    def branch_setting
+      %W(-s branch=#{branch}) unless branch.blank?
     end
 
     def execute_task

lib/kernel.rb

@@ -2,13 +2,19 @@
 
 module Kernel
 
-  def capture_stdout
-    out = StringIO.new
-    $stdout = out
-    yield
-    return out
-  ensure
-    $stdout = STDOUT
+  def capture(stream)
+    return super if stream.is_a?(String)
+
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
   end
 
 end