rspec-core 3.6.0.beta2 → 3.7.0

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

@@ -59,7 +59,9 @@ module RSpec
         end
 
         def print_summary(duration, example_count, failure_count, pending_count)
-          totals =  "#{example_count} example#{'s' unless example_count == 1}, "
+          totals = String.new(
+            "#{example_count} example#{'s' unless example_count == 1}, "
+          )
           totals << "#{failure_count} failure#{'s' unless failure_count == 1}"
           totals << ", #{pending_count} pending" if pending_count > 0
 

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

@@ -21,11 +21,13 @@ module RSpec
         end
 
         # rubocop:disable Style/ClassVars
+        # @private
         @@converter = NullConverter
+
         begin
           require 'coderay'
-          RSpec::Support.require_rspec_core 'source/syntax_highlighter'
-          RSpec::Core::Source::SyntaxHighlighter.attempt_to_add_rspec_terms_to_coderay_keywords
+          RSpec::Support.require_rspec_core 'formatters/syntax_highlighter'
+          RSpec::Core::Formatters::SyntaxHighlighter.attempt_to_add_rspec_terms_to_coderay_keywords
           @@converter = CoderayConverter
           # rubocop:disable Lint/HandleExceptions
         rescue LoadError

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

@@ -6,7 +6,7 @@ module RSpec
     module Formatters
       # @private
       class JsonFormatter < BaseFormatter
-        Formatters.register self, :message, :dump_summary, :dump_profile, :stop, :close
+        Formatters.register self, :message, :dump_summary, :dump_profile, :stop, :seed, :close
 
         attr_reader :output_hash
 
@@ -26,7 +26,8 @@ module RSpec
             :duration => summary.duration,
             :example_count => summary.example_count,
             :failure_count => summary.failure_count,
-            :pending_count => summary.pending_count
+            :pending_count => summary.pending_count,
+            :errors_outside_of_examples_count => summary.errors_outside_of_examples_count
           }
           @output_hash[:summary_line] = summary.totals_line
         end
@@ -46,9 +47,13 @@ module RSpec
           end
         end
 
+        def seed(notification)
+          return unless notification.seed_used?
+          @output_hash[:seed] = notification.seed
+        end
+
         def close(_notification)
           output.write @output_hash.to_json
-          output.close if IO === output && output != $stdout
         end
 
         def dump_profile(profile)
