Use new rspec-support requires.

Author: myronmarston

lib/rspec/core.rb

@@ -1,45 +1,19 @@
-require_rspec = if ENV['REQUIRE_RELATIVE']
-  lambda do |path|
-    require_relative path
-  end
-else # for 1.8.7
-  lambda do |path|
-    require "rspec/#{path}"
-  end
-end
-
 require 'set'
 require 'time'
 require 'rbconfig'
 
-require_rspec['core/version']
-
-require 'rspec/support/caller_filter'
-require 'rspec/core/warnings'
-
-require_rspec['core/flat_map']
-require_rspec['core/filter_manager']
-require_rspec['core/dsl']
-require_rspec['core/notifications']
-require_rspec['core/reporter']
-
-require_rspec['core/hooks']
-require_rspec['core/memoized_helpers']
-require_rspec['core/metadata']
-require_rspec['core/pending']
-require_rspec['core/formatters']
-require_rspec['core/ordering']
-
-require_rspec['core/world']
-require_rspec['core/configuration']
-require_rspec['core/option_parser']
-require_rspec['core/configuration_options']
-require_rspec['core/command_line']
-require_rspec['core/runner']
-require_rspec['core/example']
-require_rspec['core/shared_example_group/collection']
-require_rspec['core/shared_example_group']
-require_rspec['core/example_group']
+require "rspec/support"
+RSpec::Support.require_rspec_support "caller_filter"
+
+RSpec::Support.define_optimized_require_for_rspec(:core) { |f| require_relative f }
+
+%w[
+  version warnings flat_map filter_manager dsl notifications
+  reporter hooks memoized_helpers metadata pending formatters
+  ordering world configuration option_parser configuration_options
+  command_line runner example shared_example_group/collection
+  shared_example_group example_group
+].each { |name| RSpec::Support.require_rspec_core name }
 
 module RSpec
   autoload :SharedContext, 'rspec/core/shared_context'

lib/rspec/core/configuration.rb

@@ -1,7 +1,8 @@
 require 'fileutils'
-require 'rspec/core/backtrace_formatter'
-require 'rspec/core/ruby_project'
-require 'rspec/core/formatters/deprecation_formatter'
+
+RSpec::Support.require_rspec_core "backtrace_formatter"
+RSpec::Support.require_rspec_core "ruby_project"
+RSpec::Support.require_rspec_core "formatters/deprecation_formatter"
 
 module RSpec
   module Core
@@ -422,7 +423,7 @@ def mock_with(framework)
               "Pass a module or one of #{MOCKING_ADAPTERS.keys.inspect}"
           end
 
-          require "rspec/core/mocking_adapters/#{const_name.to_s.downcase}"
+          RSpec::Support.require_rspec_core "mocking_adapters/#{const_name.to_s.downcase}"
           RSpec::Core::MockingAdapters.const_get(const_name)
         end
 

lib/rspec/core/drb_command_line.rb

@@ -1,5 +1,5 @@
 require 'drb/drb'
-require 'rspec/core/drb_options'
+RSpec::Support.require_rspec_core "drb_options"
 
 module RSpec
   module Core

lib/rspec/core/formatters.rb

@@ -1,4 +1,4 @@
-require 'rspec/core/formatters/legacy_formatter'
+RSpec::Support.require_rspec_core 'formatters/legacy_formatter'
 
 # ## Built-in Formatters
 #

lib/rspec/core/formatters/base_formatter.rb

@@ -1,4 +1,4 @@
-require 'rspec/core/formatters/helpers'
+RSpec::Support.require_rspec_core "formatters/helpers"
 require 'stringio'
 
 module RSpec

lib/rspec/core/formatters/base_text_formatter.rb

@@ -1,4 +1,4 @@
-require 'rspec/core/formatters/base_formatter'
+RSpec::Support.require_rspec_core "formatters/base_formatter"
 require 'set'
 
 module RSpec

lib/rspec/core/formatters/deprecation_formatter.rb

@@ -1,4 +1,4 @@
-require 'rspec/core/formatters/helpers'
+RSpec::Support.require_rspec_core "formatters/helpers"
 require 'set'
 
 module RSpec

lib/rspec/core/formatters/documentation_formatter.rb

@@ -1,4 +1,4 @@
-require 'rspec/core/formatters/base_text_formatter'
+RSpec::Support.require_rspec_core "formatters/base_text_formatter"
 
 module RSpec
   module Core

lib/rspec/core/formatters/html_formatter.rb

@@ -1,5 +1,5 @@
-require 'rspec/core/formatters/base_text_formatter'
-require 'rspec/core/formatters/html_printer'
+RSpec::Support.require_rspec_core "formatters/base_text_formatter"
+RSpec::Support.require_rspec_core "formatters/html_printer"
 
 module RSpec
   module Core
@@ -134,7 +134,7 @@ def percent_done
         # could output links to images or other files produced during the specs.
         #
         def extra_failure_content(exception)
-          require 'rspec/core/formatters/snippet_extractor'
+          RSpec::Support.require_rspec_core "formatters/snippet_extractor"
           backtrace = exception.backtrace.map {|line| configuration.backtrace_formatter.backtrace_line(line)}
           backtrace.compact!
           @snippet_extractor ||= SnippetExtractor.new

lib/rspec/core/formatters/json_formatter.rb

@@ -1,4 +1,4 @@
-require 'rspec/core/formatters/base_formatter'
+RSpec::Support.require_rspec_core "formatters/base_formatter"
 require 'json'
 
 module RSpec

lib/rspec/core/formatters/legacy_formatter.rb

@@ -1,4 +1,4 @@
-require 'rspec/core/formatters/helpers'
+RSpec::Support.require_rspec_core "formatters/helpers"
 require 'stringio'
 
 module RSpec

lib/rspec/core/formatters/progress_formatter.rb

@@ -1,4 +1,5 @@
-require 'rspec/core/formatters/base_text_formatter'
+RSpec::Support.require_rspec_core "formatters/base_text_formatter"
+
 module RSpec
   module Core
     module Formatters

lib/rspec/core/notifications.rb

@@ -1,4 +1,4 @@
-require 'rspec/core/formatters/helpers'
+RSpec::Support.require_rspec_core "formatters/helpers"
 
 module RSpec::Core
   module Notifications

lib/rspec/core/option_parser.rb

@@ -92,7 +92,7 @@ def parser(options)
         end
 
         parser.on('--init', 'Initialize your project with RSpec.') do |cmd|
-          require 'rspec/core/project_initializer'
+          RSpec::Support.require_rspec_core "project_initializer"
           ProjectInitializer.new.run
           exit
         end

lib/rspec/core/ordering.rb

@@ -3,7 +3,7 @@ module Core
     if defined?(::Random)
       RandomNumberGenerator = ::Random
     else
-      require 'rspec/core/backport_random'
+      RSpec::Support.require_rspec_core "backport_random"
       RandomNumberGenerator = RSpec::Core::Backports::Random
     end
 

lib/rspec/core/rake_task.rb

@@ -1,4 +1,6 @@
-require 'rspec/support/warnings'
+require 'rspec/support'
+RSpec::Support.require_rspec_support "warnings"
+
 require 'rake'
 require 'rake/tasklib'
 require 'shellwords'

spec/rspec/core/configuration_spec.rb

@@ -109,7 +109,7 @@ def absolute_path_to(dir)
 
     describe "#mock_framework" do
       it "defaults to :rspec" do
-        expect(config).to receive(:require).with('rspec/core/mocking_adapters/rspec')
+        expect(RSpec::Support).to receive(:require_rspec_core).with('mocking_adapters/rspec')
         config.mock_framework
       end
     end
@@ -168,13 +168,13 @@ def absolute_path_to(dir)
       end
 
       it 'uses the named adapter' do
-        expect(config).to receive(:require).with("rspec/core/mocking_adapters/mocha")
+        expect(RSpec::Support).to receive(:require_rspec_core).with('mocking_adapters/mocha')
         stub_const("RSpec::Core::MockingAdapters::Mocha", Module.new)
         config.mock_with :mocha
       end
 
       it "uses the null adapter when given :nothing" do
-        expect(config).to receive(:require).with('rspec/core/mocking_adapters/null').and_call_original
+        expect(RSpec::Support).to receive(:require_rspec_core).with('mocking_adapters/null').and_call_original
         config.mock_with :nothing
       end
 
@@ -191,9 +191,13 @@ def absolute_path_to(dir)
       end
 
       context 'when there are already some example groups defined' do
+        before { allow(RSpec::Support).to receive(:require_rspec_core) }
+
         it 'raises an error since this setting must be applied before any groups are defined' do
           allow(RSpec.world).to receive(:example_groups).and_return([double.as_null_object])
-          stub_const("RSpec::Core::MockingAdapters::Mocha", double(:framework_name => :mocha))
+          mocha = stub_const("RSpec::Core::MockingAdapters::Mocha", Module.new)
+          allow(mocha).to receive_messages(:framework_name => :mocha)
+
           expect {
             config.mock_with :mocha
           }.to raise_error(/must be configured before any example groups are defined/)
@@ -206,7 +210,9 @@ def absolute_path_to(dir)
         end
 
         it 'does not raise an error if re-setting the same config' do
-          stub_const("RSpec::Core::MockingAdapters::Mocha", double(:framework_name => :mocha))
+          mocha = stub_const("RSpec::Core::MockingAdapters::Mocha", Module.new)
+          allow(mocha).to receive_messages(:framework_name => :mocha)
+
           groups = []
           allow(RSpec.world).to receive_messages(:example_groups => groups)
           config.mock_with :mocha