wrong 0.4.4-java → 0.4.5-java

data/lib/wrong/assert.rb

@@ -64,7 +64,7 @@ module Wrong
 
         chunk = Wrong::Chunk.from_block(block, depth + 2)
 
-        message = FailureMessage.new(chunk, block, valence, explanation).full
+        message = FailureMessage.new(chunk, valence, explanation).full
         raise failure_class.new(message)
       end
     end

data/lib/wrong/chunk.rb

@@ -26,16 +26,20 @@ module Wrong
                 as_proc.source_location
               else
                 # in Ruby 1.8, it reads the source location from the call stack
-                caller[depth].split(":")
+                # # $stderr.puts "---"
+                # $stderr.puts caller.join("\n")
+                relevant_caller = caller[depth]
+                # $stderr.puts "*** #{relevant_caller}"
+                relevant_caller.split(":")
               end
 
-      new(file, line, block)
+      new(file, line, &block)
     end
 
     attr_reader :file, :line_number, :block
 
     # line parameter is 1-based
-    def initialize(file, line_number, block = nil)
+    def initialize(file, line_number, &block)
       @file = file
       @line_number = line_number.to_i
       @block = block
@@ -143,7 +147,7 @@ module Wrong
         # todo: extract some of this into Sexp
         parts_list = []
         begin
-          unless sexp.first == :arglist # or sexp.first == :iter
+          unless [:arglist, :lasgn, :iter].include? sexp.first
             code = sexp.to_ruby.strip
             parts_list << code unless code == "" || parts_list.include?(code)
           end
@@ -221,6 +225,7 @@ module Wrong
 
     end
 
+public # don't know exactly why this needs to be public but eval'ed code can't find it otherwise
     def indent(indent, *s)
       "#{"  " * indent}#{s.join('')}"
     end

data/lib/wrong/failure_message.rb

@@ -41,14 +41,14 @@ module Wrong
     end
     
     
-    attr_accessor :chunk, :block, :valence, :explanation
+    attr_accessor :chunk, :valence, :explanation
 
-    def initialize(chunk, block, valence, explanation)
-      @chunk, @block, @valence, @explanation = chunk, block, valence, explanation
+    def initialize(chunk, valence, explanation)
+      @chunk, @valence, @explanation = chunk, valence, explanation
     end
 
     def basic
-      "#{valence == :deny ? "Didn't expect" : "Expected"} #{chunk.code}"
+      "#{valence == :deny ? "Didn't expect" : "Expected"} #{colored(:blue, chunk.code)}"
     end
     
     def full
@@ -58,9 +58,7 @@ module Wrong
       
       formatted_message = if predicate && !(predicate.is_a? Predicated::Conjunction)
         if formatter = FailureMessage.formatter_for(predicate)
-          failure = formatter.describe
-          failure = failure.bold if Wrong.config[:color]
-          failure
+          colored(:bold, formatter.describe)
         end
       end
       
@@ -75,16 +73,12 @@ module Wrong
 
     protected    
     def code
-      @code ||= begin
-        code = chunk.code
-        code = code.color(:blue) if Wrong.config[:color]
-        code
-      end
+      @code ||= chunk.code
     end
     
     def predicate
       @predicate ||= begin
-        Predicated::Predicate.from_ruby_code_string(code, block.binding)
+        Predicated::Predicate.from_ruby_code_string(code, chunk.block.binding)
       rescue Predicated::Predicate::DontKnowWhatToDoWithThisSexpError, Exception => e
         # save it off for debugging
         @@last_predicated_error = e
@@ -92,6 +86,17 @@ module Wrong
       end
     end
     
+    def colored(color, text)
+      if Wrong.config[:color]
+        if color == :bold
+          text.bold
+        else
+          text.color(color)
+        end
+      else
+        text
+      end
+    end
 
   end
 end

data/lib/wrong/version.rb

@@ -1,3 +1,3 @@
 module Wrong
-  VERSION = "0.4.4" unless defined?(Wrong::VERSION)
+  VERSION = "0.4.5" unless defined?(Wrong::VERSION)
 end

data/test/chunk_test.rb

@@ -175,6 +175,13 @@ z
       code_parts = chunk.parts
       assert !code_parts.include?("rescuing")
     end
+    
+    it "skips assignments" do
+      chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
+        x = 7; x
+      CODE
+      assert !chunk.parts.include?("(x = 7)")
+    end    
   end
 
   describe "#details" do
@@ -247,6 +254,13 @@ z
       # this means it's a literal slash plus t inside double quotes -- i.e. it shows the escaped (inspected) string
       assert d == "\n" + '    x is "flavor:\tvanilla"' + "\n"
     end
+    
+    it "skips assignments" do
+      y = 14
+      d = details { x = 7; y }
+      assert d !~ /x = 7/
+      assert d =~ /y is 14/
+    end
 
     it "indents unescaped newlines inside the inspected value" do
       weirdo = Object.new

data/test/failure_message_test.rb

@@ -2,22 +2,22 @@ require "./test/test_helper"
 require "wrong/assert"
 require "wrong/failure_message"
 
-module Wrong
-
-  class BogusFormatter < FailureMessage::Formatter
-    def match?
-      predicate.is_a? BogusPredicate
-    end
-
-    def describe
-      "bogus #{predicate.object_id}"
-    end
+class BogusFormatter < Wrong::FailureMessage::Formatter
+  def match?
+    predicate.is_a? BogusPredicate
   end
 
-  class BogusPredicate < Predicated::Predicate
+  def describe
+    "bogus #{predicate.object_id}"
   end
+end
+
+class BogusPredicate < Predicated::Predicate
+end
+
+module Wrong
 
-  describe FailureMessage::Formatter do
+  describe Wrong::FailureMessage::Formatter do
     include Wrong::Assert
 
     it "describes a predicate" do
@@ -27,23 +27,28 @@ module Wrong
     end
   end
 
-  describe FailureMessage do
+  describe Wrong::FailureMessage do    
     include Wrong::Assert
 
     it "can register a formatter class for a predicate pattern" do
-      FailureMessage.register_formatter(BogusFormatter)
-      assert { FailureMessage.formatter_for(BogusPredicate.new).is_a? BogusFormatter }
-      assert { FailureMessage.formatters.include?(BogusFormatter)}
+      Wrong::FailureMessage.register_formatter(::BogusFormatter)
+      assert { Wrong::FailureMessage.formatter_for(::BogusPredicate.new).is_a? ::BogusFormatter }
+      assert { Wrong::FailureMessage.formatters.include?(::BogusFormatter)}
     end
 
-    def message(options = {})
-      block = options[:block] || proc { 2 + 2 == 5 }
-      chunk = Chunk.from_block(block)
+    before do
+      @chunk = Wrong::Chunk.new(__FILE__, __LINE__ + 1) do
+        2 + 2 == 5
+      end
+    end
+
+    def message(options = {}, &block)
       valence = options[:valence] || :assert 
       explanation = options[:explanation]
-      FailureMessage.new(chunk, block, valence, explanation)
+      Wrong::FailureMessage.new(@chunk, valence, explanation)
     end
 
+
     describe "#basic" do      
       it "shows the code" do
         assert { message.basic == "Expected ((2 + 2) == 5)" }
@@ -65,18 +70,18 @@ module Wrong
       end
       
       it "doesn't say 'but' if there are no details" do
-        block = proc { 7 }
-        chunk = Chunk.from_block(block)
-        assert { chunk.details.empty? }
-        msg = message(:block => block)
-        deny { msg.full.include? ", but"}
+        @chunk = Wrong::Chunk.new(__FILE__, __LINE__ + 1) do
+          2
+        end
+        assert { @chunk.details.empty? }
+        deny { message.full.include? ", but"}
       end
       
-      it "say 'but' with if there are details" do
-        block = proc { 2 + 2 == 5 }
-        chunk = Chunk.from_block(block)
-        msg = message(:block => block)
-        assert { msg.full.include? ", but\n    (2 + 2) is 4"}
+      it "says 'but' if there are details" do
+        @chunk = Wrong::Chunk.new(__FILE__, __LINE__ + 1) do
+          2 + 2 == 5
+        end
+        assert { message.full.include? ", but\n    (2 + 2) is 4"}
       end
       
     end

data/test/failures_test.rb

@@ -83,7 +83,6 @@ describe "failures" do
      #        }
      #      }.message)
      #    end
-  # end
 
   describe "array comparisons" do
     it "basic" do

data/test/message/array_diff_test.rb

@@ -2,14 +2,13 @@ require "./test/test_helper"
 require "wrong/assert"
 require "wrong/helpers"
 require "wrong/adapters/minitest"
-
 require "wrong/message/array_diff"
 
 describe "when you're comparing strings and they don't match, show me the diff message" do
 
   def assert_string_diff_message(first_array, second_array, expected_error_message)
     e = rescuing {
-      Wrong.assert { first_array == second_array }
+      assert { first_array == second_array }
     }
     assert {
       e.message.include?(expected_error_message.strip)

data/test/string_comparison_test.rb

@@ -5,6 +5,8 @@ require "wrong/message/string_comparison"
 module Wrong
 describe StringComparison do
 
+  StringComparison = Wrong::StringComparison # so Ruby 1.9.1 can find it
+  
   before do
     # crank the window and prelude down for these tests
     @old_window = StringComparison.window
@@ -153,7 +155,7 @@ second: ..."kl*nopqrstuvwxyz"
       error = rescuing do
         assert { "xyz" == "abc" }
       end
-      assert { error.message =~ /Strings differ/ }
+      assert { error.message =~ /Strings differ at position 0:/ }
     end
   end
 end

metadata

@@ -3,14 +3,14 @@ name: wrong
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 4
-  - 4
-  version: 0.4.4
+    - 0
+    - 4
+    - 5
+  version: 0.4.5
 platform: java
 authors: 
-- Steve Conover
-- Alex Chaffee
+  - Steve Conover
+  - Alex Chaffee
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -18,79 +18,74 @@ cert_chain: []
 date: 2010-11-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: predicated
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 2
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby_parser
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby2ruby
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sexp_processor
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: predicated
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 2
+              - 2
+            version: 0.2.2
+    requirement: *id001
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: ruby_parser
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 0
+              - 4
+            version: 2.0.4
+    requirement: *id002
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: ruby2ruby
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 2
+            version: "1.2"
+    requirement: *id003
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: sexp_processor
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 3
+              - 0
+            version: "3.0"
+    requirement: *id004
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: diff-lcs
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 1
+              - 2
+            version: 1.1.2
+    requirement: *id005
+    prerelease: false
+    type: :runtime
 description: |-
   Wrong provides a general assert method that takes a predicate block. Assertion failure
   messages are rich in detail. The Wrong idea is to replace all those countless assert_this,
@@ -104,70 +99,28 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
+  - README.markdown
 files: 
-- lib/wrong/adapters/minitest.rb
-- lib/wrong/adapters/rspec.rb
-- lib/wrong/adapters/test_unit.rb
-- lib/wrong/assert.rb
-- lib/wrong/chunk.rb
-- lib/wrong/close_to.rb
-- lib/wrong/config.rb
-- lib/wrong/d.rb
-- lib/wrong/failure_message.rb
-- lib/wrong/helpers.rb
-- lib/wrong/irb.rb
-- lib/wrong/message/array_diff.rb
-- lib/wrong/message/string_comparison.rb
-- lib/wrong/message/test_context.rb
-- lib/wrong/rainbow.rb
-- lib/wrong/ruby2ruby_patch.rb
-- lib/wrong/sexp_ext.rb
-- lib/wrong/version.rb
-- lib/wrong.rb
-- README.markdown
-- test/adapters/minitest_test.rb
-- test/adapters/railsapp/app/controllers/application_controller.rb
-- test/adapters/railsapp/app/helpers/application_helper.rb
-- test/adapters/railsapp/autotest/discover.rb
-- test/adapters/railsapp/config/application.rb
-- test/adapters/railsapp/config/boot.rb
-- test/adapters/railsapp/config/environment.rb
-- test/adapters/railsapp/config/environments/development.rb
-- test/adapters/railsapp/config/environments/production.rb
-- test/adapters/railsapp/config/environments/test.rb
-- test/adapters/railsapp/config/initializers/backtrace_silencers.rb
-- test/adapters/railsapp/config/initializers/inflections.rb
-- test/adapters/railsapp/config/initializers/mime_types.rb
-- test/adapters/railsapp/config/initializers/secret_token.rb
-- test/adapters/railsapp/config/initializers/session_store.rb
-- test/adapters/railsapp/config/routes.rb
-- test/adapters/railsapp/db/seeds.rb
-- test/adapters/railsapp/spec/spec_helper.rb
-- test/adapters/railsapp/spec/wrong_spec.rb
-- test/adapters/rspec1/failing_spec.rb
-- test/adapters/rspec2/failing_spec.rb
-- test/adapters/rspec_rails_test.rb
-- test/adapters/rspec_test.rb
-- test/adapters/test_unit_test.rb
-- test/assert_advanced_test.rb
-- test/assert_test.rb
-- test/capturing_test.rb
-- test/chunk_test.rb
-- test/close_to_test.rb
-- test/config_test.rb
-- test/d_test.rb
-- test/failure_message_test.rb
-- test/failures_test.rb
-- test/message/array_diff_test.rb
-- test/message/test_context_test.rb
-- test/rescuing_test.rb
-- test/separate.rb
-- test/sexp_ext_test.rb
-- test/string_comparison_test.rb
-- test/suite.rb
-- test/test_helper.rb
-- test/wrong_test.rb
+  - lib/wrong.rb
+  - lib/wrong/assert.rb
+  - lib/wrong/chunk.rb
+  - lib/wrong/close_to.rb
+  - lib/wrong/config.rb
+  - lib/wrong/d.rb
+  - lib/wrong/failure_message.rb
+  - lib/wrong/helpers.rb
+  - lib/wrong/irb.rb
+  - lib/wrong/rainbow.rb
+  - lib/wrong/ruby2ruby_patch.rb
+  - lib/wrong/sexp_ext.rb
+  - lib/wrong/version.rb
+  - lib/wrong/adapters/minitest.rb
+  - lib/wrong/adapters/rspec.rb
+  - lib/wrong/adapters/test_unit.rb
+  - lib/wrong/message/array_diff.rb
+  - lib/wrong/message/string_comparison.rb
+  - lib/wrong/message/test_context.rb
+  - README.markdown
 has_rdoc: true
 homepage: http://github.com/sconover/wrong
 licenses: []
@@ -176,71 +129,68 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 997316472760642936
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: wrong
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Wrong provides a general assert method that takes a predicate block.  Assertion failure messages are rich in detail.
 test_files: 
-- test/adapters/minitest_test.rb
-- test/adapters/railsapp/app/controllers/application_controller.rb
-- test/adapters/railsapp/app/helpers/application_helper.rb
-- test/adapters/railsapp/autotest/discover.rb
-- test/adapters/railsapp/config/application.rb
-- test/adapters/railsapp/config/boot.rb
-- test/adapters/railsapp/config/environment.rb
-- test/adapters/railsapp/config/environments/development.rb
-- test/adapters/railsapp/config/environments/production.rb
-- test/adapters/railsapp/config/environments/test.rb
-- test/adapters/railsapp/config/initializers/backtrace_silencers.rb
-- test/adapters/railsapp/config/initializers/inflections.rb
-- test/adapters/railsapp/config/initializers/mime_types.rb
-- test/adapters/railsapp/config/initializers/secret_token.rb
-- test/adapters/railsapp/config/initializers/session_store.rb
-- test/adapters/railsapp/config/routes.rb
-- test/adapters/railsapp/db/seeds.rb
-- test/adapters/railsapp/spec/spec_helper.rb
-- test/adapters/railsapp/spec/wrong_spec.rb
-- test/adapters/rspec1/failing_spec.rb
-- test/adapters/rspec2/failing_spec.rb
-- test/adapters/rspec_rails_test.rb
-- test/adapters/rspec_test.rb
-- test/adapters/test_unit_test.rb
-- test/assert_advanced_test.rb
-- test/assert_test.rb
-- test/capturing_test.rb
-- test/chunk_test.rb
-- test/close_to_test.rb
-- test/config_test.rb
-- test/d_test.rb
-- test/failure_message_test.rb
-- test/failures_test.rb
-- test/message/array_diff_test.rb
-- test/message/test_context_test.rb
-- test/rescuing_test.rb
-- test/separate.rb
-- test/sexp_ext_test.rb
-- test/string_comparison_test.rb
-- test/suite.rb
-- test/test_helper.rb
-- test/wrong_test.rb
+  - test/assert_advanced_test.rb
+  - test/assert_test.rb
+  - test/capturing_test.rb
+  - test/chunk_test.rb
+  - test/close_to_test.rb
+  - test/config_test.rb
+  - test/d_test.rb
+  - test/failure_message_test.rb
+  - test/failures_test.rb
+  - test/rescuing_test.rb
+  - test/separate.rb
+  - test/sexp_ext_test.rb
+  - test/string_comparison_test.rb
+  - test/suite.rb
+  - test/test_helper.rb
+  - test/wrong_test.rb
+  - test/adapters/minitest_test.rb
+  - test/adapters/rspec_rails_test.rb
+  - test/adapters/rspec_test.rb
+  - test/adapters/test_unit_test.rb
+  - test/adapters/railsapp/app/controllers/application_controller.rb
+  - test/adapters/railsapp/app/helpers/application_helper.rb
+  - test/adapters/railsapp/autotest/discover.rb
+  - test/adapters/railsapp/config/application.rb
+  - test/adapters/railsapp/config/boot.rb
+  - test/adapters/railsapp/config/environment.rb
+  - test/adapters/railsapp/config/routes.rb
+  - test/adapters/railsapp/config/environments/development.rb
+  - test/adapters/railsapp/config/environments/production.rb
+  - test/adapters/railsapp/config/environments/test.rb
+  - test/adapters/railsapp/config/initializers/backtrace_silencers.rb
+  - test/adapters/railsapp/config/initializers/inflections.rb
+  - test/adapters/railsapp/config/initializers/mime_types.rb
+  - test/adapters/railsapp/config/initializers/secret_token.rb
+  - test/adapters/railsapp/config/initializers/session_store.rb
+  - test/adapters/railsapp/db/seeds.rb
+  - test/adapters/railsapp/spec/spec_helper.rb
+  - test/adapters/railsapp/spec/wrong_spec.rb
+  - test/adapters/rspec1/failing_spec.rb
+  - test/adapters/rspec2/failing_spec.rb
+  - test/message/array_diff_test.rb
+  - test/message/test_context_test.rb