parallel_rspec 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd859eb40b317c48862eb67b4f24f3fa50e4bea8
-  data.tar.gz: 6c04d37e7c0828a2b3bfa7112e9819a28b814c91
+  metadata.gz: 773680cd7ac7cc86421fc4511597b488293aa9b0
+  data.tar.gz: 420dff9c171a05bf34e3013c8cb8c0aed377bf0e
 SHA512:
-  metadata.gz: 10d65506bd40f980d529362af9b5e95e3da72d0be1eda7bdb86ec52f16ac903b38fb9a717c2ca63da7c2533e639b7a1368aa067a7623287af42337a4aa7ca076
-  data.tar.gz: ef27474707581225d8514111a55c8859459979932730dade8872f62a70781dd4318ae51db90c33405aaac2674ffb067ef9fc71b39376030084824fd4dd514414
+  metadata.gz: 5b347907242eed08bc9edef8f2d59f221519d74d9f30ff6fa8fdb81edac1c7cdfc1df2b1c38566a20aa6a137618909a5a6c539d6f7c5d9ff6dcb92760c8815be
+  data.tar.gz: cbe1cf67c4deab173e1668dae741f555d8b930872a558f08d6d3d71925d06d0c4c38f2f1d5266f2d8cc8a0af8e02c05ba10f0768e39fa493cbf81e1a604f57df

data/README.md

@@ -30,7 +30,7 @@ This version of ParallelRSpec has been tested with RSpec 3.3.
 
 By default, ParallelRSpec will use two workers.  If you would like to use more, set an environment variable:
 
-    $ export WORKERS=2
+    $ export WORKERS=4
 
 ParallelRSpec runs each worker with its own copy of the test database to avoid locking and deadlocking problems.  To create these and populate them with your schema, run:
 

data/lib/parallel_rspec/client.rb

@@ -57,5 +57,14 @@ module ParallelRSpec
           :shared_group_inclusion_backtrace,
           :type))
     end
+
+    def next_example_to_run
+      channel_to_server.write([:next_example_to_run])
+      channel_to_server.read
+    end
+
+    def result(success)
+      channel_to_server.write([:result, success])
+    end
   end
 end

data/lib/parallel_rspec/runner.rb

@@ -66,15 +66,14 @@ module ParallelRSpec
       workers = Workers.new
       workers.run_test_workers_with_server(server) do |worker, channel_to_server|
         client = Client.new(channel_to_server)
-        index = 0
-        RSpec.world.filtered_examples.each do |group, examples|
-          examples.reject! do |example|
-            index += 1
-            (index % workers.number_of_workers) != (worker % workers.number_of_workers)
-          end
+        success = true
+        while next_example = client.next_example_to_run
+          example_group, example_index = *next_example
+          example = RSpec.world.filtered_examples[example_group][example_index]
+          example_group_instance = example_group.new(example.inspect_output)
+          success = example.run(example_group_instance, client) && success
         end
-        success = example_groups.map { |g| g.run(client) }.all?
-        channel_to_server.write([:result, success])
+        client.result(success)
       end
       server.success?
     end

data/lib/parallel_rspec/server.rb

@@ -1,34 +1,48 @@
 module ParallelRSpec
   class Server
-    attr_reader :reporter
+    attr_reader :remaining_example_group_indexes, :reporter
 
     def initialize(reporter)
+      @remaining_example_group_indexes = RSpec.world.filtered_examples.each_with_object({}) do |(example_group, examples), results|
+        results[example_group] = examples.size unless example_group.any_context_hooks? || examples.size.zero?
+      end
       @reporter = reporter
       @success = true
     end
 
-    def example_started(example)
+    def example_started(example, channel_to_client)
       reporter.example_started(example)
     end
 
-    def example_passed(example)
+    def example_passed(example, channel_to_client)
       reporter.example_passed(example)
     end
 
-    def example_failed(example)
+    def example_failed(example, channel_to_client)
       reporter.example_failed(example)
     end
 
-    def example_pending(example)
+    def example_pending(example, channel_to_client)
       reporter.example_pending(example)
     end
 
-    def deprecation(hash)
+    def deprecation(hash, channel_to_client)
       reporter.deprecation(hash)
     end
 
-    def result(result)
-      @success &&= result
+    def next_example_to_run(channel_to_client)
+      if remaining_example_group_indexes.empty?
+        channel_to_client.write(nil)
+      else
+        klass = remaining_example_group_indexes.keys.first
+        remaining_example_group_indexes[klass] -= 1
+        channel_to_client.write([klass, remaining_example_group_indexes[klass]])
+        remaining_example_group_indexes.delete(klass) if remaining_example_group_indexes[klass].zero?
+      end
+    end
+
+    def result(success, channel_to_client)
+      @success &&= success
     end
 
     def success?

data/lib/parallel_rspec/version.rb

@@ -1,3 +1,3 @@
 module ParallelRSpec
-  VERSION = "0.3.1"
+  VERSION = "0.4.1"
 end

data/lib/parallel_rspec/workers.rb

@@ -2,7 +2,7 @@ module ParallelRSpec
   class Workers
     def self.number_of_workers
       workers = ENV['WORKERS'].to_i
-      workers = 4 if workers.zero?
+      workers = 2 if workers.zero?
       workers
     end
 
@@ -46,7 +46,7 @@ module ParallelRSpec
       while !channels.empty?
         Channel.read_select(channels).each do |channel|
           if command = channel.read
-            server.send(*command)
+            server.send(*(command + [channel]))
           else
             channels.delete(channel)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_rspec
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Will Bryant, Powershop New Zealand Ltd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler