m 1.6.1 → 1.7.0

data/lib/m/runner.rb

@@ -1,11 +1,11 @@
-require_relative 'parser'
-require_relative 'executor'
+require_relative "parser"
+require_relative "executor"
 
 ### Runners are in charge of running your tests, depending on the framework
 # Instead of slamming all of this junk in an `M` class, it's here instead.
 module M
   class Runner
-    def initialize(argv)
+    def initialize argv
       @argv = argv
     end
 

data/lib/m/runners/base.rb

@@ -2,14 +2,14 @@ module M
   module Runners
     class Base
       def suites
-        raise 'Not implemented'
+        raise "Not implemented"
       end
 
-      def run(_test_arguments)
-        raise 'Not implemented'
+      def run _test_arguments
+        raise "Not implemented"
       end
 
-      def test_methods(suite_class)
+      def test_methods suite_class
         suite_class.test_methods
       end
     end

data/lib/m/runners/minitest_4.rb

@@ -5,7 +5,7 @@ module M
         MiniTest::Unit::TestCase.test_suites
       end
 
-      def run(test_arguments)
+      def run test_arguments
         MiniTest::Unit.runner.run test_arguments
       end
     end

data/lib/m/runners/minitest_5.rb

@@ -2,19 +2,17 @@ module M
   module Runners
     class Minitest5 < Base
       def suites
-        if Minitest.respond_to?(:seed)
-          Minitest.seed = (ENV["SEED"] || srand).to_i % 0xFFFF
-        end
+        Minitest.seed = (ENV["SEED"] || srand).to_i % 0xFFFF if Minitest.respond_to? :seed
         Minitest::Runnable.runnables
       end
 
-      def run(test_arguments)
+      def run test_arguments
         output = Minitest.run test_arguments
         ::Minitest.class_variable_get(:@@after_run).reverse_each(&:call)
         output
       end
 
-      def test_methods(suite_class)
+      def test_methods suite_class
         suite_class.runnable_methods
       end
     end

data/lib/m/runners/minitest_6.rb

@@ -0,0 +1,3 @@
+require_relative "minitest_5"
+
+M::Runners::Minitest6 = M::Runners::Minitest5

data/lib/m/runners/test_unit.rb

@@ -2,22 +2,22 @@ module M
   module Runners
     class TestUnit < Base
       def suites
-        if Test::Unit::TestCase.respond_to?(:test_suites)
+        if Test::Unit::TestCase.respond_to? :test_suites
           Test::Unit::TestCase.test_suites
         else
           Test::Unit::TestCase::DESCENDANTS
         end
       end
 
-      def run(test_arguments)
-        Test::Unit::AutoRunner.run(false, nil, test_arguments)
+      def run test_arguments
+        Test::Unit::AutoRunner.run false, nil, test_arguments
       end
 
-      def test_methods(suite_class)
-        if suite_class.respond_to?(:test_methods)
+      def test_methods suite_class
+        if suite_class.respond_to? :test_methods
           suite_class.test_methods
         else
-          suite_class.public_instance_methods(true).grep(/^test/).map { |m| m.to_s }
+          suite_class.public_instance_methods(true).grep(/^test/).map(&:to_s)
         end
       end
     end

data/lib/m/runners/unsupported_framework.rb

@@ -6,14 +6,14 @@ module M
         []
       end
 
-      def run(_test_arguments)
+      def run _test_arguments
         not_supported
       end
 
       private
 
       def not_supported
-        STDERR.puts "This test framework is not supported! Please open up an issue at https://github.com/qrush/m !"
+        warn "This test framework is not supported! Please open up an issue at https://github.com/qrush/m !"
         false
       end
     end

data/lib/m/test_collection.rb

@@ -11,18 +11,18 @@ module M
     # internal collection
     def_delegators :@collection, :size, :<<, :each
 
-    def initialize(collection = nil)
+    def initialize collection = nil
       @collection = collection || []
     end
 
     # Slice out tests that may be within the given line.
     # Returns a new TestCollection with the results.
-    def within(lines)
+    def within lines
       # Into a new collection, filter only the tests that...
       collection = select do |test|
-        lines.none? || lines.any? { |line| (test.start_line..test.end_line).include?(line) }
+        lines.none? || lines.any? { |line| (test.start_line..test.end_line).cover?(line) }
       end
-      self.class.new(collection)
+      self.class.new collection
     end
 
     # Used to line up method names in `#sprintf` when `m` aborts
@@ -33,7 +33,7 @@ module M
     end
 
     # Be considerate when printing out tests and pre-sort them by line number
-    def by_line_number(&block)
+    def by_line_number &block
       # On each member of the collection, sort by line number and yield
       # the block into the sorted collection
       sort_by(&:start_line).each(&block)

data/lib/m/test_method.rb

@@ -1,4 +1,4 @@
-require "method_source"
+require_relative "finish_line" # if RUBY_VERSION < "4.1"
 
 module M
   ### Simple data structure for what a test method contains.
@@ -8,27 +8,22 @@ module M
   #
   # Includes the name of this method, what line on the file it begins on,
   # and where it ends.
-  class TestMethod < Struct.new(:name, :start_line, :end_line)
-    # Set up a new test method for this test suite class
-    def self.create(suite_class, test_method)
-      # Hopefully it's been defined as an instance method, so we'll need to
-      # look up the ruby Method instance for it
-      method = suite_class.instance_method(test_method)
+  TestMethod = Struct.new :name, :start_line, :end_line do
+    def self.create suite_class, test_method
+      method = suite_class.instance_method test_method
 
-      # Ruby can find the starting line for us, so pull that out of the array
-      start_line = method.source_location.last
+      # Ruby can find the starting line for us, so pull that out of the array.
+      # Ruby 4.1+ can also provide the ending line.
+      #start_line, end_line = method.source_location.values_at(1, 3)
+      start_line = method.source_location[1]
 
-      # Ruby can't find the end line however, and I'm too lazy to write
-      # a parser. Instead, `method_source` adds `Method#source` so we can
-      # deduce this ourselves.
-      #
-      # The end line should be the number of line breaks in the method source,
-      # added to the starting line and subtracted by one.
-      
-      end_line = method.source.split("\n").size + start_line - 1
+      # Ruby < 4.1 can't find the end line. Use a Ripper-derived parser to
+      # determine the ending line.
+      #end_line ||= FinishLine.ending_line_for method
+      end_line = FinishLine.ending_line_for method
 
       # Shove the given attributes into a new databag
-      new(test_method, start_line, end_line)
+      new test_method, start_line, end_line
     end
   end
 end

data/lib/m/testable.rb

@@ -3,14 +3,14 @@ module M
     attr_accessor :file, :recursive, :passthrough_options
     attr_reader :lines
 
-    def initialize(file = "", lines = [], recursive = false)
+    def initialize file = "", lines = [], recursive = false
       @file = file
       @recursive = recursive
       @passthrough_options = []
       self.lines = lines
     end
 
-    def lines=(lines)
+    def lines= lines
       @lines = lines.map(&:to_i)
     end
   end

data/lib/m/version.rb

@@ -1,3 +1,3 @@
 module M
-  VERSION = "1.6.1"
+  VERSION = "1.7.0".freeze
 end

data/lib/m.rb

@@ -1,12 +1,12 @@
 ### M, your metal test runner
 # Maybe this gem should have a longer name? Metal?
-require_relative 'm/version'
-require_relative 'm/frameworks'
-require_relative 'm/runner'
+require_relative "m/version"
+require_relative "m/frameworks"
+require_relative "m/runner"
 
 module M
   # Accept arguments coming from bin/m and run tests, then bail out immediately.
-  def self.run(argv)
+  def self.run argv
     # sync output since we're going to exit hard and fast
     $stdout.sync = true
     $stderr.sync = true

data/m.gemspec

@@ -1,26 +1,24 @@
-require './lib/m'
+require "./lib/m"
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Nick Quaranto"]
-  gem.email         = ["nick@quaran.to"]
-  gem.homepage      = "https://github.com/qrush/m"
+  gem.authors = ["Nick Quaranto"]
+  gem.email = ["nick@quaran.to"]
+  gem.homepage = "https://github.com/qrush/m"
+  gem.license = "MIT"
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "m"
+  gem.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  gem.files = `git ls-files`.split "\n"
+  gem.name = "m"
   gem.require_paths = ["lib"]
-  gem.version       = M::VERSION
+  gem.version = M::VERSION
 
-  gem.add_runtime_dependency "method_source", ">= 0.6.7"
-  gem.add_runtime_dependency "rake", ">= 0.9.2.2"
+  gem.add_runtime_dependency "rake"
 
   gem.add_development_dependency "activesupport"
