rspec-core 3.6.0.beta2 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cedf9914463a5f8470ddb33bef491f31615a7b63
-  data.tar.gz: 8eecab50a480c797c96f53932f955643f23db6eb
+  metadata.gz: 33bf2ee1c5d02653b19cece430ba75ac28668df0
+  data.tar.gz: 5c3e3a2f628543125d4bc02ffff6ee05135e4d1e
 SHA512:
-  metadata.gz: a162b44414bcbd3ac23ee749f456976c10858bc84b8703a4ef63f370fcf8a691b7366ef8a9d0d2e15f7cecea6f38ce78379da1a25be1f75bf09ea9e913aa4939
-  data.tar.gz: f9a9b8815b6a42d5da60f033443dbf145b025058a6ec327c8a16fde556c83a753b1ed2bfd54ae85e02772fa54e8d7169c7323e034622b52ffbd9e3eab0826841
+  metadata.gz: ca2f7dea70f81dad661b79e61b7b4142989368fddca025d8741a97d5d36037bf598c4dff28a37c4a25bc5116520aa49ace6fbd4cc16b1f7b49bc8f5ef1956435
+  data.tar.gz: 8d104339ba402be5aec231e5d16e6fcad61cd9b81554593f71f87393b0638f6be590fdbdab06c54b1f981ef9f576eff8db302e32026d8ecabaebb9710d219ba9

data/Changelog.md

