maxitest 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63d1e9c4bb62f38867ffed9a061c639f2726371f
-  data.tar.gz: f678636ae4d38cef099a82fd8e6d0ca6d293d352
+  metadata.gz: 271f7a9230cc5370341413d7f3d7d944831e5ab4
+  data.tar.gz: c8c7aaf229077231927a498915a713bad72c9306
 SHA512:
-  metadata.gz: 0c25363ed5eff711abe65784ddb657c801c1fa4cfb13e3a04bd2e4298a454dd2733a5f27e42d778b3b701b0f82d7a0bd07554b6f25312c6cc11331d4a5d2c0c2
-  data.tar.gz: 6bf5c87dde9d3816816b1a37ba2994d175acb9295cfb6e8869d9583d8fdbeefcad8694f9e1d025813e216d008919be132008e680aa7c84b8acffff6a8f6ec18f
+  metadata.gz: edaebf80fdc723a22c39c85e55eba26cd09c83396958bccab4286d045cfc57965a6a575e51a5a4c81eb8654139c920fcad98e9dda279085b56040608288d8fa1
+  data.tar.gz: 88ba8dbe7dd89d707727359c6b5116b05a0c53ceaf20cde5824c961abc02f2e9f1d08259f0536a224aa5cf2d69be8e967e5c4653936153eea7f1747361575312

data/lib/maxitest/implicit_subject.rb

@@ -10,4 +10,4 @@ module Maxitest
   end
 end
 
-Object.include Maxitest::ImplicitSubject # Minitest hacks Kernel -> we need to use alias method or go into Object
+Object.send(:include, Maxitest::ImplicitSubject) # Minitest hacks Kernel -> we need to use alias method or go into Object

data/lib/maxitest/vendor/around.rb

@@ -28,10 +28,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # https://raw.githubusercontent.com/splattael/minitest-around/master/lib/minitest/around/version.rb
 # BEGIN generated by rake update, do not modify
-module Minitest
-  module Around
-    VERSION = '0.3.0'
-  end
+module MinitestAround
+  VERSION = '0.3.0'
 end
 #END generated by rake update, do not modify
 
@@ -56,7 +54,7 @@ Minitest::Spec::DSL.class_eval do
   # - resume to call first part
   # - execute test
   # - resume fiber to execute last part
-  def around(&block)
+  def around(*args, &block)
     fib = nil
     before do
       fib = Fiber.new do |context, resume|

data/lib/maxitest/vendor/line.rb

@@ -26,9 +26,54 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =end
 #END generated by rake update, do not modify
 
-# https://raw.githubusercontent.com/judofyr/minitest-line/master/lib/minitest/line_plugin.rb
+# https://raw.githubusercontent.com/grosser/minitest-line/grosser/describe/lib/minitest/line_plugin.rb
 # BEGIN generated by rake update, do not modify
 module Minitest
+  module Line
+    class << self
+      def tests_with_lines
+        target_file = target_file()
+        methods_with_lines(target_file).concat describes_with_lines(target_file)
+      end
+
+      private
+
+      def target_file
+        runnables.each do |r|
+          r.runnable_methods.each do |m|
+            file, line = r.instance_method(m).source_location
+            return file if file
+          end
+        end
+        nil
+      end
+
+      def methods_with_lines(target_file)
+        runnables.flat_map do |runnable|
+          rname = Class.instance_method(:name).bind(runnable).call
+          runnable.runnable_methods.map do |name|
+            file, line = runnable.instance_method(name).source_location
+            next unless file == target_file
+            test_name = (rname ? "#{rname}##{name}" : name)
+            [test_name, line]
+          end
+        end.uniq.compact
+      end
+
+      def describes_with_lines(target_file)
+        runnables.map do |runnable|
+          next unless caller = runnable.instance_variable_get(:@minitest_line_caller)
+          next unless line = caller.detect { |line| line.include?(target_file) }
+          ["/#{Regexp.escape(runnable.name)}/", line[/:(\d+):in/, 1].to_i]
+        end.compact
+      end
+
+      def runnables
+        Minitest::Runnable.runnables
+      end
+    end
+  end
+
   def self.plugin_line_options(opts, options)
     opts.on '-l', '--line N', Integer, "Run test at line number" do |lineno|
       options[:line] = lineno
@@ -36,35 +81,18 @@ module Minitest
   end
 
   def self.plugin_line_init(options)
-    exp_line = options[:line]
-    if !exp_line
+    unless exp_line = options[:line]
       reporter.reporters << LineReporter.new
       return
     end
 
-    methods = Runnable.runnables.flat_map do |runnable|
-      runnable.runnable_methods.map do |name|
-        [name, runnable.instance_method(name)]
-      end
-    end.uniq
-
-    current_filename = nil
-    tests = {}
+    tests = Minitest::Line.tests_with_lines
 
-    methods.each do |name, meth|
-      next unless loc = meth.source_location
-      current_filename ||= loc[0]
-      next unless current_filename == loc[0]
-      tests[loc[1]] = name
-    end
+    filter, _ = tests.sort_by { |n, l| -l }.detect { |n, l| exp_line >= l }
 
-    _, main_test = tests.sort_by { |k, v| -k }.detect do |line, name|
-      exp_line >= line
-    end
+    raise "Could not find test method after line #{exp_line}" unless filter
 
-    raise "Could not find test method after line #{exp_line}" unless main_test
-
-    options[:filter] = main_test
+    options[:filter] = filter
   end
 
   class LineReporter < Reporter
@@ -101,4 +129,21 @@ module Minitest
   def self.plugin_line_inject_reporter
   end
 end
+#END generated by rake update, do not modify
+
+# https://raw.githubusercontent.com/grosser/minitest-line/grosser/describe/lib/minitest/line/describe_track.rb
+# BEGIN generated by rake update, do not modify
+module Minitest
+  module Line
+    module DescribeTrack
+      def describe(*args, &block)
+        klass = super
+        klass.instance_variable_set(:@minitest_line_caller, caller[0..5])
+        klass
+      end
+    end
+  end
+end
+
+Object.send(:include, Minitest::Line::DescribeTrack)
 #END generated by rake update, do not modify

data/lib/maxitest/version.rb

@@ -1,3 +1,3 @@
 module Maxitest
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxitest
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest