rspec 0.5.4 → 0.5.5

data/lib/spec/runner/context_runner.rb

@@ -14,12 +14,12 @@ module Spec
       end
     
       def add_context(context)
-        return if !@single_spec.nil? unless context.matches?@single_spec
-        context.isolate @single_spec if context.matches?@single_spec
+        return if !@single_spec.nil? unless context.matches?(@single_spec)
+        context.run_single_spec @single_spec if context.matches?(@single_spec)
         @contexts << context
       end
       
-      def run(exit_when_done=false)
+      def run(exit_when_done)
         @reporter.start number_of_specs
         @contexts.each do |context|
           context.run(@reporter, @dry_run)
@@ -28,7 +28,7 @@ module Spec
         failure_count = @reporter.dump
         if(exit_when_done)
           exit_code = (failure_count == 0) ? 0 : 1
-          exit!(exit_code)
+          exit(exit_code)
         end
       end
     

data/lib/spec/runner/kernel_ext.rb

@@ -3,7 +3,7 @@ module Kernel
     context = Spec::Runner::Context.new(name, &block)
     runner = context_runner
     runner.add_context(context)
-    runner.run if runner.standalone
+    runner.run(false) if runner.standalone
   end
   
 private

data/lib/spec/runner/spec_matcher.rb

@@ -0,0 +1,39 @@
+class SpecMatcher
+
+  def initialize(context_and_or_spec_name, context_name)
+    @context_name = context_name
+    @name_to_match = context_and_or_spec_name
+  end
+  
+  def matches? spec
+    if matches_context?
+      if matches_spec?(spec) or context_only?
+        return true
+      end
+    end
+    if matches_spec? spec
+      if spec_only? spec
+        return true
+      end
+    end
+  end
+  
+  private
+  
+  def spec_only? spec
+    @name_to_match == spec
+  end
+  
+  def context_only?
+    @name_to_match == @context_name
+  end
+  
+  def matches_context?
+    @name_to_match =~ /^#{@context_name}\b/
+  end
+  
+  def matches_spec? spec
+    @name_to_match =~ /\b#{spec}$/
+  end
+  
+end

data/lib/spec/runner/specification.rb

@@ -41,10 +41,10 @@ module Spec
         @mocks << mock
       end
       
-      def matches? name
-        name == @name
+      def matches_matcher? matcher
+        matcher.matches? @name 
       end
-
+            
       private
       
       def first_error errors

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec
     unless defined? MAJOR
       MAJOR = 0
       MINOR = 5
-      TINY  = 4
+      TINY  = 5
 
       STRING = [MAJOR, MINOR, TINY].join('.')
 

data/test/spec/api/helper/equality_test.rb

@@ -34,7 +34,7 @@ module Spec
           end
         end
 
-        def test_should_not_equal_should_raise_when_objects_are_not_equal
+        def test_should_not_equal_should_raise_when_objects_are_equal
           assert_raise(ExpectationNotMetError) do
             @dummy.should.not.equal @equal_dummy
           end

data/test/spec/runner/backtrace_tweaker_test.rb

@@ -14,25 +14,25 @@ module Spec
       def test_should_replace___instance_exec_with_spec_name
         @error.set_backtrace ["./examples/airport_spec.rb:28:in `__instance_exec_1014688_1661744'"]
         @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace[0].should.equal "./examples/airport_spec.rb:28:in `spec name'"
+        @error.backtrace[0].should_equal "./examples/airport_spec.rb:28:in `spec name'"
       end
 
       def test_should_leave_anything_in_api_dir_in_full_backtrace_mode
         @error.set_backtrace ["/lib/spec/api/anything.rb"]
         @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace[0].should.equal "/lib/spec/api/anything.rb"
+        @error.backtrace[0].should_equal "/lib/spec/api/anything.rb"
       end
-
+      
       def test_should_leave_anything_in_runner_dir_in_full_backtrace_mode
         @error.set_backtrace ["/lib/spec/runner/anything.rb"]
         @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace.should.not.be.empty
+        @error.backtrace.should_not_be_empty
       end
       
       def test_should_leave_bin_spec
         @error.set_backtrace ["bin/spec:"]
         @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace.should.not.be.empty
+        @error.backtrace.should_not_be_empty
       end
       
     end
@@ -50,25 +50,31 @@ module Spec
       def test_should_replace___instance_exec_with_spec_name
         @error.set_backtrace ["./examples/airport_spec.rb:28:in `__instance_exec_1014688_1661744'"]
         @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace[0].should.equal "./examples/airport_spec.rb:28:in `spec name'"
+        @error.backtrace[0].should_equal "./examples/airport_spec.rb:28:in `spec name'"
       end
 
       def test_should_remove_anything_in_api_dir
         @error.set_backtrace ["/lib/spec/api/anything.rb"]
         @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace.should.be.empty
+        @error.backtrace.should_be_empty
       end
 
       def test_should_remove_anything_in_runner_dir
         @error.set_backtrace ["/lib/spec/runner/anything.rb"]
         @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace.should.be.empty
+        @error.backtrace.should_be_empty
+      end
+
+      def test_should_remove_anything_from_textmate_ruby_bundle
+        @error.set_backtrace ["/Applications/TextMate.app/Contents/SharedSupport/Bundles/Ruby.tmbundle/Support/tmruby.rb:147"]
+        @tweaker.tweak_backtrace @error, 'spec name'
+        @error.backtrace.should_be_empty
       end
 
       def test_should_remove_bin_spec
         @error.set_backtrace ["bin/spec:"]
         @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace.should.be.empty
+        @error.backtrace.should_be_empty
       end
 
     end

data/test/spec/runner/context_matching_test.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module Spec
+  module Runner
+    class ContextMatchingTest < Test::Unit::TestCase
+      
+      def setup
+        @formatter = Api::Mock.new "formatter"
+        @context = Context.new("context") {}
+        @matcher = Spec::Api::Mock.new("matcher")
+      end
+      
+      def test_should_use_spec_matcher
+        @matcher.should_receive(:matches?).with("submitted spec")
+        @context.specify("submitted spec") {}
+        assert !@context.matches?("context with spec", @matcher)
+      end
+
+      def test_run_single_spec_should_trim_specs_when_spec_is_specified
+        @context.specify("spec1") {}
+        @context.specify("spec2") {}
+        @context.run_single_spec "context spec1"
+        assert_equal 1, @context.number_of_specs
+      end
+      
+      def test_run_single_spec_should_not_trim_specs_when_spec_is_not_specified
+        @context.specify("spec1") {}
+        @context.specify("spec2") {}
+        @context.run_single_spec "context"
+        assert_equal 2, @context.number_of_specs
+      end
+      
+    end
+  end
+end

data/test/spec/runner/context_runner_test.rb

@@ -21,7 +21,7 @@ module Spec
         runner.add_context context1
         runner.add_context context2        
 
-        runner.run
+        runner.run(false)
 
         context1.__verify
         context2.__verify
@@ -29,31 +29,31 @@ module Spec
       end
       
       def test_should_support_single_spec
-        legal_context = Api::Mock.new "legal context"
-        legal_context.should_receive(:matches?).at_least(:once).and_return(true)
-        legal_context.should_receive(:run)
-        legal_context.should_receive(:isolate)
-        legal_context.should_receive(:number_of_specs).and_return(1)
+        desired_context = Api::Mock.new "desired context"
+        desired_context.should_receive(:matches?).at_least(:once).and_return(true)
+        desired_context.should_receive(:run)
+        desired_context.should_receive(:run_single_spec)
+        desired_context.should_receive(:number_of_specs).and_return(1)
         
-        illegal_context = Api::Mock.new "illegal context"
-        illegal_context.should_receive(:matches?).and_return(false)
-        illegal_context.should_receive(:run).never
-        illegal_context.should_receive(:number_of_specs).never
+        other_context = Api::Mock.new "other context"
+        other_context.should_receive(:matches?).and_return(false)
+        other_context.should_receive(:run).never
+        other_context.should_receive(:number_of_specs).never
         
         reporter = Api::Mock.new 'reporter'
 
-        runner = ContextRunner.new(reporter, false, false, "legal context legal spec")
-        runner.add_context legal_context
-        runner.add_context illegal_context
+        runner = ContextRunner.new(reporter, false, false, "desired context legal spec")
+        runner.add_context desired_context
+        runner.add_context other_context
         
         reporter.should_receive(:start)
         reporter.should_receive(:end)
         reporter.should_receive(:dump)
         
-        runner.run
+        runner.run(false)
 
-        legal_context.__verify
-        illegal_context.__verify
+        desired_context.__verify
+        other_context.__verify
         reporter.__verify
       end
       

data/test/spec/runner/context_test.rb

@@ -69,27 +69,6 @@ module Spec
         @context.specify("four") {}
         assert_equal(4, @context.number_of_specs)
       end
-      
-      def test_matches_should_pass_if_matches_context_and_spec
-        @context.specify("spec") {}
-        assert @context.matches? "context spec"
-      end
-      
-      def test_matches_should_fail_if_input_does_not_start_with_name
-        assert !@context.matches?("contextual spec")
-      end
-      
-      def test_matches_should_fail_if_input_does_not_include_valid_spec
-        assert !@context.matches?("context spec")
-      end
-      
-      def test_isolate_should_trim_specs
-        @context.specify("spec1") {}
-        @context.specify("spec2") {}
-        @context.isolate "context spec1"
-        assert_equal 1, @context.number_of_specs
-      end
-      
     end
   end
 end

