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

data/spec/rspec/core/deprecations_spec.rb

@@ -2,7 +2,9 @@ require "spec_helper"
 
 describe "deprecations" do
   describe "Spec" do
-    RSpec.should_receive(:warn).with /Spec .* RSpec/i
-    Spec
+    it "is deprecated" do
+      RSpec.should_receive(:warn_deprecation).with /Spec .* RSpec/i
+      Spec
+    end
   end
 end

data/spec/rspec/core/drb_command_line_spec.rb

@@ -0,0 +1,151 @@
+require "spec_helper"
+
+describe "::DRbCommandLine" do
+  before do
+    RSpec.stub(:configuration).and_return(RSpec::Core::Configuration.new)
+  end
+
+  context "without server running" do
+    it "prints error" do
+      err = out = StringIO.new
+      RSpec::Core::DRbCommandLine.new([]).run(err, out)
+
+      err.rewind
+      err.read.should =~ /No DRb server is running/
+    end
+    
+    it "returns false" do
+      err = out = StringIO.new
+      result = RSpec::Core::DRbCommandLine.new([]).run(err, out)
+      result.should be_false
+    end
+  end
+  
+  describe "--drb-port" do
+    def config_options_object(*args)
+      RSpec::Core::DRbCommandLine.new(args)
+    end
+
+    def with_RSPEC_DRB_set_to(val)
+      original = ENV['RSPEC_DRB']
+      ENV['RSPEC_DRB'] = val
+      begin
+        yield
+      ensure
+        ENV['RSPEC_DRB'] = original
+      end
+    end
+
+    context "without RSPEC_DRB environment variable set" do
+      it "defaults to 8989" do
+        with_RSPEC_DRB_set_to(nil) do
+          RSpec::Core::DRbCommandLine.new([]).drb_port.should == 8989
+        end
+      end
+      
+      it "sets the DRb port" do
+        with_RSPEC_DRB_set_to(nil) do
+          RSpec::Core::DRbCommandLine.new(["--drb-port", "1234"]).drb_port.should == 1234
+          RSpec::Core::DRbCommandLine.new(["--drb-port", "5678"]).drb_port.should == 5678
+        end
+      end
+    end
+
+    context "with RSPEC_DRB environment variable set" do
+
+      context "without config variable set" do
+        it "uses RSPEC_DRB value" do
+          with_RSPEC_DRB_set_to('9000') do
+            RSpec::Core::DRbCommandLine.new([]).drb_port.should == "9000"
+          end
+        end
+      end
+        
+      context "and config variable set" do
+        it "uses configured value" do
+          with_RSPEC_DRB_set_to('9000') do
+            RSpec::Core::DRbCommandLine.new(%w[--drb-port 5678]).drb_port.should == 5678
+          end
+        end
+      end
+    end
+  end
+
+  context "with server running" do
+    class ::FakeDrbSpecServer
+      def self.run(argv, err, out) 
+        RSpec::Core::CommandLine.new(argv).run(err, out)
+      end
+    end
+
+    def dummy_spec_filename
+      @dummy_spec_filename ||= File.expand_path(File.dirname(__FILE__)) + "/_dummy_spec#{@drb_example_file_counter}.rb"
+    end
+  
+    before(:all) do
+      @drb_port = 8990
+      @drb_example_file_counter = 0
+      DRb::start_service("druby://127.0.0.1:#{@drb_port}", ::FakeDrbSpecServer)
+    end
+
+    before(:each) do
+      @drb_example_file_counter += 1
+      create_dummy_spec_file
+    end
+
+    after(:each) do
+      File.delete(dummy_spec_filename)
+    end
+
+    after(:all) do
+      DRb::stop_service
+    end
+
+    def create_dummy_spec_file
+      File.open(dummy_spec_filename, 'w') do |f|
+        f.write %q{
+          describe "DUMMY CONTEXT for 'DrbCommandLine with -c option'" do
+            it "should be output with green bar" do
+              true.should be_true
+            end
+
+            it "should be output with red bar" do
+              raise("I want to see a red bar!")
+            end
+          end
+        }
+      end
+    end
+
+    def run_spec_via_druby(argv)
+      err, out = StringIO.new, StringIO.new
+      RSpec::Core::DRbCommandLine.new(argv.push("--drb-port", @drb_port.to_s)).run(err, out)
+      out.rewind
+      out.read
+    end
+
+    it "returns true" do
+      err, out = StringIO.new, StringIO.new
+      result = RSpec::Core::DRbCommandLine.new(["--drb-port", @drb_port.to_s]).run(err, out)
+      result.should be_true
+    end
+    
+    it "should output green colorized text when running with --colour option" do
+      out = run_spec_via_druby(["--colour", dummy_spec_filename])
+      out.should =~ /\e\[32m/m
+    end
+  
+    it "should output red colorized text when running with -c option" do
+      pending
+      out = run_spec_via_druby(["-c", dummy_spec_filename])
+      out.should =~ /\e\[31m/m
+    end
+    
+    it "integrates via Runner.new.run" do
+      err, out = StringIO.new, StringIO.new
+      result = RSpec::Core::Runner.run(%W[ --drb --drb-port #{@drb_port} #{dummy_spec_filename}], err, out)
+      result.should be_true
+    end
+  end
+  
+end

data/spec/rspec/core/formatters/base_formatter_spec.rb

@@ -2,7 +2,8 @@ require "spec_helper"
 
 describe RSpec::Core::Formatters::BaseFormatter do
   
-  let(:formatter) { RSpec::Core::Formatters::BaseFormatter.new }
+  let(:output)    { StringIO.new }
+  let(:formatter) { RSpec::Core::Formatters::BaseFormatter.new(output) }
 
   it "has start as an interface with one argument" do
     formatter.should have_interface_for(:start).with(1).argument

data/spec/rspec/core/formatters/base_text_formatter_spec.rb

@@ -8,10 +8,9 @@ module RSpec::Core::Formatters
         output = StringIO.new
         group = RSpec::Core::ExampleGroup.describe
         example = group.example { "this".should eq("that") }
-        formatter = RSpec::Core::Formatters::BaseTextFormatter.new
+        formatter = RSpec::Core::Formatters::BaseTextFormatter.new(output)
         group.run_all(formatter)
 
-        RSpec.configuration.stub(:output) { output }
         RSpec.configuration.stub(:color_enabled?) { false }
         formatter.dump_failures
         output.string.should =~ /(\s+)expected \"that\"\n\1     got \"this\"/m

data/spec/rspec/core/formatters/documentation_formatter_spec.rb

@@ -16,10 +16,9 @@ module RSpec::Core::Formatters
       ]
 
       output = StringIO.new
-      RSpec.configuration.stub(:output) { output }
       RSpec.configuration.stub(:color_enabled?) { false }
 
-      formatter = RSpec::Core::Formatters::DocumentationFormatter.new
+      formatter = RSpec::Core::Formatters::DocumentationFormatter.new(output)
       
       examples.each {|e| formatter.example_finished(e) }
 

data/spec/rspec/core/formatters/progress_formatter_spec.rb

@@ -5,10 +5,9 @@ describe RSpec::Core::Formatters::ProgressFormatter do
   
    before do
      @output = StringIO.new
-     @formatter = RSpec::Core::Formatters::ProgressFormatter.new
+     @formatter = RSpec::Core::Formatters::ProgressFormatter.new(@output)
      @formatter.start(2)
      @formatter.stub!(:color_enabled?).and_return(false)
-     @formatter.stub!(:output).and_return(@output)
    end
    
    it "should produce line break on start dump" do

data/spec/rspec/core/resources/a_spec.rb

@@ -1 +1 @@
-# Empty - used by ../options_spec.rb
+# Empty - used by ../options_spec.rb

data/spec/rspec/core/runner_spec.rb

@@ -1,34 +1,45 @@
 require 'spec_helper'
 
-describe RSpec::Core::Runner do
-
-  describe 'reporter' do
-
-    it 'should return the configured formatter' do
-      RSpec::Core::Runner.new.reporter.should == RSpec.configuration.formatter
-    end
-
-  end  
-  
-  describe 'at_exit' do
-    
-    it 'should set an at_exit hook if none is already set' do
-      RSpec::Core::Runner.stub!(:installed_at_exit?).and_return(false)
-      RSpec::Core::Runner.should_receive(:at_exit)
-      RSpec::Core::Runner.autorun
+module RSpec::Core
+  describe Runner do
+    describe 'at_exit' do
+      it 'sets an at_exit hook if none is already set' do
+        RSpec::Core::Runner.stub(:installed_at_exit?).and_return(false)
+        RSpec::Core::Runner.stub(:running_in_drb?).and_return(false)
+        RSpec::Core::Runner.should_receive(:at_exit)
+        RSpec::Core::Runner.autorun
+      end
+      
+      it 'does not set the at_exit hook if it is already set' do
+        RSpec::Core::Runner.stub(:installed_at_exit?).and_return(true)
+        RSpec::Core::Runner.stub(:running_in_drb?).and_return(false)
+        RSpec::Core::Runner.should_receive(:at_exit).never
+        RSpec::Core::Runner.autorun
+      end
     end
     
-    it 'should not set the at_exit hook if it is already set' do
-      RSpec::Core::Runner.stub!(:installed_at_exit?).and_return(true)
-      RSpec::Core::Runner.should_receive(:at_exit).never
-      RSpec::Core::Runner.autorun
+    describe "#run" do
+      context "with --drb or -X" do
+        before(:each) do
+          @err = @out = StringIO.new
+
+          @options = RSpec::Core::ConfigurationOptions.new(%w[--drb --drb-port 8181 --color])
+          RSpec::Core::ConfigurationOptions.stub(:new) { @options }
+          
+          @drb_proxy = double(RSpec::Core::DRbCommandLine, :run => true)
+          RSpec::Core::DRbCommandLine.stub(:new => @drb_proxy)
+        end
+        
+        it "builds a DRbCommandLine" do
+          RSpec::Core::DRbCommandLine.should_receive(:new)
+          RSpec::Core::Runner.run(%w[ --drb ], @err, @out)
+        end
+
+        it "runs specs over the proxy" do
+          @drb_proxy.should_receive(:run).with(@err, @out)
+          RSpec::Core::Runner.run(%w[ --drb ], @err, @out)
+        end
+      end
     end
-    
-  end
-  
-  describe 'placeholder' do
-    
-    # it "should "    
-    # RSpec::Core::Runner.new
   end
 end

data/spec/rspec/core/shared_example_group_spec.rb

@@ -191,7 +191,7 @@ module RSpec::Core
           group.magic[:after_each].should eq("after each 3")
         end
 
-        it "runs after(:all) only once from shared example_group", :pending => true, :compat => 'rspec-1.2' do
+        it "runs after(:all) only once from shared example_group", :compat => 'rspec-1.2' do
           group.magic[:after_all].should eq("after all 1")
         end
 

data/spec/spec_helper.rb

@@ -1,55 +1,70 @@
-$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
-require 'rspec/core'
-
-$LOAD_PATH << File.expand_path('../../../rspec-expectations/lib', __FILE__)
-$LOAD_PATH << File.expand_path('../../../rspec-mocks/lib', __FILE__)
-require 'rspec/expectations'
-require 'rspec/mocks'
-
-begin
-  require 'autotest'
-rescue LoadError
-  raise "Could not load autotest."
-end
+require 'rubygems'
+require 'spork'
 
-require 'autotest/rspec2'
+Spork.prefork do
+  $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+  require 'rspec/core'
 
-Dir['./spec/support/**/*.rb'].map {|f| require f}
+  $LOAD_PATH << File.expand_path('../../../rspec-expectations/lib', __FILE__)
+  $LOAD_PATH << File.expand_path('../../../rspec-mocks/lib', __FILE__)
+  require 'rspec/expectations'
+  require 'rspec/mocks'
 
-module RSpec
-  module Core
-    module Matchers
-      def fail
-        raise_error(::RSpec::Expectations::ExpectationNotMetError)
-      end
+  begin
+    require 'autotest'
+  rescue LoadError
+    raise "Could not load autotest."
+  end
+
+  require 'autotest/rspec2'
+
+  Dir['./spec/support/**/*.rb'].map {|f| require f}
 
-      def fail_with(message)
-        raise_error(::RSpec::Expectations::ExpectationNotMetError, message)
+  module RSpec
+    module Core
+      module Matchers
+        def fail
+          raise_error(::RSpec::Expectations::ExpectationNotMetError)
+        end
+
+        def fail_with(message)
+          raise_error(::RSpec::Expectations::ExpectationNotMetError, message)
+        end
       end
     end
   end
-end
 
-class RSpec::Core::ExampleGroup
-  def self.run_all(reporter=nil)
-    run(reporter || RSpec::Mocks::Mock.new('reporter').as_null_object)
+  class NullObject
+    def method_missing(method, *args, &block)
+      # ignore
+    end
   end
-end
 
-def in_editor?
-  ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
-end
+  class RSpec::Core::ExampleGroup
+    def self.run_all(reporter=nil)
+      run(reporter || NullObject.new)
+    end
+  end
 
-RSpec.configure do |c|
-  c.color_enabled = !in_editor?
-  c.exclusion_filter = { :ruby => lambda {|version|
-    !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
-  }}
-  c.before(:each) do
-    @real_world = RSpec.world
-    RSpec.instance_variable_set(:@world, RSpec::Core::World.new)
+  def in_editor?
+    ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
   end
-  c.after(:each) do
-    RSpec.instance_variable_set(:@world, @real_world)
+
+  RSpec.configure do |c|
+    c.color_enabled = !in_editor?
+    c.exclusion_filter = { :ruby => lambda {|version|
+      !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
+    }}
+    c.before(:each) do
+      @real_world = RSpec.world
+      RSpec.instance_variable_set(:@world, RSpec::Core::World.new)
+    end
+    c.after(:each) do
+      RSpec.instance_variable_set(:@world, @real_world)
+    end
   end
 end
+
+Spork.each_run do
+end
+

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 9
-  version: 2.0.0.beta.9
+  - 10
+  version: 2.0.0.beta.10
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -05:00
+date: 2010-06-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 9
-        version: 2.0.0.beta.9
+        - 10
+        version: 2.0.0.beta.10
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 9
-        version: 2.0.0.beta.9
+        - 10
+        version: 2.0.0.beta.10
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -104,58 +104,10 @@ files:
 - 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
@@ -178,9 +130,11 @@ files:
 - 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
@@ -201,6 +155,7 @@ files:
 - 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
@@ -209,6 +164,8 @@ files:
 - 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
@@ -216,6 +173,7 @@ files:
 - 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
@@ -249,7 +207,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    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
@@ -283,13 +241,14 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.beta.9
+summary: rspec-core-2.0.0.beta.10
 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