m 1.0.1 → 1.1.0

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in wtf.gemspec
 gemspec

data/lib/m.rb

@@ -15,14 +15,14 @@
 #If you're using Bundler, you'll need to include it in your Gemfile. Toss it into the `test` group:
 #
 #     group :test do
-#       gem 'm', '~> 1.0'
+#       gem 'm', '~> 1.1'
 #     end
 #
 #Developing a RubyGem? Add `m` as a development dependency.
 #
 #     Gem::Specification.new do |gem|
 #       # ...
-#       gem.add_development_dependency "m", "~> 1.0"
+#       gem.add_development_dependency "m", "~> 1.1"
 #     end
 #
 #`m` is Ruby 1.9+ only. Sorry, but `method_source`, `sourcify`, and `ruby_parser`
@@ -83,8 +83,13 @@
 #
 #     1 tests, 2 assertions, 0 failures, 0 errors, 0 skips
 #
-#`m` also works with `ActiveSupport::TestCase` as well, so it will work great with
-#your Rails test suites.
+#### Supports
+#
+#`m` works with a few Ruby test frameworks:
+#
+#* `Test::Unit`
+#* `ActiveSupport::TestCase`
+#* `MiniTest::Unit::TestCase`
 #
 ### License
 #
@@ -93,7 +98,7 @@
 ### M, your metal test runner
 # Maybe this gem should have a longer name? Metal?
 module M
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 
   # Accept arguments coming from bin/m and run tests.
   def self.run(argv)
@@ -151,8 +156,17 @@ module M
         # assemble the regexp to run these tests,
         test_names = tests_to_run.map(&:name).join('|')
 
+        # set up the args needed for the runner
+        test_arguments = ["-n", "/(#{test_names})/"]
+
         # directly run the tests from here and exit with the status of the tests passing or failing
-        exit Test::Unit::AutoRunner.run(false, nil, ["-n", "/(#{test_names})/"])
+        if defined?(Test)
+          exit Test::Unit::AutoRunner.run(false, nil, test_arguments)
+        elsif defined?(MiniTest)
+          exit MiniTest::Unit.runner.run test_arguments
+        else
+          not_supported
+        end
       else
         # Otherwise we found no tests on this line, so you need to pick one.
         message = "No tests found on line #{@line}. Valid tests to run:\n\n"
@@ -170,8 +184,8 @@ module M
 
     # Finds all test suites in this test file, with test methods included.
     def suites
-      # Since we're not using `ruby -Itest` to run the tests, we need to add this directory to the `LOAD_PATH`
-      $:.unshift "./test"
+      # Since we're not using `ruby -Itest -Ilib` to run the tests, we need to add this directory to the `LOAD_PATH`
+      $:.unshift "./test", "./lib"
 
       begin
         # Fire up this Ruby file. Let's hope it actually has tests.
@@ -181,8 +195,17 @@ module M
         abort "Failed loading test file:\n#{e.message}"
       end
 
-      # Use some janky internal test/unit API to group test methods by test suite.
-      Test::Unit::TestCase.test_suites.inject({}) do |suites, suite_class|
+      # Figure out what test framework we're using
+      if defined?(Test)
+        suites = Test::Unit::TestCase.test_suites
+      elsif defined?(MiniTest)
+        suites = MiniTest::Unit::TestCase.test_suites
+      else
+        not_supported
+      end
+
+      # Use some janky internal APIs to group test methods by test suite.
+      suites.inject({}) do |suites, suite_class|
         # End up with a hash of suite class name to an array of test methods, so we can later find them and ignore empty test suites
         suites[suite_class] = suite_class.test_methods if suite_class.test_methods.size > 0
         suites
@@ -206,5 +229,10 @@ module M
         end
       end
     end
+
+    # Fail loudly if this isn't supported
+    def not_supported
+      abort "This test framework is not supported! Please open up an issue at https://github.com/qrush/m !"
+    end
   end
 end

data/m.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "activesupport"
   gem.add_development_dependency "rdiscount"
   gem.add_development_dependency "rocco"
