minitest-line 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5ce066391b220600b0c1866d5000050bd9aeaa9
-  data.tar.gz: ac7e7ae85bbb0d820b6a4be83c0b7039ff56e284
+  metadata.gz: 6f044801efcc67afb2b576858ec11a4214e048b0
+  data.tar.gz: 06d87c3848f4d297a183b7de8196b0acdfd10921
 SHA512:
-  metadata.gz: b58cd597e96cc4f0f1d40fdaab8e0007c178161987355ba212a985efd39750d3148b44ebe4536dd5de257f76f428ef80c679957668c365e499bfdcb24303a801
-  data.tar.gz: b3bef54a0ae8f41e2efe1cfcdfe19d9deeccc0b8aaf7cc677f0c9cc64478cea00477b90b3a1032dea039710915656994938987173d701012da153ac724ca3c9c
+  metadata.gz: b84f0c75b45d2e31368e0c39b64c047be30937a4e2acdd88c7566f0a7eb0f075b79ef785a39fe55a16b108bf53ec2c8272d428ece2707908478b45ee2a476397
+  data.tar.gz: e4fe4e0a823e4e7fefe54b661adcc6d268edc106ce758ec6a37454cb41d0d17e53f133ffdb898a7b70fb84dc71a38699517fd89d4cc89924ce0a83398a6a2ad1

data/lib/minitest/line/describe_track.rb

@@ -0,0 +1,13 @@
+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)

data/lib/minitest/line_plugin.rb

@@ -1,6 +1,41 @@
 require 'pathname'
 
 module Minitest
+  module Line
+    class << self
+      def tests_with_lines
+        target_file = $0
+        methods_with_lines(target_file).concat describes_with_lines(target_file)
+      end
+
+      private
+
+      def methods_with_lines(target_file)
+        runnables.flat_map do |runnable|
+          rname = runnable.name
+          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
@@ -8,35 +43,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
-
-    _, main_test = tests.sort_by { |k, v| -k }.detect do |line, name|
-      exp_line >= line
-    end
+    filter, _ = tests.sort_by { |n, l| -l }.detect { |n, l| exp_line >= l }
 
-    raise "Could not find test method after line #{exp_line}" unless main_test
+    raise "Could not find test method before line #{exp_line}" unless filter
 
-    options[:filter] = main_test
+    options[:filter] = filter
   end
 
   class LineReporter < Reporter
@@ -62,7 +80,9 @@ module Minitest
         if file
           file = Pathname.new(file)
           file = file.relative_path_from(pwd) if file.absolute?
-          io.puts "ruby #{file} -l #{line}"
+          output = "ruby #{file} -l #{line}"
+          output = "\e[31m#{output}\e[0m" if $stdout.tty?
+          io.puts output
         end
       end
     end
@@ -71,4 +91,3 @@ module Minitest
   def self.plugin_line_inject_reporter
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-line
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Magnus Holm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -30,6 +30,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/minitest/line/describe_track.rb
 - lib/minitest/line_plugin.rb
 homepage: https://github.com/judofyr/minitest-line
 licenses: