wrong 0.6.0 → 0.6.2

data/README.markdown

@@ -4,7 +4,9 @@
 
 ## Abstract ##
 
-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`, `assert\_that`, `should\_something` library methods which only exist to give a failure message that's not simply "assertion failed". Wrong replaces all of them in one fell swoop, since if you can write it in Ruby, Wrong can make a sensible failure message out of it.
+Wrong provides a simple, general assert method that takes a block, and understands the code inside it, providing verbose failure messages for free.
+
+The Wrong idea is to replace `assert_equal` and all those countless `assert\_this`, `assert\_that`, `should\_something` library methods which only exist to give a failure message that's not simply "assertion failed". Wrong replaces all of them in one fell swoop, since if you can write it in Ruby, Wrong can make a sensible failure message out of it.
 
 We'd very much appreciate feedback and bug reports. There are plenty of things left to be done to make the results look uniformly clean and beautiful. We want your feedback, and especially to give us cases where either it blows up or the output is ugly or uninformative.
 
@@ -113,7 +115,11 @@ Remember, if you want `d` to work at runtime (e.g. in a webapp) then you must `i
 
 ### eventually
 
-If you care that something is going to be true *soon*, but maybe not *right* now, use `eventually`. It will keep executing the block, up to 4 times a second, until either
+If you care that something is going to be true *soon*, but maybe not *right* now, use `eventually`.
+
+    eventually { night? }
+
+It will keep executing the block, up to 4 times a second, until either
 
   * the block returns true(ish)
   * 5 seconds elapse
@@ -428,6 +434,18 @@ Here are some suggestions:
 
 Just don't use "`aver`" since we took that one for an internal method in `Wrong::Assert`.
 
+### Verbose ###
+
+Wrong works inside frameworks like Test::Unit and RSpec, but sometimes you just want to stick a bunch of assertions in a file and run it. In that case, *verbose mode* might come in handy. It prints every *successful* assertion to the console (including explanations, if provided, and in color, if desired).
+
+    Wrong.config.verbose
+    assert("basic math") { 2 + 2 == 4}
+    
+prints
+
+    basic math: ((2 + 2) == 4)
+
+
 ## Helper Assert Methods ##
 
 If you really want to, you can define your proc in one method, pass it in to another method, and have that method assert it. This is a challenge for Wrong and you probably shouldn't do it. Wrong will do its best to figure out where the actual assertion code is but it might not succeed.

data/lib/wrong/assert.rb

@@ -6,6 +6,7 @@ require "wrong/chunk"
 require "wrong/config"
 require "wrong/failure_message"
 require "wrong/ruby2ruby_patch" # need to patch it after some other stuff loads
+require "wrong/rainbow"
 
 module Wrong
   module Assert
@@ -65,7 +66,17 @@ module Wrong
 
       value = block.call
       value = !value if valence == :deny
-      unless value
+      if value
+        if Wrong.config[:verbose]
+          code = Wrong::Chunk.from_block(block, depth + 2).code 
+          if Wrong.config[:color]
+            explanation = explanation.color(:blue) if explanation
+            code = code.color(:green)
+          end
+          message = "#{explanation + ": " if explanation}#{code}"
+          puts message
+        end
+      else
         chunk = Wrong::Chunk.from_block(block, depth + 2)
 
         message = FailureMessage.new(chunk, valence, explanation).full

data/lib/wrong/chunk.rb

@@ -6,7 +6,8 @@ def require_optionally(library)
   begin
     require library
   rescue LoadError => e
-    raise e unless e.message == "no such file to load -- #{library}"
+    raise e unless e.message == "no such file to load -- #{library}" or
+      e.message == "cannot load such file -- #{library}" # 1.9.3 changed the error message
   end
 end
 
@@ -27,10 +28,7 @@ module Wrong
                 as_proc.source_location
               else
                 # in Ruby 1.8, it reads the source location from the call stack
-                # # $stderr.puts "---"
-                # $stderr.puts caller.join("\n")
                 relevant_caller = caller[depth]
-                # $stderr.puts "*** #{relevant_caller}"
                 relevant_caller.split(":")
               end
 

data/lib/wrong/version.rb

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

data/test/adapters/rspec_test.rb

@@ -5,6 +5,7 @@ require "fileutils"
 
 require "./test/test_helper"
 require "wrong/adapters/minitest"
+require "bundler"
 
 include Wrong
 
@@ -31,10 +32,12 @@ describe "testing rspec" do
             assert { line =~ /rspec[-\w]* \(#{rspec_version}\.[\w.]*\)/ }
           end
         end
-
-        spec_output = sys "ruby #{dir}/failing_spec.rb",
+        
+        Bundler.with_clean_env do
+          spec_output = sys "ruby #{dir}/failing_spec.rb",
                           (rspec_version == 1 || RUBY_VERSION =~ /^1\.8\./ || RUBY_VERSION == '1.9.1' ? nil : 1) # RSpec v1 exits with 0 on failure :-(
-      end
+          end
+        end
 
       assert { spec_output.include? "1 failure" }
       assert { spec_output.include? "Expected ((2 + 2) == 5), but" }

data/test/adapters/test_unit_test.rb

@@ -1,7 +1,7 @@
 here = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{here}/../../lib"
 
-# gem "test-unit"
+gem "test-unit"
 require "test/unit"
 require "test/unit/autorunner"
 

data/test/verbose_test.rb

@@ -0,0 +1,66 @@
+here = File.dirname(__FILE__)
+
+require "#{here}/test_helper"
+require "wrong/assert"
+require "wrong/helpers"
+require "wrong/d"
+require "wrong/rainbow"
+
+describe "verbose assert" do
+  
+  include Wrong::Helpers
+  include Wrong::D
+  
+  before do
+    @m = Module.new do
+      extend Wrong::Assert
+    end
+    Wrong.config.verbose
+    @color_enabled = Sickill::Rainbow.enabled
+  end
+  
+  after do
+    Wrong.config[:verbose] = nil
+    Wrong.config[:color] = nil
+    Sickill::Rainbow.enabled = @color_enabled
+  end
+
+  it "sets the verbose flag" do
+    assert Wrong.config[:verbose]
+  end
+  
+  it "prints the contents of a successful assert" do
+    out = capturing {
+      @m.assert { 2 + 2 == 4 }
+    }
+    assert_equal "((2 + 2) == 4)\n", out
+  end
+
+  it "prints the message and contents of a successful assert" do
+    out = capturing {
+      @m.assert("basic math") { 2 + 2 == 4 }
+    }
+    assert_equal "basic math: ((2 + 2) == 4)\n", out
+  end
+  
+  it "prints in color" do
+    Wrong.config.color
+    Sickill::Rainbow.enabled = true
+    out = capturing {
+      @m.assert { 2 + 2 == 4 }
+    }
+    colored = ["((2 + 2) == 4)".color(:green), "\n"].join
+    assert_equal colored, out
+  end
+
+  it "prints in color with an explanation" do
+    Wrong.config.color
+    Sickill::Rainbow.enabled = true
+    out = capturing {
+      @m.assert("basic math") { 2 + 2 == 4 }
+    }
+    colored = ["basic math".color(:blue), ": ", "((2 + 2) == 4)".color(:green), "\n"].join
+    assert_equal colored, out
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrong
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000Z
+date: 2012-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicated
-  requirement: &70261729040380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70261729040380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &70261729039880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70261729039880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
-  requirement: &70261729039420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70261729039420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sexp_processor
-  requirement: &70261729038960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +70,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261729038960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &70261729038500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +86,15 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70261729038500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: ParseTree
-  requirement: &70261729038040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +102,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261729038040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70261729037580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70261729037580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: file-tail
-  requirement: &70261729037120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +134,12 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261729037120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: ! 'Wrong provides a general assert method that takes a predicate block.
   Assertion failure
 
@@ -184,6 +224,7 @@ files:
 - test/string_comparison_test.rb
 - test/suite.rb
 - test/test_helper.rb
+- test/verbose_test.rb
 - test/wrong_test.rb
 homepage: http://github.com/sconover/wrong
 licenses: []
@@ -199,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2960303026263975082
+      hash: -1208132037524365010
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: wrong
-rubygems_version: 1.8.6
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Wrong provides a general assert method that takes a predicate block.  Assertion
@@ -256,4 +297,5 @@ test_files:
 - test/string_comparison_test.rb
 - test/suite.rb
 - test/test_helper.rb
+- test/verbose_test.rb
 - test/wrong_test.rb