wrong 0.5.4 → 0.5.6

data/README.markdown

@@ -16,7 +16,7 @@ Inspired by [assert { 2.0 }](http://assert2.rubyforge.org/) but rewritten from s
 
 We have deployed gems for both Ruby and JRuby; if you get dependency issues on your platform, please let us know what Ruby interpreter and version you're using and what errors you get, and we'll try to track it down.
 
-## Usage ##
+## Usage
 
 Wrong provides a simple assert method that takes a block:
 
@@ -56,6 +56,16 @@ And a companion, 'deny':
 
 	deny{'abc'.include?('bc')}
 	 ==> Didn't expect "abc".include?("bc")
+	
+More examples are in the file `examples.rb` <http://github.com/alexch/wrong/blob/master/examples.rb>
+
+There's also a spreadsheet showing a translation from Test::Unit and RSpec to Wrong, with notes, at [this Google Doc](https://spreadsheets.google.com/pub?key=0AouPn6oLrimWdE0tZDVOWnFGMzVPZy0tWHZwdnhFYkE&hl=en&output=html). (Ask <alexch@gmail.com> if you want editing privileges.)
+
+And don't miss the [slideshare presentation](http://www.slideshare.net/alexchaffee/wrong-5069976).
+
+## Helper methods
+
+### rescuing
 
 There's also a convenience method for catching errors:
 
@@ -66,6 +76,8 @@ There's also a convenience method for catching errors:
         rescuing { raise("vanilla") } is #<RuntimeError: vanilla>
         raise("vanilla") raises RuntimeError: vanilla
 
+### capturing
+
 And one for capturing output streams:
 
     assert { capturing { puts "hi" } == "hi\n" }
@@ -75,12 +87,16 @@ And one for capturing output streams:
     assert { out == "something standard\n" }
     assert { err =~ /something erroneous/ }
 
+### close_to?
+
 If you want to compare floats, try this:
 
     assert { 5.0.close_to?(5.0001) }   # default tolerance = 0.001
     assert { 5.0.close_to?(5.1, 0.5) } # optional tolerance parameter
 
-(If you don't want `close_to?` cluttering up `Float` in your test runs then use `include Wrong::Assert` instead of `include Wrong`.)
+If you don't want `close_to?` cluttering up `Float` in your test runs then use `include Wrong::Assert` instead of `include Wrong`.
+
+### d
 
 We also implement the most amazing debugging method ever, `d`, which gives you a sort of mini-wrong wherever you want it
 , even in production code at runtime:
@@ -90,13 +106,9 @@ We also implement the most amazing debugging method ever, `d`, which gives you a
     d { x } # => prints "x is 7" to the console
     d { x * 2 } # => prints "(x * 2) is 14" to the console
 
-(`d` was originally implemented by Rob Sanheim in LogBuddy; as with Assert2 this version is a rewrite and homage.) Remember, if you want `d` to work at runtime (e.g. in a webapp) then you must `include Wrong::D` inside your app, e.g. in your `environment.rb` file.
+`d` was originally implemented by Rob Sanheim in LogBuddy; as with Assert2 this version is a rewrite and homage. You may also enjoy [g](https://github.com/jugyo/g) by [jugyo](http://jugyo.org/).
 
-More examples are in the file `examples.rb` <http://github.com/alexch/wrong/blob/master/examples.rb>
-
-There's also a spreadsheet showing a translation from Test::Unit and RSpec to Wrong, with notes, at [this Google Doc](https://spreadsheets.google.com/pub?key=0AouPn6oLrimWdE0tZDVOWnFGMzVPZy0tWHZwdnhFYkE&hl=en&output=html). (Ask <alexch@gmail.com> if you want editing privileges.)
-
-And don't miss the [slideshare presentation](http://www.slideshare.net/alexchaffee/wrong-5069976).
+Remember, if you want `d` to work at runtime (e.g. in a webapp) then you must `include Wrong::D` inside your app, e.g. in your `environment.rb` file.
 
 ## Test Framework Adapters ##
 
@@ -250,7 +262,6 @@ Before you get your knickers in a twist about how this is totally unacceptable b
 * Beware of Side Effects! (See discussion elsewhere in this document.)
 * "Doesn't all this parsing slow down my test run"?  No - this applies to failure cases only. If the assert block returns true then Wrong simply moves on.
 
-
 ## Explanations ##
 
 `assert` and `deny` can take an optional explanation, e.g.
@@ -286,6 +297,26 @@ We hope this structure lets your eyes focus on the meaningful values and differe
 
 Wrong tries to maintain indentation to improve readability. If the inspected VALUE contains newlines, or is longer than will fit on your console, the succeeding lines will be indented to a pleasant level.
 
+Sometimes Wrong will not be able to evaluate a detail without raising an exception. This exception will be duly noted, which might be misleading. For example, 
+
+	a = [1,2,3,4]
+	assert { a.all? {|i| i<4} }
+	
+would fail, since on the final pass, `(i < 4)` is false. But the error message is a bit vague:
+
+	Wrong::Assert::AssertionFailedError: Expected a.all? { |i| (i < 4) }, but
+	    i raises NameError: undefined local variable or method `i' for main:Object
+
+In evaluating the inner expression, Wrong does not have access to the block parameter `i`, since `i` is not in the scope of the outer expression. A better way to write the assertion would be
+
+    a = [1,2,3,4]
+    a.each {|i| assert {i < 4}}
+
+which gives
+
+	Wrong::Assert::AssertionFailedError: Expected (i < 4), but
+	    i is 4
+
 ## Formatters ##
 
 Enhancements for error messages sit under wrong/message.

data/lib/wrong/assert.rb

@@ -20,7 +20,7 @@ module Wrong
     # Actual signature: assert(explanation = nil, depth = 0, &block)
     def assert(*args, &block)
       # to notice (and fail fast from) odd recursion problem
-      raise "Reentry bug while trying to assert(#{args.join(', ')})" if @_inside_wrong_assert
+      raise "Reentry bug while trying to assert(#{args.join(', ')})" if (@_inside_wrong_assert ||= nil)
       @_inside_wrong_assert = true
 
       if block.nil?

data/lib/wrong/chunk.rb

@@ -77,18 +77,7 @@ module Wrong
     end
 
     def read_source_file(file)
-      Chunk.read_here_or_higher(file)
-    end
-
-    def self.read_here_or_higher(file, dir = ".")
-      File.read "#{dir}/#{file}"
-    rescue Errno::ENOENT, Errno::EACCES => e
-      # we may be in a chdir underneath where the file is, so move up one level and try again
-      parent = "#{dir}/..".gsub(/^(\.\/)*/, '')
-      if File.expand_path(dir) == File.expand_path(parent)
-        raise Errno::ENOENT, "couldn't find #{file}"
-      end
-      read_here_or_higher(file, parent)
+      Config.read_here_or_higher(file)
     end
 
     # Algorithm:
@@ -294,7 +283,7 @@ public # don't know exactly why this needs to be public but eval'ed code can't f
     end
     
     def self.terminal_width
-      @terminal_width || (terminal_size && terminal_size.first) || 80
+      (@terminal_width ||= nil) || (terminal_size && terminal_size.first) || 80
     end
 
     def self.terminal_width= forced_with

data/lib/wrong/config.rb

@@ -1,17 +1,16 @@
-require "wrong/chunk"
 
 module Wrong
 
   def self.load_config
     settings = begin
-      Chunk.read_here_or_higher(".wrong")
+      Config.read_here_or_higher(".wrong")
     rescue Errno::ENOENT => e
       # couldn't find it
       nil # In Ruby 1.8, "e" would be returned here otherwise
     end
     Config.new settings
   end
-
+  
   def self.config
     @config ||= load_config
   end
@@ -25,6 +24,17 @@ module Wrong
     class ConfigError < RuntimeError
     end
 
+    def self.read_here_or_higher(file, dir = ".")
+      File.read "#{dir}/#{file}"
+    rescue Errno::ENOENT, Errno::EACCES => e
+      # we may be in a chdir underneath where the file is, so move up one level and try again
+      parent = "#{dir}/..".gsub(/^(\.\/)*/, '')
+      if File.expand_path(dir) == File.expand_path(parent)
+        raise Errno::ENOENT, "couldn't find #{file}"
+      end
+      read_here_or_higher(file, parent)
+    end
+
     def initialize(string = nil)
       self[:aliases] = {:assert => [:assert], :deny => [:deny]}
       if string

data/lib/wrong/version.rb

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

data/test/assert_test.rb

@@ -10,7 +10,7 @@ describe "basic assert features" do
   end
 
   describe "pass/fail basics" do
-    it "passes when the result is true.  deny does the reverse" do
+    it "assert passes when the result is true.  deny does the reverse" do
       @m.assert { true }
       @m.assert { 1==1 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrong
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-19 00:00:00.000000000Z
+date: 2011-08-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicated
-  requirement: &2169343480 !ruby/object:Gem::Requirement
+  requirement: &70326965279440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2169343480
+  version_requirements: *70326965279440
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &2169342940 !ruby/object:Gem::Requirement
+  requirement: &70326965278120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2169342940
+  version_requirements: *70326965278120
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
-  requirement: &2169342460 !ruby/object:Gem::Requirement
+  requirement: &70326965276680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2169342460
+  version_requirements: *70326965276680
 - !ruby/object:Gem::Dependency
   name: sexp_processor
-  requirement: &2169341960 !ruby/object:Gem::Requirement
+  requirement: &70326965275820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169341960
+  version_requirements: *70326965275820
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &2169341460 !ruby/object:Gem::Requirement
+  requirement: &70326965274860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2169341460
+  version_requirements: *70326965274860
 - !ruby/object:Gem::Dependency
   name: ParseTree
-  requirement: &2169340960 !ruby/object:Gem::Requirement
+  requirement: &70326965274080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169340960
+  version_requirements: *70326965274080
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &2169340440 !ruby/object:Gem::Requirement
+  requirement: &70326965273080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169340440
+  version_requirements: *70326965273080
 - !ruby/object:Gem::Dependency
   name: file-tail
-  requirement: &2169339940 !ruby/object:Gem::Requirement
+  requirement: &70326965272260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +99,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169339940
+  version_requirements: *70326965272260
 description: ! 'Wrong provides a general assert method that takes a predicate block.
   Assertion failure
 
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 488446624914030243
+      hash: -1102052589902211149
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: wrong
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Wrong provides a general assert method that takes a predicate block.  Assertion