rails_parallel 0.1.2 → 0.1.3

data/lib/rails_parallel/rake.rb

@@ -6,6 +6,21 @@ require 'rails_parallel/schema'
 
 module RailsParallel
   class Rake
+    class UnexpectedResponse < StandardError
+      attr_reader :expected, :received
+
+      def initialize(expected, received)
+        @expected = expected
+        @received = received
+      end
+
+      def to_s
+        "Expected #{@expected}, got #{received}"
+      end
+    end
+
+    class SuiteFailure < StandardError; end
+
     include Singleton
 
     SCHEMA_DIR = 'tmp/rails_parallel/schema'
@@ -57,7 +72,13 @@ module RailsParallel
         :options => options,
         :files   => files.to_a
       }
-      expect(:done)
+
+      begin
+        expect(:success)
+      rescue UnexpectedResponse => e
+        raise SuiteFailure.new("Test suite '#{name}' failed") if e.received == :failure
+        raise e
+      end
     end
 
     def shutdown
@@ -77,7 +98,7 @@ module RailsParallel
 
     def expect(want)
       got = @socket.next_object
-      raise "Expected #{want}, got #{got}" unless want == got
+      raise UnexpectedResponse.new(want, got) unless want == got
     end
 
     def parse_options(ruby_opts)

data/lib/rails_parallel/runner.rb

@@ -17,8 +17,8 @@ module RailsParallel
       @socket << :ready
       @socket.each_object do |obj|
         break if obj == :shutdown
-        run_suite(obj)
-        @socket << :done << :ready
+        @socket << run_suite(obj) ? :success : :failure
+        @socket << :ready
       end
     rescue EOFError
       # shutdown

data/lib/rails_parallel/runner/parent.rb

@@ -58,7 +58,9 @@ module RailsParallel
             output_result(Time.now - start)
           end
         end
+
         wait_for(pid)
+        @faults.empty?
       end
 
       private
@@ -137,6 +139,7 @@ module RailsParallel
           while pid = wait_any(true)
             child = @by_pid[pid]
             close_child(child) if child
+            break if @children.empty?
           end
         end
       end

data/lib/rails_parallel/version.rb

@@ -1,3 +1,3 @@
 module RailsParallel
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_parallel
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Adrian Irving-Beer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 -04:00
+date: 2011-08-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency