m 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbd933c0fe3a41a288037d2a8b1a6c3bec5f60b7
-  data.tar.gz: d9bfa2b3ba294b898407a2a053556dd8b18d3855
+  metadata.gz: bd1ad8313ab5bd9e236d70fe871ba3e29d871221
+  data.tar.gz: 0e6b5521243cf531c2c45509aaf9d27c438696d5
 SHA512:
-  metadata.gz: db5ce32d613f9edaf57001b2dcec827fd8465d5c89fc55f551f7e211cf43bd7eea38a321b53d5b1d7556dace9ef62675f69cfb03c5fb68d90699b427256de742
-  data.tar.gz: e1d13b7da917f7fcbf7df78ec20a11b10af5cd7131c4f5cb44c8b9b0c6aa0a3ba93e13ac2b236fcfd2f304dd2684e75594de8b08cc5efe9357cb2740e5d5841d
+  metadata.gz: 33c1b791fe1b6c24152547b4629a9b48a7be747b80d946d7180083835265cf5c98d46d5cdeacb6c1382722871c37dc04a37c55851ecd76841277b4a1a67513f3
+  data.tar.gz: 79c1d8f2ab1417c58807cd69275de576fd94ca746dc5d48dc043d2372bc8a5b55eaddd26d4e662a49583f884e3c1373f36f3417888702d17f09f9988bbbf5324

data/.gitignore

@@ -16,3 +16,4 @@ test/version_tmp
 tmp
 /docs
 _site
+.ruby-version

data/.travis.yml

@@ -1,6 +1,10 @@
 rvm:
-  - 1.9.3
   - 2.0.0
-branches:
-  only:
-    - master
+  - 2.1.0
+  - 2.2.0
+install:
+  - bundle install
+  - bundle --gemfile=gemfiles/minitest5.gemfile
+  - bundle --gemfile=gemfiles/minitest4.gemfile
+script:
+  - bundle exec rake tests

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'coveralls', require: false
+gem 'benchmark-ips'
 
 gemspec

data/README.md

@@ -50,7 +50,7 @@ Gem::Specification.new do |gem|
 end
 ```
 
-m works on Ruby 1.9+ only.
+m works on Ruby 2.0+ only.
 
 
 USAGE
@@ -128,16 +128,21 @@ SUPPORT
 CONTRIBUTING
 ============
 
-You can run the tests for minitest 4 with:
+You can run all the tests with:
 
-    rake appraisal:minitest4 test
+    bundle exec rake tests
+
+You can also run tests selectively. For minitest 4 run:
+
+    appraisal minitest4 rake test
 
 and the ones for minitest 5 with:
 
-    rake appraisal:minitest5 test TEST=test/minitest_5_test.rb
+    appraisal minitest5 rake test TEST=test/minitest_5_test.rb
 
-In the case of minitest 5 the whole suite will fail due to incompatibilities
-with ruby (at least until 2.1.1).
+In the case of minitest 5, we have to specify the test to run, because running
+the whole suite will fail due to incompatibilities with ruby (at least until
+2.1.1).
 
 
 LICENSE

data/Rakefile

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'appraisal'
+require 'coveralls'
 require "bundler/gem_tasks"
 require 'rake/clean'
 require "rake/testtask"
@@ -10,12 +11,20 @@ task :default => [:test]
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
+  t.libs << 'lib'
   t.pattern = 'test/*_test.rb'
 end
 
+desc 'Run all tests and get merged test coverage'
+task :tests do
+  system "appraisal minitest4 rake test"
+  system "appraisal minitest5 rake test TEST=test/minitest_5_test.rb"
+  Coveralls.push!
+end
+
 desc 'Run simple benchmarks'
 task :bench do
-  exec "ruby test/bench.rb"
+  exec "ruby test/bench.rb > benchmarks/#{Time.now.strftime('%Y%m%d')}-benchmark.log"
 end
 
 # ROCCO ===============================================================

data/benchmarks/20150430-benchmark.log

@@ -0,0 +1,26 @@
+Calculating -------------------------------------
+running m on a file that doesn't exist
+                         1.000  i/100ms
+running m on an empty file
+                         1.000  i/100ms
+running m on an entire file with minitest5
+                         1.000  i/100ms
+running m on an entire file with minitest4
+                         1.000  i/100ms
+running m on a specific test with minitest4
+                         1.000  i/100ms
+running m on a specific test with minitest5
+                         1.000  i/100ms
+-------------------------------------------------
+running m on a file that doesn't exist
+                          3.097  (± 0.0%) i/s -     16.000 
+running m on an empty file
+                          1.821  (± 0.0%) i/s -     10.000  in   5.496098s
+running m on an entire file with minitest5
+                          0.711  (± 0.0%) i/s -      4.000  in   5.630911s
+running m on an entire file with minitest4
+                          0.746  (± 0.0%) i/s -      4.000  in   5.362587s
+running m on a specific test with minitest4
+                          0.748  (± 0.0%) i/s -      4.000  in   5.345471s
+running m on a specific test with minitest5
+                          0.746  (± 0.0%) i/s -      4.000  in   5.363017s

data/gemfiles/minitest4.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "coveralls", :require=>false
 gem "minitest", "4.7.5"
 
-gemspec :path=>"../"
+gemspec :path=>"../"

data/gemfiles/minitest4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    m (1.3.2)
+    m (1.3.3)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
 
@@ -18,38 +18,50 @@ GEM
       bundler
       rake
     atomic (1.1.14)
-    colorize (0.6.0)
-    coveralls (0.5.8)
-      colorize
-      json
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    docile (1.1.1)
+    coveralls (0.8.1)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
+      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.6.9)
-    json (1.8.1)
+    json (1.8.2)
     method_source (0.8.2)
-    mime-types (2.0)
+    mime-types (2.5)
     minitest (4.7.5)
     multi_json (1.8.4)
     mustache (0.99.4)
+    netrc (0.10.3)
     rake (10.1.1)
     rdiscount (1.6.8)
     redcarpet (3.0.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rocco (0.8.2)
       mustache
       redcarpet
-    simplecov (0.8.2)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thor (0.18.1)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
     thread_safe (0.1.3)
       atomic
+    tins (1.5.1)
     tzinfo (0.3.38)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
 
 PLATFORMS
   ruby

data/gemfiles/minitest5.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "coveralls", :require=>false
 gem "minitest"
 
-gemspec :path=>"../"
+gemspec :path=>"../"

data/gemfiles/minitest5.gemfile.lock

@@ -14,35 +14,47 @@ GEM
     appraisal (0.5.2)
       bundler
       rake
-    colorize (0.6.0)
-    coveralls (0.5.8)
-      colorize
-      json
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    docile (1.1.1)
+    coveralls (0.8.1)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
+      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.6.9)
-    json (1.8.1)
+    json (1.8.2)
     method_source (0.8.2)
-    mime-types (2.0)
+    mime-types (2.5)
     minitest (5.3.1)
     multi_json (1.8.4)
     mustache (0.99.4)
+    netrc (0.10.3)
     rake (10.1.1)
     rdiscount (1.6.8)
     redcarpet (3.0.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rocco (0.8.2)
       mustache
       redcarpet
-    simplecov (0.8.2)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thor (0.18.1)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    tins (1.5.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
 
 PLATFORMS
   ruby

data/lib/m.rb

@@ -1,102 +1,8 @@
-#`m`  stands for metal, which is a better test/unit test runner that can run
-#tests by line number.
-#
-#[![m ci](https://secure.travis-ci.org/qrush/m.png)](http://travis-ci.org/qrush/m)
-#
-#![Rush is a heavy metal band. Look it up on Wikipedia.](https://raw.github.com/qrush/m/master/rush.jpg)
-#
-#<sub>[Rush at the Bristol Colston Hall May 1979](http://www.flickr.com/photos/8507625@N02/3468299995/)</sub>
-### Install
-#
-#Install via:
-#
-#     gem install m
-#
-#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.3.1'
-#     end
-#
-#Developing a RubyGem? Add `m` as a development dependency.
-#
-#     Gem::Specification.new do |gem|
-#       # ...
-#       gem.add_development_dependency "m", "~> 1.3.1"
-#     end
-#
-#`m` works on Ruby 1.9+ only.
-#
-### Usage
-#
-#Basically, I was sick of using the `-n` flag to grab one test to run. Instead, I
-#prefer how RSpec's test runner allows tests to be run by line number.
-#
-#Given this file:
-#
-#     $ cat -n test/example_test.rb
-#      1	require 'test/unit'
-#      2
-#      3	class ExampleTest < Test::Unit::TestCase
-#      4	  def test_apple
-#      5	    assert_equal 1, 1
-#      6	  end
-#      7
-#      8	  def test_banana
-#      9	    assert_equal 1, 1
-#     10	  end
-#     11	end
-#
-#You can run a test by line number, using format `m TEST_FILE:LINE_NUMBER_OF_TEST`:
-#
-#     $ m test/example_test.rb:4
-#     Run options: -n /test_apple/
-#
-#     # Running tests:
-#
-#     .
-#
-#     Finished tests in 0.000525s, 1904.7619 tests/s, 1904.7619 assertions/s.
-#
-#     1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
-#
-#Hit the wrong line number? No problem, `m` helps you out:
-#
-#     $ m test/example_test.rb:2
-#     No tests found on line 2. Valid tests to run:
-#
-#      test_apple: m test/examples/test_unit_example_test.rb:4
-#     test_banana: m test/examples/test_unit_example_test.rb:8
-#
-#Want to run the whole test? Just leave off the line number.
-#
-#     $ m test/example_test.rb
-#     Run options:
-#
-#     # Running tests:
-#
-#     ..
-#
-#     Finished tests in 0.001293s, 1546.7904 tests/s, 3093.5808 assertions/s.
-#
-#     1 tests, 2 assertions, 0 failures, 0 errors, 0 skips
-#
-#### Supports
-#
-#`m` works with a few Ruby test frameworks:
-#
-#* `Test::Unit`
-#* `ActiveSupport::TestCase`
-#* `MiniTest::Unit::TestCase`
-#
-### License
-#
-#This gem is MIT licensed, please see `LICENSE` for more information.
-
 ### M, your metal test runner
 # Maybe this gem should have a longer name? Metal?
 require_relative 'version'
 require_relative 'm/frameworks'
+require_relative 'm/runner'
 
 module M
   # Accept arguments coming from bin/m and run tests, then bail out immediately.
@@ -106,180 +12,4 @@ module M
     $stderr.sync = true
     exit! Runner.new(argv).run
   end
-
-  ### Runner is in charge of running your tests.
-  # Instead of slamming all of this junk in an `M` class, it's here instead.
-  class Runner
-    def initialize(argv)
-      @argv = argv
-    end
-
-    # There's two steps to running our tests:
-    # 1. Parsing the given input for the tests we need to find (or groups of tests)
-    # 2. Run those tests we found that match what you wanted
-    def run
-      parse
-      execute
-    end
-
-    private
-
-    def parse
-      # With no arguments,
-      if @argv.empty?
-        # Just shell out to `rake test`.
-        exec "rake test"
-      else
-        parse_options! @argv
-
-        # Parse out ARGV, it should be coming in in a format like `test/test_file.rb:9`
-        @file, line = @argv.first.split(':')
-        @line ||= line.to_i
-
-        # If this file is a directory, not a file, run the tests inside of this directory
-        if Dir.exist?(@file)
-          # Make a new rake test task with a hopefully unique name, and run every test looking file in it
-          require "rake/testtask"
-          Rake::TestTask.new(:m_custom) do |t|
-            t.libs << 'test'
-            t.libs << 'spec'
-            t.test_files = FileList["#{@file}/*test*.rb", "#{@file}/*spec*.rb"]
-          end
-          # Invoke the rake task and exit, hopefully it'll work!
-          Rake::Task['m_custom'].invoke
-          exit
-        end
-      end
-    end
-
-    def parse_options!(argv)
-      require 'optparse'
-
-      OptionParser.new do |opts|
-        opts.banner  = 'Options:'
-        opts.version = M::VERSION
-
-        opts.on '-h', '--help', 'Display this help.' do
-          puts "Usage: m [OPTIONS] [FILES]\n\n", opts
-          exit
-        end
-
-        opts.on '--version', 'Display the version.' do
-          puts "m #{M::VERSION}"
-          exit
-        end
-
-        opts.on '-l', '--line LINE', Integer, 'Line number for file.' do |line|
-          @line = line
-        end
-
-        opts.parse! argv
-      end
-    end
-
-    def execute
-      # Locate tests to run that may be inside of this line. There could be more than one!
-      tests_to_run = tests.within(@line)
-
-      # If we found any tests,
-      if tests_to_run.size > 0
-        # assemble the regexp to run these tests,
-        test_names = tests_to_run.map { |test| Regexp.escape(test.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
-        if Frameworks.minitest5?
-          Minitest.run test_arguments
-        elsif Frameworks.minitest4?
-          MiniTest::Unit.runner.run test_arguments
-        elsif defined?(Test)
-          Test::Unit::AutoRunner.run(false, nil, test_arguments)
-        else
-          not_supported
-        end
-      elsif tests.size > 0
-        # 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"
-
-        # For every test ordered by line number,
-        # spit out the test name and line number where it starts,
-        tests.by_line_number do |test|
-          message << "#{sprintf("%0#{tests.column_size}s", test.name)}: m #{@file}:#{test.start_line}\n"
-        end
-
-        # Spit out helpful message and bail
-        STDERR.puts message
-        false
-      else
-        # There were no tests at all
-        message = "There were no tests found.\n\n"
-        STDERR.puts message
-        false
-      end
-    end
-
-    # Finds all test suites in this test file, with test methods included.
-    def suites
-      # Since we're not using `ruby -Itest -Ilib` to run the tests, we need to add this directory to the `LOAD_PATH`
-      $:.unshift "./test", "./spec", "./lib"
-
-      begin
-        # Fire up this Ruby file. Let's hope it actually has tests.
-        load @file
-      rescue LoadError => e
-        # Fail with a happier error message instead of spitting out a backtrace from this gem
-        STDERR.puts "Failed loading test file:\n#{e.message}"
-        return []
-      end
-
-      # Figure out what test framework we're using
-      if Frameworks.minitest5?
-        suites = Minitest::Runnable.runnables
-      elsif Frameworks.minitest4?
-        suites = MiniTest::Unit::TestCase.test_suites
-      elsif defined?(Test)
-        suites = Test::Unit::TestCase.test_suites
-      else
-        suites = []
-        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
-        if Frameworks.minitest5?
-          suites[suite_class] = suite_class.runnable_methods if suite_class.runnable_methods.size > 0
-        else
-          suites[suite_class] = suite_class.test_methods if suite_class.test_methods.size > 0
-        end
-        suites
-      end
-    end
-
-    # Shoves tests together in our custom container and collection classes.
-    # Memoize it since it's unnecessary to do this more than one for a given file.
-    def tests
-      @tests ||= begin
-        require "m/test_collection"
-        require "m/test_method"
-        # With each suite and array of tests,
-        # and with each test method present in this test file,
-        # shove a new test method into this collection.
-        suites.inject(TestCollection.new) do |collection, (suite_class, test_methods)|
-          test_methods.each do |test_method|
-            collection << TestMethod.create(suite_class, test_method)
-          end
-          collection
-        end
-      end
-    end
-
-    # Fail loudly if this isn't supported
-    def not_supported
-      STDERR.puts "This test framework is not supported! Please open up an issue at https://github.com/qrush/m !"
-      false
-    end
-  end
 end