rrrspec-client 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8eeee74390a15216c9ee1617ece868ca8c8d35
-  data.tar.gz: 7c5d6bcabc4418977305017db7b6aed02a6497de
+  metadata.gz: 42b80bd79e217f92b060c1cc3ee329fc47e65d20
+  data.tar.gz: c81027789ac8dde9d749f2c044cb6f38c66f1659
 SHA512:
-  metadata.gz: 26acef471216841b57ca5c03af5dedc133d3878519842c6a8a0b8cbbd669df7439b17b1264417bd0a7c76b07dd14a95603f4ff024e481c411d0ecb1fc643bac4
-  data.tar.gz: 3975213a640c79809879ed3fd4754fb0aabcfe2a4a5cccd68f82e41f065c56b866b7731d282995404bddb70039cede434e326959c2ec884d6b888826676f33ab
+  metadata.gz: 23b32613282ccd0680fe04c98b89b22a5595e82cedc9d1c566d23aaff4450c42394f44e5ba8319cfe432aa14ae7eb3e6db6733836ad95ac4c5c3fb1ddc180632
+  data.tar.gz: 312c3195f17d9ea1d50a34bc80f333b6955f92c5619dc6502b881e24684a42650a18345cf881c9888998efa980b240c31656d7fd86063c2a0a3926cad4bff8ce

data/lib/rrrspec/client/rspec_runner.rb

@@ -6,9 +6,7 @@ module RRRSpec
     class RSpecRunner
       def initialize
         @options = RSpec::Core::ConfigurationOptions.new([])
-        @options.parse_options
         @configuration = RSpec.configuration
-        @configuration.setup_load_path_and_require([])
         @world = RSpec.world
         @before_suite_run = false
       end
@@ -39,7 +37,7 @@ module RRRSpec
             @configuration.load_spec_files
             @world.announce_filters
             unless @before_suite_run
-              @configuration.run_hook(:before, :suite)
+              run_before_suite_hooks
               @before_suite_run = true
             end
             status = true
@@ -59,21 +57,11 @@ module RRRSpec
           @configuration.output_stream = $stdout
           @configuration.error_stream = $stderr
           @configuration.add_formatter(RSpec::Core::Formatters::BaseTextFormatter)
-          if @configuration.respond_to?(:formatter_loader)
-            # RSpec >= 2.99
-            formatters.each do |formatter|
-              @configuration.formatter_loader.formatters << formatter
-            end
-          else
-            formatters.each do |formatter|
-              @configuration.formatters << formatter
-            end
+          formatters.each do |formatter|
+            @configuration.add_formatter(formatter)
           end
-          @configuration.reporter.report(
-            @world.example_count,
-            @configuration.randomize? ? @configuration.seed : nil
-          ) do |reporter|
-            @world.example_groups.ordered.each do |example_group|
+          @configuration.reporter.report(@world.example_count) do |reporter|
+            @world.ordered_example_groups.each do |example_group|
               example_group.run(reporter)
             end
           end
@@ -87,6 +75,16 @@ module RRRSpec
         @world.example_groups.clear
         @configuration.reset
       end
+
+      private
+
+      def run_before_suite_hooks
+        hooks = @configuration.instance_variable_get(:@before_suite_hooks)
+        hook_context = RSpec::Core::SuiteHookContext.new
+        hooks.each do |h|
+          h.run(hook_context)
+        end
+      end
     end
   end
 end

data/lib/rrrspec/client/slave_runner.rb

@@ -1,6 +1,7 @@
 require 'set'
 require 'extreme_timeout'
 require 'timeout'
+require 'rspec/core/formatters'
 
 module RRRSpec
   module Client
@@ -66,7 +67,7 @@ module RRRSpec
 
           soft_timeout_sec, hard_timeout_sec = spec_timeout_sec(task)
 
-          formatter = RedisReportingFormatter.new
+          formatter = RedisReportingFormatter
           trial.start
           status, outbuf, errbuf = ExtremeTimeout::timeout(
             hard_timeout_sec, TIMEOUT_EXITCODE
@@ -87,41 +88,62 @@ module RRRSpec
       end
 
       class RedisReportingFormatter
-        attr_reader :passed, :pending, :failed
+        RSpec::Core::Formatters.register(self, :example_passed, :example_pending, :example_failed)
 
-        def initialize
-          @passed = 0
-          @pending = 0
-          @failed = 0
-          @timeout = false
+        def initialize(_output)
+          self.class.reset
         end
 
-        def example_passed(example)
-          @passed += 1
+        def example_passed(_notification)
+          self.class.example_passed
         end
 
-        def example_pending(example)
-          @pending += 1
+        def example_pending(_notification)
+          self.class.example_pending
         end
 
-        def example_failed(example)
-          @failed += 1
-          if example.exception.is_a?(SoftTimeoutException)
-            @timeout = true
-          end
+        def example_failed(notification)
+          self.class.example_failed(notification)
         end
 
-        def status
-          if @timeout
-            'timeout'
-          elsif @failed != 0
-            'failed'
-          elsif @pending != 0
-            'pending'
-          else
-            'passed'
+        module ClassMethods
+          attr_reader :passed, :pending, :failed
+
+          def reset
+            @passed = 0
+            @pending = 0
+            @failed = 0
+            @timeout = false
+          end
+
+          def example_passed
+            @passed += 1
+          end
+
+          def example_pending
+            @pending += 1
+          end
+
+          def example_failed(notification)
+            @failed += 1
+            if notification.exception.is_a?(SoftTimeoutException)
+              @timeout = true
+            end
+          end
+
+          def status
+            if @timeout
+              'timeout'
+            elsif @failed != 0
+              'failed'
+            elsif @pending != 0
+              'pending'
+            else
+              'passed'
+            end
           end
         end
+        extend ClassMethods
       end
     end
   end

data/lib/rrrspec/client/version.rb

@@ -1,5 +1,5 @@
 module RRRSpec
   module Client
-    VERSION = "0.2.4"
+    VERSION = "0.3.0"
   end
 end

data/rrrspec-client.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "extreme_timeout"
   spec.add_dependency "launchy"
   spec.add_dependency "redis"
-  spec.add_dependency "rspec", ">= 2.14.1", "< 3"
+  spec.add_dependency "rspec", ">= 3.0"
   spec.add_dependency "thor"
   spec.add_dependency "uuidtools"
   spec.add_dependency "tzinfo"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrrspec-client
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Masaya Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,20 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement