rspec-expectations 2.0.0.beta.3 → 2.0.0.beta.4

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.3
+2.0.0.beta.4

data/cucumber.yml

@@ -4,4 +4,4 @@ rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format
 std_opts = "#{rerun_opts} --require features --format rerun --out rerun.txt --strict --tags ~@wip"
 %>
 default: <%= std_opts %>
-wip: --tags @wip:3 --wip features
+wip: --require features --tags @wip:3 --wip features

data/features/matchers/access_running_example.feature

@@ -0,0 +1,48 @@
+@wip
+Feature: access running example
+
+  Scenario: matcher defined via DSL
+    Given a file named "example_spec.rb" with:
+      """
+      Rspec::Matchers.define :bar do
+        match do |_|
+          running_example.foo == "foo"
+        end
+      end
+
+      describe "something" do
+        def foo
+          "foo"
+        end
+
+        it "does something" do
+          "foo".should bar
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then I should see "1 example, 0 failures"
+    
+  Scenario: matcher defined via #new 
+    Given a file named "example_spec.rb" with:
+      """
+      describe "something" do
+        def bar
+          Rspec::Matchers::Matcher.new :bar do
+            match do |_|
+              running_example.foo == "foo"
+            end
+          end
+        end
+
+        def foo
+          "foo"
+        end
+
+        it "does something" do
+          "foo".should bar
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then I should see "1 example, 0 failures"

data/lib/rspec/expectations/differs/load-diff-lcs.rb

@@ -1,12 +1,7 @@
 begin
   require 'diff/lcs'
 rescue LoadError
-  begin
-    require 'rubygems' unless ENV['NO_RUBYGEMS']
-    require 'diff/lcs'
-  rescue LoadError
-    raise "You must gem install diff-lcs to use diffing"
-  end
+  raise "You must gem install diff-lcs to use diffing"
 end
 
 require 'diff/lcs/hunk'

data/lib/rspec/matchers/extensions/instance_exec.rb

@@ -15,14 +15,14 @@ module Rspec
             orig_critical, Thread.critical = Thread.critical, true
             n = 0
             n += 1 while respond_to?(method_name="__instance_exec#{n}")
-            singleton_class.module_eval{ define_method(:__instance_exec, &block) }
+            singleton_class.module_eval{ define_method(method_name, &block) }
           ensure
             Thread.critical = orig_critical
           end
           begin
-            return send(:__instance_exec, *args)
+            return send(method_name, *args)
           ensure
-            singleton_class.module_eval{ remove_method(:__instance_exec) } rescue nil
+            singleton_class.module_eval{ remove_method(method_name) } rescue nil
           end
         end
       end

data/lib/rspec/matchers/matcher.rb

@@ -6,7 +6,6 @@ module Rspec
       include Rspec::Matchers
 
       attr_reader :expected, :actual
-
       def initialize(name, *expected, &declarations)
         @name     = name
         @expected = expected
@@ -22,7 +21,12 @@ module Rspec
           instance_exec(*@expected, &declarations)
         end
       end
-
+      
+      def instance_exec(*args, &block)
+        self.running_example ||= eval("running_example", block.binding) rescue nil
+        super(*args, &block)
+      end
+            
       #Used internally by objects returns by +should+ and +should_not+.
       def matches?(actual)
         @actual = actual
@@ -87,9 +91,12 @@ module Rspec
           end
         end
       end
-
+      
+    protected
+      attr_accessor :running_example
+      
     private
-
+    
       def making_declared_methods_public # :nodoc:
         # Our home-grown instance_exec in ruby 1.8.6 results in any methods
         # declared in the block eval'd by instance_exec in the block to which we

data/rspec-expectations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-expectations}
-  s.version = "2.0.0.beta.3"
+  s.version = "2.0.0.beta.4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-03-15}
   s.description = %q{rspec expectations (should[_not] and matchers)}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "cucumber.yml",
      "features/expectations/customized_message.feature",
      "features/expectations/implicit_docstrings.feature",
+     "features/matchers/access_running_example.feature",
      "features/matchers/define_diffable_matcher.feature",
      "features/matchers/define_matcher.feature",
      "features/matchers/define_matcher_outside_rspec.feature",
@@ -102,12 +103,13 @@ Gem::Specification.new do |s|
      "spec/rspec/matchers/throw_symbol_spec.rb",
      "spec/spec_helper.rb",
      "spec/suite.rb",
-     "spec/support/classes.rb"
+     "spec/support/classes.rb",
+     "specs.watchr"
   ]
   s.homepage = %q{http://github.com/rspec/expectations}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-expectations-2.0.0.beta.3
+  Thank you for installing rspec-expectations-2.0.0.beta.4
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -119,7 +121,7 @@ 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-expectations-2.0.0.beta.3}
+  s.summary = %q{rspec-expectations-2.0.0.beta.4}
   s.test_files = [
     "spec/rspec/expectations/differs/default_spec.rb",
      "spec/rspec/expectations/extensions/kernel_spec.rb",
@@ -161,19 +163,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_development_dependency(%q<aruba>, [">= 0.1.1"])
-      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.3"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.3"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.4"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
     else
       s.add_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_dependency(%q<aruba>, [">= 0.1.1"])
-      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.3"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.3"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.4"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
     end
   else
     s.add_dependency(%q<cucumber>, [">= 0.6.2"])
     s.add_dependency(%q<aruba>, [">= 0.1.1"])
-    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.3"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.3"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.4"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
   end
 end
 

data/spec/rspec/matchers/dsl_spec.rb

@@ -15,8 +15,8 @@ module Rspec
           obj = Object.new
           obj.extend mod
     
-          Rspec::Matchers::Matcher.should_receive(:new).with(:foo, 3)
-    
+          Rspec::Matchers::Matcher.should_receive(:new).with(:foo, 3) { stub('matcher').as_null_object }
+
           obj.foo(3)
         end
       end

data/spec/rspec/matchers/matcher_spec.rb

@@ -284,6 +284,39 @@ module Rspec
         matcher.expecting('value').matches?('value').should be_true
         matcher.expecting('value').matches?('other value').should be_false
       end
+
+      context "defined using the dsl" do
+        it "can access the running_example" do
+          Rspec::Matchers.define(:__access_running_example) do
+            match do |actual|
+              actual == running_example
+            end
+          end
+          running_example.should __access_running_example
+        end
+      end
+    
+      context "defined using #new" do
+        it "can access the running_example" do
+          @matcher = Rspec::Matchers::Matcher.new(:something) {}
+          @matcher.send(:running_example).should eq(running_example)
+        end
+      end
+
+      context "wrapped in a method" do
+        
+        def access_running_example
+          Matcher.new(:access_running_example) do
+            match do |actual|
+              actual == running_example
+            end
+          end
+        end
+        
+        it "can access the running_example" do
+          running_example.should access_running_example
+        end
+      end
     end
   end
 end

data/specs.watchr

@@ -0,0 +1,57 @@
+# Run me with:
+#
+#   $ watchr specs.watchr
+
+# --------------------------------------------------
+# Convenience Methods
+# --------------------------------------------------
+def all_test_files
+  Dir['spec/**/*_spec.rb']
+end
+
+def run_test_matching(thing_to_match)
+  matches = all_test_files.grep(/#{thing_to_match}/i)
+  if matches.empty?
+    puts "Sorry, thanks for playing, but there were no matches for #{thing_to_match}"  
+  else
+    run matches.join(' ')
+  end
+end
+
+def run(files_to_run)
+  puts("Running: #{files_to_run}")
+  system("clear;rspec -cfs #{files_to_run}")
+  no_int_for_you
+end
+
+def run_all_tests
+  run(all_test_files.join(' '))
+end
+
+# --------------------------------------------------
+# Watchr Rules
+# --------------------------------------------------
+watch('^spec/(.*)_spec\.rb'  )   { |m| run_test_matching(m[1]) }
+watch('^lib/(.*)\.rb'               )   { |m| run_test_matching(m[1]) }
+watch('^spec/spec_helper\.rb')   { run_all_tests }
+# --------------------------------------------------
+# Signal Handling
+# --------------------------------------------------
+
+def no_int_for_you
+  @sent_an_int = nil
+end
+
+Signal.trap 'INT' do
+  if @sent_an_int then      
+    puts "   A second INT?  Ok, I get the message.  Shutting down now."
+    exit
+  else
+    puts "   Did you just send me an INT? Ugh.  I'll quit for real if you do it again."
+    @sent_an_int = true
+    Kernel.sleep 1.5
+    run_all_tests
+  end
+end
+
+# vim:ft=ruby

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 3
-  version: 2.0.0.beta.3
+  - 4
+  version: 2.0.0.beta.4
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -06:00
+date: 2010-03-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,8 +60,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 3
-        version: 2.0.0.beta.3
+        - 4
+        version: 2.0.0.beta.4
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,8 +76,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 3
-        version: 2.0.0.beta.3
+        - 4
+        version: 2.0.0.beta.4
   type: :development
   version_requirements: *id004
 description: rspec expectations (should[_not] and matchers)
@@ -99,6 +99,7 @@ files:
 - cucumber.yml
 - features/expectations/customized_message.feature
 - features/expectations/implicit_docstrings.feature
+- features/matchers/access_running_example.feature
 - features/matchers/define_diffable_matcher.feature
 - features/matchers/define_matcher.feature
 - features/matchers/define_matcher_outside_rspec.feature
@@ -176,6 +177,7 @@ files:
 - spec/spec_helper.rb
 - spec/suite.rb
 - spec/support/classes.rb
+- specs.watchr
 has_rdoc: true
 homepage: http://github.com/rspec/expectations
 licenses: []
@@ -183,7 +185,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-expectations-2.0.0.beta.3
+    Thank you for installing rspec-expectations-2.0.0.beta.4
   
     This is beta software. If you are looking
     for a supported production release, please
@@ -217,7 +219,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.0.0.beta.3
+summary: rspec-expectations-2.0.0.beta.4
 test_files: 
 - spec/rspec/expectations/differs/default_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb