m 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eb68da70e67de74c0b2074aa426481b9261f0e3
-  data.tar.gz: f80e95794ab9c624d9ce64208e7d076ae31db2cf
+  metadata.gz: 797baa07531404e7d5add0a5928b0a3997dae6c6
+  data.tar.gz: b0210ac7b23dc08ce3666568c783cf44fcebffa1
 SHA512:
-  metadata.gz: 64487e0b8fa78471e2317887a0876638bdf56ed56350293494ef94b61727abc189f0775370bdef56106666f45e4d84b3e1e242baec9bac93d521f5b8b18b2baf
-  data.tar.gz: 197996dd41f2c9750a38fe6d8a6a87573e8176ca07f52cdd7e04aeff92aeeac8f1ea7b46a70e1c402e3562c4993900cfb5d5c096b61dd0b4f7aa1d87ebb1708f
+  metadata.gz: 47430e39fa825c9ce6f6c1ce0290a2bcde416edbaa5bf9113e7b5b0f53f532e563ece5ca322dd74bc686f82eabecf90dc5e513893b8845c57317cd3f3fd7d526
+  data.tar.gz: 2a6b64f5c7eac7f794843e12699114c790ee2de5a7a92161fe71c9f237c82b8f67080a9b8608c0a00ebb553b99fb1f084024f3ef6900ac003ba6a949d839d75b

data/.travis.yml

@@ -3,6 +3,8 @@ rvm:
   - 2.1.0
   - 2.2.0
   - jruby-1.7.21
+before_install:
+  - gem install bundler
 install:
   - bundle install
   - bundle --gemfile=gemfiles/minitest5.gemfile

data/README.md

@@ -36,7 +36,7 @@ If you’re using Bundler, you’ll need to include it in your Gemfile. Toss it
 
 ``` ruby
 group :test do
-  gem 'm', '~> 1.3.1'
+  gem 'm', '~> 1.5.0'
 end
 ```
 
@@ -46,7 +46,7 @@ Developing a RubyGem? Add m as a development dependency.
 ``` ruby
 Gem::Specification.new do |gem|
   # ...
-  gem.add_development_dependency "m", "~> 1.3.1"
+  gem.add_development_dependency "m", "~> 1.5.0"
 end
 ```
 
@@ -114,6 +114,18 @@ Want to run the whole test? Just leave off the line number.
 
     1 tests, 2 assertions, 0 failures, 0 errors, 0 skips
 
+If you want to run all the tests in a directory as well as its subdirectories, use the `-r` flag:
+
+    $ m -r test/models
+    "Searching provided directory for tests recursively"
+    Run options:
+
+    ..
+
+    Finished in 3.459902s, 45.0880 runs/s, 87.5747 assertions/s.
+
+    156 tests, 303 assertions, 0 failures, 0 errors, 13 skips
+
 
 SUPPORT
 =======

data/gemfiles/minitest4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    m (1.3.4)
+    m (1.4.2)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
 
@@ -82,4 +82,4 @@ DEPENDENCIES
   rocco
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/gemfiles/minitest5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    m (1.3.4)
+    m (1.4.2)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
 
@@ -72,4 +72,4 @@ DEPENDENCIES
   rocco
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/gemfiles/test_unit_gem.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    m (1.3.4)
+    m (1.4.2)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
 
@@ -82,4 +82,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

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/parser.rb

@@ -25,15 +25,15 @@ 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")]
           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
@@ -67,8 +67,21 @@ module M
           testable.line = 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/testable.rb

@@ -1,11 +1,12 @@
 module M
   class Testable
-    attr_accessor :file
+    attr_accessor :file, :recursive
     attr_reader :line
 
-    def initialize(file = "", line = nil)
+    def initialize(file = "", line = nil, recursive = false)
       @file = file
       @line = line
+      @recursive = recursive
     end
 
     def line=(line)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module M
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

data/test/everything_test.rb

@@ -27,7 +27,7 @@ class EverythingTest < MTest
 
   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 tests, 1 assertions, 1 failures/, output)
   end
 
   def test_blank_file_is_quieter

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

@@ -0,0 +1,7 @@
+require_relative '../../../test_helper'
+
+class DTest < MTest
+  def test_d
+    assert_equal 1, 1
+  end
+end

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

@@ -0,0 +1,7 @@
+require_relative '../../../../test_helper'
+
+class ETest < MTest
+  def test_e
+    assert_equal 1, 1
+  end
+end

data/test/exit_codes_test.rb

@@ -0,0 +1,33 @@
+require "test_helper"
+
+class ExitCodesTest < MTest
+  def test_failing_test_returns_1
+    m("examples/subdir_with_failures/a_test")
+    refute $?.success?, "expected exit code to be 1 but it was #{$?.exitstatus}"
+  end
+
+  def test_test_with_error_returns_1
+    m("../lib/error_tests/error_test")
+    refute $?.success?, "expected exit code to be 1 but it was #{$?.exitstatus}"
+  end
+
+  def test_dir_with_failure_returns_1
+    m("examples/subdir_with_failures")
+    refute $?.success?, "expected exit code to be 1 but it was #{$?.exitstatus}"
+  end
+
+  def test_dir_with_error_returns_1
+    m("../lib/error_tests")
+    refute $?.success?, "expected exit code to be 1 but it was #{$?.exitstatus}"
+  end
+
+  def test_without_errors_or_failures_returns_0
+    m("examples/subdir/a_test")
+    assert $?.success?, "expected exit code to be 0 but it was #{$?.exitstatus}"
+  end
+
+  def test_dir_without_errors_or_failures_returns_0
+    m("examples/subdir")
+    assert $?.success?, "expected exit code to be 0 but it was #{$?.exitstatus}"
+  end
+end

data/test/options_test.rb

@@ -30,4 +30,14 @@ class OptionsTest < MTest
     output = m('--line 20 examples/minitest_4_example_test.rb:2')
     assert_output(/1 tests, 1 assertions/, output)
   end
+
+  def test_recursive_option
+    output = m('-r examples/subdir')
+    assert_output(/5 tests/, output)
+  end
+
+  def test_recursive_option_without_directory_arg_fails
+    output = m('-r')
+    assert_match(/OptionParser::MissingArgument/, output)
+  end
 end

data/test/test_helper.rb

@@ -16,6 +16,11 @@ module Testable
     assert $?.success?, "Execution failed, output:\n\n#{output}"
     assert_match regexp, output
   end
+
+  def assert_output_for_failed_execution(regexp, output)
+    refute $?.success?, "Execution did not fail, but it should"
+    assert_match regexp, output
+  end
 end
 
 require 'm'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Nick Quaranto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -120,6 +120,7 @@ files:
 - gemfiles/minitest5.gemfile.lock
 - gemfiles/test_unit_gem.gemfile
 - gemfiles/test_unit_gem.gemfile.lock
+- lib/error_tests/error_test.rb
 - lib/m.rb
 - lib/m/executor.rb
 - lib/m/frameworks.rb
@@ -149,10 +150,13 @@ files:
 - test/examples/minitest_5_example_test.rb
 - test/examples/multiple_example_test.rb
 - test/examples/subdir/a_test.rb
+- test/examples/subdir/another_subdir/d_test.rb
+- test/examples/subdir/another_subdir/yet_another_subdir/e_test.rb
 - test/examples/subdir/b_test.rb
 - test/examples/subdir/c_test.rb
 - test/examples/subdir_with_failures/a_test.rb
 - test/examples/test_unit_example_test.rb
+- test/exit_codes_test.rb
 - test/minitest_4_test.rb
 - test/minitest_5_test.rb
 - test/multiple_test.rb
@@ -178,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Run test/unit tests by line number. Metal!
@@ -196,10 +200,13 @@ test_files:
 - test/examples/minitest_5_example_test.rb
 - test/examples/multiple_example_test.rb
 - test/examples/subdir/a_test.rb
+- test/examples/subdir/another_subdir/d_test.rb
+- test/examples/subdir/another_subdir/yet_another_subdir/e_test.rb
 - test/examples/subdir/b_test.rb
 - test/examples/subdir/c_test.rb
 - test/examples/subdir_with_failures/a_test.rb
 - test/examples/test_unit_example_test.rb
+- test/exit_codes_test.rb
 - test/minitest_4_test.rb
 - test/minitest_5_test.rb
 - test/multiple_test.rb