assert 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assert (0.2.0)
+    assert (0.2.1)
       ansi (~> 1.3)
 
 GEM

data/lib/assert.rb

@@ -1,8 +1,5 @@
-require 'assert/setup/suite'
-require 'assert/setup/view'
-
-require 'assert/setup/helpers'
-require 'assert/setup/autorun'
+require 'assert/setup'
+require 'assert/autorun'
 
 Assert::Helpers.load(caller)
 Assert.autorun

data/lib/assert/{setup/autorun.rb → autorun.rb}

@@ -1,3 +1,4 @@
+require 'assert/setup'
 require 'assert/runner'
 
 module Assert

data/lib/assert/context.rb

@@ -86,11 +86,17 @@ module Assert
         else
           raise ArgumentError, "please provide a test block" unless block_given?
           method_name = "test: should #{desc_or_macro}"
-          if method_defined?(method_name)
+
+          # instead of using the typical 'method_defined?' pattern (which) checks
+          # all parent contexts, we really just need to make sure the method_name
+          # is not part of self's local_pulic_test_methods for this check
+          if Assert.suite.send(:local_public_test_methods, self).include?(method_name)
             from = caller.first
             puts "WARNING: should #{desc_or_macro.inspect} is redefining #{method_name}!"
             puts "  from: #{from}"
+            puts "  self: #{self.inspect}"
           end
+
           define_method(method_name, &block)
         end
       end

data/lib/assert/rake_tasks.rb

@@ -3,17 +3,13 @@ require 'rake/tasklib'
 
 module Assert; end
 module Assert::RakeTasks
+  include Rake::DSL if defined? Rake::DSL
 
   FILE_SUFFIX = "_test.rb"
 
   # Setup the rake tasks for testing
   # * add 'include Assert::RakeTasks' to your Rakefile
   def self.included(receiver)
-    # get rid of rake warnings
-    if defined?(::Rake::DSL)
-      receiver.send :include, ::Rake::DSL
-    end
-
     # auto-build rake tasks for the ./test files (if defined in ./test)
     self.for(:test) if File.exists?(File.expand_path('./test', Dir.pwd))
   end

data/lib/assert/setup.rb

@@ -0,0 +1,5 @@
+require 'assert/setup/suite'
+require 'assert/setup/view'
+require 'assert/setup/helpers'
+
+Assert::Helpers.load(caller)

data/lib/assert/setup/helpers.rb

@@ -15,7 +15,7 @@ module Assert
       PACKAGE_HELPER_FILE = "helper"
       TEST_REGEX = /^#{PACKAGE_TEST_DIR}$|^#{PACKAGE_TEST_DIR}\/|\/#{PACKAGE_TEST_DIR}\/|\/#{PACKAGE_TEST_DIR}$/
 
-      USER_TEST_HELPER = "~/.assert"
+      USER_TEST_HELPER = "~/.assert/options"
 
       def load(caller_info)
         if (crp = caller_root_path(caller_info))
@@ -52,8 +52,9 @@ module Assert
       # parent dir of caller named TEST_DIR
       def caller_root_path(caller_info)
         caller_dirname = File.expand_path(File.dirname(caller_info[0]))
-        if (test_dir_pos = caller_dirname.index(TEST_REGEX)) > 0
-          root_dir = caller_dirname[0..(test_dir_pos-1)]
+        test_dir_pos = caller_dirname.index(TEST_REGEX)
+        if test_dir_pos && (test_dir_pos > 0)
+          caller_dirname[0..(test_dir_pos-1)]
         end
       end
     end

data/lib/assert/suite.rb

@@ -97,11 +97,20 @@ module Assert
     end
 
     def local_public_test_methods(klass)
+      # start with all public meths, store off the local ones
       methods = klass.public_instance_methods
+      local_methods = klass.public_instance_methods(false)
+
+      # remove any from the superclass
       while (klass.superclass)
         methods -= (klass = klass.superclass).public_instance_methods
       end
-      methods.delete_if {|method_name| method_name !~ /^test./ }
+
+      # add back in the local ones (to work around super having the same methods)
+      methods += local_methods
+
+      # uniq and remove any that don't start with 'test'
+      methods.uniq.delete_if {|method_name| method_name !~ /^test./ }
     end
 
     private

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/fixtures/inherited_stuff.rb

@@ -17,9 +17,17 @@ class SuperStuff
     "super not test meth"
   end
 
+  def test_from_super
+    "test from the super"
+  end
+
+  def test_repeated
+    "repeated test from super"
+  end
+
 end
 
-class SubStuff
+class SubStuff < SuperStuff
   include MixinStuff
 
   def test_subclass_stuff
@@ -33,4 +41,9 @@ class SubStuff
   def more_other_stuff
     "more other stuff"
   end
+
+  def test_repeated
+    "repeated test from sub"
+  end
+
 end

data/test/helper.rb

@@ -1,4 +1,4 @@
-# this file is automatically required in when you require 'test_belt'
+# this file is automatically required in when you require 'assert'
 # put test helpers here
 
 require 'stringio'

data/test/irb.rb

@@ -1,7 +1,5 @@
-require 'assert'
+# require in any test helper and load user settings
+require 'assert/setup'
 
 # this file is required in when the 'irb' rake test is run.
-# b/c 'assert' is required above, the test helper will be
-# required in.
-
 # put any IRB setup code here

data/test/suite_test.rb

@@ -35,7 +35,7 @@ class Assert::Suite
 
     should "determine a klass' local public test methods" do
       assert_equal(
-        ["test_subclass_stuff", "test_mixin_stuff"].sort,
+        ["test_subclass_stuff", "test_mixin_stuff", "test_repeated"].sort,
         subject.send(:local_public_test_methods, SubStuff).sort.collect(&:to_s)
       )
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-18 00:00:00 Z
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -64,11 +64,9 @@ files:
 - README.rdoc
 - Rakefile
 - assert.gemspec
-- examples/empty_test.rb
-- examples/results_test.rb
-- examples/single_test.rb
 - lib/assert.rb
 - lib/assert/assertions.rb
+- lib/assert/autorun.rb
 - lib/assert/context.rb
 - lib/assert/macro.rb
 - lib/assert/macros/methods.rb
@@ -77,7 +75,7 @@ files:
 - lib/assert/result.rb
 - lib/assert/result_set.rb
 - lib/assert/runner.rb
-- lib/assert/setup/autorun.rb
+- lib/assert/setup.rb
 - lib/assert/setup/helpers.rb
 - lib/assert/setup/suite.rb
 - lib/assert/setup/view.rb

data/examples/empty_test.rb

@@ -1,5 +0,0 @@
-require 'assert'
-
-class EmptyTest < Assert::Context
-
-end

data/examples/results_test.rb

@@ -1,25 +0,0 @@
-require 'assert'
-
-class ResultsTest < Assert::Context
-
-  def test_that_passes
-    assert 1==1
-  end
-
-  def test_that_fails
-    assert 1==0
-  end
-
-  def test_that_ignores
-    ignore
-  end
-
-  def test_that_skips
-    skip
-  end
-
-  def test_that_errors
-    raise Exception
-  end
-
-end

data/examples/single_test.rb

@@ -1,9 +0,0 @@
-require 'assert'
-
-class SingleTest < Assert::Context
-
-  def test_this_thing
-    assert 1==1
-  end
-
-end