data/test/spec/runner/spec_matcher_test.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+module Spec
+  module Runner
+    class SpecMatcherTest < Test::Unit::TestCase
+      
+      def test_should_match_context_and_spec
+        matcher = SpecMatcher.new("a context with a spec", "a context")
+        assert matcher.matches?("with a spec")
+      end
+      
+      def test_should_not_match_wrong_context
+        matcher = SpecMatcher.new("another context with a spec", "a context")
+        assert !matcher.matches?("with a spec")
+      end
+     
+      def test_should_not_match_wrong_spec
+        matcher = SpecMatcher.new("a context with another spec", "a context")
+        assert !matcher.matches?("with a spec")
+      end
+      
+      def test_should_match_context_only
+        matcher = SpecMatcher.new("a context", "a context")
+        assert matcher.matches?("with a spec")
+      end
+      
+      def test_should_not_match_wrong_context_only
+        matcher = SpecMatcher.new("another context", "a context")
+        assert !matcher.matches?("with a spec")
+      end
+      
+      def test_should_match_spec_only
+        matcher = SpecMatcher.new("with a spec", "a context")
+        assert matcher.matches?("with a spec")
+      end
+      
+      def test_should_match_wrong_spec_only
+        matcher = SpecMatcher.new("with another spec", "a context")
+        assert !matcher.matches?("with a spec")
+      end
+    end
+  end
+end

data/test/spec/runner/specification_test.rb

@@ -90,14 +90,19 @@ module Spec
         spec.run @reporter, nil, teardown
       end
       
-      def test_should_match_if_name_matches
+      def test_should_match_if_name_matches_end_of_input
         spec = Specification.new("spec")
-        assert spec.matches?"spec"
+        assert spec.matches_matcher?(SpecMatcher.new("context spec", "context"))
+      end
+      
+      def test_should_match_if_name_matches_entire_input
+        spec = Specification.new("spec")
+        assert spec.matches_matcher?(SpecMatcher.new("spec", "context"))
       end
       
       def test_should_not_match_if_name_does_not_match
-        spec = Specification.new("specification")
-        assert (!spec.matches?"spec")
+        spec = Specification.new("otherspec")
+        assert !spec.matches_matcher?(SpecMatcher.new("context spec", "context"))
       end
       
       def teardown

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
-date: 2006-05-13
-summary: Behaviour Specification Framework for Ruby
+  version: 0.5.5
+date: 2006-06-06 00:00:00 -05:00
+summary: RSpec-0.5.5 - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
-email: srbaker@pobox.com
+email: rspec-devel@rubyforge.org
 homepage: http://rspec.rubyforge.org
 rubyforge_project: rspec
-description: "RSpec is a behaviour specification framework for Ruby.  RSpec was created in response to Dave Astels' article _A New Look at Test Driven Development_ which can be read at: http://daveastels.com/index.php?p=5  RSpec is intended to provide the features discussed in Dave's article."
+description: "RSpec is a behaviour driven development (BDD) framework for Ruby.  RSpec was  created in response to Dave Astels' article _A New Look at Test Driven Development_  which can be read at: http://daveastels.com/index.php?p=5  RSpec is intended to provide the features discussed in Dave's article."
 autorequire: spec
 default_executable: spec
 bindir: bin
@@ -23,8 +23,10 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
       version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-- Steven Baker
+- Steven Baker, Aslak Hellesoy, Dave Astels, David Chelimsky
 files: 
 - CHANGES
 - EXAMPLES.rd
@@ -65,12 +67,12 @@ files:
 - lib/spec/runner/progress_bar_formatter.rb
 - lib/spec/runner/rdoc_formatter.rb
 - lib/spec/runner/reporter.rb
+- lib/spec/runner/spec_matcher.rb
 - lib/spec/runner/specdoc_formatter.rb
 - lib/spec/runner/specification.rb
 - lib/spec/tool/command_line.rb
 - lib/spec/tool/test_unit_translator.rb
 - test/test_helper.rb
-- test/rcov/rcov_testtask.rb
 - test/spec/api/duck_type_test.rb
 - test/spec/api/sugar_test.rb
 - test/spec/api/helper/arbitrary_predicate_test.rb
@@ -89,6 +91,7 @@ files:
 - test/spec/api/mocks/mock_test.rb
 - test/spec/api/mocks/null_object_test.rb
 - test/spec/runner/backtrace_tweaker_test.rb
+- test/spec/runner/context_matching_test.rb
 - test/spec/runner/context_runner_test.rb
 - test/spec/runner/context_test.rb
 - test/spec/runner/execution_context_test.rb
@@ -98,6 +101,7 @@ files:
 - test/spec/runner/progress_bar_formatter_test.rb
 - test/spec/runner/rdoc_formatter_test.rb
 - test/spec/runner/reporter_test.rb
+- test/spec/runner/spec_matcher_test.rb
 - test/spec/runner/specdoc_formatter_test.rb
 - test/spec/runner/specification_test.rb
 - test/spec/tool/command_line_test.rb
@@ -113,10 +117,8 @@ files:
 - doc/config.yaml
 - doc/plugin
 - doc/README
-- doc/reference
 - doc/src
 - doc/plugin/syntax.rb
-- doc/reference/rspec reference.page
 - doc/src/core_team.page
 - doc/src/default.css
 - doc/src/default.template