Sketch of generating runnables in OptionParser

Author: urbanautomaton

lib/rspec/core/configuration_options.rb

@@ -35,6 +35,9 @@ def configure_filter_manager(filter_manager)
       # @return [Hash] the final merged options, drawn from all external sources
       attr_reader :options
 
+      # @return [Array<String>] the original command-line arguments
+      attr_reader :args
+
     private
 
       def organize_options

lib/rspec/core/option_parser.rb

@@ -68,7 +68,17 @@ def parser(options)
 
         parser.on('--bisect[=verbose]', 'Repeatedly runs the suite in order to isolate the failures to the ',
                   '  smallest reproducible case.') do |argument|
-          options[:bisect] = argument || true
+          options[:runner] = -> (opts, err, out) do
+            RSpec::Support.require_rspec_core "bisect/coordinator"
+
+            success = Bisect::Coordinator.bisect_with(
+              opts.args,
+              RSpec.configuration,
+              bisect_formatter_for(argument)
+            )
+
+            exit(success ? 0 : 1)
+          end
         end
 
         parser.on('--[no-]fail-fast[=COUNT]', 'Abort the run after a certain number of failures (1 by default).') do |argument|
@@ -97,15 +107,27 @@ def parser(options)
         end
 
         parser.on('-X', '--[no-]drb', 'Run examples via DRb.') do |o|
-          options[:drb] = o
+          if o
+            options[:runner] = -> (opts, err, out) do
+              require 'rspec/core/drb'
+              begin
+                DRbRunner.new(opts).run(err, out)
+                exit
+              rescue DRb::DRbConnError
+                err.puts "No DRb server is running. Running in local process instead ..."
+              end
+            end
+          end
         end
 
         parser.on('--drb-port PORT', 'Port to connect to the DRb server.') do |o|
           options[:drb_port] = o.to_i
         end
 
         parser.on('--init', 'Initialize your project with RSpec.') do |_cmd|
-          initialize_project_and_exit
+          options[:runner] = -> (*_args) do
+            initialize_project_and_exit
+          end
         end
 
         parser.separator("\n  **** Output ****\n\n")
@@ -242,7 +264,9 @@ def parser(options)
         parser.separator("\n  **** Utility ****\n\n")
 
         parser.on('-v', '--version', 'Display the version.') do
-          print_version_and_exit
+          options[:runner] = -> (*_args) do
+            print_version_and_exit
+          end
         end
 
         # These options would otherwise be confusing to users, so we forcibly
@@ -254,7 +278,9 @@ def parser(options)
         invalid_options = %w[-d --I]
 
         parser.on_tail('-h', '--help', "You're looking at it.") do
-          print_help_and_exit(parser, invalid_options)
+          options[:runner] = -> (*_args) do
+            print_help_and_exit(parser, invalid_options)
+          end
         end
 
         # This prevents usage of the invalid_options.
@@ -288,6 +314,11 @@ def initialize_project_and_exit
       exit
     end
 
+    def bisect_formatter_for(argument)
+      return Formatters::BisectDebugFormatter if argument == "verbose"
+      Formatters::BisectProgressFormatter
+    end
+
     def print_version_and_exit
       puts RSpec::Core::Version::STRING
       exit

lib/rspec/core/runner.rb

@@ -65,38 +65,13 @@ def self.run(args, err=$stderr, out=$stdout)
         trap_interrupt
         options = ConfigurationOptions.new(args)
 
-        if options.options[:drb]
-          require 'rspec/core/drb'
-          begin
-            DRbRunner.new(options).run(err, out)
-            return
-          rescue DRb::DRbConnError
-            err.puts "No DRb server is running. Running in local process instead ..."
-          end
-        elsif options.options[:bisect]
-          bisect_and_exit(options.options[:bisect], args)
+        if options.options[:runner]
+          options.options[:runner].call(options, err, out)
         end
 
         new(options).run(err, out)
       end
 
-      def self.bisect_and_exit(argument, original_args)
-        RSpec::Support.require_rspec_core "bisect/coordinator"
-
-        success = Bisect::Coordinator.bisect_with(
-          original_args,
-          RSpec.configuration,
-          bisect_formatter_for(argument)
-        )
-
-        exit(success ? 0 : 1)
-      end
-
-      def self.bisect_formatter_for(argument)
-        return Formatters::BisectDebugFormatter if argument == "verbose"
-        Formatters::BisectProgressFormatter
-      end
-
       def initialize(options, configuration=RSpec.configuration, world=RSpec.world)
         @options       = options
         @configuration = configuration