hydra 0.23.1 → 0.23.2

data/VERSION

@@ -1 +1 @@
-0.23.1
+0.23.2

data/hydra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hydra}
-  s.version = "0.23.1"
+  s.version = "0.23.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Gauthier"]
-  s.date = %q{2010-10-25}
+  s.date = %q{2010-11-03}
   s.default_executable = %q{warmsnake.rb}
   s.description = %q{Spread your tests over multiple machines to test your code faster.}
   s.email = %q{nick@smartlogicsolutions.com}
@@ -61,6 +61,7 @@ Gem::Specification.new do |s|
      "lib/hydra/worker.rb",
      "test/fixtures/assert_true.rb",
      "test/fixtures/config.yml",
+     "test/fixtures/conflicting.rb",
      "test/fixtures/features/step_definitions.rb",
      "test/fixtures/features/write_alternate_file.feature",
      "test/fixtures/features/write_file.feature",
@@ -85,7 +86,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ngauthier/hydra}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Distributed testing toolkit}
   s.test_files = [
     "test/pipe_test.rb",
@@ -98,6 +99,7 @@ Gem::Specification.new do |s|
      "test/fixtures/assert_true.rb",
      "test/fixtures/slow.rb",
      "test/fixtures/write_file_spec.rb",
+     "test/fixtures/conflicting.rb",
      "test/fixtures/write_file_with_pending_spec.rb",
      "test/fixtures/write_file.rb",
      "test/message_test.rb",
@@ -111,7 +113,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_development_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
       s.add_development_dependency(%q<cucumber>, ["= 0.9.2"])

data/lib/hydra/runner.rb

@@ -79,6 +79,14 @@ module Hydra #:nodoc:
       end
     end
 
+    def format_ex_in_file(file, ex)
+      "Error in #{file}:\n  #{format_exception(ex)}"
+    end
+
+    def format_exception(ex)
+      "#{ex.class.name}: #{ex.message}\n    #{ex.backtrace.join("\n    ")}"
+    end
+
     # Run all the Test::Unit Suites in a ruby file
     def run_test_unit_file(file)
       begin
@@ -86,6 +94,9 @@ module Hydra #:nodoc:
       rescue LoadError => ex
         trace "#{file} does not exist [#{ex.to_s}]"
         return ex.to_s
+      rescue Exception => ex
+        trace "Error requiring #{file} [#{ex.to_s}]"
+        return format_ex_in_file(file, ex)
       end
       output = []
       @result = Test::Unit::TestResult.new
@@ -97,7 +108,7 @@ module Hydra #:nodoc:
       begin
         klasses.each{|klass| klass.suite.run(@result){|status, name| ;}}
       rescue => ex
-        output << ex.to_s
+        output << format_ex_in_file(file, ex)
       end
 
       return output.join("\n")

data/test/fixtures/conflicting.rb

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+# this test is around to make sure that we handle all the errors
+# that can occur when 'require'ing a test file.
+class SyncTest < Object
+  def test_it_again
+    assert true
+  end
+end
+

data/test/master_test.rb

@@ -20,6 +20,35 @@ class MasterTest < Test::Unit::TestCase
       assert_equal "HYDRA", File.read(target_file)
     end
 
+    # this test simulates what happens when we have 2 tests with the same
+    # class name but with different parent classes.  This can happen when 
+    # we have a functional and an integration test class with the same name.
+    should "run even with a test that will not require" do
+      class FileOutputListener < Hydra::Listener::Abstract
+        attr_accessor :output
+        def initialize(&block)
+          self.output = {}
+        end
+
+        def file_end(file, output)
+          self.output[file] = output
+        end
+      end
+
+      listener =  FileOutputListener.new
+      sync_test = File.join(File.dirname(__FILE__), 'fixtures', 'sync_test.rb')
+      Hydra::Master.new(
+        # we want the actual test to run last to make sure the runner can still run tests
+        :files => [sync_test, conflicting_test_file, test_file],
+        :autosort => false,
+        :listeners => [listener]
+      )
+      assert_match /superclass mismatch for class SyncTest/, listener.output[conflicting_test_file]
+      assert_match conflicting_test_file, listener.output[conflicting_test_file]
+      assert File.exists?(target_file)
+      assert_equal "HYDRA", File.read(target_file)
+    end
+
     should "run a spec with pending examples" do
       progress_bar = Hydra::Listener::ProgressBar.new(StringIO.new)
       Hydra::Master.new(

data/test/test_helper.rb

@@ -50,6 +50,10 @@ class Test::Unit::TestCase
   def json_file
     File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'json_data.json'))
   end
+
+  def conflicting_test_file
+    File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'conflicting.rb'))
+  end
 end
 
 module Hydra #:nodoc:

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hydra
 version: !ruby/object:Gem::Version 
+  hash: 71
   prerelease: false
   segments: 
   - 0
   - 23
-  - 1
-  version: 0.23.1
+  - 2
+  version: 0.23.2
 platform: ruby
 authors: 
 - Nick Gauthier
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -04:00
+date: 2010-11-03 00:00:00 -04:00
 default_executable: warmsnake.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 33
         segments: 
         - 2
         - 10
@@ -35,9 +38,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 62196421
         segments: 
         - 2
         - 0
@@ -51,9 +56,11 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 9
@@ -65,9 +72,11 @@ dependencies:
   name: therubyracer
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 7
@@ -127,6 +136,7 @@ files:
 - lib/hydra/worker.rb
 - test/fixtures/assert_true.rb
 - test/fixtures/config.yml
+- test/fixtures/conflicting.rb
 - test/fixtures/features/step_definitions.rb
 - test/fixtures/features/write_alternate_file.feature
 - test/fixtures/features/write_file.feature
@@ -157,23 +167,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Distributed testing toolkit
@@ -188,6 +202,7 @@ test_files:
 - test/fixtures/assert_true.rb
 - test/fixtures/slow.rb
 - test/fixtures/write_file_spec.rb
+- test/fixtures/conflicting.rb
 - test/fixtures/write_file_with_pending_spec.rb
 - test/fixtures/write_file.rb
 - test/message_test.rb