rspec-core 3.7.1 → 3.9.3

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/rake_task.rb

@@ -45,6 +45,21 @@ module RSpec
       # A message to print to stderr when there are failures.
       attr_accessor :failure_message
 
+      if RUBY_VERSION < "1.9.0" || Support::Ruby.jruby?
+        # Run RSpec with a clean (empty) environment is not supported
+        def with_clean_environment=(_value)
+          raise ArgumentError, "Running in a clean environment is not supported on Ruby versions before 1.9.0"
+        end
+
+        # Run RSpec with a clean (empty) environment is not supported
+        def with_clean_environment
+          false
+        end
+      else
+        # Run RSpec with a clean (empty) environment.
+        attr_accessor :with_clean_environment
+      end
+
       # Use verbose output. If this is set to true, the task will print the
       # executed spec command to stdout. Defaults to `true`.
       attr_accessor :verbose
@@ -76,7 +91,12 @@ module RSpec
         command = spec_command
         puts command if verbose
 
-        return if system(command)
+        if with_clean_environment
+          return if system({}, command, :unsetenv_others => true)
+        else
+          return if system(command)
+        end
+
         puts failure_message if failure_message
 
         return unless fail_on_error
@@ -102,7 +122,7 @@ module RSpec
         if ENV['SPEC']
           FileList[ENV['SPEC']].sort
         elsif String === pattern && !File.exist?(pattern)
-          return if rspec_opts =~ /--pattern/
+          return if [*rspec_opts].any? { |opt| opt =~ /--pattern/ }
           "--pattern #{escape pattern}"
         else
           # Before RSpec 3.1, we used `FileList` to get the list of matched

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.
     #
@@ -82,6 +77,14 @@ module RSpec::Core
       end
     end
 
+    # @param exit_code [Integer] the exit_code to be return by the reporter
+    #
+    # Reports a run that exited early without having run any examples.
+    #
+    def exit_early(exit_code)
+      report(0) { exit_code }
+    end
+
     # @private
     def start(expected_example_count, time=RSpec::Core::Time.now)
       @start = time
@@ -231,6 +234,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

@@ -84,6 +84,8 @@ module RSpec
       # @param out [IO] output stream
       def run(err, out)
         setup(err, out)
+        return @configuration.reporter.exit_early(@configuration.failure_exit_code) if RSpec.world.wants_to_quit
+
         run_specs(@world.ordered_example_groups).tap do
           persist_example_statuses
         end
@@ -94,10 +96,11 @@ 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)
+        return if RSpec.world.wants_to_quit
+
         @configuration.load_spec_files
+      ensure
         @world.announce_filters
       end
 
@@ -122,17 +125,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 +185,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

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support "with_keywords_when_needed"
+
 module RSpec
   module Core
     # Represents some functionality that is shared with multiple example groups.
@@ -33,7 +35,7 @@ module RSpec
         klass.update_inherited_metadata(@metadata) unless @metadata.empty?
 
         SharedExampleGroupInclusionStackFrame.with_frame(@description, inclusion_line) do
-          klass.class_exec(*args, &@definition)
+          RSpec::Support::WithKeywordsWhenNeeded.class_exec(klass, *args, &@definition)
           klass.class_exec(&customization_block) if customization_block
         end
       end
@@ -76,7 +78,7 @@ module RSpec
       #     end
       #   end
       #
-      #   describe Account do
+      #   RSpec.describe Account do
       #     it_behaves_like "auditable" do
       #       let(:auditable) { Account.new }
       #     end
@@ -103,7 +105,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 +114,6 @@ module RSpec
             alias shared_examples_for shared_examples
           end
         end
-        # rubocop:enable Lint/NestedMethodDefinition
 
         # @private
         def self.exposed_globally?
@@ -259,7 +259,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.9.3'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -5,7 +5,7 @@ module RSpec
     # Internal container for global non-configuration data.
     class World
       # @private
-      attr_reader :example_groups, :filtered_examples
+      attr_reader :example_groups, :filtered_examples, :example_group_counts_by_spec_file
 
       # Used internally to determine what to do when a SIGINT is received.
       attr_accessor :wants_to_quit
@@ -17,10 +17,22 @@ module RSpec
       attr_accessor :non_example_failure
 
       def initialize(configuration=RSpec.configuration)
+        @wants_to_quit = false
         @configuration = configuration
         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
@@ -42,6 +54,7 @@ module RSpec
         example_groups.clear
         @sources_by_path.clear if defined?(@sources_by_path)
         @syntax_highlighter = nil
+        @example_group_counts_by_spec_file = Hash.new(0)
       end
 
       # @private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.9.3
 platform: ruby
 authors:
 - Steven Baker
 - David Chelimsky
 - Chad Humphries
 - Myron Marston
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain:
 - |
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2020-09-30 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.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.9.3
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -96,14 +96,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.14.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.14.9
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -192,10 +192,14 @@ 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/did_you_mean.rb
 - lib/rspec/core/drb.rb
 - lib/rspec/core/dsl.rb
 - lib/rspec/core/example.rb
@@ -204,14 +208,16 @@ 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
 - lib/rspec/core/formatters/documentation_formatter.rb
 - lib/rspec/core/formatters/exception_presenter.rb
+- lib/rspec/core/formatters/failure_list_formatter.rb
 - lib/rspec/core/formatters/fallback_message_formatter.rb
 - lib/rspec/core/formatters/helpers.rb
 - lib/rspec/core/formatters/html_formatter.rb
@@ -259,8 +265,13 @@ files:
 homepage: https://github.com/rspec/rspec-core
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/rspec/rspec-core/issues
+  changelog_uri: https://github.com/rspec/rspec-core/blob/v3.9.3/Changelog.md
+  documentation_uri: https://rspec.info/documentation/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
+  source_code_uri: https://github.com/rspec/rspec-core
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -276,9 +287,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
-summary: rspec-core-3.7.1
+summary: rspec-core-3.9.3
 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