rspec-core 3.7.1 → 3.8.0

data/lib/rspec/core/formatters/syntax_highlighter.rb

@@ -13,6 +13,25 @@ module RSpec
           implementation.highlight_syntax(lines)
         end
 
+        # rubocop:disable Lint/RescueException
+        # rubocop:disable Lint/HandleExceptions
+        def self.attempt_to_add_rspec_terms_to_coderay_keywords
+          CodeRay::Scanners::Ruby::Patterns::IDENT_KIND.add(%w[
+            describe context
+            it specify
+            before after around
+            let subject
+            expect allow
+          ], :keyword)
+        rescue Exception
+          # Mutating CodeRay's contants like this is not a public API
+          # and might not always work. If we cannot add our keywords
+          # to CodeRay it is not a big deal and not worth raising an
+          # error over, so we ignore it.
+        end
+      # rubocop:enable Lint/HandleExceptions
+      # rubocop:enable Lint/RescueException
+
       private
 
         if RSpec::Support::OS.windows?
@@ -38,25 +57,6 @@ module RSpec
           end
         end
 
-        # rubocop:disable Lint/RescueException
-        # rubocop:disable Lint/HandleExceptions
-        def self.attempt_to_add_rspec_terms_to_coderay_keywords
-          CodeRay::Scanners::Ruby::Patterns::IDENT_KIND.add(%w[
-            describe context
-            it specify
-            before after around
-            let subject
-            expect allow
-          ], :keyword)
-        rescue Exception
-          # Mutating CodeRay's contants like this is not a public API
-          # and might not always work. If we cannot add our keywords
-          # to CodeRay it is not a big deal and not worth raising an
-          # error over, so we ignore it.
-        end
-        # rubocop:enable Lint/HandleExceptions
-        # rubocop:enable Lint/RescueException
-
         # @private
         module CodeRayImplementation
           RESET_CODE = "\e[0m"

data/lib/rspec/core/hooks.rb

@@ -322,7 +322,7 @@ module RSpec
       #     end
       #
       # The yielded example aliases `run` with `call`, which lets you treat it
-      # like a `Proc`. This is especially handy when working with libaries
+      # like a `Proc`. This is especially handy when working with libraries
       # that manage their own setup and teardown using a block or proc syntax,
       # e.g.
       #
@@ -339,8 +339,6 @@ module RSpec
         @hooks ||= HookCollections.new(self, FilterableItemRepository::UpdateOptimized)
       end
 
-    private
-
       # @private
       Hook = Struct.new(:block, :options)
 

data/lib/rspec/core/invocations.rb

@@ -26,21 +26,23 @@ module RSpec
 
       # @private
       class Bisect
-        def call(options, _err, _out)
+        def call(options, err, out)
           RSpec::Support.require_rspec_core "bisect/coordinator"
+          runner = Runner.new(options).tap { |r| r.configure(err, out) }
+          formatter = bisect_formatter_klass_for(options.options[:bisect]).new(
+            out, runner.configuration.bisect_runner
+          )
 
           success = RSpec::Core::Bisect::Coordinator.bisect_with(
-            options.args,
-            RSpec.configuration,
-            bisect_formatter_for(options.options[:bisect])
+            runner, options.args, formatter
           )
 
           success ? 0 : 1
         end
 
-        private
+      private
 
-        def bisect_formatter_for(argument)
+        def bisect_formatter_klass_for(argument)
           return Formatters::BisectDebugFormatter if argument == "verbose"
           Formatters::BisectProgressFormatter
         end

data/lib/rspec/core/memoized_helpers.rb

@@ -483,9 +483,9 @@ EOS
       def self.module_for(example_group)
         get_constant_or_yield(example_group, :LetDefinitions) do
           mod = Module.new do
-            include Module.new {
+            include(Module.new {
               example_group.const_set(:NamedSubjectPreventSuper, self)
-            }
+            })
           end
 
           example_group.const_set(:LetDefinitions, mod)

data/lib/rspec/core/profiler.rb

@@ -20,7 +20,9 @@ module RSpec
       def example_group_finished(notification)
         return unless notification.group.top_level?
 
-        @example_groups[notification.group][:total_time] =  Time.now - @example_groups[notification.group][:start]
+        group = @example_groups[notification.group]
+        return unless group.key?(:start)
+        group[:total_time] = Time.now - group[:start]
       end
 
       def example_started(notification)

data/lib/rspec/core/reporter.rb

@@ -21,17 +21,12 @@ module RSpec::Core
       @non_example_exception_count = 0
       @setup_default = lambda {}
       @setup = false
+      @profiler = nil
     end
 
     # @private
     attr_reader :examples, :failed_examples, :pending_examples
 
-    # @private
-    def setup_profiler
-      @profiler = Profiler.new
-      register_listener @profiler, *Profiler::NOTIFICATIONS
-    end
-
     # Registers a listener to a list of notifications. The reporter will send
     # notification of events to all registered listeners.
     #
@@ -231,6 +226,8 @@ module RSpec::Core
       return if @setup
 
       @setup_default.call
+      @profiler = Profiler.new
+      register_listener @profiler, *Profiler::NOTIFICATIONS
       @setup = true
     end
 

data/lib/rspec/core/runner.rb

@@ -94,9 +94,7 @@ module RSpec
       # @param err [IO] error stream
       # @param out [IO] output stream
       def setup(err, out)
-        @configuration.error_stream = err
-        @configuration.output_stream = out if @configuration.output_stream == $stdout
-        @options.configure(@configuration)
+        configure(err, out)
         @configuration.load_spec_files
         @world.announce_filters
       end
@@ -122,17 +120,11 @@ module RSpec
         success ? 0 : @configuration.failure_exit_code
       end
 
-    private
-
-      def persist_example_statuses
-        return unless (path = @configuration.example_status_persistence_file_path)
-
-        ExampleStatusPersister.persist(@world.all_examples, path)
-      rescue SystemCallError => e
-        RSpec.warning "Could not write example statuses to #{path} (configured as " \
-                      "`config.example_status_persistence_file_path`) due to a " \
-                      "system error: #{e.inspect}. Please check that the config " \
-                      "option is set to an accessible, valid file path", :call_site => nil
+      # @private
+      def configure(err, out)
+        @configuration.error_stream = err
+        @configuration.output_stream = out if @configuration.output_stream == $stdout
+        @options.configure(@configuration)
       end
 
       # @private
@@ -188,6 +180,20 @@ module RSpec
           $stderr.puts "\nRSpec is shutting down and will print the summary report... Interrupt again to force quit."
         end
       end
+
+    private
+
+      def persist_example_statuses
+        return if @configuration.dry_run
+        return unless (path = @configuration.example_status_persistence_file_path)
+
+        ExampleStatusPersister.persist(@world.all_examples, path)
+      rescue SystemCallError => e
+        RSpec.warning "Could not write example statuses to #{path} (configured as " \
+                      "`config.example_status_persistence_file_path`) due to a " \
+                      "system error: #{e.inspect}. Please check that the config " \
+                      "option is set to an accessible, valid file path", :call_site => nil
+      end
     end
   end
 end

data/lib/rspec/core/shared_example_group.rb

@@ -103,7 +103,6 @@ module RSpec
       # Shared examples top level DSL.
       module TopLevelDSL
         # @private
-        # rubocop:disable Lint/NestedMethodDefinition
         def self.definitions
           proc do
             def shared_examples(name, *args, &block)
@@ -113,7 +112,6 @@ module RSpec
             alias shared_examples_for shared_examples
           end
         end
-        # rubocop:enable Lint/NestedMethodDefinition
 
         # @private
         def self.exposed_globally?
@@ -259,7 +257,7 @@ module RSpec
           # :nocov:
           def ensure_block_has_source_location(block)
             source_location = yield.split(':')
-            block.extend Module.new { define_method(:source_location) { source_location } }
+            block.extend(Module.new { define_method(:source_location) { source_location } })
           end
           # :nocov:
         end

data/lib/rspec/core/shell_escape.rb

@@ -6,7 +6,7 @@ module RSpec
       module_function
 
       def quote(argument)
-        "'#{argument.gsub("'", "\\\\'")}'"
+        "'#{argument.to_s.gsub("'", "\\\\'")}'"
       end
 
       if RSpec::Support::OS.windows?
@@ -17,7 +17,7 @@ module RSpec
         require 'shellwords'
 
         def escape(shell_command)
-          shell_command.shellescape
+          Shellwords.escape(shell_command.to_s)
         end
       end
 

data/lib/rspec/core/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Core.
     module Version
       # Current version of RSpec Core, in semantic versioning format.
-      STRING = '3.7.1'
+      STRING = '3.8.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -21,6 +21,17 @@ module RSpec
         configuration.world = self
         @example_groups = []
         @example_group_counts_by_spec_file = Hash.new(0)
+        prepare_example_filtering
+      end
+
+      # @api public
+      #
+      # Prepares filters so that they apply to example groups when they run.
+      #
+      # This is a separate method so that filters can be modified/replaced and
+      # examples refiltered during a process's lifetime, which can be useful for
+      # a custom runner.
+      def prepare_example_filtering
         @filtered_examples = Hash.new do |hash, group|
           hash[group] = filter_manager.prune(group.examples)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.8.0
 platform: ruby
 authors:
 - Steven Baker
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -54,14 +54,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -192,8 +192,11 @@ files:
 - lib/rspec/core/backtrace_formatter.rb
 - lib/rspec/core/bisect/coordinator.rb
 - lib/rspec/core/bisect/example_minimizer.rb
-- lib/rspec/core/bisect/runner.rb
+- lib/rspec/core/bisect/fork_runner.rb
 - lib/rspec/core/bisect/server.rb
+- lib/rspec/core/bisect/shell_command.rb
+- lib/rspec/core/bisect/shell_runner.rb
+- lib/rspec/core/bisect/utilities.rb
 - lib/rspec/core/configuration.rb
 - lib/rspec/core/configuration_options.rb
 - lib/rspec/core/drb.rb
@@ -204,9 +207,10 @@ files:
 - lib/rspec/core/filter_manager.rb
 - lib/rspec/core/flat_map.rb
 - lib/rspec/core/formatters.rb
+- lib/rspec/core/formatters/base_bisect_formatter.rb
 - lib/rspec/core/formatters/base_formatter.rb
 - lib/rspec/core/formatters/base_text_formatter.rb
-- lib/rspec/core/formatters/bisect_formatter.rb
+- lib/rspec/core/formatters/bisect_drb_formatter.rb
 - lib/rspec/core/formatters/bisect_progress_formatter.rb
 - lib/rspec/core/formatters/console_codes.rb
 - lib/rspec/core/formatters/deprecation_formatter.rb
@@ -277,8 +281,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.7.1
+summary: rspec-core-3.8.0
 test_files: []

data/lib/rspec/core/formatters/bisect_formatter.rb

@@ -1,69 +0,0 @@
-require 'drb/drb'
-
-module RSpec
-  module Core
-    module Formatters
-      # Used by `--bisect`. When it shells out and runs a portion of the suite, it uses
-      # this formatter as a means to have the status reported back to it, via DRb.
-      #
-      # Note that since DRb calls carry considerable overhead compared to normal
-      # method calls, we try to minimize the number of DRb calls for perf reasons,
-      # opting to communicate only at the start and the end of the run, rather than
-      # after each example.
-      # @private
-      class BisectFormatter
-        Formatters.register self, :start, :start_dump, :example_started,
-                            :example_failed, :example_passed, :example_pending
-
-        def initialize(_output)
-          port = RSpec.configuration.drb_port
-          drb_uri = "druby://localhost:#{port}"
-          @all_example_ids = []
-          @failed_example_ids = []
-          @bisect_server = DRbObject.new_with_uri(drb_uri)
-          @remaining_failures = []
-          RSpec.configuration.files_or_directories_to_run = @bisect_server.files_or_directories_to_run
-        end
-
-        def start(_notification)
-          @remaining_failures = Set.new(@bisect_server.expected_failures)
-        end
-
-        def example_started(notification)
-          @all_example_ids << notification.example.id
-        end
-
-        def example_failed(notification)
-          @failed_example_ids << notification.example.id
-          example_finished(notification, :failed)
-        end
-
-        def example_passed(notification)
-          example_finished(notification, :passed)
-        end
-
-        def example_pending(notification)
-          example_finished(notification, :pending)
-        end
-
-        def start_dump(_notification)
-          @bisect_server.latest_run_results = RunResults.new(
-            @all_example_ids, @failed_example_ids
-          )
-        end
-
-        RunResults = Struct.new(:all_example_ids, :failed_example_ids)
-
-      private
-
-        def example_finished(notification, status)
-          return unless @remaining_failures.include?(notification.example.id)
-          @remaining_failures.delete(notification.example.id)
-
-          return if status == :failed && !@remaining_failures.empty?
-          RSpec.world.wants_to_quit = true
-        end
-      end
-    end
-  end
-end