m 1.4.0 → 1.6.0

data/gemfiles/test_unit_gem.gemfile

@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", :require => false, :group => :coverage
+gem "coveralls", require: false
+gem "benchmark-ips"
+gem "allocation_stats"
 gem "test-unit"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/test_unit_gem.gemfile.lock

@@ -1,80 +1,71 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    m (1.3.4)
+    m (1.5.1)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.3)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    appraisal (2.0.2)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    allocation_stats (0.1.5)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
-    coveralls (0.8.2)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+    benchmark-ips (2.9.1)
+    concurrent-ruby (1.1.9)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-    docile (1.1.5)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    json (1.8.3-java)
-    method_source (0.8.2)
-    mime-types (2.6.1)
-    minitest (5.7.0)
-    mustache (1.0.2)
-    netrc (0.10.3)
-    power_assert (0.2.4)
-    rake (10.4.2)
-    rdiscount (2.1.8)
-    redcarpet (3.3.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    docile (1.4.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    json (2.5.1)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    mustache (1.1.1)
+    power_assert (2.0.1)
+    rake (13.0.6)
+    rdiscount (2.2.0.2)
+    redcarpet (3.5.1)
     rocco (0.8.2)
       mustache
       redcarpet
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    term-ansicolor (1.3.2)
+    simplecov-html (0.10.2)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-unit (3.1.2)
+    test-unit (3.4.4)
       power_assert
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
-    tins (1.5.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf (0.1.4-java)
-    unf_ext (0.0.7.1)
+    thor (1.1.0)
+    tins (1.29.1)
+      sync
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   activesupport
+  allocation_stats
   appraisal
+  benchmark-ips
   coveralls
   m!
   rdiscount
@@ -82,4 +73,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.10.6
+   2.2.26

data/lib/error_tests/error_test.rb

@@ -0,0 +1,7 @@
+require_relative "../../test/test_helper.rb"
+
+class ErrorTest < MTest
+  def test_purposeful_error
+    raise RuntimeError
+  end
+end

data/lib/m/executor.rb

@@ -12,7 +12,7 @@ module M
 
     def execute
       # Locate tests to run that may be inside of this line. There could be more than one!
-      tests_to_run = tests.within(testable.line)
+      tests_to_run = tests.within(testable.lines)
 
       # If we found any tests,
       if tests_to_run.size > 0
@@ -23,10 +23,10 @@ module M
         test_arguments = ["-n", "/^(#{test_names})$/"]
 
         # directly run the tests from here and exit with the status of the tests passing or failing
-        runner.run(test_arguments)
+        runner.run(test_arguments + testable.passthrough_options)
       elsif tests.size > 0
         # Otherwise we found no tests on this line, so you need to pick one.
-        message = "No tests found on line #{testable.line}. Valid tests to run:\n\n"
+        message = "No tests found on line #{testable.lines.join(', ')}. Valid tests to run:\n\n"
 
         # For every test ordered by line number,
         # spit out the test name and line number where it starts,

data/lib/m/frameworks.rb

@@ -30,12 +30,16 @@ module M
       self.class.test_unit?
     end
 
+    def self.minitest_version_major
+      defined?(Minitest) ? Minitest::Unit::VERSION.slice(/\d+/) : nil
+    end
+
     def self.minitest5?
-      defined?(Minitest) && Minitest::Unit::VERSION.start_with?("5")
+      minitest_version_major == "5"
     end
 
     def self.minitest4?
-      defined?(MiniTest)
+      minitest_version_major == "4"
     end
 
     def self.test_unit?

data/lib/m/parser.rb

@@ -15,8 +15,17 @@ module M
       else
         parse_options! argv
 
-        # Parse out ARGV, it should be coming in in a format like `test/test_file.rb:9`
-        testable.file, testable.line = argv.first.split(':')
+        if argv.first.start_with?("--")
+          exec "rake test #{argv.join}"
+          exit 0
+        else
+          # Parse out ARGV, it should be coming in in a format like `test/test_file.rb:9:19`
+          parsed = argv.shift.split(':')
+          testable.file = parsed.shift
+          testable.lines = parsed if testable.lines.none?
+          # Anything else on ARGV will be passed along to the runner
+          testable.passthrough_options = argv
+        end
 
         # If this file is a directory, not a file, run the tests inside of this directory
         if Dir.exist?(testable.file)
@@ -25,15 +34,16 @@ module M
           Rake::TestTask.new(:m_custom) do |t|
             t.libs << 'test'
             t.libs << 'spec'
-            t.test_files = FileList["#{testable.file}/*test*.rb", "#{testable.file}/*spec*.rb"]
+            t.test_files = FileList[wildcard("test"), wildcard("spec")]
+            t.warning = false
           end
           # Invoke the rake task and exit, hopefully it'll work!
           begin
             Rake::Task['m_custom'].invoke
           rescue RuntimeError
-            exit
+            exit(1)
           ensure
-            exit
+            exit($?.exitstatus)
           end
         else
           return testable
@@ -64,11 +74,24 @@ module M
 
         opts.on '-l', '--line LINE', Integer, 'Line number for file.' do |line|
           p "parsing line #{line}"
-          testable.line = line
+          testable.lines = [line]
+        end
+
+        opts.on '-r', '--recursive DIR', 'Search provided directory recursively.' do |directory|
+          testable.recursive = true
+          argv << directory
         end
 
         opts.parse! argv
       end
     end
+
+    def wildcard(type)
+      if testable.recursive
+        "#{testable.file}/**/*#{type}*.rb"
+      else
+        "#{testable.file}/*#{type}*.rb"
+      end
+    end
   end
 end

data/lib/m/test_collection.rb

@@ -17,13 +17,12 @@ module M
 
     # Slice out tests that may be within the given line.
     # Returns a new TestCollection with the results.
-    def within(line)
+    def within(lines)
       # Into a new collection, filter only the tests that...
-      self.class.new(select do |test|
-        # are within the given boundary for this method
-        # or include everything if the line given is zero (no line)
-        line.zero? || (test.start_line..test.end_line).include?(line)
-      end)
+      collection = select do |test|
+        lines.none? || lines.any? { |line| (test.start_line..test.end_line).include?(line) }
+      end
+      self.class.new(collection)
     end
 
     # Used to line up method names in `#sprintf` when `m` aborts

data/lib/m/test_method.rb

@@ -1,3 +1,5 @@
+require "method_source"
+
 module M
   ### Simple data structure for what a test method contains.
   #
@@ -22,7 +24,7 @@ module M
       #
       # The end line should be the number of line breaks in the method source,
       # added to the starting line and subtracted by one.
-      require "method_source"
+      
       end_line = method.source.split("\n").size + start_line - 1
 
       # Shove the given attributes into a new databag

data/lib/m/testable.rb

@@ -1,15 +1,17 @@
 module M
   class Testable
-    attr_accessor :file
-    attr_reader :line
+    attr_accessor :file, :recursive, :passthrough_options
+    attr_reader :lines
 
-    def initialize(file = "", line = nil)
+    def initialize(file = "", lines = [], recursive = false)
       @file = file
-      @line = line
+      @recursive = recursive
+      @passthrough_options = []
+      self.lines = lines
     end
 
-    def line=(line)
-      @line ||= line.to_i
+    def lines=(lines)
+      @lines = lines.map(&:to_i)
     end
   end
 end

data/lib/m/version.rb

@@ -0,0 +1,3 @@
+module M
+  VERSION = "1.6.0"
+end

data/lib/m.rb

@@ -1,6 +1,6 @@
 ### M, your metal test runner
 # Maybe this gem should have a longer name? Metal?
-require_relative 'version'
+require_relative 'm/version'
 require_relative 'm/frameworks'
 require_relative 'm/runner'
 

data/test/active_support_test.rb

@@ -2,28 +2,28 @@ require 'test_helper'
 
 class ActiveSupportTest < MTest
   def test_run_simple_test_by_line_number
-    output = m('examples/active_support_example_test.rb:11')
-    assert_output(/1 tests, 1 assertions/, output)
+    output = m('examples/active_support_example_test.rb:12')
+    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')
-    assert_output(/4 tests/, output)
+    assert_output(/4 (runs|tests)/, output)
   end
 
   def test_run_inside_of_test
-    output = m('examples/active_support_example_test.rb:12')
-    assert_output(/1 tests, 1 assertions/, output)
+    output = m('examples/active_support_example_test.rb:13')
+    assert_output(/1 (runs|tests), 1 assertions/, output)
   end
 
   def test_run_on_end_of_test
-    output = m('examples/active_support_example_test.rb:13')
-    assert_output(/1 tests, 1 assertions/, output)
+    output = m('examples/active_support_example_test.rb:14')
+    assert_output(/1 (runs|tests), 1 assertions/, output)
   end
 
   def test_run_inside_big_test
-    output = m('examples/active_support_example_test.rb:17')
-    assert_output(/1 tests, 3 assertions/, output)
+    output = m('examples/active_support_example_test.rb:18')
+    assert_output(/1 (runs|tests), 3 assertions/, output)
   end
 
   def test_run_on_blank_line_orders_tests_by_line_number
@@ -33,21 +33,21 @@ class ActiveSupportTest < MTest
     expected = <<-EOF
 No tests found on line 2. Valid tests to run:
 
-      test_normal: m examples/active_support_example_test.rb:7
-      test_carrot: m examples/active_support_example_test.rb:11
-      test_daikon: m examples/active_support_example_test.rb:15
-test_eggplant_fig: m examples/active_support_example_test.rb:21
+      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
     assert_equal expected.strip, output
   end
 
   def test_run_on_test_with_spaces
-    output = m('examples/active_support_example_test.rb:21')
-    assert_output(/1 tests, 1 assertions/, output)
+    output = m('examples/active_support_example_test.rb:22')
+    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:7')
-    assert_output(/1 tests, 1 assertions/, output)
+    output = m('examples/active_support_unescaped_example_test.rb:8')
+    assert_output(/1 (runs|tests), 1 assertions/, output)
   end
 end

data/test/everything_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class EverythingTest < MTest
   def test_runs_entire_test_suite_with_no_arguments
     output = m('')
-    assert_output(/12 tests/, output)
+    assert_output(/12 (runs|tests)/, output)
   end
 
   def test_missing_file_gives_a_decent_error_message
@@ -19,15 +19,15 @@ class EverythingTest < MTest
 
   def test_running_tests_within_a_subdirectory
     output = m('examples/subdir')
-    assert_output(/3 tests/, output)
+    assert_output(/3 (runs|tests)/, output)
 
     output = m('examples')
-    assert_output(/12 tests/, output)
+    assert_output(/12 (runs|tests)/, output)
   end
 
   def test_running_tests_with_failures_within_a_subdirectory
     output = m('examples/subdir_with_failures')
-    assert_output(/1 tests, 1 assertions, 1 failures/, output)
+    assert_output_for_failed_execution(/1 (runs|tests), 1 assertions, 1 failures/, output)
   end
 
   def test_blank_file_is_quieter

data/test/examples/active_support_example_test.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/test_case'
 
 class ActiveSupportExampleTest < ActiveSupport::TestCase

data/test/examples/active_support_unescaped_example_test.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/test_case'
 
 class ActiveSupportExampleTest < ActiveSupport::TestCase

data/test/examples/minitest_example_test.rb

@@ -0,0 +1,36 @@
+require 'minitest/unit'
+
+class Meme
+  def i_can_has_cheezburger?
+    "OHAI!"
+  end
+
+  def will_it_blend?
+    "YES!"
+  end
+end
+
+Test = M::Frameworks.minitest4? ? MiniTest::Unit::TestCase : Minitest::Test
+
+class TestMeme < Test
+  def setup
+    @meme = Meme.new
+  end
+
+  def test_that_kitty_can_eat
+    assert_equal "OHAI!", @meme.i_can_has_cheezburger?
+  end
+
+  def test_that_it_will_not_blend
+    refute_match(/^maybe/i, @meme.will_it_blend?)
+    refute_match(/^no/i, @meme.will_it_blend?)
+    refute_match(/^lolz/i, @meme.will_it_blend?)
+  end
+
+  def test_that_kitty_can_eat_two_time
+    assert_equal "OHAI!", @meme.i_can_has_cheezburger?
+    assert_equal "OHAI!", @meme.i_can_has_cheezburger?
+  end
+
+  Minitest.after_run { p "ran after run block" } if Minitest.respond_to?(:after_run)
+end