rspec 1.2.3 → 1.2.4

data/History.rdoc

@@ -1,3 +1,9 @@
+=== Version 1.2.4
+
+* bug fix
+
+  * just one - update the manifest
+
 === Version 1.2.3
 
 * deprecations

data/Manifest.txt

@@ -67,6 +67,7 @@ features/interop/examples_and_tests_together.feature
 features/interop/rspec_output.feature
 features/interop/test_but_not_test_unit.feature
 features/interop/test_case_with_should_methods.feature
+features/matchers/define_diffable_matcher.feature
 features/matchers/define_matcher.feature
 features/matchers/define_matcher_outside_rspec.feature
 features/mock_framework_integration/use_flexmock.feature
@@ -113,6 +114,7 @@ lib/spec/expectations.rb
 lib/spec/expectations/errors.rb
 lib/spec/expectations/extensions.rb
 lib/spec/expectations/extensions/kernel.rb
+lib/spec/expectations/fail_with.rb
 lib/spec/expectations/handler.rb
 lib/spec/interop/test.rb
 lib/spec/interop/test/unit/autorunner.rb

data/features/matchers/define_diffable_matcher.feature

@@ -0,0 +1,26 @@
+Feature: define diffable matcher
+
+  When a matcher is defined as diffable, and the --diff
+  flag is set, the output will include a diff of the submitted
+  objects.
+
+  Scenario: define a diffable matcher
+    Given a file named "diffable_matcher_spec.rb" with:
+      """
+      Spec::Matchers.define :be_just_like do |expected|
+        match do |actual|
+          actual == expected
+        end
+        
+        diffable
+      end
+
+      describe "this" do
+        it {should be_just_like("that")}
+      end
+      """
+    When I run "spec diffable_matcher_spec.rb --diff"
+    Then the exit code should be 256
+
+    And the stdout should match "should be just like \"that\""
+    And the stdout should match "Diff:\n@@ -1,2 +1,2 @@\n-that\n+this"

data/lib/spec/expectations/fail_with.rb

@@ -0,0 +1,39 @@
+module Spec
+  module Expectations
+    class << self
+      attr_accessor :differ
+      
+      # raises a Spec::Expectations::ExpectationNotMetError with message
+      #
+      # When a differ has been assigned and fail_with is passed
+      # <code>expected</code> and <code>target</code>, passes them
+      # to the differ to append a diff message to the failure message.
+      def fail_with(message, expected=nil, target=nil) # :nodoc:
+        if (Array === message) & (message.length == 3)
+          ::Spec.warn(<<-NOTICE
+
+*****************************************************************
+DEPRECATION WARNING: you are using deprecated behaviour that will
+be removed from a future version of RSpec.
+
+* Support for matchers that return arrays from failure message
+methods is deprecated.
+* Instead, the matcher should return a string, and expose methods
+for the expected() and actual() values.
+*****************************************************************
+NOTICE
+          )
+          message, expected, target = message[0], message[1], message[2]
+        end
+        unless (differ.nil? || expected.nil? || target.nil?)
+          if expected.is_a?(String)
+            message << "\nDiff:" << self.differ.diff_as_string(target.to_s, expected)
+          elsif !target.is_a?(Proc)
+            message << "\nDiff:" << self.differ.diff_as_object(target, expected)
+          end
+        end
+        Kernel::raise(Spec::Expectations::ExpectationNotMetError.new(message))
+      end
+    end
+  end
+end

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec # :nodoc:
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 2
-      TINY   = 3
+      TINY   = 4
       
       STRING = [MAJOR, MINOR, TINY].compact.join('.')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -115,6 +115,7 @@ files:
 - features/interop/rspec_output.feature
 - features/interop/test_but_not_test_unit.feature
 - features/interop/test_case_with_should_methods.feature
+- features/matchers/define_diffable_matcher.feature
 - features/matchers/define_matcher.feature
 - features/matchers/define_matcher_outside_rspec.feature
 - features/mock_framework_integration/use_flexmock.feature
@@ -161,6 +162,7 @@ files:
 - lib/spec/expectations/errors.rb
 - lib/spec/expectations/extensions.rb
 - lib/spec/expectations/extensions/kernel.rb
+- lib/spec/expectations/fail_with.rb
 - lib/spec/expectations/handler.rb
 - lib/spec/interop/test.rb
 - lib/spec/interop/test/unit/autorunner.rb
@@ -410,7 +412,7 @@ homepage: http://rspec.info
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-1.2.3
+    Thank you for installing rspec-1.2.4
   
     Please be sure to read History.rdoc and Upgrade.rdoc
     for useful information about this release.
@@ -440,6 +442,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: rspec 1.2.3
+summary: rspec 1.2.4
 test_files: []