Refactor: remove special cases from configuration options.

It's easiest to leverage the same "order then set configs"
logic of `process_options_into` rather than treating
libs and requires as special.

Author: myronmarston

lib/rspec/core/configuration.rb

@@ -897,7 +897,7 @@ def safe_include(mod, host)
       end
 
       # @private
-      def setup_load_path_and_require(paths)
+      def requires=(paths)
         directories = ['lib', default_path].select { |p| File.directory? p }
         RSpec::Core::RubyProject.add_to_load_path(*directories)
         paths.each {|path| require path}

lib/rspec/core/configuration_options.rb

@@ -16,9 +16,6 @@ def initialize(args)
       def configure(config)
         config.filter_manager = filter_manager
 
-        config.libs = options[:libs] || []
-        config.setup_load_path_and_require(options[:requires] || [])
-
         process_options_into config
         load_formatters_into config
       end
@@ -29,7 +26,7 @@ def parse_options
             filter_manager.include opts.delete(:inclusion_filter) if opts.has_key?(:inclusion_filter)
             filter_manager.exclude opts.delete(:exclusion_filter) if opts.has_key?(:exclusion_filter)
           }.
-          inject {|h, opts|
+          inject(:libs => [], :requires => []) {|h, opts|
             h.merge(opts) {|k, oldval, newval|
               [:libs, :requires].include?(k) ? oldval + newval : newval
             }
@@ -51,7 +48,7 @@ def filter_manager
         :line_numbers, :full_description, :full_backtrace, :tty
       ].to_set
 
-      UNPROCESSABLE_OPTIONS = [:libs, :formatters, :requires].to_set
+      UNPROCESSABLE_OPTIONS = [:formatters].to_set
 
       def force?(key)
         !UNFORCED_OPTIONS.include?(key)
@@ -67,7 +64,7 @@ def order(keys, *ordered)
       def process_options_into(config)
         opts = options.reject { |k, _| UNPROCESSABLE_OPTIONS.include? k }
 
-        order(opts.keys, :default_path, :pattern).each do |key|
+        order(opts.keys, :libs, :requires, :default_path, :pattern).each do |key|
           force?(key) ? config.force(key => opts[key]) : config.__send__("#{key}=", opts[key])
         end
       end

spec/rspec/core/configuration_options_spec.rb

@@ -26,22 +26,22 @@
       opts = config_options_object(*%w[--require a/path -I a/lib])
       config = double("config").as_null_object
       expect(config).to receive(:libs=).ordered
-      expect(config).to receive(:setup_load_path_and_require).ordered
+      expect(config).to receive(:requires=).ordered
       opts.configure(config)
     end
 
     it "sends loads requires before loading specs" do
       opts = config_options_object(*%w[-rspec_helper])
       config = double("config").as_null_object
-      expect(config).to receive(:setup_load_path_and_require).ordered
+      expect(config).to receive(:requires=).ordered
       expect(config).to receive(:files_or_directories_to_run=).ordered
       opts.configure(config)
     end
 
     it "sets up load path and requires before formatter" do
       opts = config_options_object(*%w[--require a/path -f a/formatter])
       config = double("config").as_null_object
-      expect(config).to receive(:setup_load_path_and_require).ordered
+      expect(config).to receive(:requires=).ordered
       expect(config).to receive(:add_formatter).ordered
       opts.configure(config)
     end

spec/rspec/core/configuration_spec.rb

@@ -53,7 +53,7 @@ module RSpec::Core
       end
     end
 
-    describe "#setup_load_path_and_require" do
+    describe "#requires=" do
       include_context "isolate load path mutation"
 
       def absolute_path_to(dir)
@@ -65,7 +65,7 @@ def absolute_path_to(dir)
         $LOAD_PATH.delete(lib_dir)
 
         expect($LOAD_PATH).not_to include(lib_dir)
-        config.setup_load_path_and_require []
+        config.requires = []
         expect($LOAD_PATH).to include(lib_dir)
       end
 
@@ -74,20 +74,20 @@ def absolute_path_to(dir)
         foo_dir = absolute_path_to("features")
 
         expect($LOAD_PATH).not_to include(foo_dir)
-        config.setup_load_path_and_require []
+        config.requires = []
         expect($LOAD_PATH).to include(foo_dir)
       end
 
       it 'stores the required files' do
         expect(config).to receive(:require).with('a/path')
-        config.setup_load_path_and_require ['a/path']
+        config.requires = ['a/path']
         expect(config.requires).to eq ['a/path']
       end
 
       context "when `default_path` refers to a file rather than a directory" do
         it 'does not add it to the load path' do
           config.default_path = 'Rakefile'
-          config.setup_load_path_and_require []
+          config.requires = []
           expect($LOAD_PATH).not_to include(match(/Rakefile/))
         end
       end