rspec-core 2.0.0.beta.9 → 2.0.0.beta.10

data/lib/rspec/core/configuration_options.rb

@@ -8,113 +8,56 @@ module RSpec
       LOCAL_OPTIONS_FILE  = ".rspec"
       GLOBAL_OPTIONS_FILE = File.join(File.expand_path("~"), ".rspec")
       
-      attr_reader :args, :options
+      attr_reader :options
       
       def initialize(args)
         @args = args
-        @options = {}
+        @options = parse_options
       end
-      
-      def apply_to(config)
-        merged_options.each do |key, value|
-          config.send("#{key}=", value)
+
+      def configure(config)
+        options.each do |key, value|
+          config.send("#{key}=", value) rescue nil
         end
       end
 
-      def parse_command_line_options
-        @options = Parser.parse!(@args)
-        @options[:files_or_directories_to_run] = @args
-        @options
+      def drb_argv
+        argv = []
+        argv << "--color"    if options[:color_enabled]
+        argv << "--profile"   if options[:profile_examples]
+        argv << "--backtrace" if options[:full_backtrace]
+        argv << "--formatter"    << options[:formatter]               if options[:formatter]
+        argv << "--line_number"  << options[:line_number]             if options[:line_number]
+        argv << "--options_file" << options[:options_file]            if options[:options_file]
+        argv << "--example"      << options[:full_description].source if options[:full_description]
+        argv + options[:files_or_directories_to_run]
       end
 
     private
 
-      def merged_options
+      def parse_options
+        command_line_options = parse_command_line_options
+        local_options        = parse_local_options(command_line_options)
+        global_options       = parse_global_options
+
         [global_options, local_options, command_line_options].inject do |merged, options|
           merged.merge(options)
         end
       end
 
-      def command_line_options
-        parse_command_line_options
+      def parse_command_line_options
+        options = Parser.parse!(@args)
+        options[:files_or_directories_to_run] = @args
+        options
       end
 
-      class Parser
-        def self.parse!(args)
-          new.parse!(args)
-        end
-
-        class << self
-          alias_method :parse, :parse!
-        end
-
-        def parse!(args)
-          options = {}
-          parser(options).parse!(args)
-          options
-        end
-
-        alias_method :parse, :parse!
-
-        def parser(options)
-          OptionParser.new do |parser|
-            parser.banner = "Usage: rspec [options] [files or directories]"
-
-            parser.on('-b', '--backtrace', 'Enable full backtrace') do |o|
-              options[:full_backtrace] = true
-            end
-
-            parser.on('-c', '--[no-]color', '--[no-]colour', 'Enable color in the output') do |o|
-              options[:color_enabled] = o
-            end
-            
-            parser.on('-d', '--debug', 'Enable debugging') do |o|
-              options[:debug] = true
-            end
-
-            parser.on('-e', '--example PATTERN', "Run examples whose full descriptions match this pattern",
-                    "(PATTERN is compiled into a Ruby regular expression)") do |o|
-              options[:full_description] = /#{o}/
-            end
-
-            parser.on('-f', '--formatter FORMATTER', 'Choose a formatter',
-                    '  [p]rogress (default - dots)',
-                    '  [d]ocumentation (group and example names)') do |o|
-              options[:formatter] = o
-            end
-
-            parser.on_tail('-h', '--help', "You're looking at it.") do 
-              puts parser
-              exit
-            end
-
-            parser.on('-I DIRECTORY', 'specify $LOAD_PATH directory (may be used more than once)') do |dir|
-              options[:libs] ||= []
-              options[:libs] << dir
-            end
-
-            parser.on('-l', '--line_number LINE', 'Specify the line number of a single example to run') do |o|
-              options[:line_number] = o
-            end
-
-            parser.on('-o', '--options PATH', 'Read configuration options from a file path.  (Defaults to spec/spec.parser)') do |o|
-              options[:options_file] = o || local_options_file
-            end
-            
-            parser.on('-p', '--profile', 'Enable profiling of examples with output of the top 10 slowest examples') do |o|
-              options[:profile_examples] = o
-            end
-          end
-        end
+      def parse_local_options(options)
+        parse_options_file(local_options_file(options))
       end
 
-      def global_options
+      def parse_global_options
         parse_options_file(GLOBAL_OPTIONS_FILE)
       end
-
-      def local_options
-        parse_options_file(local_options_file)
-      end
       
       def parse_options_file(path)
         Parser.parse(args_from_options_file(path))
@@ -125,13 +68,12 @@ module RSpec
         File.readlines(path).map {|l| l.split}.flatten
       end
 
-      def local_options_file
-        return @options.delete(:options_file) if @options[:options_file]
+      def local_options_file(options)
+        return options[:options_file] if options[:options_file]
         return LOCAL_OPTIONS_FILE if File.exist?(LOCAL_OPTIONS_FILE)
         RSpec.deprecate("spec/spec.opts", ".rspec or ~/.rspec", "2.0.0") if File.exist?("spec/spec.opts")
         "spec/spec.opts"
       end
