assert 2.1.1 → 2.1.2

data/lib/assert/result.rb

@@ -49,7 +49,7 @@ module Assert::Result
     end
 
     def trace
-      self.backtrace.filtered.first.to_s
+      (self.backtrace.filtered.first || self.test.context_info.called_from).to_s
     end
 
     def ==(other)
@@ -107,11 +107,6 @@ module Assert::Result
       "Fail"
     end
 
-    # override of the base, show the test's context info called_from
-    def trace
-      self.test.context_info.called_from || super
-    end
-
   end
 
   # raised by the 'skip' context helper to break test execution
@@ -135,11 +130,6 @@ module Assert::Result
       "Skip"
     end
 
-    # override of the base, show the test's context info called_from
-    def trace
-      self.test.context_info.called_from || super
-    end
-
   end
 
   class Error < Base
@@ -191,42 +181,17 @@ module Assert::Result
     def to_s; self.join("\n"); end
 
     def filtered
-      new_bt = []
-
-      self.each do |line|
-        break if filter_out?(line)
-        new_bt << line
-      end
-
-      new_bt = self.reject { |line| filter_out?(line) } if new_bt.empty?
-      new_bt = self.dup if new_bt.empty?
-
-      self.class.new(new_bt)
+      self.class.new(self.reject { |line| filter_out?(line) })
     end
 
     protected
 
-    # filter a line out if it's an assert lib line
-
+    # filter a line out if it's an assert lib/bin line
     def filter_out?(line)
-      # from minitest (for reference)...
-      # file = File.expand_path __FILE__
-             # if RUBY_VERSION =~ /^1\.9/ then  # bt's expanded, but __FILE__ isn't :(
-             #    File.expand_path __FILE__
-             # elsif  __FILE__ =~ /^[^\.]/ then # assume both relative
-             #   require 'pathname'
-             #   pwd = Pathname.new Dir.pwd
-             #   pn = Pathname.new File.expand_path(__FILE__)
-             #   relpath = pn.relative_path_from(pwd) rescue pn
-             #   pn = File.join ".", relpath unless pn.relative?
-             #   pn.to_s
-             # else                             # assume both are expanded
-             #   __FILE__
-             # end
-
       # './lib' in project dir, or '/usr/local/blahblah' if installed
       assert_lib_path = File.expand_path('../..', __FILE__)
-      line.rindex(assert_lib_path, 0)
+      assert_bin_regex = /bin\/assert\:/
+      line.rindex(assert_lib_path, 0) || line =~ assert_bin_regex
     end
   end
 

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/test/unit/context_tests.rb

@@ -98,7 +98,7 @@ class Assert::Context
 
     should "create a fail result and set its backtrace" do
       assert_kind_of Assert::Result::Fail, subject
-      assert_equal Factory.context_info_called_from, subject.trace
+      assert_equal subject.backtrace.filtered.first, subject.trace
       assert_kind_of Array, subject.backtrace
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-30 00:00:00 Z
+date: 2013-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ansi