mcmire-matchy 0.4.2 → 0.5.0

data/test/test_matcher_builder.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class TestMatcherBuilder < Test::Unit::TestCase
+class TestMatcherBuilder < Matchy.test_case_class
   include Matchy::MatcherBuilder
 
   def setup

data/test/test_modals.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class TestModals < Test::Unit::TestCase
+class TestModals < Matchy.test_case_class
   def setup
     @expectation = build_matcher() {|r,m,a| true}
     @bad_expectation = build_matcher() {|r,m,a| false}

data/test/test_operator_expectations.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class TestOperatorExpectations < Test::Unit::TestCase
+class TestOperatorExpectations < Matchy.test_case_class
   # EQUALS (==)
   def test_equals
     3.should == 3
@@ -9,7 +9,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_equals_fails
     lambda {
       3.should == 5
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_equals
@@ -19,7 +19,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_negative_equals_fails
     lambda {
       3.should_not == 3
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   # LESS THAN (<)
@@ -30,7 +30,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_less_than_fails
     lambda {
       4.should < 3
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_less_than_equals
@@ -40,7 +40,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_negative_less_than_fails
     lambda {
       4.should_not < 5
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end 
   
   # GREATER THAN (>)
@@ -51,7 +51,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_greater_than_fails
     lambda {
       4.should > 5
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_greater_than_equals
@@ -61,7 +61,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_negative_greater_than_fails
     lambda {
       4.should_not > 3
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   # LESS THAN EQUAL (<=)
@@ -76,7 +76,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_less_than_equal_fails
     lambda {
       4.should <= 3
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_less_than_equal
@@ -86,7 +86,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_negative_less_than_equal_fails
     lambda {
       4.should_not <= 5
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   # GREATER THAN EQUALS (>=)
@@ -101,7 +101,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_greater_than_equal_fails
     lambda {
       4.should >= 5
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_greater_than_equal_equals
@@ -111,7 +111,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_negative_greater_than_equal_fails
     lambda {
       4.should_not >= 3
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   # MATCHES (=~)
@@ -122,7 +122,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_matches_fails
     lambda {
       "d00d ur 1337".should =~ /world/
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_matches
@@ -132,7 +132,7 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_negative_matches_fails
     lambda {
       "it's a freak out!".should_not =~ /freak/
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_fail_message
@@ -156,12 +156,13 @@ class TestOperatorExpectations < Test::Unit::TestCase
   end
   
   def test_fail_message_for_hash
-    obj = Matchy::Expectations::OperatorExpectation.new({:foo => 'bar', :baz => 'quux'}, true)
+    hash = {:foo => 'bar', :baz => 'quux'}
+    obj = Matchy::Expectations::OperatorExpectation.new(hash, true)
     
     def obj.flunk(msg)
       msg
     end
     
-    (obj == {:foo => 'bar'}).should == "Expected {:baz=>\"quux\", :foo=>\"bar\"} to == {:foo=>\"bar\"} (diff: {:baz=>\"quux\"})."
+    (obj == {:foo => 'bar'}).should == "Expected #{hash.inspect} to == {:foo=>\"bar\"} (diff: {:baz=>\"quux\"})."
   end
 end

data/test/test_truth_expectations.rb

@@ -10,7 +10,7 @@ class Exister
   end
 end
 
-class TestTruthExpectations < Test::Unit::TestCase
+class TestTruthExpectations < Matchy.test_case_class
   
   def setup
     @obj = Object.new
@@ -29,13 +29,13 @@ class TestTruthExpectations < Test::Unit::TestCase
   def test_equal_fail
     lambda {
       3.should equal(4)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_equal_fail
     lambda {
       3.should_not equal(3)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
 
   def test_eql
@@ -53,13 +53,13 @@ class TestTruthExpectations < Test::Unit::TestCase
   def test_eql_fail
     lambda {
       3.should eql(13)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_eql_fail
     lambda {
       3.should_not eql(3)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_exists
@@ -76,14 +76,14 @@ class TestTruthExpectations < Test::Unit::TestCase
     lambda {
       thing = Exister.new(false)
       thing.should exist
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_exists_fail
     lambda {
       thing = Exister.new(true)
       thing.should_not exist
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_be
@@ -101,7 +101,7 @@ class TestTruthExpectations < Test::Unit::TestCase
   def test_be_fail
     lambda {
       true.should be(false)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_be_close
@@ -115,13 +115,13 @@ class TestTruthExpectations < Test::Unit::TestCase
   def test_be_close_fail
     lambda {
       (19.0 - 13.0).should be_close(33.04)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_be_close_with_delta_fail
     lambda {
       (19.0 - 13.0).should be_close(6.0, 0.0)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_satisfy
@@ -135,13 +135,13 @@ class TestTruthExpectations < Test::Unit::TestCase
   def test_satisfy_fail
     lambda {
       13.should satisfy(lambda {|i| i > 15})
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_satisfy_fail
     lambda {
       13.should_not satisfy(lambda {|i| i < 15})
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_equal_fail_message
@@ -235,7 +235,7 @@ class TestTruthExpectations < Test::Unit::TestCase
   def test_kind_of_fail
     lambda {
       3.should be_kind_of(Hash)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_kind_of
@@ -245,7 +245,7 @@ class TestTruthExpectations < Test::Unit::TestCase
   def test_negative_kind_of_fail
     lambda {
       3.should_not be_kind_of(Fixnum)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
 
   def test_respond_to
@@ -255,7 +255,7 @@ class TestTruthExpectations < Test::Unit::TestCase
   def test_respond_to_fail
     lambda {
       "foo".should respond_to(:nonexistant_method)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_respond_to
@@ -265,7 +265,7 @@ class TestTruthExpectations < Test::Unit::TestCase
   def test_negative_respond_to_fail
     lambda {
       "foo".should_not respond_to(:length)
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(Matchy.assertion_failed_error)
   end
   
   # be_something
@@ -280,7 +280,7 @@ class TestTruthExpectations < Test::Unit::TestCase
     def @obj.something?
       false
     end
-    lambda {@obj.should be_something}.should raise_error(Test::Unit::AssertionFailedError)
+    lambda {@obj.should be_something}.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_be_something_method_missing_pass
@@ -294,7 +294,7 @@ class TestTruthExpectations < Test::Unit::TestCase
     def @obj.something?
       true
     end
-    lambda {@obj.should_not be_something}.should raise_error(Test::Unit::AssertionFailedError)
+    lambda {@obj.should_not be_something}.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_be_something_method_missing_fail_message
@@ -331,7 +331,7 @@ class TestTruthExpectations < Test::Unit::TestCase
     def @obj.something?(arg)
       false
     end
-    lambda {@obj.should be_something(1)}.should raise_error(Test::Unit::AssertionFailedError)
+    lambda {@obj.should be_something(1)}.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_negative_be_something_method_missing_pass
@@ -345,7 +345,7 @@ class TestTruthExpectations < Test::Unit::TestCase
     def @obj.something?(arg)
       true
     end
-    lambda {@obj.should_not be_something(1)}.should raise_error(Test::Unit::AssertionFailedError)
+    lambda {@obj.should_not be_something(1)}.should raise_error(Matchy.assertion_failed_error)
   end
   
   def test_be_something_method_missing_fail_message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mcmire-matchy
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jeremy McAnally
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -06:00
+date: 2010-02-13 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -23,15 +23,9 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
-- History.txt
 - License.txt
-- Manifest.txt
-- PostInstall.txt
 - README.rdoc
 - Rakefile
-- config/hoe.rb
-- config/requirements.rb
 - countloc.rb
 - lib/matchy.rb
 - lib/matchy/built_in/change_expectations.rb
@@ -44,24 +38,8 @@ files:
 - lib/matchy/matcher_builder.rb
 - lib/matchy/modals.rb
 - lib/matchy/version.rb
-- mcmire-matchy.gemspec
-- setup.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- test/all.rb
-- test/ruby1.9.compatibility_tests.rb
-- test/test_change_expectation.rb
-- test/test_custom_matcher.rb
-- test/test_enumerable_expectations.rb
-- test/test_error_expectations.rb
-- test/test_expectation_builder.rb
-- test/test_helper.rb
-- test/test_matcher_builder.rb
-- test/test_modals.rb
-- test/test_operator_expectations.rb
-- test/test_truth_expectations.rb
 has_rdoc: true
-homepage: http://github.com/mcmire/matchy
+homepage: http://matchy.rubyforge.org
 licenses: []
 
 post_install_message: 
@@ -89,8 +67,6 @@ signing_key:
 specification_version: 3
 summary: RSpec-esque matchers for use in Test::Unit
 test_files: 
-- test/all.rb
-- test/ruby1.9.compatibility_tests.rb
 - test/test_change_expectation.rb
 - test/test_custom_matcher.rb
 - test/test_enumerable_expectations.rb

data/.gitignore

@@ -1,3 +0,0 @@
-pkg/*
-.DS_Store
-*.gem

data/History.txt

@@ -1,4 +0,0 @@
-== 0.0.1 2008-10-03
-
-* 1 major enhancement:
-  * Initial release

data/Manifest.txt

@@ -1,36 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-PostInstall.txt
-README.rdoc
-Rakefile
-config/hoe.rb
-config/requirements.rb
-countloc.rb
-lib/matchy.rb
-lib/matchy/built_in/change_expectations.rb
-lib/matchy/built_in/enumerable_expectations.rb
-lib/matchy/built_in/error_expectations.rb
-lib/matchy/built_in/operator_expectations.rb
-lib/matchy/built_in/truth_expectations.rb
-lib/matchy/custom_matcher.rb
-lib/matchy/expectation_builder.rb
-lib/matchy/matcher_builder.rb
-lib/matchy/modals.rb
-lib/matchy/version.rb
-matchy.gemspec
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-test/all.rb
-test/ruby1.9.compatibility_tests.rb
-test/test_change_expectation.rb
-test/test_custom_matcher.rb
-test/test_enumerable_expectations.rb
-test/test_error_expectations.rb
-test/test_expectation_builder.rb
-test/test_helper.rb
-test/test_matcher_builder.rb
-test/test_modals.rb
-test/test_operator_expectations.rb
-test/test_truth_expectations.rb

data/PostInstall.txt

@@ -1,7 +0,0 @@
-
-For more information on matchy, see http://matchy.rubyforge.org
-
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
-
-

data/config/hoe.rb

@@ -1,73 +0,0 @@
-require 'matchy/version'
-
-AUTHOR = 'Jeremy McAnally'  # can also be an array of Authors
-EMAIL = "jeremy@entp.com"
-DESCRIPTION = "RSpec-esque matchers for use in Test::Unit"
-GEM_NAME = 'matchy' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'matchy' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-EXTRA_DEPENDENCIES = [
-#  ['activesupport', '>= 1.3.1']
-]    # An array of rubygem dependencies [name, version]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil
-# UNCOMMENT IF REQUIRED:
-# REV = YAML.load(`svn info`)['Revision']
-VERS = Matchy::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'matchy documentation',
-    "--opname", "index.html",
-    "--line-numbers",
-    "--main", "README.rdoc",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
-    @extra_deps
-  end
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
-
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-$hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""