-  gem.add_development_dependency "rdiscount" unless defined? JRUBY_VERSION
-  gem.add_development_dependency "rocco" unless defined? JRUBY_VERSION
-  gem.add_development_dependency "appraisal"
+  gem.add_development_dependency "standard"
 
-  gem.required_ruby_version = ">= 1.9"
+  gem.required_ruby_version = ">= 2.7"
 
-  gem.summary = gem.description = %q{Run test/unit tests by line number. Metal!}
+  gem.summary = gem.description = "Run test/unit tests by line number. Metal!"
+  gem.metadata["rubygems_mfa_required"] = "true"
 end

data/test/Rakefile

@@ -1,6 +1,6 @@
 require "rake/testtask"
 
 Rake::TestTask.new do |t|
-  t.libs << '.'
-  t.pattern = 'examples/*_test.rb'
+  t.libs << "."
+  t.pattern = "examples/*_test.rb"
 end

data/test/active_support_test.rb

@@ -1,53 +1,58 @@
-require 'test_helper'
+require_relative "test_helper"
 
 class ActiveSupportTest < MTest
+  def test_run_simple_test_by_line_number_with_absolute_path
+    output = m File.join(__dir__, "examples/active_support_example_test.rb:9")
+    assert_output(/1 (runs|tests), 1 assertions/, output)
+  end
+
   def test_run_simple_test_by_line_number
-    output = m('examples/active_support_example_test.rb:12')
+    output = m "examples/active_support_example_test.rb:9"
     assert_output(/1 (runs|tests), 1 assertions/, output)
   end
 
   def test_runs_entire_test_without_line_number
-    output = m('examples/active_support_example_test.rb')
+    output = m "examples/active_support_example_test.rb"
     assert_output(/4 (runs|tests)/, output)
   end
 
   def test_run_inside_of_test
-    output = m('examples/active_support_example_test.rb:13')
+    output = m "examples/active_support_example_test.rb:10"
     assert_output(/1 (runs|tests), 1 assertions/, output)
   end
 
   def test_run_on_end_of_test
-    output = m('examples/active_support_example_test.rb:14')
+    output = m "examples/active_support_example_test.rb:11"
     assert_output(/1 (runs|tests), 1 assertions/, output)
   end
 
   def test_run_inside_big_test
-    output = m('examples/active_support_example_test.rb:18')
+    output = m "examples/active_support_example_test.rb:15"
     assert_output(/1 (runs|tests), 3 assertions/, output)
   end
 
   def test_run_on_blank_line_orders_tests_by_line_number
-    output = m('examples/active_support_example_test.rb:2')
+    output = m "examples/active_support_example_test.rb:8"
 
     assert !$?.success?
-    expected = <<-EOF
-No tests found on line 2. Valid tests to run:
-
-      test_normal: m examples/active_support_example_test.rb:8
-      test_carrot: m examples/active_support_example_test.rb:12
-      test_daikon: m examples/active_support_example_test.rb:16
-test_eggplant_fig: m examples/active_support_example_test.rb:22
-EOF
+    expected = <<~OUTPUT
+      No tests found on line 8. Valid tests to run:
+
+            test_normal: m examples/active_support_example_test.rb:5
+            test_carrot: m examples/active_support_example_test.rb:9
+            test_daikon: m examples/active_support_example_test.rb:13
+      test_eggplant_fig: m examples/active_support_example_test.rb:19
+    OUTPUT
     assert_equal expected.strip, output
   end
 
   def test_run_on_test_with_spaces
-    output = m('examples/active_support_example_test.rb:22')
+    output = m "examples/active_support_example_test.rb:19"
     assert_output(/1 (runs|tests), 1 assertions/, output)
   end
 
   def test_run_on_test_with_unescaped_regular_express_characters
-    output = m('examples/active_support_unescaped_example_test.rb:8')
+    output = m "examples/active_support_unescaped_example_test.rb:5"
     assert_output(/1 (runs|tests), 1 assertions/, output)
   end
 end

data/test/allocations.rb

@@ -1,23 +1,20 @@
-$LOAD_PATH.unshift 'lib'
-require 'm'
-require 'allocation_stats'
+require_relative "../lib/m"
+require "allocation_stats"
 