+  gem.add_development_dependency "minitest"
 
   gem.required_ruby_version = "~> 1.9"
 

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 /10 tests/, output
+    assert_output /12 tests/, output
   end
 
   def test_missing_file_gives_a_decent_error_message
@@ -18,6 +18,6 @@ class EverythingTest < MTest
     assert_output /3 tests/, output
 
     output = m('examples')
-    assert_output /10 tests/, output
+    assert_output /12 tests/, output
   end
 end

data/test/examples/minitest_example_test.rb

@@ -0,0 +1,28 @@
+require 'minitest/unit'
+
+class Meme
+  def i_can_has_cheezburger?
+    "OHAI!"
+  end
+
+  def will_it_blend?
+    "YES!"
+  end
+end
+
+
+class TestMeme < MiniTest::Unit::TestCase
+  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
+end

data/test/minitest_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+class MinitestTest < MTest
+  def test_run_simple_test_by_line_number
+    output = m('examples/minitest_example_test.rb:19')
+    assert_output /1 tests, 1 assertions/, output
+  end
+
+  def test_runs_entire_test_without_line_number
+    output = m('examples/minitest_example_test.rb')
+    assert_output /2 tests/, output
+  end
+
+  def test_run_inside_of_test
+    output = m('examples/minitest_example_test.rb:20')
+    assert_output /1 tests, 1 assertions/, output
+  end
+
+  def test_run_on_end_of_test
+    output = m('examples/minitest_example_test.rb:21')
+    assert_output /1 tests, 1 assertions/, output
+  end
+
+  def test_run_inside_big_test
+    output = m('examples/minitest_example_test.rb:25')
+    assert_output /1 tests, 6 assertions/, output
+  end
+
+  def test_run_on_blank_line
+    output = m('examples/minitest_example_test.rb:2')
+
+    assert !$?.success?
+    assert_match /No tests found on line 2. Valid tests to run:/, output
+    assert_match %r{    test_that_kitty_can_eat: m examples/minitest_example_test\.rb:19}, output
+    assert_match %r{test_that_it_will_not_blend: m examples/minitest_example_test\.rb:23}, output
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: m
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70258225055260 !ruby/object:Gem::Requirement
+  requirement: &70312941477320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70258225055260
+  version_requirements: *70312941477320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70258225054420 !ruby/object:Gem::Requirement
+  requirement: &70312941476520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70258225054420
+  version_requirements: *70312941476520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70258225069800 !ruby/object:Gem::Requirement
+  requirement: &70312941475560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70258225069800
+  version_requirements: *70312941475560
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70258225069260 !ruby/object:Gem::Requirement
+  requirement: &70312941510320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70258225069260
+  version_requirements: *70312941510320
 - !ruby/object:Gem::Dependency
   name: rocco
-  requirement: &70258225068840 !ruby/object:Gem::Requirement
+  requirement: &70312941509900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,7 +68,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70258225068840
+  version_requirements: *70312941509900
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70312941509480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70312941509480
 description: 
 email:
 - nick@quaran.to
@@ -96,11 +107,13 @@ files:
 - test/bench.rb
 - test/everything_test.rb
 - test/examples/active_support_example_test.rb
+- test/examples/minitest_example_test.rb
 - test/examples/multiple_example_test.rb
 - test/examples/subdir/a_test.rb
 - test/examples/subdir/b_test.rb
 - test/examples/subdir/c_test.rb
 - test/examples/test_unit_example_test.rb
+- test/minitest_test.rb
 - test/multiple_test.rb
 - test/test_helper.rb
 - test/test_unit_test.rb
@@ -134,11 +147,13 @@ test_files:
 - test/bench.rb
 - test/everything_test.rb
 - test/examples/active_support_example_test.rb
+- test/examples/minitest_example_test.rb
 - test/examples/multiple_example_test.rb
 - test/examples/subdir/a_test.rb
 - test/examples/subdir/b_test.rb
 - test/examples/subdir/c_test.rb
 - test/examples/test_unit_example_test.rb
+- test/minitest_test.rb
 - test/multiple_test.rb
 - test/test_helper.rb
 - test/test_unit_test.rb