@@ -81,6 +86,7 @@ module RSpec
 
         def format_example(example)
           {
+            :id => example.id,
             :description => example.description,
             :full_description => example.full_description,
             :status => example.execution_result.status.to_s,

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

@@ -171,8 +171,9 @@ module RSpec
         # @api public
         # @group Suite Notifications
         #
-        # Invoked at the very end, `close` allows the formatter to clean
-        # up resources, e.g. open streams, etc.
+        # Invoked at the end of a suite run. Allows the formatter to do any
+        # tidying up, but be aware that formatter output streams may be used
+        # elsewhere so don't actually close them.
         #
         # @param notification [Notifications::NullNotification]
       end

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

@@ -1,5 +1,3 @@
-RSpec::Support.require_rspec_core "source"
-
 module RSpec
   module Core
     module Formatters
@@ -17,7 +15,7 @@ module RSpec
 
         def self.source_from_file(path)
           raise NoSuchFileError unless File.exist?(path)
-          RSpec.world.source_cache.source_from_file(path)
+          RSpec.world.source_from_file(path)
         end
 
         if RSpec::Support::RubyFeatures.ripper_supported?

data/lib/rspec/core/{source → formatters}/syntax_highlighter.rb

@@ -1,6 +1,6 @@
 module RSpec
   module Core
-    class Source
+    module Formatters
       # @private
       # Provides terminal syntax highlighting of code snippets
       # when coderay is available.

data/lib/rspec/core/hooks.rb

@@ -456,7 +456,9 @@ module RSpec
           return if RSpec.configuration.dry_run?
 
           if scope == :context
-            run_owned_hooks_for(position, :context, example_or_group)
+            unless example_or_group.class.metadata[:skip]
+              run_owned_hooks_for(position, :context, example_or_group)
+            end
           else
             case position
             when :before then run_example_hooks_for(example_or_group, :before, :reverse_each)

data/lib/rspec/core/memoized_helpers.rb

@@ -285,6 +285,9 @@ EOS
           # We have to pass the block directly to `define_method` to
           # allow it to use method constructs like `super` and `return`.
           raise "#let or #subject called without a block" if block.nil?
+          raise(
+            "#let or #subject called with a reserved name #initialize"
+          ) if :initialize == name
           MemoizedHelpers.module_for(self).__send__(:define_method, name, &block)
 
           # Apply the memoization. The method has been defined in an ancestor

data/lib/rspec/core/metadata_filter.rb

@@ -111,6 +111,10 @@ module RSpec
           @items_and_filters.unshift [item, metadata]
         end
 
+        def delete(item, metadata)
+          @items_and_filters.delete [item, metadata]
+        end
+
         def items_for(request_meta)
           @items_and_filters.each_with_object([]) do |(item, item_meta), to_return|
             to_return << item if item_meta.empty? ||
@@ -167,6 +171,11 @@ module RSpec
           handle_mutation(metadata)
         end
 
+        def delete(item, metadata)
+          super
+          reconstruct_caches
+        end
+
         def items_for(metadata)
           # The filtering of `metadata` to `applicable_metadata` is the key thing
           # that makes the memoization actually useful in practice, since each
@@ -191,6 +200,14 @@ module RSpec
 
       private
 
+        def reconstruct_caches
+          @applicable_keys.clear
+          @proc_keys.clear
+          @items_and_filters.each do |_item, metadata|
+            handle_mutation(metadata)
+          end
+        end
+
         def handle_mutation(metadata)
           @applicable_keys.merge(metadata.keys)
           @proc_keys.merge(proc_keys_from metadata)

data/lib/rspec/core/notifications.rb

@@ -111,7 +111,7 @@ module RSpec::Core
         formatted = "\nFailures:\n"
 
         failure_notifications.each_with_index do |failure, index|
-          formatted << failure.fully_formatted(index.next, colorizer)
+          formatted += failure.fully_formatted(index.next, colorizer)
         end
 
         formatted
@@ -120,7 +120,7 @@ module RSpec::Core
       # @return [String] The list of pending examples, fully formatted in the
       #   way that RSpec's built-in formatters emit.
       def fully_formatted_pending_examples(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
-        formatted = "\nPending: (Failures listed here are expected and do not affect your suite's status)\n"
+        formatted = "\nPending: (Failures listed here are expected and do not affect your suite's status)\n".dup
 
         pending_notifications.each_with_index do |notification, index|
           formatted << notification.fully_formatted(index.next, colorizer)
@@ -232,9 +232,14 @@ module RSpec::Core
       #   RSpec's built-in formatters emit.
       def fully_formatted(pending_number, colorizer=::RSpec::Core::Formatters::ConsoleCodes)
         formatted_caller = RSpec.configuration.backtrace_formatter.backtrace_line(example.location)
-        colorizer.wrap("\n  #{pending_number}) #{example.full_description}", :pending) << "\n     " <<
-          Formatters::ExceptionPresenter::PENDING_DETAIL_FORMATTER.call(example, colorizer) <<
-          "\n" << colorizer.wrap("     # #{formatted_caller}\n", :detail)
+
+        [
+          colorizer.wrap("\n  #{pending_number}) #{example.full_description}", :pending),
+          "\n     ",
+          Formatters::ExceptionPresenter::PENDING_DETAIL_FORMATTER.call(example, colorizer),
+          "\n",
+          colorizer.wrap("     # #{formatted_caller}\n", :detail)
+        ].join("")
       end
     end
 
@@ -315,13 +320,15 @@ module RSpec::Core
       # @api
       # @return [String] A line summarising the result totals of the spec run.
       def totals_line
-        summary = Formatters::Helpers.pluralize(example_count, "example")
-        summary << ", " << Formatters::Helpers.pluralize(failure_count, "failure")
-        summary << ", #{pending_count} pending" if pending_count > 0
+        summary = Formatters::Helpers.pluralize(example_count, "example") +
+          ", " + Formatters::Helpers.pluralize(failure_count, "failure")
+        summary += ", #{pending_count} pending" if pending_count > 0
         if errors_outside_of_examples_count > 0
-          summary << ", "
-          summary << Formatters::Helpers.pluralize(errors_outside_of_examples_count, "error")
-          summary << " occurred outside of examples"
+          summary += (
+            ", " +
+            Formatters::Helpers.pluralize(errors_outside_of_examples_count, "error") +
+            " occurred outside of examples"
+          )
         end
         summary
       end
@@ -336,7 +343,7 @@ module RSpec::Core
       #                          specific colors.
       # @return [String] A colorized results line.
       def colorized_totals_line(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
-        if failure_count > 0
+        if failure_count > 0 || errors_outside_of_examples_count > 0
           colorizer.wrap(totals_line, RSpec.configuration.failure_color)
         elsif pending_count > 0
           colorizer.wrap(totals_line, RSpec.configuration.pending_color)
@@ -380,7 +387,7 @@ module RSpec::Core
                     "#{colorized_totals_line(colorizer)}\n"
 
         unless failed_examples.empty?
-          formatted << colorized_rerun_commands(colorizer) << "\n"
+          formatted += (colorized_rerun_commands(colorizer) + "\n")
         end
 
         formatted

data/lib/rspec/core/option_parser.rb

@@ -201,7 +201,7 @@ FILTERING
           configure_only_failures(options)
         end
 
-        parser.on("--next-failure", "Apply `--only-failures` and abort after one failure.",
+        parser.on("-n", "--next-failure", "Apply `--only-failures` and abort after one failure.",
                   "  (Equivalent to `--only-failures --fail-fast --order defined`)") do
           configure_only_failures(options)
           set_fail_fast(options, 1)

data/lib/rspec/core/output_wrapper.rb

@@ -0,0 +1,29 @@
+module RSpec
+  module Core
+    # @private
+    class OutputWrapper
+      # @private
+      attr_accessor :output
+
+      # @private
+      def initialize(output)
+        @output = output
+      end
+
+      def respond_to?(name, priv=false)
+        output.respond_to?(name, priv)
+      end
+
+      def method_missing(name, *args, &block)
+        output.send(name, *args, &block)
+      end
+
+      # Redirect calls for IO interface methods
+      IO.instance_methods(false).each do |method|
+        define_method(method) do |*args, &block|
+          output.send(method, *args, &block)
+        end
+      end
+    end
+  end
+end

data/lib/rspec/core/project_initializer/spec/spec_helper.rb

@@ -12,9 +12,6 @@
 # the additional setup, and require it from the spec files that actually need
 # it.
 #
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate

data/lib/rspec/core/reporter.rb

@@ -19,19 +19,13 @@ module RSpec::Core
       @pending_examples = []
       @duration = @start = @load_time = nil
       @non_example_exception_count = 0
+      @setup_default = lambda {}
+      @setup = false
     end
 
     # @private
     attr_reader :examples, :failed_examples, :pending_examples
 
-    # @private
-    def reset
-      @examples = []
-      @failed_examples = []
-      @pending_examples = []
-      @profiler = Profiler.new if defined?(@profiler)
-    end
-
     # @private
     def setup_profiler
       @profiler = Profiler.new
@@ -52,6 +46,13 @@ module RSpec::Core
       true
     end
 
+    # @private
+    def prepare_default(loader, output_stream, deprecation_stream)
+      @setup_default = lambda do
+        loader.setup_default output_stream, deprecation_stream
+      end
+    end
+
     # @private
     def registered_listeners(notification)
       @listeners[notification].to_a
@@ -200,6 +201,7 @@ module RSpec::Core
 
     # @private
     def notify(event, notification)
+      ensure_listeners_ready
       registered_listeners(event).each do |formatter|
         formatter.__send__(event, notification)
       end
@@ -225,6 +227,13 @@ module RSpec::Core
 
   private
 
+    def ensure_listeners_ready
+      return if @setup
+
+      @setup_default.call
+      @setup = true
+    end
+
     def close
       notify :close, Notifications::NullNotification
     end

data/lib/rspec/core/set.rb

@@ -44,6 +44,11 @@ module RSpec
         end
         self
       end
+
+      def clear
+        @values.clear
+        self
+      end
     end
   end
 end

data/lib/rspec/core/shared_example_group.rb

@@ -64,11 +64,6 @@ module RSpec
       #     group; any example group or example with matching metadata will
       #     automatically include this shared example group.
       #   @param block The block to be eval'd
-      # @overload shared_examples(metadata, &block)
-      #   @param metadata [Array<Symbol>, Hash] metadata to attach to this
-      #     group; any example group or example with matching metadata will
-      #     automatically include this shared example group.
-      #   @param block The block to be eval'd
       #
       # Stores the block for later use. The block will be evaluated
       # in the context of an example group via `include_examples`,

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.6.0.beta2'
+      STRING = '3.7.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -40,7 +40,8 @@ module RSpec
       def reset
         RSpec::ExampleGroups.remove_all_constants
         example_groups.clear
-        @shared_example_group_registry = nil
+        @sources_by_path.clear if defined?(@sources_by_path)
+        @syntax_highlighter = nil
       end
 
       # @private
@@ -129,11 +130,18 @@ module RSpec
       end
 
       # @private
-      def source_cache
-        @source_cache ||= begin
-          RSpec::Support.require_rspec_core "source"
-          Source::Cache.new(@configuration)
+      def source_from_file(path)
+        unless defined?(@sources_by_path)
+          RSpec::Support.require_rspec_support 'source'
+          @sources_by_path = {}
         end
+
+        @sources_by_path[path] ||= Support::Source.from_file(path)
+      end
+
+      # @private
+      def syntax_highlighter
+        @syntax_highlighter ||= Formatters::SyntaxHighlighter.new(@configuration)
       end
 
       # @api private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.6.0.beta2
+  version: 3.7.0
 platform: ruby
 authors:
 - Steven Baker
@@ -46,22 +46,22 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta2
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta2
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -110,14 +110,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - lib/rspec/core/formatters/progress_formatter.rb
 - lib/rspec/core/formatters/protocol.rb
 - lib/rspec/core/formatters/snippet_extractor.rb
+- lib/rspec/core/formatters/syntax_highlighter.rb
 - lib/rspec/core/hooks.rb
 - lib/rspec/core/invocations.rb
 - lib/rspec/core/memoized_helpers.rb
@@ -236,6 +237,7 @@ files:
 - lib/rspec/core/notifications.rb
 - lib/rspec/core/option_parser.rb
 - lib/rspec/core/ordering.rb
+- lib/rspec/core/output_wrapper.rb
 - lib/rspec/core/pending.rb
 - lib/rspec/core/profiler.rb
 - lib/rspec/core/project_initializer.rb
@@ -250,11 +252,6 @@ files:
 - lib/rspec/core/shared_context.rb
 - lib/rspec/core/shared_example_group.rb
 - lib/rspec/core/shell_escape.rb
-- lib/rspec/core/source.rb
-- lib/rspec/core/source/location.rb
-- lib/rspec/core/source/node.rb
-- lib/rspec/core/source/syntax_highlighter.rb
-- lib/rspec/core/source/token.rb
 - lib/rspec/core/test_unit_assertions_adapter.rb
 - lib/rspec/core/version.rb
 - lib/rspec/core/warnings.rb
@@ -275,14 +272,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.6.0.beta2
+summary: rspec-core-3.7.0
 test_files: []
 has_rdoc: