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

data/lib/rspec/core/world.rb

@@ -59,11 +59,11 @@ module RSpec
       def announce_inclusion_filter
         if inclusion_filter
           if RSpec.configuration.run_all_when_everything_filtered? && RSpec.world.example_count == 0
-            RSpec.configuration.puts "No examples were matched by #{inclusion_filter.inspect}, running all"
+            RSpec.configuration.output_stream.puts "No examples were matched by #{inclusion_filter.inspect}, running all"
             RSpec.configuration.clear_inclusion_filter
             filtered_examples.clear
           else
-            RSpec.configuration.puts "Run filtered using #{inclusion_filter.inspect}"          
+            RSpec.configuration.output_stream.puts "Run filtered using #{inclusion_filter.inspect}"          
           end
         end      
       end

data/lib/rspec/monkey.rb

@@ -0,0 +1 @@
+require "rspec/monkey/spork/test_framework/rspec.rb"

data/lib/rspec/monkey/spork/test_framework/rspec.rb

@@ -0,0 +1,7 @@
+if defined?(Spork::TestFramework::RSpec)
+  class Spork::TestFramework::RSpec < Spork::TestFramework
+    def run_tests(argv, err, out)
+      ::RSpec::Core::CommandLine.new(argv).run(err, out)
+    end
+  end
+end

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.9"
+  s.version = "2.0.0.beta.10"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-05-27}
+  s.date = %q{2010-06-02}
   s.description = %q{RSpec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
@@ -31,58 +31,10 @@ Gem::Specification.new do |s|
      "bin/rspec",
      "bin/spec",
      "cucumber.yml",
-     "example_specs/failing/README.txt",
-     "example_specs/failing/diffing_spec.rb",
-     "example_specs/failing/failing_implicit_docstrings_example.rb",
-     "example_specs/failing/failure_in_after.rb",
-     "example_specs/failing/failure_in_before.rb",
-     "example_specs/failing/mocking_example.rb",
-     "example_specs/failing/mocking_with_flexmock.rb",
-     "example_specs/failing/mocking_with_mocha.rb",
-     "example_specs/failing/mocking_with_rr.rb",
-     "example_specs/failing/partial_mock_example.rb",
-     "example_specs/failing/pending_example.rb",
-     "example_specs/failing/predicate_example.rb",
-     "example_specs/failing/raising_example.rb",
-     "example_specs/failing/spec_helper.rb",
-     "example_specs/failing/syntax_error_example.rb",
-     "example_specs/failing/team_spec.rb",
-     "example_specs/failing/timeout_behaviour.rb",
-     "example_specs/passing/custom_formatter.rb",
-     "example_specs/passing/custom_matchers.rb",
-     "example_specs/passing/dynamic_spec.rb",
-     "example_specs/passing/file_accessor.rb",
-     "example_specs/passing/file_accessor_spec.rb",
-     "example_specs/passing/filtered_formatter.rb",
-     "example_specs/passing/filtered_formatter_example.rb",
-     "example_specs/passing/greeter_spec.rb",
-     "example_specs/passing/helper_method_example.rb",
-     "example_specs/passing/implicit_docstrings_example.rb",
-     "example_specs/passing/io_processor.rb",
-     "example_specs/passing/io_processor_spec.rb",
-     "example_specs/passing/mocking_example.rb",
-     "example_specs/passing/multi_threaded_example_group_runner.rb",
-     "example_specs/passing/nested_classes_example.rb",
-     "example_specs/passing/options_example.rb",
-     "example_specs/passing/options_formatter.rb",
-     "example_specs/passing/partial_mock_example.rb",
-     "example_specs/passing/pending_example.rb",
-     "example_specs/passing/predicate_example.rb",
-     "example_specs/passing/shared_example_group_example.rb",
-     "example_specs/passing/shared_stack_examples.rb",
-     "example_specs/passing/spec_helper.rb",
-     "example_specs/passing/stack.rb",
-     "example_specs/passing/stack_spec.rb",
-     "example_specs/passing/stack_spec_with_nested_example_groups.rb",
-     "example_specs/passing/stubbing_example.rb",
-     "example_specs/passing/subject_example.rb",
-     "example_specs/passing/yielding_example.rb",
-     "example_specs/ruby1.9.compatibility/access_to_constants_spec.rb",
-     "example_specs/spec_helper.rb",
      "features/command_line/example_name_option.feature",
      "features/command_line/line_number_appended_to_path.feature",
      "features/command_line/line_number_option.feature",
-     "features/configuration/custom_options.feature",
+     "features/configuration/custom_settings.feature",
      "features/configuration/options_file.feature",
      "features/example_groups/describe_aliases.feature",
      "features/example_groups/nested_groups.feature",
@@ -105,9 +57,11 @@ Gem::Specification.new do |s|
      "lib/rspec/core.rb",
      "lib/rspec/core/around_proxy.rb",
      "lib/rspec/core/backward_compatibility.rb",
+     "lib/rspec/core/command_line.rb",
      "lib/rspec/core/configuration.rb",
      "lib/rspec/core/configuration_options.rb",
      "lib/rspec/core/deprecation.rb",
+     "lib/rspec/core/drb_command_line.rb",
      "lib/rspec/core/errors.rb",
      "lib/rspec/core/example.rb",
      "lib/rspec/core/example_group.rb",
@@ -128,6 +82,7 @@ Gem::Specification.new do |s|
      "lib/rspec/core/mocking/with_rr.rb",
      "lib/rspec/core/mocking/with_rspec.rb",
      "lib/rspec/core/object_extensions.rb",
+     "lib/rspec/core/option_parser.rb",
      "lib/rspec/core/pending.rb",
      "lib/rspec/core/rake_task.rb",
      "lib/rspec/core/ruby_project.rb",
@@ -136,6 +91,8 @@ Gem::Specification.new do |s|
      "lib/rspec/core/subject.rb",
      "lib/rspec/core/version.rb",
      "lib/rspec/core/world.rb",
+     "lib/rspec/monkey.rb",
+     "lib/rspec/monkey/spork/test_framework/rspec.rb",
      "rspec-core.gemspec",
      "script/console",
      "spec/autotest/failed_results_re_spec.rb",
@@ -143,6 +100,7 @@ Gem::Specification.new do |s|
      "spec/rspec/core/configuration_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
      "spec/rspec/core/deprecations_spec.rb",
+     "spec/rspec/core/drb_command_line_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
      "spec/rspec/core/example_spec.rb",
      "spec/rspec/core/formatters/base_formatter_spec.rb",
@@ -173,7 +131,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.9
+  Thank you for installing rspec-core-2.0.0.beta.10
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -185,13 +143,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-core-2.0.0.beta.9}
+  s.summary = %q{rspec-core-2.0.0.beta.10}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
      "spec/rspec/core/configuration_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
      "spec/rspec/core/deprecations_spec.rb",
+     "spec/rspec/core/drb_command_line_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
      "spec/rspec/core/example_spec.rb",
      "spec/rspec/core/formatters/base_formatter_spec.rb",
@@ -224,19 +183,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.9"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.9"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.10"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.10"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_development_dependency(%q<autotest>, [">= 4.2.9"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.9"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.9"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.10"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.10"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_dependency(%q<autotest>, [">= 4.2.9"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.9"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.9"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.10"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.10"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/rspec/core/configuration_options_spec.rb

@@ -1,10 +1,15 @@
 require 'spec_helper'
+
 require 'ostruct'
 
 describe RSpec::Core::ConfigurationOptions do
   
+  def config_options_object(*args)
+    RSpec::Core::ConfigurationOptions.new(args)
+  end
+
   def options_from_args(*args)
-    RSpec::Core::ConfigurationOptions.new(args).parse_command_line_options
+    config_options_object(*args).options
   end
 
   describe 'color_enabled' do
@@ -102,6 +107,86 @@ describe RSpec::Core::ConfigurationOptions do
       options_from_args("-d").should include(:debug => true)
     end
   end
+  
+  describe "--drb (-X)" do
+    context "combined with --debug" do
+      it "turns off the debugger if --drb is specified first" do
+        config_options_object("--drb", "--debug").drb_argv.should_not include("--debug")
+        config_options_object("--drb", "-d"     ).drb_argv.should_not include("--debug")
+        config_options_object("-X",    "--debug").drb_argv.should_not include("--debug")
+        config_options_object("-X",    "-d"     ).drb_argv.should_not include("--debug")
+      end
+      
+      it "turns off the debugger option if --drb is specified later" do      
+        config_options_object("--debug", "--drb").drb_argv.should_not include("--debug")
+        config_options_object("-d",      "--drb").drb_argv.should_not include("--debug")
+        config_options_object("--debug", "-X"   ).drb_argv.should_not include("--debug")
+        config_options_object("-d",      "-X"   ).drb_argv.should_not include("--debug")
+      end
+      
+      it "turns off the debugger option if --drb is specified in the options file" do
+        File.stub(:exist?) { true }
+        File.stub(:readlines) { %w[ --drb  ] }
+        config_options_object("--debug").drb_argv.should_not include("--debug")
+        config_options_object("-d"     ).drb_argv.should_not include("--debug")        
+      end
+      
+      it "turns off the debugger option if --debug is specified in the options file" do
+        File.stub(:exist?) { true }
+        File.stub(:readlines) { %w[ --debug  ] }
+        config_options_object("--drb").drb_argv.should_not include("--debug")
+        config_options_object("-X"   ).drb_argv.should_not include("--debug")        
+      end
+    end
+        
+    it "sends all the arguments other than --drb back to the parser after parsing options" do
+      config_options_object("--drb", "--color").drb_argv.should_not include("--drb")
+    end
+  end
+  
+  
+  # TODO #drb_argv may not be the best name
+  # TODO ensure all options are output
+  # TODO check if we need to spec that the short options are "expanded" ("-v" becomes "--version" currently)
+  describe "#drb_argv" do
+    it "preserves extra arguments" do
+      config_options_object(*%w[ a --drb b --color c ]).drb_argv.should eq(%w[ --color a b c ])
+    end
+    
+    context "--drb specified in ARGV" do
+      it "renders all the original arguments except --drb" do
+        config_options_object(*%w[ --drb --color --formatter s --line_number 1 --example pattern --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --formatter s --line_number 1 --example pattern ])
+      end
+    end
+
+    context "--drb specified in the options file" do
+      it "renders all the original arguments except --drb" do
+        File.stub(:exist?) { true }
+        File.stub(:readlines) { %w[ --drb --color ] }
+        config_options_object(*%w[ --formatter s --line_number 1 --example pattern --profile --backtrace ]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --formatter s --line_number 1 --example pattern ])
+      end
+    end
+
+    context "--drb specified in ARGV and the options file" do
+      it "renders all the original arguments except --drb" do
+        File.stub(:exist?) { true }
+        File.stub(:readlines) { %w[ --drb --color ] }
+        config_options_object(*%w[ --drb --formatter s --line_number 1 --example pattern --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --formatter s --line_number 1 --example pattern ])
+      end
+    end
+
+    context "--drb specified in ARGV and in as ARGV-specified --options file" do
+      it "renders all the original arguments except --drb and --options" do
+        File.stub(:exist?) { true }
+        File.stub(:readlines) { %w[ --drb --color ] }
+        config_options_object(*%w[ --drb --formatter s --line_number 1 --example pattern --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --formatter s --line_number 1 --example pattern ])
+      end
+    end
+  end
 
   describe "options file (override)" do
     let(:config) { OpenStruct.new }
@@ -111,7 +196,7 @@ describe RSpec::Core::ConfigurationOptions do
       File.stub(:readlines) { ["--formatter", "doc"] }
 
       cli_options = RSpec::Core::ConfigurationOptions.new([])
-      cli_options.apply_to(config)
+      cli_options.configure(config)
       config.formatter.should == 'doc'
     end
     
@@ -120,7 +205,7 @@ describe RSpec::Core::ConfigurationOptions do
       File.stub(:readlines) { ["--formatter doc"] }
 
       cli_options = RSpec::Core::ConfigurationOptions.new([])
-      cli_options.apply_to(config)
+      cli_options.configure(config)
       config.formatter.should == 'doc'
     end
     
@@ -138,7 +223,7 @@ describe RSpec::Core::ConfigurationOptions do
       end
       cli_options = RSpec::Core::ConfigurationOptions.new(["--no-color"])
 
-      cli_options.apply_to(config)
+      cli_options.configure(config)
 
       config.formatter.should == "documentation"
       config.line_number.should == "37"
@@ -159,7 +244,7 @@ describe RSpec::Core::ConfigurationOptions do
       end
       cli_options = RSpec::Core::ConfigurationOptions.new([])
 
-      cli_options.apply_to(config)
+      cli_options.configure(config)
 
       config.formatter.should == "local"
     end
@@ -168,11 +253,10 @@ describe RSpec::Core::ConfigurationOptions do
       config_options = RSpec::Core::ConfigurationOptions.new(['--formatter', 'progress'])
       config_options.stub(:parse_options_file).and_return(:formatter => 'documentation')
 
-      config_options.apply_to(config)
+      config_options.configure(config)
 
       config.formatter.should == 'progress'
     end
   end
-
 end
 

data/spec/rspec/core/configuration_spec.rb

@@ -6,10 +6,6 @@ module RSpec::Core
 
     let(:config) { subject }
 
-    before(:each) do
-      RSpec.world.stub(:configuration).and_return(config)
-    end
-
     describe "#mock_framework_class" do
       before(:each) do
         config.stub(:require)
@@ -221,6 +217,14 @@ module RSpec::Core
     end
 
     describe "full_backtrace=" do
+      before do
+        @backtrace_clean_patterns = config.backtrace_clean_patterns
+      end
+
+      after do
+        config.backtrace_clean_patterns = @backtrace_clean_patterns
+      end
+
       it "clears the backtrace clean patterns" do
         config.full_backtrace = true
         config.backtrace_clean_patterns.should == []
@@ -240,6 +244,14 @@ module RSpec::Core
         config.debug = false
       end
     end
+    
+    describe "#output=" do
+      it "sets the output" do
+        output = mock("output")
+        config.output = output
+        config.output.should equal(output)
+      end
+    end
 
     describe "libs=" do
       it "adds directories to the LOAD_PATH" do
@@ -248,13 +260,13 @@ module RSpec::Core
       end
     end
 
-    describe "#add_option" do
-      describe ":type => :boolean" do
+    describe "#add_setting" do
+      describe "with no modifiers" do
         context "with no additional options" do
-          before { config.add_option :custom_option, :type => :boolean }
+          before { config.add_setting :custom_option }
 
-          it "defaults to false" do
-            config.custom_option.should be_false
+          it "defaults to nil" do
+            config.custom_option.should be_nil
           end
 
           it "adds a predicate" do
@@ -262,28 +274,50 @@ module RSpec::Core
           end
 
           it "can be overridden" do
-            config.custom_option = true
-            config.custom_option.should be_true
+            config.custom_option = "a value"
+            config.custom_option.should eq("a value")
           end
         end
 
-        context "with :default => true" do
-          before { config.add_option :custom_option, :type => :boolean, :default => true }
+        context "with :default => 'a value'" do
+          before { config.add_setting :custom_option, :default => 'a value' }
 
-          it "defaults to false" do
-            config.custom_option.should be_true
+          it "defaults to 'a value'" do
+            config.custom_option.should eq("a value")
           end
 
-          it "adds a predicate" do
+          it "returns true for the predicate" do
             config.custom_option?.should be_true
           end
 
           it "can be overridden" do
-            config.custom_option = false
-            config.custom_option.should be_false
+            config.custom_option = "a new value"
+            config.custom_option.should eq("a new value")
           end
         end
       end
+
+      context "with :alias => " do
+        before do
+          config.add_setting :custom_option
+          config.add_setting :another_custom_option, :alias => :custom_option
+        end
+
+        it "delegates the getter to the other option" do
+          config.another_custom_option = "this value"
+          config.custom_option.should == "this value"
+        end
+
+        it "delegates the setter to the other option" do
+          config.custom_option = "this value"
+          config.another_custom_option.should == "this value"
+        end
+
+        it "delegates the predicate to the other option" do
+          config.custom_option = true
+          config.another_custom_option?.should be_true
+        end
+      end
     end
 
   end