guard-minitest 1.0.0.beta1 → 1.0.0.beta.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0bcd2150ad6d82a9346b585f9070df25e67ef74c
+  data.tar.gz: 274627dde2b37eb4b89a2e414b1466f6a183da3e
+SHA512:
+  metadata.gz: fd9a40805f36b9dfe2e82712ab3cb27c828d0d7277aeab6519306ceddd0f8d5d6d7dcfc82b5874d2d4094d9d73d16f72c65ca9b27be482c28004334533bba7f6
+  data.tar.gz: c4b41126138fecaa381207877bb3969c581bc2671fffa9c6e573aa5ed63e4494a5f2d3be90386fe58552c9e23fd482063322f141e3ea463f23ad329053847bae

data/CHANGELOG.md

@@ -1,77 +1,139 @@
-## 1.0.0 (beta 1)
+## Unreleased Changes
+
+[Full Changelog](https://github.com/guard/guard-minitest/compare/v1.0.0.beta.2...master)
+
+## 1.0.0.beta.2 - Jun 5, 2013
+
+[Full Changelog](https://github.com/guard/guard-minitest/compare/v1.0.0.beta1...v1.0.0.beta.2)
+
+### Improvements
+
+* [#62][] Add notification when `spring` is used. ([@rymai][])
+* [#39][] Fix `watch` `Regex` for `lib` directory. ([@rymai][])
+* [#51][] Add color using the pride Minitest plugin (`--pride` option). ([@rymai][])
+* [#59][] Update spring command from test to testunit. ([@sbrink][])
+* [#57][] Added support for spring. ([@aspiers][])
+* [#56][] Include test directory in load path when DRb used. ([@sbleon][])
+* [#54][] Added support for zeus. ([@leemhenson][])
+* [#55][] Add `:all_on_start` option. ([@aflock][])
+* [#41][] Simplifying the DRb version of the runner. ([@chadoh][])
+* [#38][] Improves notification message formatting. ([@arronmabrey][])
+
+## 1.0.0.beta1 - Dec 10, 2012
+
+[Full Changelog](https://github.com/guard/guard-minitest/compare/0.5.0...v1.0.0.beta1)
+
+### Improvements
 
 Upgrade to match Guard 1.1 API:
 
- * Deprecate `:notify` option, use guard notification configuration (Yann
-   Lugrin)
- * Use `guard_on_change` method (Jason Staten)
+* Deprecate the `:notify` option. Use Guard notification configuration instead ([via the CLI](https://github.com/guard/guard#-n--notify-option) or [via the Guardfile](https://github.com/guard/guard#notification)) ([@yannlugrin][])
+* [#45][] Use `run_on_changes` method. ([@statianzo][])
+
+###  New feature
+
+* Add `:cli` option and deprecate `:seed` and `:verbose` options ([@yannlugrin][])
+
+### Improvements
+
+* [#49][] Update Guardfile template for Rails 4. ([@itzki][])
+* [#43][] & [#46][] Fix README links. ([@manewitz][] & [@sometimesfood][])
+
+## 0.5.0 - Feb 24, 2012
 
-Features:
+[Full Changelog](https://github.com/guard/guard-minitest/compare/0.4.0...0.5.0)
 
- * Add `:cli` option and deprecate `:seed` and `:verbose` options (Yann
-   Lugrin)
+### Bug fixes
 
-Documentation:
+* Hard coded tests folders path. (Nathan Youngman)
+* Watch subfolder in Guardfile template. (Wilker Lúcio, Mark Kremer)
+* Notifications work with DRb. (Brian Morearty)
+* Initialized constant with Ruby 1.9. (Jonas Grimfelt)
 
- * Update Guardfile template for Rails 4 (itzki)
- * Fix README links (Mike Manewitz & Sebastian Boehm)
+### New features
 
-## 0.5.0 (Feb 24, 2012)
+* Option to overwrite test folders and test files pattern. ([@japgolly][])
 
-Bug Fixes:
+## 0.4.0 - Jun 15, 2011
 
- * Hard coded tests folders path (Nathan Youngman)
- * Watch subfolder in Guardfile template (Wilker Lúcio, Mark Kremer)
- * Notification work with DRB (Brian Morearty)
- * Initialized constant with ruby 1.9 (Jonas Grimfelt)
+[Full Changelog](https://github.com/guard/guard-minitest/compare/0.3.0...0.4.0)
 
-Features:
+### New features
 
- * Option to overwrite test folders and test files pattern (japgolly)
+* Support of MiniTest 2. ([@yannlugrin][])
+* DRB support. (Oriol Gual)
+* Use regexp in Guardfile Template. (Emmanuel Gomez)
 
-## 0.4.0 (Jun 15, 2011)
+### Improvement
 
-Features:
+* Need guard 0.4 ([@yannlugrin][])
 
- * Support of MiniTest 2 (Yann Lugrin)
- * DRB support (Oriol Gual)
- * Use regexp in Guardfile Template (Emmanuel Gomez)
+## 0.3.0 - Oct 27, 2010
 
-Dependencies:
+[Full Changelog](https://github.com/guard/guard-minitest/compare/0.2.2...0.3.0)
 
- * Need guard 0.4 (Yann Lugrin)
+### Bug fixes
 
-## 0.3.0 (Oct 27, 2010)
+* All guard API action return a boolean value
+* Depends on guard 0.2.2 to fix darwin watching problems
 
-Bug Fixes:
+### New features
 
- * All guard API action return a boolean value
- * Depends on guard 0.2.2 to fix darwin watching problems
+* Desktop notification can be disabled
+* Bundler usage can be disabled
+* Rubygems usage can be enable (only if bundler is not present or disable)
 
-Features:
+## 0.2.2 - Oct 24, 2010
 
- * Desktop notification can be disabled
- * Bundler usage can be disabled
- * Rubygems usage can be enable (only if bundler is not present or disable)
+[Full Changelog](https://github.com/guard/guard-minitest/compare/0.2.1...0.2.2)
 
-## 0.2.2 (Oct 24, 2010)
+### Bug fixes
 
-Bug Fixes:
+* Depends on guard 0.2.1 to fix linux watching probalems
+* Remove duplicate code
 
- * Depends on guard 0.2.1 to fix linux watching probalems
- * Remove duplicate code
+## 0.2.1 - Oct 22, 2010
 
-## 0.2.1 (Oct 22, 2010)
+[Full Changelog](https://github.com/guard/guard-minitest/compare/0.2.0...0.2.1)
 
-Bug Fixes:
+### Bug fixes
 
- * Don't set minitest seed option by default
+* Don't set minitest seed option by default
 
-Documentation:
+### Improvement
 
- * Tested on ruby 1.8.6
+* Tested on Ruby 1.8.6
 
-## 0.2.0 (Oct 20, 2010)
+## 0.2.0 - Oct 20, 2010
 
-First stable release
+First stable release.
 
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#38]: https://github.com/guard/guard/issues/38
+[#39]: https://github.com/guard/guard/issues/39
+[#41]: https://github.com/guard/guard/issues/41
+[#43]: https://github.com/guard/guard/issues/43
+[#45]: https://github.com/guard/guard/issues/45
+[#46]: https://github.com/guard/guard/issues/46
+[#49]: https://github.com/guard/guard/issues/49
+[#51]: https://github.com/guard/guard/issues/51
+[#54]: https://github.com/guard/guard/issues/54
+[#55]: https://github.com/guard/guard/issues/55
+[#56]: https://github.com/guard/guard/issues/56
+[#57]: https://github.com/guard/guard/issues/57
+[#59]: https://github.com/guard/guard/issues/59
+[#62]: https://github.com/guard/guard/issues/62
+[@aflock]: https://github.com/aflock
+[@arronmabrey]: https://github.com/arronmabrey
+[@aspiers]: https://github.com/aspiers
+[@chadoh]: https://github.com/chadoh
+[@itzki]: https://github.com/itzki
+[@japgolly]: https://github.com/japgolly
+[@leemhenson]: https://github.com/leemhenson
+[@manewitz]: https://github.com/manewitz
+[@rymai]: https://github.com/rymai
+[@sbleon]: https://github.com/sbleon
+[@sbrink]: https://github.com/sbrink
+[@sometimesfood]: https://github.com/sometimesfood
+[@statianzo]: https://github.com/statianzo
+[@yannlugrin]: https://github.com/yannlugrin

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Yann Lugrin
+Copyright (c) 2010-2012 Yann Lugrin, 2013 Rémy Coutable
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,112 +1,147 @@
-Guard::Minitest [![Build Status](https://secure.travis-ci.org/guard/guard-minitest.png?branch=master)](http://travis-ci.org/guard/guard-minitest)
-===============
+# Guard::Minitest
+[![Gem Version](https://badge.fury.io/rb/guard-minitest.png)](http://badge.fury.io/rb/guard-minitest) [![Build Status](https://travis-ci.org/guard/guard-minitest.png?branch=master)](https://travis-ci.org/guard/guard-minitest) [![Dependency Status](https://gemnasium.com/guard/guard-minitest.png)](https://gemnasium.com/guard/guard-minitest) [![Code Climate](https://codeclimate.com/github/guard/guard-minitest.png)](https://codeclimate.com/github/guard/guard-minitest) [![Coverage Status](https://coveralls.io/repos/guard/guard-minitest/badge.png?branch=master)](https://coveralls.io/r/guard/guard-minitest)
 
-Minitest guard allows to automatically & intelligently launch tests with
-[minitest framework](http://github.com/seattlerb/minitest) when files are modified.
+Guard::Minitest allows to automatically & intelligently launch tests with the
+[minitest framework](https://github.com/seattlerb/minitest) when files are modified.
 
- * Compatible with MiniTest 1.7.x & 2.x
- * Tested on Ruby 1.8.7, 1.9.2 & 1.9.3
+* Compatible with minitest >= 2.1 (optimal support for 5.x).
+* Tested against Ruby 1.8.7, 1.9.3, 2.0.0, JRuby (1.8 mode & 1.9 mode) & Rubinius (1.8 mode & 1.9 mode).
 
-Install
--------
+## Install
 
 Please be sure to have [Guard](http://github.com/guard/guard) installed before continue.
 
-Install the gem:
+The simplest way to install Guard::Minitest is to use [Bundler](http://gembundler.com/).
 
-```bash
-gem install guard-minitest
+Add Guard::Minitest to your `Gemfile`:
+
+```ruby
+group :development do
+  gem 'guard-minitest'
+end
 ```
 
-Add it to your Gemfile (inside test group):
+and install it by running Bundler:
 
-```ruby
-gem 'guard-minitest'
+```bash
+$ bundle
 ```
 
-Add guard definition to your Guardfile by running this command:
+Add guard definition to your Guardfile by running the following command:
 
 ```bash
 guard init minitest
 ```
 
-Usage
------
+## Usage
 
 Please read [Guard usage doc](http://github.com/guard/guard#readme)
 
-Guardfile
----------
+## Guardfile
 
-Minitest guard can be really adapated to all kind of projects.
+Guard::Minitest can be really adapated to all kind of projects.
 Please read [guard doc](http://github.com/guard/guard#readme) for more info about Guardfile DSL.
 
-### Standard ruby gems with Minitest::Unit
+### Standard Guardfile when using Minitest::Unit
 
 ```ruby
-guard 'minitest' do
-  watch(%r|^test/test_(.*)\.rb|)
-  watch(%r{^lib/(.*/)?([^/]+)\.rb$})  { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-  watch(%r|^test/test_helper\.rb|)    { "test" }
+guard :minitest do
+  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
+### Standard Guardfile when using Minitest::Spec
 
 ```ruby
-guard 'minitest' do
-  watch(%r|^spec/(.*)_spec\.rb|)
-  watch(%r{^lib/(.*/)?([^/]+)\.rb$})  { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+guard :minitest do
+  watch(%r{^spec/(.*)_spec\.rb})
+  watch(%r{^lib/(.+)\.rb})         { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^spec/spec_helper\.rb}) { 'spec' }
 end
 ```
 
-Options
--------
+## Options
+
+### List of available options
+
+```ruby
+:all_on_start => false      # run all tests in group on startup, default: true
+:cli => '--test'            # pass arbitrary Minitest CLI arguments, default: ''
+:test_folders => ['tests']  # specify an array of paths that contain test files, default: %w[test spec]
+:test_file_patterns => true # specify an array of patterns that test files must match in order to be run, default: %w[*_test.rb test_*.rb *_spec.rb]
+:spring => true             # enable spring support, default: false
+:zeus => true               # enable zeus support; default: false
+:drb => true                # enable DRb support, default: false
+:bundler => false           # don't use "bundle exec" to run the minitest command, default: true
+:rubygems => true           # require rubygems when run the minitest command (only if bundler is disabled), default: false
+```
+
+### Options usage examples
 
-You can change the default location and pattern of minitest files:
+You can change the default location of test files using the `:test_folders` option and pattern of test files using the `:test_file_patterns` option:
 
 ```ruby
-guard 'minitest', test_folders: 'test/unit', test_file_patterns: '*_test.rb' do
+guard :minitest, :test_folders => 'test/unit', :test_file_patterns => '*_test.rb' do
   # ...
 end
 ```
 
-You can pass any of the standard MiniTest CLI options using the :cli option:
+You can pass any of the standard MiniTest CLI options using the `:cli` option:
 
 ```ruby
-guard 'minitest', :cli => "--seed 123456 --verbose" do
+guard :minitest, :cli => '--seed 123456 --verbose' do
   # ...
 end
 ```
 
-If you use [spork-testunit](https://github.com/sporkrb/spork-testunit) you can enable it with (you'll have to load it before):
+[Spring](https://github.com/jonleighton/spring) is supported (Ruby 1.9.X / Rails 3.2+ only), but you must enable it:
 
 ```ruby
-guard 'minitest', :drb => true do
+guard :minitest, :spring => true do
   # ...
 end
 ```
 
-### List of available options:
+[Zeus](https://github.com/burke/zeus) is supported, but you must enable it.
+Please note that notification are currently disabled when using Zeus, if
+you're interested in adding notification support for Zeus, please participate
+in the [issue #62](https://github.com/guard/guard-minitest/issues/62).
 
 ```ruby
-:notify => false            # disable desktop notifications
-:bundler => false           # don't use "bundle exec" to run the minitest command, default: true
-:rubygems => true           # require rubygems when run the minitest command (only if bundler is disabled), default: false
+guard :minitest, :zeus => true do
+  # ...
+end
 ```
 
-Development
------------
+[Spork / spork-testunit](https://github.com/sporkrb/spork-testunit) is supported, but you must enable it:
+
+```ruby
+guard :minitest, :drb => true do
+  # ...
+end
+```
+
+## Development
+
+* Documentation hosted at [RubyDoc](http://rubydoc.info/github/guard/guard-minitest/master/frames).
+* Source hosted at [GitHub](https://github.com/guard/guard-minitest).
+
+Pull requests are very welcome! Please try to follow these simple rules if applicable:
+
+* Please create a topic branch for every separate change you make.
+* Make sure your patches are well tested. All specs run by Travis CI must pass.
+* Update the [README](https://github.com/guard/guard-minitest/blob/master/README.md).
+* Please **do not change** the version number.
 
-* Source hosted on [GitHub](http://github.com/guard/guard-minitest)
-* Report issues/Questions/Feature requests on [GitHub Issues](http://github.com/guard/guard-minitest/issues)
+For questions please join us in our [Google group](http://groups.google.com/group/guard-dev) or on
+`#guard` (irc.freenode.net).
 
-Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
-you make.
+## Maintainer
 
-Authors
--------
+[Rémy Coutable](https://github.com/rymai) ([@rymai](http://twitter.com/rymai), [rymai.me](http://rymai.me))
 
-[Yann Lugrin](http://github.com/yannlugrin)
+## Author
 
+[Yann Lugrin](https://github.com/yannlugrin)

data/lib/guard/minitest.rb

@@ -5,18 +5,24 @@ require 'guard/guard'
 module Guard
   class Minitest < Guard
 
-    autoload :Runner,    'guard/minitest/runner'
-    autoload :Inspector, 'guard/minitest/inspector'
+    require 'guard/minitest/inspector'
+    require 'guard/minitest/runner'
+    require 'guard/minitest/version'
+    require 'minitest/autorun'
 
     def initialize(watchers = [], options = {})
       super
+      @options = {
+        :all_on_start => true
+      }.merge(options)
 
-      @runner = Runner.new(options)
+      @runner    = Runner.new(@options)
       @inspector = Inspector.new(@runner.test_folders, @runner.test_file_patterns)
     end
 
     def start
-      true
+      UI.info "Guard::Minitest #{MinitestVersion::VERSION} is running, with Minitest::Unit #{::MiniTest::Unit::VERSION}!"
+      run_all if @options[:all_on_start]
     end
 
     def stop
@@ -29,14 +35,13 @@ module Guard
 
     def run_all
       paths = @inspector.clean_all
-      return @runner.run(paths, :message => 'Running all tests') unless paths.empty?
-      true
+      @runner.run(paths, :message => 'Running all tests')
     end
 
     def run_on_changes(paths = [])
       paths = @inspector.clean(paths)
-      return @runner.run(paths) unless paths.empty?
-      true
+      @runner.run(paths)
     end
+
   end
 end

data/lib/guard/minitest/inspector.rb

@@ -11,7 +11,7 @@ module Guard
       end
 
       def clean_all
-        clean self.test_folders
+        clean(test_folders)
       end
 
       def clean(paths)
@@ -21,7 +21,7 @@ module Guard
         paths.dup.each do |path|
           if File.directory?(path)
             paths.delete(path)
-            paths += test_files_for_pathes([path])
+            paths += test_files_for_paths([path])
           end
         end
 
@@ -31,12 +31,13 @@ module Guard
         paths
       end
 
-    private
+      private
+
       def test_folder_regex
-        @test_folder_regex ||= (
-          folders= self.test_folders.map {|f| Regexp.quote f}.join '|'
+        @_test_folder_regex ||= begin
+          folders = test_folders.map { |f| Regexp.quote(f) }.join('|')
           Regexp.new("^/?(?:#{folders})(?:/|$)")
-        )
+        end
       end
 
       def test_folder?(path)
@@ -48,21 +49,21 @@ module Guard
       end
 
       def test_files
-        @test_files ||= test_files_for_pathes(self.test_folders)
+        @_test_files ||= test_files_for_paths(test_folders)
       end
 
       def join_for_glob(fragments)
-        "{#{fragments.join ','}}"
+        "{#{fragments.join(',')}}"
       end
 
-      def test_files_for_pathes(pathes)
-        pathes= join_for_glob(pathes)
-        files= join_for_glob(self.test_file_patterns)
-        Dir.glob(pathes + '/**/' + files)
+      def test_files_for_paths(paths)
+        paths = join_for_glob(paths)
+        files = join_for_glob(test_file_patterns)
+        Dir.glob(paths + '/**/' + files)
       end
 
       def clear_test_files_list
-        @test_files = nil
+        @_test_files = nil
       end
 
     end

data/lib/guard/minitest/notifier.rb

@@ -2,36 +2,39 @@
 require 'guard/notifier'
 
 module Guard
-  class MinitestNotifier
+  class Minitest
+    class Notifier
 
-    def self.guard_message(test_count, assertion_count, failure_count, error_count, skip_count, duration)
-      message = "#{test_count} examples, #{assertion_count} assertions, #{failure_count} failures, #{error_count} errors"
-      if skip_count > 0
-        message << " (#{skip_count} skips)"
+      def self.guard_message(test_count, assertion_count, failure_count, error_count, skip_count, duration)
+        message = "#{test_count} tests"
+        if skip_count > 0
+          message << " (#{skip_count} skipped)"
+        end
+        message << "\n#{assertion_count} assertions, #{failure_count} failures, #{error_count} errors"
+        if test_count && assertion_count
+          message << "\n\n%.2f tests/s, %.2f assertions/s\n\nFinished in %.4f seconds" % [test_count / duration, assertion_count / duration, duration]
+        end
+        message
       end
-      if test_count && assertion_count
-        message << "\nin %.6f seconds, %.4f tests/s, %.4f assertions/s." % [duration, test_count / duration, assertion_count / duration]
-      end
-      message
-    end
 
-    # failed | pending (skip) | success
-    def self.guard_image(failure_count, skip_count)
-      icon = if failure_count > 0
-        :failed
-      elsif skip_count > 0
-        :pending
-      else
-        :success
+      # failed | pending (skip) | success
+      def self.guard_image(failure_count, skip_count)
+        icon = if failure_count > 0
+          :failed
+        elsif skip_count > 0
+          :pending
+        else
+          :success
+        end
       end
-    end
 
-    def self.notify(test_count, assertion_count, failure_count, error_count, skip_count, duration)
-      message = guard_message(test_count, assertion_count, failure_count, error_count, skip_count, duration)
-      image   = guard_image(failure_count + error_count, skip_count)
+      def self.notify(test_count, assertion_count, failure_count, error_count, skip_count, duration)
+        message = guard_message(test_count, assertion_count, failure_count, error_count, skip_count, duration)
+        image   = guard_image(failure_count + error_count, skip_count)
 
-      ::Guard::Notifier.notify(message, :title => 'MiniTest results', :image => image)
-    end
+        ::Guard::Notifier.notify(message, :title => 'Minitest results', :image => image)
+      end
 
+    end
   end
 end

data/lib/guard/minitest/reporter.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+require 'minitest'
+require 'guard/minitest/notifier'
+
+module Guard
+  class Minitest
+    class Reporter < ::Minitest::Reporter
+
+      def report
+        aggregate = results.group_by { |r| r.failure.class }
+        aggregate.default = [] # dumb. group_by should provide this
+
+        f = aggregate[::Minitest::Assertion].size
+        e = aggregate[::Minitest::UnexpectedError].size
+        s = aggregate[::Minitest::Skip].size
+        t = Time.now - start_time
+
+        ::Guard::Minitest::Notifier.notify(count, self.assertions, f, e, s, t)
+      end
+
+    end
+  end
+end

data/lib/guard/minitest/runner.rb

@@ -3,27 +3,27 @@ module Guard
   class Minitest
     class Runner
 
-      class << self
-
-        def run(paths = [], options = {})
-          Runner.new(options).run(paths, options)
-        end
-
+      def self.run(paths = [], options = {})
+        Runner.new(options).run(paths, options)
       end
 
       def initialize(options = {})
-        parse_deprecated_options(options)
-
         @options = {
-          :bundler  => File.exist?("#{Dir.pwd}/Gemfile"),
-          :rubygems => false,
-          :drb      => false,
+          :bundler            => File.exist?("#{Dir.pwd}/Gemfile"),
+          :rubygems           => false,
+          :drb                => false,
+          :zeus               => false,
+          :spring             => false,
           :test_folders       => %w[test spec],
           :test_file_patterns => %w[*_test.rb test_*.rb *_spec.rb],
-          :cli      => ''
+          :cli                => nil
         }.merge(options)
-        [:test_folders,:test_file_patterns].each {|k| (@options[k]= [@options[k]].flatten.uniq.compact).freeze}
-        options= options.freeze
+
+        parse_deprecated_options
+
+        [:test_folders, :test_file_patterns].each do |k|
+          @options[k] = Array(@options[k]).uniq.compact
+        end
       end
 
       def run(paths, options = {})
@@ -33,19 +33,11 @@ module Guard
       end
 
       def cli_options
-        @options[:cli] ||= ''
-      end
-
-      def verbose?
-        @options[:cli].include?('--verbose')
-      end
-
-      def notify?
-        !!@options[:notification]
+        @cli_options ||= Array(@options[:cli])
       end
 
       def bundler?
-        @options[:bundler]
+        @options[:bundler] && ! @options[:spring]
       end
 
       def rubygems?
@@ -56,6 +48,14 @@ module Guard
         @options[:drb]
       end
 
+      def zeus?
+        @options[:zeus].is_a?(String) || @options[:zeus]
+      end
+
+      def spring?
+        @options[:spring]
+      end
+
       def test_folders
         @options[:test_folders]
       end
@@ -69,50 +69,74 @@ module Guard
       def minitest_command(paths)
         cmd_parts = []
 
-        cmd_parts << "bundle exec" if bundler?
-        if drb?
-          cmd_parts << 'testdrb'
-          cmd_parts << "-r #{File.expand_path('../runners/default_runner.rb', __FILE__)}"
-          cmd_parts << "-e '::GUARD_NOTIFY=#{notify?}'"
-          test_folders.each do |f|
-            cmd_parts << "#{f}/test_helper.rb" if File.exist?("#{f}/test_helper.rb")
-            cmd_parts << "#{f}/spec_helper.rb" if File.exist?("#{f}/spec_helper.rb")
-          end
-          cmd_parts += paths.map{|path| "./#{path}" }
+        cmd_parts << 'bundle exec' if bundler?
+        cmd_parts << if drb?
+          drb_command(paths)
+        elsif zeus?
+          zeus_command(paths)
+        elsif spring?
+          spring_command(paths)
         else
-          cmd_parts << 'ruby'
-          cmd_parts += test_folders.map{|f| %[-I"#{f}"] }
-          cmd_parts << '-r rubygems' if rubygems?
-          cmd_parts << '-r bundler/setup' if bundler?
-          cmd_parts += paths.map{|path| "-r ./#{path}" }
-          cmd_parts << "-r #{File.expand_path('../runners/default_runner.rb', __FILE__)}"
-          cmd_parts << '-e \'MiniTest::Unit.autorun\''
-          cmd_parts << '--' << cli_options unless cli_options.empty?
+          ruby_command(paths)
         end
 
-        cmd_parts.join(' ')
+        cmd_parts.compact.join(' ')
       end
 
-      def parse_deprecated_options(options)
-        options[:cli] ||= ''
+      def drb_command(paths)
+        %w[testdrb -Itest] + relative_paths(paths)
+      end
+
+      def zeus_command(paths)
+        command = @options[:zeus].is_a?(String) ? @options[:zeus] : 'test'
+
+        ['zeus', command] + relative_paths(paths)
+      end
+
+      def spring_command(paths)
+        cmd_parts = ['spring testunit']
+        cmd_parts << File.expand_path('../runners/old_runner.rb', __FILE__) unless ::MiniTest::Unit::VERSION =~ /^5/
+
+        cmd_parts + relative_paths(paths)
+      end
+
+      def ruby_command(paths)
+        cmd_parts  = ['ruby']
+        cmd_parts += test_folders.map {|f| %[-I"#{f}"] }
+        cmd_parts << '-r rubygems' if rubygems?
+        cmd_parts << '-r bundler/setup' if bundler?
+        cmd_parts += paths.map { |path| "-r ./#{path}" }
+        if ::MiniTest::Unit::VERSION =~ /^5/
+          cmd_parts << '-e \'Minitest.autorun\''
+        else
+          cmd_parts << "-r #{File.expand_path('../runners/old_runner.rb', __FILE__)}"
+          cmd_parts << '-e \'MiniTest::Unit.autorun\''
+        end
+        cmd_parts << '--'
+        cmd_parts += cli_options
+        cmd_parts << '--pride' # uses pride for output colorization
+      end
 
-        if value = options.delete(:notify)
-          options[:notification] = value
+      def relative_paths(paths)
+        paths.map { |p| "./#{p}" }
+      end
+
+      def parse_deprecated_options
+        if @options.key?(:notify)
           UI.info %{DEPRECATION WARNING: The :notify option is deprecated. Guard notification configuration is used.}
         end
 
         [:seed, :verbose].each do |key|
-          if value = options.delete(key)
-             options[:cli] << " --#{key}"
-            if ![TrueClass, FalseClass].include?(value.class)
-              options[:cli] << " #{value}"
-            end
+          if value = @options.delete(key)
+            final_value = "--#{key}"
+            final_value << " #{value}" unless [TrueClass, FalseClass].include?(value.class)
+            cli_options << final_value
 
-            UI.info %{DEPRECATION WARNING: The :#{key} option is deprecated. Pass standard command line argument "--#{key}" to MiniTest with the :cli option.}
+            UI.info %{DEPRECATION WARNING: The :#{key} option is deprecated. Pass standard command line argument "--#{key}" to Minitest with the :cli option.}
           end
         end
       end
+
     end
   end
 end
-

data/lib/guard/minitest/runners/{version_2_runner.rb → old_runner.rb}

@@ -11,11 +11,8 @@ module MiniTest
         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
+        ::Guard::Minitest::Notifier.notify(test_count, assertion_count, failures, errors, skips, duration)
       end
-    rescue NameError
-      puts "*** WARN: if you use MiniTest 1, please add version option in your 'Guardfile`."
-      raise
     end
 
   end

data/lib/guard/minitest/templates/Guardfile

@@ -1,30 +1,30 @@
-guard 'minitest' do
+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]}#{m[2]}_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' }
 
   # Rails 4
-  # watch(%r|^test/test_helper\.rb|) { "test" }
-  # watch(%r|^test/.+_test\.rb|)
-  # watch(%r|^app/(.+)\.rb|)                               { |m| "test/#{m[1]}_test.rb" }
-  # watch(%r|^app/controllers/application_controller\.rb|) { "test/controllers" }
-  # watch(%r|^app/controllers/(.+)_controller\.rb|)        { |m| "test/integration/#{m[1]}_test.rb" }
-  # watch(%r|^app/views/(.+)_mailer/.+|)                   { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
-  # watch(%r|^lib/(.+)\.rb|)                               { |m| "test/lib/#{m[1]}_test.rb" }
+  # watch(%r{^test/test_helper\.rb}) { 'test' }
+  # watch(%r{^test/.+_test\.rb})
+  # watch(%r{^app/(.+)\.rb})                               { |m| "test/#{m[1]}_test.rb" }
+  # watch(%r{^app/controllers/application_controller\.rb}) { 'test/controllers' }
+  # watch(%r{^app/controllers/(.+)_controller\.rb})        { |m| "test/integration/#{m[1]}_test.rb" }
+  # watch(%r{^app/views/(.+)_mailer/.+})                   { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
+  # watch(%r{^lib/(.+)\.rb})                               { |m| "test/lib/#{m[1]}_test.rb" }
 
   # Rails 3.2
-  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/controllers/#{m[1]}_test.rb" }
-  # watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
-  # watch(%r|^app/models/(.*)\.rb|)      { |m| "test/unit/#{m[1]}_test.rb" }
+  # watch(%r{^app/controllers/(.*)\.rb}) { |m| "test/controllers/#{m[1]}_test.rb" }
+  # watch(%r{^app/helpers/(.*)\.rb})     { |m| "test/helpers/#{m[1]}_test.rb" }
+  # watch(%r{^app/models/(.*)\.rb})      { |m| "test/unit/#{m[1]}_test.rb" }
 
   # Rails
-  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/functional/#{m[1]}_test.rb" }
-  # watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
-  # watch(%r|^app/models/(.*)\.rb|)      { |m| "test/unit/#{m[1]}_test.rb" }
+  # watch(%r{^app/controllers/(.*)\.rb}) { |m| "test/functional/#{m[1]}_test.rb" }
+  # watch(%r{^app/helpers/(.*)\.rb})     { |m| "test/helpers/#{m[1]}_test.rb" }
+  # watch(%r{^app/models/(.*)\.rb})      { |m| "test/unit/#{m[1]}_test.rb" }
 end

data/lib/guard/minitest/version.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
 module Guard
-  module MinitestVersion
-    VERSION = '1.0.0.beta1'
+  class MinitestVersion
+
+    VERSION = '1.0.0.beta.2'
+
   end
 end

data/lib/minitest/guard_minitest_plugin.rb

@@ -0,0 +1,10 @@
+require 'guard/minitest/reporter'
+
+module Minitest
+  def self.plugin_guard_minitest_options(opts, options) # :nodoc:
+  end
+
+  def self.plugin_guard_minitest_init(options) # :nodoc:
+    self.reporter << ::Guard::Minitest::Reporter.new(File.open('/dev/null', 'w'))
+  end
+end

metadata

@@ -1,144 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: guard-minitest
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
-  prerelease: 6
+  version: 1.0.0.beta.2
 platform: ruby
 authors:
 - Yann Lugrin
+- Rémy Coutable
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.1'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.10'
-description: Guard::Minitest automatically run your tests with MiniTest framework
+        version: '0'
+description: Guard::Minitest automatically run your tests with Minitest framework
   (much like autotest)
 email:
-- yann.lugrin@sans-savoir.net
+- remy@rymai.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/guard/minitest/inspector.rb
 - lib/guard/minitest/notifier.rb
+- lib/guard/minitest/reporter.rb
 - lib/guard/minitest/runner.rb
-- 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/runners/old_runner.rb
 - lib/guard/minitest/templates/Guardfile
 - lib/guard/minitest/version.rb
 - lib/guard/minitest.rb
+- lib/minitest/guard_minitest_plugin.rb
+- CHANGELOG.md
 - LICENSE
 - README.md
-- CHANGELOG.md
-homepage: http://rubygems.org/gems/guard-minitest
+homepage: https://github.com/guard/guard-minitest
 licenses: []
+metadata: {}
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
-- --main=README.rdoc
-- --exclude='(lib|test|spec)|(Gem|Guard|Rake)file'
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 97313028328538676
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
-rubyforge_project: guard-minitest
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Guard gem for MiniTest framework
+specification_version: 4
+summary: Guard gem for the Minitest framework
 test_files: []

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

@@ -1,8 +0,0 @@
-# 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/runners/version_1_runner.rb

@@ -1,17 +0,0 @@
-# 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