@@ -1,3 +1,31 @@
+### 3.6.0 / 2017-05-04
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.6.0.beta2...v3.6.0)
+
+Enhancements:
+
+* Add seed information to JSON formatter output. (#2388, Mitsutaka Mimura)
+* Include example id in the JSON formatter output. (#2369, Xavier Shay)
+* Respect changes to `config.output_stream` after formatters have been
+  setup. (#2401, #2419, Ilya Lavrov)
+
+Bug Fixes:
+
+* Delay formatter loading until the last minute to allow accessing the reporter
+  without triggering formatter setup. (Jon Rowe, #2243)
+* Ensure context hook failures running before an example can access the
+  reporter. (Jon Jensen, #2387)
+* Multiple fixes to allow using the runner multiple times within the same
+  process: `RSpec.clear_examples` resets the formatter and no longer clears
+  shared examples, and streams can be used across multiple runs rather than
+  being closed after the first. (#2368, Xavier Shay)
+* Prevent unexpected `example_group_finished` notifications causing an error.
+  (#2396, VTJamie)
+* Fix bugs where `config.when_first_matching_example_defined` hooks would fire
+  multiple times in some cases. (Yuji Nakayama, #2400)
+* Default `last_run_status` to "unknown" when the `status` field in the
+  persistence file contains an unrecognized value. (#2360, matrinox)
+* Prevent `let` from defining an `initialize` method. (#2414, Jon Rowe)
+
 ### 3.6.0.beta2 / 2016-12-12
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.6.0.beta1...v3.6.0.beta2)
 

data/lib/rspec/core.rb

@@ -69,7 +69,7 @@ module RSpec
   # same process.
   def self.clear_examples
     world.reset
-    configuration.reporter.reset
+    configuration.reset_reporter
     configuration.start_time = ::RSpec::Core::Time.now
     configuration.reset_filters
   end

data/lib/rspec/core/configuration.rb

@@ -1,6 +1,7 @@
 RSpec::Support.require_rspec_core "backtrace_formatter"
 RSpec::Support.require_rspec_core "ruby_project"
 RSpec::Support.require_rspec_core "formatters/deprecation_formatter"
+RSpec::Support.require_rspec_core "output_wrapper"
 
 module RSpec
   module Core
@@ -141,7 +142,7 @@ module RSpec
 
       # Determines where deprecation warnings are printed.
       # Defaults to `$stderr`.
-      # @return [IO, String] IO to write to or filename to write to
+      # @return [IO, String] IO or filename to write to
       define_reader :deprecation_stream
 
       # Determines where deprecation warnings are printed.
@@ -218,7 +219,7 @@ module RSpec
       define_reader :output_stream
 
       # Set the output stream for reporter.
-      # @attr value [IO] value for output, defaults to $stdout
+      # @attr value [IO, String] IO to write to or filename to write to, defaults to $stdout
       def output_stream=(value)
         if @reporter && !value.equal?(@output_stream)
           warn "RSpec's reporter has already been initialized with " \
@@ -227,6 +228,7 @@ module RSpec
             "it to take effect. (Called from #{CallerFilter.first_non_rspec_line})"
         else
           @output_stream = value
+          output_wrapper.output = @output_stream
         end
       end
 
@@ -480,8 +482,14 @@ module RSpec
       # @private
       def reset
         @spec_files_loaded = false
+        reset_reporter
+      end
+
+      # @private
+      def reset_reporter
         @reporter = nil
         @formatter_loader = nil
+        @output_wrapper = nil
       end
 
       # @private
@@ -864,7 +872,7 @@ module RSpec
       # Adds a formatter to the set RSpec will use for this run.
       #
       # @see RSpec::Core::Formatters::Protocol
-      def add_formatter(formatter, output=output_stream)
+      def add_formatter(formatter, output=output_wrapper)
         formatter_loader.add(formatter, output)
       end
       alias_method :formatter=, :add_formatter
@@ -930,7 +938,7 @@ module RSpec
         @reporter_buffer || @reporter ||=
           begin
             @reporter_buffer = DeprecationReporterBuffer.new
-            formatter_loader.setup_default output_stream, deprecation_stream
+            formatter_loader.prepare_default output_wrapper, deprecation_stream
             @reporter_buffer.play_onto(formatter_loader.reporter)
             @reporter_buffer = nil
             formatter_loader.reporter
@@ -974,7 +982,9 @@ module RSpec
           if (path = example_status_persistence_file_path)
             begin
               ExampleStatusPersister.load_from(path).inject(statuses) do |hash, example|
-                hash[example.fetch(:example_id)] = example.fetch(:status)
+                status = example[:status]
+                status = UNKNOWN_STATUS unless VALID_STATUSES.include?(status)
+                hash[example.fetch(:example_id)] = status
                 hash
               end
             rescue SystemCallError => e
@@ -994,6 +1004,15 @@ module RSpec
       # @private
       FAILED_STATUS = "failed".freeze
 
+      # @private
+      PASSED_STATUS = "passed".freeze
+
+      # @private
+      PENDING_STATUS = "pending".freeze
+
+      # @private
+      VALID_STATUSES = [UNKNOWN_STATUS, FAILED_STATUS, PASSED_STATUS, PENDING_STATUS]
+
       # @private
       def spec_files_with_failures
         @spec_files_with_failures ||= last_run_statuses.inject(Set.new) do |files, (id, status)|
@@ -1698,7 +1717,7 @@ module RSpec
       #       mocks.patch_marshal_to_support_partial_doubles = false
       #     end
       #
-      #     config.mock_with :rspec do |expectations|
+      #     config.expect_with :rspec do |expectations|
       #       expectations.syntax = :expect
       #     end
       #   end
@@ -1761,7 +1780,7 @@ module RSpec
           return unless example_or_group_meta.key?(:example_group)
 
           # Ensure the callback only fires once.
-          @derived_metadata_blocks.items_for(specified_meta).delete(callback)
+          @derived_metadata_blocks.delete(callback, specified_meta)
 
           block.call
         end
@@ -2039,6 +2058,10 @@ module RSpec
         )
       end
 
+      def output_wrapper
+        @output_wrapper ||= OutputWrapper.new(output_stream)
+      end
+
       def output_to_tty?(output=output_stream)
         output.respond_to?(:tty?) && output.tty?
       end

data/lib/rspec/core/configuration_options.rb

@@ -186,8 +186,10 @@ module RSpec
       def global_options_file
         File.join(File.expand_path("~"), ".rspec")
       rescue ArgumentError
+        # :nocov:
         RSpec.warning "Unable to find ~/.rspec because the HOME environment variable is not set"
         nil
+        # :nocov:
       end
     end
   end

data/lib/rspec/core/example.rb

@@ -260,7 +260,11 @@ module RSpec
                         'Expected example to fail since it is pending, but it passed.',
                         [location]
                 end
-              rescue Pending::SkipDeclaredInExample
+              rescue Pending::SkipDeclaredInExample => _
+                # The "=> _" is normally useless but on JRuby it is a workaround
+                # for a bug that prevents us from getting backtraces:
+                # https://github.com/jruby/jruby/issues/4467
+                #
                 # no-op, required metadata has already been set by the `skip`
                 # method.
               rescue AllExceptionsExcludingDangerousOnesOnRubiesThatAllowIt => e
@@ -465,22 +469,22 @@ module RSpec
 
         if @exception
           execution_result.exception = @exception
-          record_finished :failed
+          record_finished :failed, reporter
           reporter.example_failed self
           false
         elsif pending_message
           execution_result.pending_message = pending_message
-          record_finished :pending
+          record_finished :pending, reporter
           reporter.example_pending self
           true
         else
-          record_finished :passed
+          record_finished :passed, reporter
           reporter.example_passed self
           true
         end
       end
 
-      def record_finished(status)
+      def record_finished(status, reporter)
         execution_result.record_finished(status, clock.now)
         reporter.example_finished(self)
       end

data/lib/rspec/core/formatters.rb

@@ -115,6 +115,11 @@ module RSpec::Core::Formatters
     # @return [String] the default formatter to setup, defaults to `progress`
     attr_accessor :default_formatter
 
+    # @private
+    def prepare_default(output_stream, deprecation_stream)
+      reporter.prepare_default(self, output_stream, deprecation_stream)
+    end
+
     # @private
     def setup_default(output_stream, deprecation_stream)
       add default_formatter, output_stream if @formatters.empty?
@@ -140,7 +145,7 @@ module RSpec::Core::Formatters
     def add(formatter_to_use, *paths)
       formatter_class = find_formatter(formatter_to_use)
 
-      args = paths.map { |p| p.respond_to?(:puts) ? p : file_at(p) }
+      args = paths.map { |p| p.respond_to?(:puts) ? p : open_stream(p) }
 
       if !Loader.formatters[formatter_class].nil?
         formatter = formatter_class.new(*args)
@@ -247,9 +252,14 @@ module RSpec::Core::Formatters
       word
     end
 
-    def file_at(path)
-      RSpec::Support::DirectoryMaker.mkdir_p(File.dirname(path))
-      File.new(path, 'w')
+    def open_stream(path_or_wrapper)
+      if RSpec::Core::OutputWrapper === path_or_wrapper
+        path_or_wrapper.output = open_stream(path_or_wrapper.output)
+        path_or_wrapper
+      else
+        RSpec::Support::DirectoryMaker.mkdir_p(File.dirname(path_or_wrapper))
+        File.new(path_or_wrapper, 'w')
+      end
     end
   end
 end

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

@@ -57,18 +57,17 @@ module RSpec
 
         # @api public
         #
-        # 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 [NullNotification] (Ignored)
         def close(_notification)
-          return unless IO === output
           return if output.closed?
 
           output.puts
 
           output.flush
-          output.close unless output == $stdout
         end
       end
     end

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

@@ -22,7 +22,7 @@ module RSpec
         end
 
         def example_group_finished(_notification)
-          @group_level -= 1
+          @group_level -= 1 if @group_level > 0
         end
 
         def example_passed(passed)

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 RSpec::Support.require_rspec_core "formatters/console_codes"
 RSpec::Support.require_rspec_core "formatters/snippet_extractor"
+RSpec::Support.require_rspec_core 'formatters/syntax_highlighter'
 RSpec::Support.require_rspec_support "encoded_string"
 
 module RSpec
@@ -215,7 +216,7 @@ module RSpec
           file_path, line_number = file_and_line_number[1..2]
           max_line_count = RSpec.configuration.max_displayed_failure_line_count
           lines = SnippetExtractor.extract_expression_lines_at(file_path, line_number.to_i, max_line_count)
-          RSpec.world.source_cache.syntax_highlighter.highlight(lines)
+          RSpec.world.syntax_highlighter.highlight(lines)
         rescue SnippetExtractor::NoSuchFileError
           ["Unable to find #{file_path} to read failed line"]
         rescue SnippetExtractor::NoSuchLineError
@@ -279,7 +280,7 @@ module RSpec
                 :description   => "#{@example.full_description} FIXED",
                 :message_color => RSpec.configuration.fixed_color,
                 :failure_lines => [
-                  "Expected pending '#{@execution_result.pending_message}' to fail. No Error was raised."
+                  "Expected pending '#{@execution_result.pending_message}' to fail. No error was raised."
                 ]
               }
             elsif @execution_result.status == :pending

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

@@ -24,8 +24,8 @@ module RSpec
         @@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
 
@@ -46,9 +46,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 +85,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/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

@@ -336,7 +336,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)

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.6.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.6.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-05-04 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.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta2
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   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.4.5.2
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.6.0.beta2
+summary: rspec-core-3.6.0
 test_files: []
 has_rdoc: 

data/lib/rspec/core/source.rb

@@ -1,86 +0,0 @@
-RSpec::Support.require_rspec_support "encoded_string"
-RSpec::Support.require_rspec_core 'source/node'
-RSpec::Support.require_rspec_core 'source/syntax_highlighter'
-RSpec::Support.require_rspec_core 'source/token'
-
-module RSpec
-  module Core
-    # @private
-    # Represents a Ruby source file and provides access to AST and tokens.
-    class Source
-      attr_reader :source, :path
-
-      def self.from_file(path)
-        source = File.read(path)
-        new(source, path)
-      end
-
-      if String.method_defined?(:encoding)
-        def initialize(source_string, path=nil)
-          @source = RSpec::Support::EncodedString.new(source_string, Encoding.default_external)
-          @path = path ? File.expand_path(path) : '(string)'
-        end
-      else # for 1.8.7
-        # :nocov:
-        def initialize(source_string, path=nil)
-          @source = RSpec::Support::EncodedString.new(source_string)
-          @path = path ? File.expand_path(path) : '(string)'
-        end
-        # :nocov:
-      end
-
-      def lines
-        @lines ||= source.split("\n")
-      end
-
-      def ast
-        @ast ||= begin
-          require 'ripper'
-          sexp = Ripper.sexp(source)
-          raise SyntaxError unless sexp
-          Node.new(sexp)
-        end
-      end
-
-      def tokens
-        @tokens ||= begin
-          require 'ripper'
-          tokens = Ripper.lex(source)
-          Token.tokens_from_ripper_tokens(tokens)
-        end
-      end
-
-      def nodes_by_line_number
-        @nodes_by_line_number ||= begin
-          nodes_by_line_number = ast.select(&:location).group_by { |node| node.location.line }
-          Hash.new { |hash, key| hash[key] = [] }.merge(nodes_by_line_number)
-        end
-      end
-
-      def tokens_by_line_number
-        @tokens_by_line_number ||= begin
-          nodes_by_line_number = tokens.group_by { |token| token.location.line }
-          Hash.new { |hash, key| hash[key] = [] }.merge(nodes_by_line_number)
-        end
-      end
-
-      def inspect
-        "#<#{self.class} #{path}>"
-      end
-
-      # @private
-      class Cache
-        attr_reader :syntax_highlighter
-
-        def initialize(configuration)
-          @sources_by_path = {}
-          @syntax_highlighter = SyntaxHighlighter.new(configuration)
-        end
-
-        def source_from_file(path)
-          @sources_by_path[path] ||= Source.from_file(path)
-        end
-      end
-    end
-  end
-end

data/lib/rspec/core/source/location.rb

@@ -1,13 +0,0 @@
-module RSpec
-  module Core
-    class Source
-      # @private
-      # Represents a source location of node or token.
-      Location = Struct.new(:line, :column) do
-        def self.location?(array)
-          array.is_a?(Array) && array.size == 2 && array.all? { |e| e.is_a?(Integer) }
-        end
-      end
-    end
-  end
-end

data/lib/rspec/core/source/node.rb

@@ -1,93 +0,0 @@
-RSpec::Support.require_rspec_core "source/location"
-
-module RSpec
-  module Core
-    class Source
-      # @private
-      # A wrapper for Ripper AST node which is generated with `Ripper.sexp`.
-      class Node
-        include Enumerable
-
-        attr_reader :sexp, :parent
-
-        def self.sexp?(array)
-          array.is_a?(Array) && array.first.is_a?(Symbol)
-        end
-
-        def initialize(ripper_sexp, parent=nil)
-          @sexp = ripper_sexp.freeze
-          @parent = parent
-        end
-
-        def type
-          sexp[0]
-        end
-
-        def args
-          @args ||= raw_args.map do |raw_arg|
-            if Node.sexp?(raw_arg)
-              Node.new(raw_arg, self)
-            elsif Location.location?(raw_arg)
-              Location.new(*raw_arg)
-            elsif raw_arg.is_a?(Array)
-              GroupNode.new(raw_arg, self)
-            else
-              raw_arg
-            end
-          end.freeze
-        end
-
-        def children
-          @children ||= args.select { |arg| arg.is_a?(Node) }.freeze
-        end
-
-        def location
-          @location ||= args.find { |arg| arg.is_a?(Location) }
-        end
-
-        def each(&block)
-          return to_enum(__method__) unless block_given?
-
-          yield self
-
-          children.each do |child|
-            child.each(&block)
-          end
-        end
-
-        def each_ancestor
-          return to_enum(__method__) unless block_given?
-
-          current_node = self
-
-          while (current_node = current_node.parent)
-            yield current_node
-          end
-        end
-
-        def inspect
-          "#<#{self.class} #{type}>"
-        end
-
-      private
-
-        def raw_args
-          sexp[1..-1] || []
-        end
-      end
-
-      # @private
-      class GroupNode < Node
-        def type
-          :group
-        end
-
-      private
-
-        def raw_args
-          sexp
-        end
-      end
-    end
-  end
-end

data/lib/rspec/core/source/token.rb

@@ -1,87 +0,0 @@
-RSpec::Support.require_rspec_core "source/location"
-
-module RSpec
-  module Core
-    class Source
-      # @private
-      # A wrapper for Ripper token which is generated with `Ripper.lex`.
-      class Token
-        CLOSING_TYPES_BY_OPENING_TYPE = {
-          :on_lbracket    => :on_rbracket,
-          :on_lparen      => :on_rparen,
-          :on_lbrace      => :on_rbrace,
-          :on_heredoc_beg => :on_heredoc_end
-        }.freeze
-
-        CLOSING_KEYWORDS_BY_OPENING_KEYWORD = {
-          'def' => 'end',
-          'do'  => 'end',
-        }.freeze
-
-        attr_reader :token
-
-        def self.tokens_from_ripper_tokens(ripper_tokens)
-          ripper_tokens.map { |ripper_token| new(ripper_token) }.freeze
-        end
-
-        def initialize(ripper_token)
-          @token = ripper_token.freeze
-        end
-
-        def location
-          @location ||= Location.new(*token[0])
-        end
-
-        def type
-          token[1]
-        end
-
-        def string
-          token[2]
-        end
-
-        def ==(other)
-          token == other.token
-        end
-
-        alias_method :eql?, :==
-
-        def inspect
-          "#<#{self.class} #{type} #{string.inspect}>"
-        end
-
-        def keyword?
-          type == :on_kw
-        end
-
-        def opening?
-          opening_delimiter? || opening_keyword?
-        end
-
-        def closed_by?(other)
-          closed_by_delimiter?(other) || closed_by_keyword?(other)
-        end
-
-        private
-
-        def opening_delimiter?
-          CLOSING_TYPES_BY_OPENING_TYPE.key?(type)
-        end
-
-        def opening_keyword?
-          return false unless keyword?
-          CLOSING_KEYWORDS_BY_OPENING_KEYWORD.key?(string)
-        end
-
-        def closed_by_delimiter?(other)
-          other.type == CLOSING_TYPES_BY_OPENING_TYPE[type]
-        end
-
-        def closed_by_keyword?(other)
-          return false unless other.keyword?
-          other.string == CLOSING_KEYWORDS_BY_OPENING_KEYWORD[string]
-        end
-      end
-    end
-  end
-end