gorgon 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    gorgon (0.3.0)
+    gorgon (0.3.1)
       amqp (~> 0.9.7)
       awesome_print
       bunny (~> 0.8.0)
       colorize (~> 0.5.8)
       open4 (~> 1.3.0)
       ruby-progressbar (~> 1.0.1)
-      test-unit
       uuidtools (~> 2.1.3)
       yajl-ruby (~> 1.1.0)
 
@@ -49,4 +48,5 @@ PLATFORMS
 DEPENDENCIES
   gorgon!
   rake
-  rspec
+  rspec (~> 2.11.0)
+  test-unit

data/gorgon.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
+  s.add_development_dependency "test-unit"
+  s.add_development_dependency "rspec", '~>2.11.0'
 
   s.add_runtime_dependency "amqp", '~>0.9.7'
   s.add_runtime_dependency "awesome_print"
   s.add_runtime_dependency "open4", '~>1.3.0'
   s.add_runtime_dependency "yajl-ruby", '~>1.1.0'
   s.add_runtime_dependency "uuidtools", '~>2.1.3'
-  s.add_runtime_dependency "test-unit"
   s.add_runtime_dependency "bunny", '~>0.8.0'
   s.add_runtime_dependency "ruby-progressbar", '~>1.0.1'
   s.add_runtime_dependency "colorize", '~>0.5.8'

data/lib/gorgon/gorgon_rspec_formatter.rb

@@ -0,0 +1,49 @@
+require 'rspec/core/formatters/base_formatter'
+require 'json'
+
+module RSpec
+  module Core
+    module Formatters
+      class GorgonRspecFormatter < BaseFormatter
+        attr_reader :output
+
+        def initialize(output)
+          super
+          @failures = []
+        end
+
+        def message(message)
+          @failures += message unless @failures.empty?
+        end
+
+        def stop
+          super
+          failures = examples.select { |e| e.execution_result[:status] == "failed" }
+
+          @failures += failures.map do |failure|
+            {
+              :test_name => "#{failure.full_description}: " \
+              "line #{failure.metadata[:line_number]}",
+              :description => failure.description,
+              :full_description => failure.full_description,
+              :status => failure.execution_result[:status],
+              :file_path => failure.metadata[:file_path],
+              :line_number  => failure.metadata[:line_number],
+            }.tap do |hash|
+              if e=failure.exception
+                hash[:class] = e.class.name
+                hash[:message] = e.message
+                hash[:location] = e.backtrace
+              end
+            end
+          end
+        end
+
+        def close
+          output.write @failures.to_json
+          output.close if IO === output && output != $stdout
+        end
+      end
+    end
+  end
+end

data/lib/gorgon/progress_bar_view.rb

@@ -8,10 +8,15 @@ LOADING_MSG = "Loading environment and workers..."
 RUNNING_MSG = "Running files:"
 LEGEND_MSG = "Legend:\nF - failure files count\nH - number of hosts that have run files\nW - number of workers running files"
 
+PROGRESS_BAR_REFRESH_RATE = 0.5
+# - because the resolution of the elapsed time is one second, we use the nyquist frequency of 0.5 seconds
+# http://en.wikipedia.org/wiki/Nyquist_frequency
+
 class ProgressBarView
   def initialize job_state
     @job_state = job_state
     @job_state.add_observer(self)
+    @timer = EventMachine::PeriodicTimer.new(PROGRESS_BAR_REFRESH_RATE) { update_elapsed_time }
   end
 
   def show
@@ -50,6 +55,11 @@ class ProgressBarView
     end
   end
 
+  def update_elapsed_time
+    @timer.cancel if @finished
+    @progress_bar.refresh if @progress_bar
+  end
+
 private
   def gorgon_crashed? payload
      payload[:type] == "crash" && payload[:action] != "finish"
@@ -70,7 +80,7 @@ private
     bar = "%w>%i".colorize(colors[:bar])
     title = "%t".colorize(colors[:title])
 
-    "#{title} | [#{bar}] %c/%C %e"
+    "#{title} | [#{bar}] %c/%C %a"
   end
 
   def terminal_size
@@ -124,10 +134,11 @@ private
   end
 
   def build_fail_message_from_hash failure
-    result = "#{'Test name'.yellow}: #{failure[:test_name]}"
-    result << "\n#{'Message:'.yellow} \n#{failure[:message]}" if failure[:message]
+    result = "#{'Test name'.light_yellow}: #{failure[:test_name]}"
+    result << "\n#{failure[:class].red}" if failure[:class]
+    result << "\n#{'Message:'.light_yellow} \n\t#{failure[:message]}" if failure[:message]
     if failure[:location]
-      result << "\n#{'In:'.yellow} \n\t"
+      result << "\n#{'In:'.light_yellow} \n\t"
       result << failure[:location].join("\n\t")
     end
     result

data/lib/gorgon/rspec_runner.rb

@@ -0,0 +1,27 @@
+require 'rspec'
+require 'stringio'
+require "yajl"
+
+require_relative "gorgon_rspec_formatter"
+
+class RspecRunner
+  class << self
+    def run_file(filename)
+      args = [
+              '-f', 'RSpec::Core::Formatters::GorgonRspecFormatter',
+              filename
+             ]
+
+      err, out = StringIO.new, StringIO.new
+
+      RSpec::Core::Runner.run(args, err, out)
+      out.rewind
+
+      Yajl::Parser.new(:symbolize_keys => true).parse(out.read)
+    end
+
+    def runner
+      :rspec
+    end
+  end
+end

data/lib/gorgon/testunit_runner.rb

@@ -28,7 +28,7 @@ class Test::Unit::TestCase
   end
 end
 
-class TestRunner
+class TestUnitRunner
   def self.run_file(filename)
     GorgonTestCases.clear_cases!
     load filename
@@ -47,4 +47,8 @@ class TestRunner
 
     output
   end
+
+  def self.runner
+    :test_unit
+  end
 end

data/lib/gorgon/version.rb

@@ -1,3 +1,3 @@
 module Gorgon
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/gorgon/worker.rb

@@ -3,24 +3,24 @@ require "gorgon/amqp_service"
 require 'gorgon/callback_handler'
 require "gorgon/g_logger"
 require 'gorgon/job_definition'
-require "gorgon/testunit_runner"
 
 require "uuidtools"
 require "awesome_print"
 require "socket"
 
-module WorkUnit
-  def self.run_file filename
+module TestRunner
+  def self.run_file filename, test_runner
     start_t = Time.now
 
     begin
-      failures = TestRunner.run_file(filename)
+      failures = test_runner.run_file(filename)
       length = Time.now - start_t
 
       if failures.empty?
-        results = {:failures => [], :type => :pass, :time => length}
+        results = {:failures => [], :type => :pass, :runner => test_runner.runner, :time => length}
       else
-        results = {:failures => failures, :type => :fail, :time => length}
+        results = {:failures => failures, :type => :fail, :runner => test_runner.runner,
+          :time => length}
       end
     rescue Exception => e
       results = {:failures => ["Exception: #{e.message}\n#{e.backtrace.join("\n")}"], :type => :crash, :time => (Time.now - start_t)}
@@ -51,7 +51,6 @@ class Worker
         :file_queue_name => job_definition.file_queue_name,
         :reply_exchange_name => job_definition.reply_exchange_name,
         :worker_id => worker_id,
-        :test_runner => WorkUnit,
         :callback_handler => callback_handler,
         :log_file => config[:log_file]
       }
@@ -79,7 +78,6 @@ class Worker
     @file_queue_name = params[:file_queue_name]
     @reply_exchange_name = params[:reply_exchange_name]
     @worker_id = params[:worker_id]
-    @test_runner = params[:test_runner]
     @callback_handler = params[:callback_handler]
   end
 
@@ -116,7 +114,13 @@ class Worker
   end
 
   def run_file(filename)
-    @test_runner.run_file(filename)
+    if filename =~ /_spec.rb$/i
+      require_relative "rspec_runner"
+      TestRunner.run_file(filename, RspecRunner)
+    else
+      require_relative "testunit_runner"
+      TestRunner.run_file(filename, TestUnitRunner)
+    end
   end
 
   def make_start_message(filename)

data/spec/gorgon_rspec_formatter_spec.rb

@@ -0,0 +1,63 @@
+require 'gorgon/gorgon_rspec_formatter'
+
+BaseFormatter = RSpec::Core::Formatters::GorgonRspecFormatter
+
+describe RSpec::Core::Formatters::GorgonRspecFormatter do
+  let(:example) {stub("Example", :description => "description",
+                      :full_description => "Full_Description",
+                      :metadata => {:file_path => "path/to/file", :line_number => 2},
+                      :execution_result => {:status => "passed"}, :exception => nil)}
+  let(:fail_example) {stub("Example", :description => "description",
+                           :full_description => "Full_Description",
+                           :metadata => {:file_path => "path/to/file", :line_number => 2},
+                           :execution_result => {:status => "failed"}, :exception => nil)}
+
+  let(:exception) { stub("Exception", :class => Object, :message => "some msg",
+                         :backtrace => "backtrace")}
+
+  let(:output) { stub("StringIO", :write => nil, :close => nil) }
+
+  before do
+    @formatter = BaseFormatter.new(output)
+  end
+
+  it "returns an array of hashes when there are failures" do
+    @formatter.stub!(:examples).and_return([example, fail_example])
+
+    expected_result = [{:test_name => "Full_Description: line 2", :description => "description",
+                         :full_description => "Full_Description", :status => "failed",
+                         :file_path => "path/to/file", :line_number => 2}]
+    output.should_receive(:write).with(expected_result.to_json)
+    @formatter.stop
+    @formatter.close
+  end
+
+  it "returns an empty array when all examples pass" do
+    @formatter.stub!(:examples).and_return([example, example])
+
+    output.should_receive(:write).with("[]")
+    @formatter.stop
+    @formatter.close
+  end
+
+  it "returns an empty array when all examples are pending" do
+    example.stub!(:execution_result).and_return(:status => "pending")
+    @formatter.stub!(:examples).and_return([example, example])
+
+    output.should_receive(:write).with("[]")
+    @formatter.stop
+    @formatter.close
+  end
+
+  it "returns exception details if there is an exception" do
+    fail_example.stub!(:exception).and_return(exception)
+    @formatter.stub!(:examples).and_return([fail_example])
+    expected_result = [{:test_name => "Full_Description: line 2", :description => "description",
+                         :full_description => "Full_Description", :status => "failed",
+                         :file_path => "path/to/file", :line_number => 2, :class => Object.name,
+                         :message => "some msg", :location => "backtrace"}]
+    output.should_receive(:write).with(expected_result.to_json)
+    @formatter.stop
+    @formatter.close
+  end
+end

data/spec/progress_bar_view_spec.rb

@@ -2,6 +2,10 @@ require 'gorgon/progress_bar_view'
 require 'gorgon/job_state'
 
 describe ProgressBarView do
+  before do
+    EventMachine::PeriodicTimer.stub(:new)
+  end
+
   describe "#initialize" do
     it "adds itself to observers of job_state" do
       job_state = JobState.new 1

data/spec/rspec_runner_spec.rb

@@ -0,0 +1,41 @@
+require 'gorgon/rspec_runner'
+
+describe RspecRunner do
+
+  subject {RspecRunner}
+  it {should respond_to(:run_file).with(1).argument}
+  it {should respond_to(:runner).with(0).argument}
+
+  describe "#run_file" do
+    before do
+      RSpec::Core::Runner.stub(:run)
+    end
+
+    it "uses Rspec runner to run filename and uses the correct options" do
+      RSpec::Core::Runner.should_receive(:run).with(["-f",
+                                                     "RSpec::Core::Formatters::GorgonRspecFormatter",
+                                                     "file"], anything, anything)
+      RspecRunner.run_file "file"
+    end
+
+    it "passes StringIO's (or something similar) to rspec runner" do
+      RSpec::Core::Runner.should_receive(:run).with(anything,
+                                                    duck_type(:read, :write, :close),
+                                                    duck_type(:read, :write, :close))
+      RspecRunner.run_file "file"
+    end
+
+    it "parses the output of the Runner and returns it" do
+      str_io = stub("StringIO", :rewind => nil, :read => :content)
+      StringIO.stub!(:new).and_return(str_io)
+      Yajl::Parser.any_instance.should_receive(:parse).with(:content).and_return :result
+      RspecRunner.run_file("file").should == :result
+    end
+  end
+
+  describe "#runner" do
+    it "returns :rspec" do
+      RspecRunner.runner.should == :rspec
+    end
+  end
+end

data/spec/worker_spec.rb

@@ -14,7 +14,7 @@ end
 describe Worker do
   WORKER_ID = 1
   let(:file_queue) { double("Queue") }
-  let(:reply_exchange) { double("Exchange") }
+  let(:reply_exchange) { double("Exchange", :publish => nil) }
   let(:fake_amqp) { fake_amqp = FakeAmqp.new file_queue, reply_exchange }
   let(:test_runner) { double("Test Runner") }
   let(:callback_handler) { stub("Callback Handler", :before_start => nil, :after_complete => nil) }
@@ -28,7 +28,6 @@ describe Worker do
       :file_queue_name => "queue",
       :reply_exchange_name => "exchange",
       :worker_id => WORKER_ID,
-      :test_runner => test_runner,
       :callback_handler => callback_handler,
       :log_file => "path/to/log_file"
     }
@@ -73,7 +72,6 @@ few lines of output and send it to originator. Order matters" do
 
     it "creates a new worker" do
       JobDefinition.stub!(:new).and_return job_definition
-      stub_const("WorkUnit", test_runner)
       Worker.should_receive(:new).with(params)
       Worker.build 1, config
     end
@@ -81,14 +79,15 @@ few lines of output and send it to originator. Order matters" do
 
   describe '#work' do
     before do
+      stub_const("TestRunner", test_runner)
       Worker.any_instance.stub(:initialize_logger)
+      @worker = Worker.new params
     end
 
     it 'should do nothing if the file queue is empty' do
       file_queue.should_receive(:pop).and_return(nil)
 
-      worker = Worker.new params
-      worker.work
+      @worker.work
     end
 
     it "should send start message when file queue is not empty" do
@@ -100,11 +99,9 @@ few lines of output and send it to originator. Order matters" do
       end
       reply_exchange.should_receive(:publish).with(any_args())
 
-      test_runner.should_receive(:run_file).with("testfile1").and_return({:type => :pass, :time => 0})
+      test_runner.stub!(:run_file).and_return({:type => :pass, :time => 0})
 
-      worker = Worker.new params
-
-      worker.work
+      @worker.work
     end
 
     it "should send finish message when test run is successful" do
@@ -117,11 +114,9 @@ few lines of output and send it to originator. Order matters" do
         msg[:filename].should == 'testfile1'
       end
 
-      test_runner.should_receive(:run_file).with('testfile1').and_return({:type => :pass, :time => 0})
-
-      worker = Worker.new params
+      test_runner.stub!(:run_file).and_return({:type => :pass, :time => 0})
 
-      worker.work
+      @worker.work
     end
 
     it "should send finish message when test run has failures" do
@@ -137,31 +132,36 @@ few lines of output and send it to originator. Order matters" do
         msg[:failures].should == failures
       end
 
-      test_runner.should_receive(:run_file).and_return({:type => :fail, :time => 0, :failures => failures})
-
-      worker = Worker.new params
+      test_runner.stub!(:run_file).and_return({:type => :fail, :time => 0, :failures => failures})
 
-      worker.work
+      @worker.work
     end
 
     it "should notify the callback framework that it has started" do
       file_queue.stub(:pop => nil)
       callback_handler.should_receive(:before_start)
 
-      worker = Worker.new params
-
-      worker.work
+      @worker.work
     end
 
     it "should notify the callback framework when it finishes" do
       file_queue.stub(:pop => nil)
       callback_handler.should_receive(:after_complete)
 
-      worker = Worker.new params
+      @worker.work
+    end
 
-      worker.work
+    it "runs file using TestUnitRunner when test is unit test" do
+      file_queue.stub!(:pop).and_return("file_test.rb", nil)
+      test_runner.should_receive(:run_file).with("file_test.rb", TestUnitRunner).and_return({})
+      @worker.work
     end
 
+    it "runs file using RspecRunner when file is a spec (finishes in _spec.rb)" do
+      file_queue.stub!(:pop).and_return("file_spec.rb", nil)
+      test_runner.should_receive(:run_file).with("file_spec.rb", RspecRunner).and_return({})
+      @worker.work
+    end
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorgon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,10 +13,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -32,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -47,6 +47,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
@@ -127,22 +143,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.3
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,7 @@ files:
 - lib/gorgon/g_logger.rb
 - lib/gorgon/gem_command_handler.rb
 - lib/gorgon/gem_service.rb
+- lib/gorgon/gorgon_rspec_formatter.rb
 - lib/gorgon/host_state.rb
 - lib/gorgon/job.rb
 - lib/gorgon/job_definition.rb
@@ -231,6 +232,7 @@ files:
 - lib/gorgon/ping_service.rb
 - lib/gorgon/pipe_forker.rb
 - lib/gorgon/progress_bar_view.rb
+- lib/gorgon/rspec_runner.rb
 - lib/gorgon/source_tree_syncer.rb
 - lib/gorgon/testunit_runner.rb
 - lib/gorgon/version.rb
@@ -241,6 +243,7 @@ files:
 - spec/failures_printer_spec.rb
 - spec/gem_command_handler_spec.rb
 - spec/gem_service_spec.rb
+- spec/gorgon_rspec_formatter_spec.rb
 - spec/host_state_spec.rb
 - spec/job_definition_spec.rb
 - spec/job_state_spec.rb
@@ -251,6 +254,7 @@ files:
 - spec/ping_service_spec.rb
 - spec/pipe_forker_spec.rb
 - spec/progress_bar_view_spec.rb
+- spec/rspec_runner_spec.rb
 - spec/source_tree_syncer_spec.rb
 - spec/worker_manager_spec.rb
 - spec/worker_spec.rb