wrong 0.3.3 → 0.4.0

data/test/suite.rb

@@ -1,4 +1,7 @@
-#simple way to make sure requires are isolated
-result = Dir["test/**/*_test.rb"].collect{|test_file| system("bundle exec ruby #{test_file}") }.uniq == [true]
-puts "suite " + (result ? "passed" : "FAILED")
-exit(result ? 0 : 1)
+#simple (but slow) way to make sure requires are isolated
+failed = Dir["test/**/*_test.rb"].collect do |test_file|
+  ok = system("bundle exec ruby #{test_file}")
+  test_file unless ok
+end.compact
+puts "suite " + (failed.empty? ? "passed" : "FAILED: #{failed.join(', ')}")
+exit(failed.empty? ? 0 : 1)

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+puts "RUBY_VERSION=#{RUBY_VERSION}#{" (JRuby)" if Object.const_defined?(:JRuby)}"
+
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
 

data/test/wrong_test.rb

@@ -0,0 +1,60 @@
+require "./test/test_helper"
+require "wrong"
+
+describe "the Wrong module" do
+
+  class Client
+    include Wrong
+  end
+
+  describe "by itself" do
+    it "gets the assert method" do
+      Wrong.assert { true }
+    end
+
+    it "gets the deny method" do
+      Wrong.deny { false }
+    end
+
+    it "gets the capturing method" do
+      value = Wrong.capturing { puts "ok" }
+      assert value == "ok\n"
+    end
+
+    it "gets the rescuing method" do
+      value = Wrong.rescuing { raise "uh-oh" }
+      assert value.message == "uh-oh"
+    end
+
+  end
+
+  describe "when included" do
+    it "gets the assert method" do
+      Client.new.assert { true }
+    end
+
+    it "gets the deny method" do
+      Client.new.deny { false }
+    end
+
+    it "gets the capturing method" do
+      value = Client.new.capturing { puts "ok" }
+      assert value == "ok\n"
+    end
+
+    it "gets the rescuing method" do
+      value = Client.new.rescuing { raise "uh-oh" }
+      assert value.message == "uh-oh"
+    end
+
+    it "adds #close_to? to Float" do
+      assert 1.0.respond_to?(:close_to?)
+    end
+
+    it "adds #d to a global namespace" do
+      x = 5
+      output = Wrong.capturing { d { x } }
+      Wrong.assert { output == "x is 5\n" }
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wrong
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Steve Conover
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -07:00
+date: 2010-10-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,101 +26,130 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 2
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ParseTree
+  name: ruby_parser
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
         segments: 
-        - 3
+        - 2
         - 0
-        - 5
-        version: 3.0.5
+        - 4
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ruby_parser
+  name: ruby2ruby
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
+        - 1
         - 2
-        - 0
-        - 4
-        version: 2.0.4
+        version: "1.2"
   type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: ruby2ruby
+  name: sexp_processor
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        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 
         hash: 23
         segments: 
         - 1
+        - 1
         - 2
-        - 4
-        version: 1.2.4
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: diff
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: ParseTree
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sourcify
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 19
         segments: 
         - 0
         - 3
-        - 6
-        version: 0.3.6
+        - 0
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: diff-lcs
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: file-tail
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 1
-        - 1
-        - 2
-        version: 1.1.2
+        - 0
+        version: "1.0"
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id008
 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,
   assert_that library methods which only exist to give a more useful failure message than
   "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.
+  in Ruby, Wrong can make a sensible failure message out of it. Also provided are several
+  helper methods, like rescuing, capturing, and d.
 email: sconover@gmail.com
 executables: []
 
@@ -129,7 +158,6 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- lib/predicated/lib/predicated/sexp_patch.rb
 - lib/wrong/adapters/minitest.rb
 - lib/wrong/adapters/rspec.rb
 - lib/wrong/adapters/test_unit.rb
@@ -137,31 +165,42 @@ files:
 - 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_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/rspec1/failing_spec.rb
+- test/adapters/rspec2/failing_spec.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/string_diff_test.rb
-- test/message/test_context_text.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
 has_rdoc: true
 homepage: http://github.com/sconover/wrong
 licenses: []
@@ -198,18 +237,25 @@ 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/rspec1/failing_spec.rb
+- test/adapters/rspec2/failing_spec.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/string_diff_test.rb
-- test/message/test_context_text.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

data/lib/wrong/message/string_diff.rb

@@ -1,42 +0,0 @@
-require "diff"
-
-module Wrong
-  module Assert
-    
-    def failure_message(method_sym, block, predicate)
-      message = super
-      
-      if predicate.is_a?(Predicated::Equal) && 
-         predicate.left.is_a?(String) &&
-         predicate.right.is_a?(String)
-        
-        problems = predicate.left.diff(predicate.right)
-        max_length = [predicate.left.length, predicate.right.length].max
-        
-        message << "\n\nstring diff:\n"
-        message << StringDiff.string_with_diff(predicate.left, problems, max_length, "-")
-        message << StringDiff.string_with_diff(predicate.right, problems, max_length, "+")
-      end
-      
-      message
-    end
-    
-    module StringDiff
-      def self.string_with_diff(original_str, problems, max_length, sign)
-        str = ""
-        str << original_str.gsub("\n", "\\n").gsub("\t", "\\t").gsub("\r", "\\r") + "\n"
-        str << StringDiff.problems_to_carrot_string(problems, max_length, sign) + "\n"
-        str
-      end
-      
-      def self.problems_to_carrot_string(problems, length, sign)
-        carrot_string = " " * length
-        problems.diffs.first.each do |add_subtract, position, character_code|
-          carrot_string[position] = "^" if sign == add_subtract
-        end
-        carrot_string
-      end
-    end
-
-  end
-end

data/test/message/string_diff_test.rb

@@ -1,89 +0,0 @@
-require "./test/test_helper"
-require "wrong/assert"
-require "wrong/message/string_diff"
-require "wrong/adapters/minitest"
-
-describe "when you're comparing strings and they don't match, show me the diff message" do
-  
-  def assert_string_diff_message(first_string, second_string, str)
-    assert{
-      rescuing{
-        assert{first_string == second_string}
-      }.message.include?(str)
-    }
-  end
-  
-  it "don't attempt to do this if the assertion is not of the form a_string==b_string" do
-    deny{
-      rescuing{
-        assert{1==2}
-      }.message.include?("diff")
-    }
-    deny{
-      rescuing{
-        assert{"a"==2}
-      }.message.include?("diff")
-    }
-    deny{
-      rescuing{
-        assert{1=="a"}
-      }.message.include?("diff")
-    }
-    deny{
-      rescuing{
-        assert{nil=="a"}
-      }.message.include?("diff")
-    }
-  end
-
-  it "simple" do
-    assert{
-      rescuing{
-        assert{"a"=="b"}
-      }.message.include?("diff")
-    }
-    
-    assert_string_diff_message("ab", "acc",  %{
-ab
- ^ 
-acc
- ^^
-})
-  end
-
-  it "whitespace" do
-    assert_string_diff_message("a\nb", "a\ncc",  %{
-a\\nb
-  ^ 
-a\\ncc
-  ^^
-})
-
-    assert_string_diff_message("a\tb", "a\tcc",  %{
-a\\tb
-  ^ 
-a\\tcc
-  ^^
-})
-    assert_string_diff_message("a\rb", "a\rcc",  %{
-a\\rb
-  ^ 
-a\\rcc
-  ^^
-})
-
-  end
-
-  xit "elides really long matching sections" do
-    left = "x"*100 + "ab" + "y"*100 + "AB" + "z"*100 
-    right = "x"*100 + "acc" + "y"*100 + "ACC" + "z"*100 
-    
-    assert_string_diff_message("ab", "acc",  %{
-...xxabyyy....yyABzzz....
-      ^          ^       
-...xxaccyyy...yyACCzzz...
-      ^^         ^^     
-})
-  end
-  
-end