guard-minitest 0.3.0 → 0.4.0.rc1

data/README.rdoc

@@ -1,7 +1,7 @@
 = Guard::Minitest
 
 Minitest guard allows to automatically & intelligently launch tests with
-{minitest framework}[http://http://github.com/seattlerb/minitest] when files are modified.
+{minitest framework}[http://github.com/seattlerb/minitest] when files are modified.
 
 - Compatible with MiniTest 1.7.x
 - Tested on Ruby 1.8.6, 1.8.7 & 1.9.2.

data/lib/guard/minitest.rb

@@ -8,8 +8,22 @@ module Guard
     autoload :Runner,    'guard/minitest/runner'
     autoload :Inspector, 'guard/minitest/inspector'
 
-    def start
+    def initialize(watchers = [], options = {})
+      super
+
       @runner ||= Runner.new(options)
+    end
+
+    def start
+      UI.info "Guard running MiniTest #{@runner.version}"
+      true
+    end
+
+    def stop
+      true
+    end
+
+    def reload
       true
     end
 

data/lib/guard/minitest/runner.rb

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

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

@@ -0,0 +1,17 @@
+# encoding: utf-8
+require 'minitest/unit'
+require 'guard/minitest/notifier'
+
+module MiniTest
+  class MiniTest::Unit
+
+    alias_method :run_without_guard, :run
+    def run(args = [])
+      start = Time.now
+      run_without_guard(args)
+      duration = Time.now - start
+      Guard::MinitestNotifier.notify(test_count, assertion_count, failures, errors, skips, duration) if GUARD_NOTIFY
+    end
+
+  end
+end

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

@@ -0,0 +1,22 @@
+# encoding: utf-8
+require 'minitest/unit'
+require 'guard/minitest/notifier'
+
+module MiniTest
+  class MiniTest::Unit
+
+    begin
+      alias_method :_run_anything_without_guard, :_run_anything
+      def _run_anything(type)
+        start = Time.now
+        _run_anything_without_guard(type)
+        duration = Time.now - start
+        Guard::MinitestNotifier.notify(test_count, assertion_count, failures, errors, skips, duration) if GUARD_NOTIFY
+      end
+    rescue NameError
+      puts "*** WARN: if you use MiniTest 1, please add version option in your 'Guardfile`."
+      raise
+    end
+
+  end
+end

data/lib/guard/minitest/templates/Guardfile

@@ -1,11 +1,11 @@
 guard 'minitest' do
   # with Minitest::Unit
-  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" }
 
   # with Minitest::Spec
-  # 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

data/lib/guard/minitest/version.rb

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

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: guard-minitest
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 15424087
+  prerelease: 6
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  - rc
+  - 1
+  version: 0.4.0.rc1
 platform: ruby
 authors: 
 - Yann Lugrin
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +02:00
+date: 2011-05-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,35 +37,35 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: minitest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
-        - 1
-        - 0
         - 2
-        version: 1.0.2
+        - 0
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: bundler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 19
         segments: 
         - 1
-        - 7
+        - 0
         - 2
-        version: 1.7.2
+        version: 1.0.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -72,7 +74,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 43
         segments: 
@@ -92,7 +94,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/guard/minitest/runners/default_runner.rb
+- lib/guard/minitest/runners/version_1_runner.rb
+- lib/guard/minitest/runners/version_2_runner.rb
 - lib/guard/minitest/inspector.rb
 - lib/guard/minitest/templates/Guardfile
 - lib/guard/minitest/notifier.rb
@@ -135,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guard-minitest
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Guard gem for MiniTest framework

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

@@ -1,63 +0,0 @@
-# encoding: utf-8
-require 'minitest/unit'
-require 'guard/minitest/notifier'
-
-module MiniTest
-  class Unit
-
-    # Compatibility with version 1.7
-    if VERSION <= '1.7.2'
-      attr_accessor :options, :help
-
-      def run(args = [])
-        self.options = process_args(args)
-
-        unless options[:seed] then
-          srand
-          options[:seed] = srand % 0xFFFF
-        end
-
-        self.help =  ['--seed', options[:seed].to_s]
-        self.help << ['--verbose'] if options[:verbose]
-        self.help =  self.help.join(' ')
-
-        run_all_tests
-
-        return failures + errors if @test_count > 0 # or return nil...
-      rescue Interrupt
-        abort 'Interrupted'
-      end
-
-      def drive_tests(filters = /./)
-        run_test_suites(filters)
-      end
-    end
-
-    # Rewrite default runner to use notification
-    def run_all_tests
-      @@out.puts "Test run options: #{help}"
-      @@out.puts
-      @@out.puts 'Started'
-
-      start = Time.now
-      drive_tests(/./)
-      duration = Time.now - start
-
-      @@out.puts
-      @@out.puts "Finished in %.6f seconds, %.4f tests/s, %.4f assertions/s." %
-      [duration, test_count / duration, assertion_count / duration]
-
-      report.each_with_index do |msg, i|
-        @@out.puts "\n%3d) %s" % [i + 1, msg]
-      end
-
-      @@out.puts
-
-      status
-      Guard::MinitestNotifier.notify(test_count, assertion_count, failures, errors, skips, duration) if GUARD_NOTIFY
-
-      @@out.puts
-      @@out.puts "Test run options: #{help}"
-    end
-  end
-end