wrong 0.3.1 → 0.3.2

data/README.markdown

@@ -110,7 +110,9 @@ So wait a second. How do we do it? Doesn't Ruby have [poor support for AST intro
 Before you get your knickers in a twist about how this is totally unacceptable because it doesn't support this or that use case, here are our caveats and excuses:
 
 * It works! Tested in 1.8.6, 1.8.7, 1.9.1, and 1.9.2-rc2. (Thank you, [rvm](http://rvm.beginrescueend.com/)!)
-* Your code needs to be in a file. That means it doesn't work in IRB. (If you're developing Ruby code without saving it to a mounted disk, then sorry, Wrong is not right for you.)
+* Your code needs to be in a file.
+  * If you're developing Ruby code without saving it to a mounted disk, then sorry, Wrong is not right for you.
+  * We monkey-patch IRB so if you do `irb -rwrong` it'll save off your session in a place Wrong can read it.
 * It's a development-time testing library, not a production runtime library, so there are no security or filesystem issues.
 * `eval` isn't evil, it's just misunderstood.
 * It makes a few assumptions about the structure of your code, leading to some restrictions:

data/lib/wrong.rb

@@ -1,8 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require "predicated/lib/predicated"
 
+require "predicated"
 require "wrong/assert"
 require "wrong/chunk"
 require "wrong/sexp_ext"
 require "wrong/version"
 require "wrong/config"
+require "wrong/irb"

data/lib/wrong/chunk.rb

@@ -39,7 +39,12 @@ module Wrong
     # if not, then glom the next line and try again
     # repeat until it parses or we're out of lines
     def parse
-      lines = File.read(@file).split("\n")
+      source = if @file == "(irb)"
+               IRB.CurrentContext.all_lines
+             else
+               File.read(@file)
+             end
+      lines = source.split("\n")
       @parser ||= RubyParser.new
       @chunk = nil
       c = 0

data/lib/wrong/irb.rb

@@ -0,0 +1,16 @@
+if defined? IRB
+  module IRB
+    class Context
+      alias :original_evaluate :evaluate
+      attr_reader :all_lines
+
+      def evaluate(line, line_no)
+        (@all_lines ||= "") <<line
+        original_evaluate line, line_no
+      end
+    end
+  end
+
+  # include it in the top level too, since if you're using Wrong inside IRB that's probably what you want
+  include Wrong::Assert
+end

data/lib/wrong/version.rb

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

data/test/adapters/rspec_test.rb

@@ -1,8 +1,10 @@
 require "./test/test_helper"
-require "wrong/adapters/rspec"
 
 describe "testing rspec" do
   it "works" do
+
+    require "wrong/adapters/rspec" # if we don't require this in here, then it interferes with minitest
+    
     # I would use
     #    out, err = capturing(:stdout, :stderr) do
     # but minitest does its own arcane stream munging and it's not working
@@ -35,7 +37,7 @@ inside rspec land
     failures = Spec::Runner.options.reporter.instance_variable_get(:@failures) # todo: use my own reporter?
     assert !failures.empty?
     exception = failures.first.exception
-    assert(exception.is_a? Spec::Expectations::ExpectationNotMetError)
+    assert(exception.is_a?(Spec::Expectations::ExpectationNotMetError))
     assert(exception.message == "Expected (sky == \"green\"), but \"blue\" is not equal to \"green\"\n    sky is \"blue\"\n")
   end
 end

data/test/assert_test.rb

@@ -52,7 +52,7 @@ describe "basic assert features" do
 
       it "gives a meaningful error when passed no block" do
         e = get_error {
-          @m.assert (2+2 == 5)
+          @m.assert(2+2 == 5)
         }
         assert e.message =~ /a block/
       end

data/test/suite.rb

@@ -1,4 +1,4 @@
 #simple way to make sure requires are isolated
-result = Dir["test/**/*_test.rb"].collect{|test_file| system("ruby #{test_file}") }.uniq == [true]
+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)

data/test/test_helper.rb

@@ -1,6 +1,13 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
-$LOAD_PATH.unshift "../predicated/lib" if File.exist?("../predicated/lib")
+
+predicated_project_dir = File.expand_path("../predicated")
+if File.exist?(predicated_project_dir) # if predicated project is a sibling of this project
+  puts "using predicated from #{predicated_project_dir}"
+  $LOAD_PATH.unshift "#{predicated_project_dir}/lib"
+  require "predicated"
+end
+
 require "rubygems"
 require "minitest/spec"
 require "minitest/unit"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wrong
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Steve Conover
@@ -16,12 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -07:00
+date: 2010-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ParseTree
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,10 +33,10 @@ dependencies:
         - 5
         version: 3.0.5
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,10 +49,10 @@ dependencies:
         - 4
         version: 2.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +65,10 @@ dependencies:
         - 4
         version: 1.2.4
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: diff
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,10 +81,10 @@ dependencies:
         - 6
         version: 0.3.6
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,6 +97,7 @@ dependencies:
         - 2
         version: 1.1.2
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 description: |-
   Wrong provides a general assert method that takes a predicate block. Assertion failure
@@ -113,66 +113,6 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- lib/predicated/Gemfile
-- lib/predicated/lib/predicated/autogen_call.rb
-- lib/predicated/lib/predicated/constrain.rb
-- lib/predicated/lib/predicated/evaluate.rb
-- lib/predicated/lib/predicated/from/callable_object.rb
-- lib/predicated/lib/predicated/from/json.rb
-- lib/predicated/lib/predicated/from/ruby_code_string.rb
-- lib/predicated/lib/predicated/from/url_part.rb
-- lib/predicated/lib/predicated/from/xml.rb
-- lib/predicated/lib/predicated/gem_check.rb
-- lib/predicated/lib/predicated/predicate.rb
-- lib/predicated/lib/predicated/print.rb
-- lib/predicated/lib/predicated/selectable.rb
-- lib/predicated/lib/predicated/simple_templated_predicate.rb
-- lib/predicated/lib/predicated/string_utils.rb
-- lib/predicated/lib/predicated/to/arel.rb
-- lib/predicated/lib/predicated/to/json.rb
-- lib/predicated/lib/predicated/to/sentence.rb
-- lib/predicated/lib/predicated/to/solr.rb
-- lib/predicated/lib/predicated/to/xml.rb
-- lib/predicated/lib/predicated/version.rb
-- lib/predicated/lib/predicated.rb
-- lib/predicated/LICENSE
-- lib/predicated/predicated.gemspec
-- lib/predicated/Rakefile
-- lib/predicated/README.markdown
-- lib/predicated/test/autogen_call_test.rb
-- lib/predicated/test/canonical_transform_cases.rb
-- lib/predicated/test/constrain_test.rb
-- lib/predicated/test/enumerable_test.rb
-- lib/predicated/test/equality_test.rb
-- lib/predicated/test/evaluate_test.rb
-- lib/predicated/test/from/callable_object_canonical_test.rb
-- lib/predicated/test/from/callable_object_test.rb
-- lib/predicated/test/from/json_test.rb
-- lib/predicated/test/from/ruby_code_string_canonical_test.rb
-- lib/predicated/test/from/ruby_code_string_test.rb
-- lib/predicated/test/from/url_part_parser_test.rb
-- lib/predicated/test/from/url_part_test.rb
-- lib/predicated/test/from/xml_test.rb
-- lib/predicated/test/json_conversion_test.rb
-- lib/predicated/test/print_test.rb
-- lib/predicated/test/selectable_test.rb
-- lib/predicated/test/simple_templated_predicate_test.rb
-- lib/predicated/test/suite.rb
-- lib/predicated/test/test_helper.rb
-- lib/predicated/test/test_helper_with_wrong.rb
-- lib/predicated/test/to/arel_test.rb
-- lib/predicated/test/to/json_test.rb
-- lib/predicated/test/to/sentence_test.rb
-- lib/predicated/test/to/solr_test.rb
-- lib/predicated/test/to/xml_test.rb
-- lib/predicated/test/xml_conversion_test.rb
-- lib/predicated/test_integration/arel_integration_test.rb
-- lib/predicated/test_integration/canonical_integration_cases.rb
-- lib/predicated/test_integration/schema.xml
-- lib/predicated/test_integration/solr_integration_test.rb
-- lib/predicated/test_integration/sqlite_db
-- lib/predicated/test_integration/suite.rb
-- lib/predicated/test_integration/usage_test.rb
 - lib/wrong/adapters/minitest.rb
 - lib/wrong/adapters/rspec.rb
 - lib/wrong/adapters/test_unit.rb
@@ -180,6 +120,7 @@ files:
 - lib/wrong/chunk.rb
 - lib/wrong/close_to.rb
 - lib/wrong/config.rb
+- lib/wrong/irb.rb
 - lib/wrong/message/array_diff.rb
 - lib/wrong/message/string_diff.rb
 - lib/wrong/message/test_context.rb

data/lib/predicated/Gemfile

@@ -1,15 +0,0 @@
-source :gemcutter
-gem "ruby_parser"
-gem "ruby2ruby"
-gem "ParseTree"
-gem "diff"
-gem "diff-lcs"
-gem "minitest"
-gem "nokogiri"
-gem "arel", "~>0.4"
-gem "sqlite3-ruby"
-gem "activerecord", "~>3.0.0.beta"
-gem "i18n"
-gem "json", "1.1.9"
-gem "treetop", "~>1.4.8"
-

data/lib/predicated/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Steve Conover
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/predicated/README.markdown

@@ -1,191 +0,0 @@
-## Abstract ##
-
-Predicated is a simple predicate model for Ruby.  It provides useful predicate transformations and operations.
-
-Tracker project:
-[http://www.pivotaltracker.com/projects/95014](http://www.pivotaltracker.com/projects/95014)
-
-## Transformations ##
-
-- From:
-  - json
-  - xml
-  - url part, ex: "!(a=1&b=2|c=3)"
-  - callable objects (lambdas/procs, and therefore blocks) - ruby 1.8.x only
-  - ruby code - ruby 1.8.x only
-- To:
-  - json
-  - xml
-  - sql where clause via [arel](http://github.com/rails/arel)
-  - [solr](http://lucene.apache.org/solr/) query string
-  - english sentence, ex: "'a' is not equal to 'b'"
-
-## Usage ##
-
-Note: The test suite acts as a comprehensive usage guide.
-
-
-Evaluate a predicate:
-    
-    require "predicated/evaluate"
-    include Predicated
-            
-    Predicate { Eq(1, 2) }.evaluate == false
-    Predicate { Lt(1, 2) }.evaluate == true
-    Predicate { Or(Lt(1, 2),Eq(1, 2)) }.evaluate == true
-    
-    x = 1
-    Predicate { Lt(x, 2) }.evaluate == true
-
-
-Parse a predicate from part of a url and then turn it into a sql where clause:
-    
-    require "predicated/from/url_part"
-    require "predicated/to/arel"
-        
-    predicate = Predicated::Predicate.from_url_part("(color=red|color=green)&size=large")
-    
-    predicate.inspect == 
-      "And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))" 
-    
-    predicate.to_arel(Table(:shirt)).to_sql == 
-      %{(("shirt"."color" = 'red' OR "shirt"."color" = 'green') AND "shirt"."size" = 'large')} 
-  
-
-Parse a predicate from json and then turn it into a solr query string:
-    
-    require "predicated/from/json"
-    require "predicated/to/solr"
-        
-    predicate = Predicated::Predicate.from_json_str(%{
-      {"and":[{"or":[["color","==","red"],["color","==","green"]]},["size","==","large"]]}
-    })
-        
-    predicate.inspect == "And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))" 
-        
-    predicate.to_solr == "((color:red OR color:green) AND size:large)" 
-
-  
-From json:
-    
-    require "predicated/from/json"
-        
-    Predicated::Predicate.from_json_str(%{
-      {"and":[
-        {"or":[
-          ["color","==","red"],
-          ["color","==","green"]
-        ]},
-        ["size","==","large"]
-      ]}
-    }).inspect == "And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))" 
-
-
-From xml:
-    
-    require "predicated/from/xml"
-        
-    Predicated::Predicate.from_xml(%{
-      <and>
-        <or>
-          <equal><left>color</left><right>red</right></equal>
-          <equal><left>color</left><right>green</right></equal>
-        </or>
-        <equal><left>size</left><right>large</right></equal>
-      </and>
-    }).inspect == "And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))" 
-
-
-From url part:
-    
-    require "predicated/from/url_part"
-        
-    Predicated::Predicate.from_url_part("(color=red|color=green)&size=large").inspect ==
-      "And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))" 
-
-
-From callable object:
-    
-    require "predicated/from/callable_object"
-        
-    Predicated::Predicate.from_callable_object{('color'=='red' || 'color'=='green') && 'size'=='large'}.inspect ==
-      "And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))" 
-
-
-From ruby code string:
-      
-    require "predicated/from/ruby_code_string"
-            
-    Predicated::Predicate.from_ruby_code_string("('color'=='red' || 'color'=='green') && 'size'=='large'").inspect ==
-      "And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))" 
-  
-  
-To json:
-      
-    require "predicated/to/json"
-    include Predicated
-            
-    Predicate{And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))}.to_json_str ==
-    %{
-      {"and":[
-        {"or":[
-          ["color","==","red"],
-          ["color","==","green"]
-        ]},
-        ["size","==","large"]
-      ]}
-    }
-  
-  
-To xml:
-      
-    require "predicated/to/xml"
-    include Predicated
-            
-    Predicate{And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))}.to_xml ==
-    %{
-      <and>
-        <or>
-          <equal><left>color</left><right>red</right></equal>
-          <equal><left>color</left><right>green</right></equal>
-        </or>
-        <equal><left>size</left><right>large</right></equal>
-      </and>      
-    }
-  
-  
-To arel (sql where clause):
-      
-    require "predicated/to/arel"
-    include Predicated
-            
-    Predicate{And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))}.to_arel(Table(:shirt)).to_sql ==
-      %{(("shirt"."color" = 'red' OR "shirt"."color" = 'green') AND "shirt"."size" = 'large')}
-  
-  
-To solr query string:
-      
-    require "predicated/to/solr"
-    include Predicated
-            
-    Predicate{And(Or(Eq('color','red'),Eq('color','green')),Eq('size','large'))}.to_solr ==
-      "((color:red OR color:green) AND size:large)"
-  
-  
-To sentence:
-      
-    require "predicated/to/sentence"
-    include Predicated
-        
-    Predicate{ And(Eq("a",1),Eq("b",2)) }.to_sentence == 
-      "'a' is equal to 1 and 'b' is equal to 2"
-    
-    Predicate{ Gt("a",1) }.to_negative_sentence == 
-      "'a' is not greater than 1" 
-
-
-## Testing Notes ##
-
-Right now this project makes use of Wrong for assertions.  Wrong uses this project.  It's kind of neat in an eat-your-own-dogfood sense, but it's possible that this will be problematic over time (particularly when changes in this project cause assertions to behave differently - if even temporarily).
-
-A middle ground is to make "from ruby string" and "from callable object" use minitest asserts, since these are the "interesting" parts of Predicated relied on by Wrong.