-def benchmark_allocations(burn: 1)
-  stats = AllocationStats.new(burn: burn).trace do
-    yield
-  end
+def benchmark_allocations burn: 1, &block
+  stats = AllocationStats.new(burn: burn).trace(&block)
 
-  columns = if ENV['DETAIL']
-              [:sourcefile, :sourceline, :class_plus]
-            else
-              [:class_plus]
-            end
+  columns = if ENV["DETAIL"]
+    [:sourcefile, :sourceline, :class_plus]
+  else
+    [:class_plus]
+  end
 
   puts stats.allocations(alias_paths: true).group_by(*columns).sort_by_size.to_text
 end
 
 benchmark_allocations do
   10.times do
-    M::Runner.new(['test/examples/minitest_5_example_test.rb:19']).run
+    M::Runner.new(["test/examples/minitest_5_or_6_example_test.rb:19"]).run
   end
 end

data/test/bench.rb

@@ -1,35 +1,28 @@
-require 'benchmark/ips'
+require "benchmark/ips"
+require "rbconfig"
 
 Benchmark.ips do |bench|
   bench.report("running m on a file that doesn't exist") do
-    `ruby -Ilib ./bin/m failwhale 2>/dev/null`
+    `bundle exec #{RbConfig.ruby} -Ilib ./bin/m failwhale 2>/dev/null`
   end
 
   bench.report("running m on an empty file") do
-    `ruby -Ilib ./bin/m test/examples/empty_example_test.rb 2>/dev/null`
+    `bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/empty_example_test.rb 2>/dev/null`
   end
 
-  bench.report("running m on an entire file with minitest4") do
-    `appraisal minitest4 ruby -Ilib ./bin/m test/examples/minitest_4_example_test.rb 2>/dev/null`
-  end
-
-  bench.report("running m on an entire file with minitest5") do
-    `appraisal minitest5 ruby -Ilib ./bin/m test/examples/minitest_5_example_test.rb 2>/dev/null`
+  bench.report("running m on an entire file with minitest") do
+    `bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/minitest_5_or_6_example_test.rb 2>/dev/null`
   end
 
   bench.report("running m on an entire file with test-unit gem") do
-    `appraisal test_unit_gem ruby -Ilib ./bin/m test/examples/test_unit_example_test.rb 2>/dev/null`
-  end
-
-  bench.report("running m on a specific test with minitest4") do
-    `appraisal minitest4 ruby -Ilib ./bin/m test/examples/minitest_4_example_test.rb:19 2>/dev/null`
+    `bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/test_unit_example_test.rb 2>/dev/null`
   end
 
-  bench.report("running m on a specific test with minitest5") do
-    `appraisal minitest5 ruby -Ilib ./bin/m test/examples/minitest_5_example_test.rb:19 2>/dev/null`
+  bench.report("running m on a specific test with minitest") do
+    `bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/minitest_5_or_6_example_test.rb:19 2>/dev/null`
   end
 
   bench.report("running m on a specific test with test-unit gem") do
-    `appraisal test_unit_gem ruby -Ilib ./bin/m test/examples/test_unit_example_test.rb:15 2>/dev/null`
+    `bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/test_unit_example_test.rb:15 2>/dev/null`
   end
 end

data/test/empty_test.rb

@@ -1,8 +1,8 @@
-require 'test_helper'
+require_relative "test_helper"
 
 class EmptyTest < MTest
   def test_run_simple_test_by_line_number
-    output = m('examples/empty_example_test.rb')
+    output = m "examples/empty_example_test.rb"
     assert !$?.success?
     assert_match(/There were no tests found./, output)
   end

data/test/everything_test.rb

@@ -1,37 +1,33 @@
-require 'test_helper'
+require_relative "test_helper"
 
 class EverythingTest < MTest
   def test_runs_entire_test_suite_with_no_arguments
-    output = m('')
+    output = m ""
     assert_output(/12 (runs|tests)/, output)
   end
 
   def test_missing_file_gives_a_decent_error_message
-    output = m('examples/thisdoesnexist_test.rb')
+    output = m "examples/thisdoesnexist_test.rb"
     assert !$?.success?
     assert_match(/Failed loading test file/, output)
-    if defined? JRUBY_VERSION
-      assert_match(/no such file to load/, output)
-    else
-      assert_match(/cannot load such file/, output)
-    end
+    assert_match(/cannot load such file/, output)
   end
 
   def test_running_tests_within_a_subdirectory
-    output = m('examples/subdir')
+    output = m "examples/subdir"
     assert_output(/3 (runs|tests)/, output)
 
-    output = m('examples')
+    output = m "examples"
     assert_output(/12 (runs|tests)/, output)
   end
 
   def test_running_tests_with_failures_within_a_subdirectory
-    output = m('examples/subdir_with_failures')
+    output = m "examples/subdir_with_failures"
     assert_output_for_failed_execution(/1 (runs|tests), 1 assertions, 1 failures/, output)
   end
 
   def test_blank_file_is_quieter
-    output = m('bananas')
+    output = m "bananas"
     assert(/Valid tests to run/ !~ output)
   end
 end

data/test/examples/active_support_example_test.rb

@@ -1,10 +1,7 @@
-require 'active_support'
-require 'active_support/test_case'
+require "active_support"
+require "active_support/test_case"
 
 class ActiveSupportExampleTest < ActiveSupport::TestCase
-  setup do
-  end
-
   def test_normal
     assert_equal 1, 1
   end

data/test/examples/active_support_unescaped_example_test.rb

@@ -1,10 +1,7 @@
-require 'active_support'
-require 'active_support/test_case'
+require "active_support"
+require "active_support/test_case"
 
 class ActiveSupportExampleTest < ActiveSupport::TestCase
-  setup do
-  end
-
   test "#assert_equal compares to objects (and ensures they are equal)" do
     assert_equal 1, 1
   end

data/test/examples/empty_example_test.rb

@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 class EmptyExampleTest < MTest
 end

data/test/examples/{minitest_5_example_test.rb → minitest_5_or_6_example_test.rb}

@@ -1,6 +1,6 @@
-require 'minitest/autorun'
+require "minitest/autorun"
 
-if M::Frameworks.minitest5?
+if M::Frameworks.minitest5? || M::Frameworks.minitest6?
   class Meme
     def i_can_has_cheezburger?
       "OHAI!"

data/test/examples/minitest_example_test.rb

@@ -1,4 +1,4 @@
-require 'minitest/unit'
+require "minitest"
 
 class Meme
   def i_can_has_cheezburger?
@@ -10,9 +10,7 @@ class Meme
   end
 end
 
-Test = M::Frameworks.minitest4? ? MiniTest::Unit::TestCase : Minitest::Test
-
-class TestMeme < Test
+class TestMeme < Minitest::Test
   def setup
     @meme = Meme.new
   end
@@ -32,5 +30,5 @@ class TestMeme < Test
     assert_equal "OHAI!", @meme.i_can_has_cheezburger?
   end
 
-  Minitest.after_run { p "ran after run block" } if Minitest.respond_to?(:after_run)
+  Minitest.after_run { p "ran after run block" } if Minitest.respond_to? :after_run
 end

data/test/examples/multiple_example_test.rb

@@ -1,8 +1,8 @@
-require 'active_support'
-require 'active_support/test_case'
+require "active_support"
+require "active_support/test_case"
 
 class MultipleExampleTest < ActiveSupport::TestCase
-  %w(grape habanero iceplant).each do |fruit|
+  ["grape", "habanero", "iceplant"].each do |fruit|
     test "#{fruit} is a fruit" do
       assert_equal 1, 1
     end

data/test/examples/subdir/a_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_helper'
+require_relative "../../test_helper"
 
 class ATest < MTest
   def test_a

data/test/examples/subdir/another_subdir/d_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../test_helper'
+require_relative "../../../test_helper"
 
 class DTest < MTest
   def test_d

data/test/examples/subdir/another_subdir/yet_another_subdir/e_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../../test_helper'
+require_relative "../../../../test_helper"
 
 class ETest < MTest
   def test_e

data/test/examples/subdir/b_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_helper'
+require_relative "../../test_helper"
 
 class BTest < MTest
   def test_b

data/test/examples/subdir/c_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_helper'
+require_relative "../../test_helper"
 
 class CTest < MTest
   def test_c

data/test/examples/subdir_with_failures/a_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_helper'
+require_relative "../../test_helper"
 
 class ATest < MTest
   def test_a

data/test/examples/test_unit_example_test.rb

@@ -1,5 +1,5 @@
-require_relative '../test_helper'
-try_loading('test-unit')
+require_relative "../test_helper"
+try_loading "test-unit"
 
 if M::Frameworks.test_unit?
   class TestUnitExampleTest < Test::Unit::TestCase