m 1.1.0 → 1.2.0

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.1'
+#       gem 'm', '~> 1.2'
 #     end
 #
 #Developing a RubyGem? Add `m` as a development dependency.
 #
 #     Gem::Specification.new do |gem|
 #       # ...
-#       gem.add_development_dependency "m", "~> 1.1"
+#       gem.add_development_dependency "m", "~> 1.2"
 #     end
 #
 #`m` is Ruby 1.9+ only. Sorry, but `method_source`, `sourcify`, and `ruby_parser`
@@ -38,12 +38,12 @@
 #
 #     $ cat -n test/example_test.rb
 #      1	require 'test/unit'
-#      2	
+#      2
 #      3	class ExampleTest < Test::Unit::TestCase
 #      4	  def test_apple
 #      5	    assert_equal 1, 1
 #      6	  end
-#      7	
+#      7
 #      8	  def test_banana
 #      9	    assert_equal 1, 1
 #     10	  end
@@ -73,7 +73,7 @@
 #Want to run the whole test? Just leave off the line number.
 #
 #     $ m test/example_test.rb
-#     Run options: 
+#     Run options:
 #
 #     # Running tests:
 #
@@ -98,7 +98,7 @@
 ### M, your metal test runner
 # Maybe this gem should have a longer name? Metal?
 module M
-  VERSION = "1.1.0"
+  VERSION = "1.2.0" unless defined?(VERSION)
 
   # Accept arguments coming from bin/m and run tests.
   def self.run(argv)
@@ -128,9 +128,11 @@ module M
         # 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
+        @line ||= line.to_i
 
         # If this file is a directory, not a file, run the tests inside of this directory
         if Dir.exist?(@file)
@@ -147,6 +149,31 @@ module M
       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)
@@ -196,10 +223,10 @@ module M
       end
 
       # Figure out what test framework we're using
-      if defined?(Test)
-        suites = Test::Unit::TestCase.test_suites
-      elsif defined?(MiniTest)
+      if defined?(MiniTest)
         suites = MiniTest::Unit::TestCase.test_suites
+      elsif defined?(Test)
+        suites = Test::Unit::TestCase.test_suites
       else
         not_supported
       end

data/lib/m/test_method.rb

@@ -1,5 +1,3 @@
-require "ostruct"
-
 module M
   ### Simple data structure for what a test method contains.
   #

data/m.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = M::VERSION
 
-  gem.add_runtime_dependency "method_source", "~> 0.6.7"
+  gem.add_runtime_dependency "method_source", ">= 0.6.7"
   gem.add_runtime_dependency "rake", ">= 0.9.2.2", "< 1.0.0"
   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"
+  gem.required_ruby_version = ">= 1.9"
 
   gem.summary = description = %q{Run test/unit tests by line number. Metal!}
 end

data/test/options_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class OptionsTest < MTest
+  def test_short_help_option
+    output = m('-h')
+    assert_output /^Usage: m \[OPTIONS\] \[FILES\]/, output
+  end
+
+  def test_long_help_option
+    output = m('--help')
+    assert_output /^Usage: m \[OPTIONS\] \[FILES\]/, output
+  end
+
+  def test_verbose_option
+    output = m('--version')
+    assert_output /^m #{M::VERSION}/, output
+  end
+
+  def test_short_line_option
+    output = m('-l19 examples/minitest_example_test.rb')
+    assert_output /1 tests, 1 assertions/, output
+  end
+
+  def test_long_line_option
+    output = m('--line 19 examples/minitest_example_test.rb')
+    assert_output /1 tests, 1 assertions/, output
+  end
+
+  def test_line_option_has_precedence_over_colon_format
+    output = m('--line 19 examples/minitest_example_test.rb:2')
+    assert_output /1 tests, 1 assertions/, output
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require './lib/m'
 require 'test/unit'
 require 'active_support/test_case'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: m
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-07 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70312941477320 !ruby/object:Gem::Requirement
+  requirement: &70302923866320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70312941477320
+  version_requirements: *70302923866320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70312941476520 !ruby/object:Gem::Requirement
+  requirement: &70302923874700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70312941476520
+  version_requirements: *70302923874700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70312941475560 !ruby/object:Gem::Requirement
+  requirement: &70302923893880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312941475560
+  version_requirements: *70302923893880
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70312941510320 !ruby/object:Gem::Requirement
+  requirement: &70302923912060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312941510320
+  version_requirements: *70302923912060
 - !ruby/object:Gem::Dependency
   name: rocco
-  requirement: &70312941509900 !ruby/object:Gem::Requirement
+  requirement: &70302923918460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312941509900
+  version_requirements: *70302923918460
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70312941509480 !ruby/object:Gem::Requirement
+  requirement: &70302923922180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,7 +79,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312941509480
+  version_requirements: *70302923922180
 description: 
 email:
 - nick@quaran.to
@@ -115,6 +115,7 @@ files:
 - test/examples/test_unit_example_test.rb
 - test/minitest_test.rb
 - test/multiple_test.rb
+- test/options_test.rb
 - test/test_helper.rb
 - test/test_unit_test.rb
 homepage: https://github.com/qrush/m
@@ -126,7 +127,7 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ~>
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -155,6 +156,7 @@ test_files:
 - test/examples/test_unit_example_test.rb
 - test/minitest_test.rb
 - test/multiple_test.rb
+- test/options_test.rb
 - test/test_helper.rb
 - test/test_unit_test.rb
 has_rdoc: