guard-minitest 0.4.0.rc1 → 0.4.0.rc2

data/README.rdoc

@@ -3,7 +3,7 @@
 Minitest guard allows to automatically & intelligently launch tests with
 {minitest framework}[http://github.com/seattlerb/minitest] when files are modified.
 
-- Compatible with MiniTest 1.7.x
+- Compatible with MiniTest 1.7.x & 2.x
 - Tested on Ruby 1.8.6, 1.8.7 & 1.9.2.
 
 == Install
@@ -34,17 +34,17 @@ Please read {guard doc}[http://github.com/guard/guard#readme] for more info abou
 === Standard ruby gems with Minitest::Unit
 
     guard 'minitest' do
-      watch('^test/test_(.*).rb')
-      watch('^lib/(.*)([^/]+)\.rb')                     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-      watch('^test/test_helper.rb')                     { "test" }
+      watch(%r|^test/test_(.*)\.rb|)
+      watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+      watch(%r|^test/test_helper\.rb|)    { "test" }
     end
 
 === Standard ruby gems with Minitest::Spec
 
     guard 'minitest' do
-      watch('^spec/(.*)_spec.rb')
-      watch('^lib/(.*)\.rb')                            { |m| "spec/#{m[1]}_spec.rb" }
-      watch('^spec/spec_helper.rb')                     { "spec" }
+      watch(%r|^spec/(.*)_spec\.rb|)
+      watch(%r|^lib/(.*)\.rb|)            { |m| "spec/#{m[1]}_spec.rb" }
+      watch(%r|^spec/spec_helper\.rb|)    { "spec" }
     end
 
 == Options
@@ -89,4 +89,4 @@ you make.
 
 == Authors
 
-{Yann Lugrin}[http://github.com/yannlugrin]
+{Yann Lugrin}[http://github.com/yannlugrin]

data/lib/guard/minitest.rb

@@ -15,7 +15,6 @@ module Guard
     end
 
     def start
-      UI.info "Guard running MiniTest #{@runner.version}"
       true
     end
 

data/lib/guard/minitest/runner.rb

@@ -12,18 +12,11 @@ module Guard
       end
 
       def initialize(options = {})
-        minitest_version = begin
-          MiniTest::Unit.const_defined?(:VERSION) && MiniTest::Unit::VERSION =~ /^1/ ? 1 : 2
-        rescue
-          2
-        end
-
         @options = {
           :verbose  => false,
           :notify   => true,
           :bundler  => File.exist?("#{Dir.pwd}/Gemfile"),
-          :rubygems => false,
-          :version  => minitest_version
+          :rubygems => false
         }.merge(options)
       end
 
@@ -53,10 +46,6 @@ module Guard
         !bundler? && @options[:rubygems]
       end
 
-      def version
-        @options[:version].to_i
-      end
-
       private
 
       def minitest_command(paths)
@@ -68,11 +57,7 @@ module Guard
         paths.each do |path|
           cmd_parts << "-r #{path}"
         end
-        if version == 1
-          cmd_parts << "-r #{File.expand_path('../runners/version_1_runner.rb', __FILE__)}"
-        else
-          cmd_parts << "-r #{File.expand_path('../runners/version_2_runner.rb', __FILE__)}"
-        end
+        cmd_parts << "-r #{File.expand_path('../runners/default_runner.rb', __FILE__)}"
         if notify?
           cmd_parts << '-e \'GUARD_NOTIFY=true; MiniTest::Unit.autorun\''
         else

data/lib/guard/minitest/runners/default_runner.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+require 'minitest/unit'
+
+if MiniTest::Unit::VERSION =~ /^1/
+  load File.expand_path('../version_1_runner.rb', __FILE__)
+else
+  load File.expand_path('../version_2_runner.rb', __FILE__)
+end

data/lib/guard/minitest/templates/Guardfile

@@ -1,11 +1,11 @@
 guard 'minitest' do
   # with Minitest::Unit
-  watch(%r|^test/test_(.*).rb|)
-  watch(%r|^lib/(.*)([^/]+)\.rb|)                       { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-  watch(%r|^test/test_helper.rb|)                       { "test" }
+  watch(%r|^test/test_(.*)\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r|^test/test_helper\.rb|)    { "test" }
 
   # with Minitest::Spec
-  # watch(%r|^spec/(.*)_spec.rb|)
-  # watch(%r|^lib/(.*)\.rb|)                            { |m| "spec/#{m[1]}_spec.rb" }
-  # watch(%r|^spec/spec_helper.rb|)                     { "spec" }
+  # watch(%r|^spec/(.*)_spec\.rb|)
+  # watch(%r|^lib/(.*)\.rb|)            { |m| "spec/#{m[1]}_spec.rb" }
+  # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
 end

data/lib/guard/minitest/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Guard
   module MinitestVersion
-    VERSION = '0.4.0.rc1'
+    VERSION = '0.4.0.rc2'
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: guard-minitest
 version: !ruby/object:Gem::Version 
-  hash: 15424087
+  hash: 15424081
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - rc
-  - 1
-  version: 0.4.0.rc1
+  - 2
+  version: 0.4.0.rc2
 platform: ruby
 authors: 
 - Yann Lugrin
@@ -96,6 +96,7 @@ extra_rdoc_files: []
 files: 
 - lib/guard/minitest/runners/version_1_runner.rb
 - lib/guard/minitest/runners/version_2_runner.rb
+- lib/guard/minitest/runners/default_runner.rb
 - lib/guard/minitest/inspector.rb
 - lib/guard/minitest/templates/Guardfile
 - lib/guard/minitest/notifier.rb