-
     end
   end
 end

data/lib/rspec/core/deprecation.rb

@@ -21,13 +21,12 @@ ADDITIONAL
       end
 
       message << "*****************************************************************"
-      warn(message)
+      warn_deprecation(message)
     end
 
-    def warn(message)
-      Kernel.warn(message)
+    def warn_deprecation(message)
+      send :warn, message
     end
-
   end
 
   class HashWithDeprecationNotice < Hash

data/lib/rspec/core/drb_command_line.rb

@@ -0,0 +1,29 @@
+module RSpec
+  module Core
+    class DRbCommandLine
+      def initialize(argv)
+        @options = RSpec::Core::ConfigurationOptions.new(argv)
+      end
+
+      def drb_port
+        @options.options[:drb_port] || ENV['RSPEC_DRB'] || 8989
+      end
+
+      def run(err, out)
+        begin
+          begin
+            DRb.start_service("druby://localhost:0")
+          rescue SocketError, Errno::EADDRNOTAVAIL
+            DRb.start_service("druby://:0")
+          end
+          spec_server = DRbObject.new_with_uri("druby://127.0.0.1:#{drb_port}")
+          spec_server.run(@options.drb_argv, err, out)
+          true
+        rescue DRb::DRbConnError
+          err.puts "No DRb server is running. Running in local process instead ..."
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -5,18 +5,15 @@ module RSpec
       class BaseFormatter
         include Helpers
         attr_accessor :example_group
-        attr_reader :example_count, :duration, :examples
+        attr_reader :example_count, :duration, :examples, :output
 
-        def initialize
+        def initialize(output)
+          @output = output
           @example_count = 0
           @examples = []
           @example_group = nil
         end
 
-        def output
-          configuration.output
-        end
-
         def pending_examples
           @pending_examples ||= ::RSpec.world.find(examples, :execution_result => { :status => 'pending' })
         end
@@ -28,8 +25,6 @@ module RSpec
         def report(count)
           sync_output do
             start(count)
-            # TODO - spec that we still dump even when there's
-            # an exception
             begin
               yield self
             ensure

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

@@ -60,8 +60,8 @@ module RSpec
             sorted_examples = examples.sort_by { |example| example.execution_result[:run_time] }.reverse.first(10)
             output.puts "\nTop #{sorted_examples.size} slowest examples:\n"        
             sorted_examples.each do |example|
-              output.puts "  (#{format_seconds(duration, 7)} seconds) #{example}"
-              output.puts grey("   # #{format_caller(example.metadata[:caller])}")
+              output.puts "  (#{format_seconds(example.execution_result[:run_time])} seconds) #{example}"
+              output.puts grey("   # #{format_caller(example.metadata[:location])}")
             end
           end
 

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

@@ -6,8 +6,8 @@ module RSpec
 
       class DocumentationFormatter < BaseTextFormatter
 
-        def initialize
-          super
+        def initialize(output)
+          super(output)
           @previous_nested_example_groups = []
         end
 

data/lib/rspec/core/kernel_extensions.rb

@@ -1,5 +1,5 @@
 module Kernel
   def debugger(*args)
-    $stderr.puts "debugger statement ignored, use -d or --debug option on rspec to enable debugging"
+    RSpec.configuration.error_stream.puts "debugger statement ignored, use -d or --debug option to enable debugging\n#{caller(0)[1]}"
   end
 end

data/lib/rspec/core/metadata.rb

@@ -82,8 +82,8 @@ EOM
       end
 
       def all_apply?(filters)
-        filters.all? do |filter_on, filter|
-          apply_condition(filter_on, filter)
+        filters.all? do |key, value|
+          apply_condition(key, value)
         end
       end
 
@@ -96,23 +96,23 @@ EOM
         end
       end
 
-      def apply_condition(filter_on, filter, metadata=nil)
+      def apply_condition(key, value, metadata=nil)
         metadata ||= self
-        case filter
+        case value
         when Hash
-          filter.all? { |k, v| apply_condition(k, v, metadata[filter_on]) }
+          value.all? { |k, v| apply_condition(k, v, metadata[key]) }
         when Regexp
-          metadata[filter_on] =~ filter
+          metadata[key] =~ value
         when Proc
-          filter.call(metadata[filter_on]) rescue false
+          value.call(metadata[key]) rescue false
         when Fixnum
-          if filter_on == :line_number
-            relevant_line_numbers(metadata).include?(world.preceding_declaration_line(filter))
+          if key == :line_number
+            relevant_line_numbers(metadata).include?(world.preceding_declaration_line(value))
           else
-            metadata[filter_on] == filter
+            metadata[key] == value
           end
         else
-          metadata[filter_on] == filter
+          metadata[key] == value
         end
       end
 

data/lib/rspec/core/option_parser.rb

@@ -0,0 +1,84 @@
+module RSpec::Core
+  class Parser
+    def self.parse!(args)
+      new.parse!(args)
+    end
+
+    class << self
+      alias_method :parse, :parse!
+    end
+
+    def parse!(args)
+      options = {}
+      parser(options).parse!(args)
+      options
+    end
+
+    alias_method :parse, :parse!
+
+    def parser(options)
+      OptionParser.new do |parser|
+        parser.banner = "Usage: rspec [options] [files or directories]"
+
+        parser.on('-b', '--backtrace', 'Enable full backtrace') do |o|
+          options[:full_backtrace] = true
+        end
+
+        parser.on('-c', '--[no-]color', '--[no-]colour', 'Enable color in the output') do |o|
+          options[:color_enabled] = o
+        end
+        
+        parser.on('-d', '--debug', 'Enable debugging') do |o|
+          options[:debug] = true
+        end
+
+        parser.on('-e', '--example PATTERN', "Run examples whose full descriptions match this pattern",
+                "(PATTERN is compiled into a Ruby regular expression)") do |o|
+          options[:full_description] = /#{o}/
+        end
+
+        parser.on('-f', '--formatter FORMATTER', 'Choose a formatter',
+                '  [p]rogress (default - dots)',
+                '  [d]ocumentation (group and example names)') do |o|
+          options[:formatter] = o
+        end
+
+        parser.on_tail('-h', '--help', "You're looking at it.") do 
+          puts parser
+          exit
+        end
+
+        parser.on('-I DIRECTORY', 'specify $LOAD_PATH directory (may be used more than once)') do |dir|
+          options[:libs] ||= []
+          options[:libs] << dir
+        end
+
+        parser.on('-l', '--line_number LINE', 'Specify the line number of a single example to run') do |o|
+          options[:line_number] = o
+        end
+
+        parser.on('-o', '--options PATH', 'Read configuration options from a file path.  (Defaults to spec/spec.parser)') do |o|
+          options[:options_file] = o || local_options_file
+        end
+        
+        parser.on('-p', '--profile', 'Enable profiling of examples with output of the top 10 slowest examples') do |o|
+          options[:profile_examples] = o
+        end
+
+        parser.on('-v', '--version', 'Show version') do
+          puts RSpec::Core::Version::STRING
+          exit
+        end
+
+        parser.on('-X', '--drb', 'Run examples via DRb') do |o|
+          options[:drb] = true
+        end
+
+        parser.on('--drb-port [PORT]', 'Port to connect to on the DRb server') do |o|
+          options[:drb_port] = o.to_i
+        end
+
+      end
+    end
+  end
+end

data/lib/rspec/core/runner.rb

@@ -1,3 +1,5 @@
+require 'drb/drb'
+
 module RSpec
   module Core
     class Runner
@@ -7,60 +9,33 @@ module RSpec
       end
 
       def self.autorun
-        return if installed_at_exit?
+        return if installed_at_exit? || running_in_drb?
         @installed_at_exit = true
-        at_exit { new.run(ARGV) ? exit(0) : exit(1) } 
-      end
-
-      def configuration
-        RSpec.configuration
+        at_exit { run(ARGV, $stderr, $stdout) ? exit(0) : exit(1) }
       end
 
-      def reporter
-        configuration.formatter
+      def self.running_in_drb?
+        (DRb.current_server rescue false) &&
+        !!((DRb.current_server.uri) =~ /druby\:\/\/127.0.0.1\:/)
       end
 
-      def inclusion_filter
-        RSpec.configuration.filter
-      end
-
-      def run(args = [])
-        configure(args)
-        RSpec.world.announce_inclusion_filter
-
-        reporter.report(example_count) do |reporter|
-          example_groups.run_examples(reporter)
+      def self.run(args, err, out)
+        if args.any? {|a| %w[--drb -X].include? a}
+          run_over_drb(args, err, out) || run_in_process(args, err, out)
+        else
+          run_in_process(args, err, out)
         end
-        
-        example_groups.success?
       end
-      
-    private
 
-      def configure(args)
-        RSpec::Core::ConfigurationOptions.new(args).apply_to(configuration)
-        configuration.require_files_to_run
-        configuration.configure_mock_framework
+      def self.run_over_drb(args, err, out)
+        DRbCommandLine.new(args).run(err, out)
       end
 
-      def example_count
-        RSpec.world.example_count
+      def self.run_in_process(args, err, out)
+        CommandLine.new(args).run(err, out)
       end
 
-      def example_groups
-        RSpec.world.example_groups.extend(ExampleGroups)
-      end
-
-      module ExampleGroups
-        def run_examples(reporter)
-          @success = self.inject(true) {|success, group| success &= group.run(reporter)}
-        end
-
-        def success?
-          @success ||= false
-        end
-      end
-      
     end
+
   end
 end