guard-minitest 0.2.2 → 0.3.0

data/README.rdoc

@@ -49,18 +49,36 @@ Please read {guard doc}[http://github.com/guard/guard#readme] for more info abou
 
 == Options
 
-You can force seed for minitest with:
+You can force minitest seed with:
 
     guard 'minitest', :seed => 12345 do
       ...
     end
 
-You can set verbose mode for minitest with:
+You can set minitest verbose mode with:
 
     guard 'minitest', :verbose => true do
       ...
     end
 
+You can disable desktop notification with:
+
+    guard 'minitest', :notify => false do
+      ...
+    end
+
+You can disable bundler usage to run minitest with:
+
+    guard 'minitest', :bundler => false do
+      ...
+    end
+
+You can enable rubygems usage to run minitest (only if bundler is not present or disabale) with:
+
+    guard 'minitest', :rubygems => true do
+      ...
+    end
+
 == Development
 
 - Source hosted at {GitHub}[http://github.com/guard/guard-minitest]

data/lib/guard/minitest.rb

@@ -7,21 +7,22 @@ module Guard
 
     autoload :Runner,    'guard/minitest/runner'
     autoload :Inspector, 'guard/minitest/inspector'
-    autoload :Notifier,  'guard/minitest/notifier'
 
     def start
-      Runner.set_seed(options)
-      Runner.set_verbose(options)
+      @runner ||= Runner.new(options)
+      true
     end
 
     def run_all
       paths = Inspector.clean(['test', 'spec'])
-      Runner.run(paths, :message => 'Running all tests') unless paths.empty?
+      return @runner.run(paths, :message => 'Running all tests') unless paths.empty?
+      true
     end
 
     def run_on_change(paths = [])
       paths = Inspector.clean(paths)
-      Runner.run(paths) unless paths.empty?
+      return @runner.run(paths) unless paths.empty?
+      true
     end
   end
 end

data/lib/guard/minitest/notifier.rb

@@ -1,35 +1,33 @@
 # encoding: utf-8
 module Guard
-  class Minitest
-    class Notifier
+  class MinitestNotifier
 
-      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)"
-        end
-        message << "\nin %.6f seconds, %.4f tests/s, %.4f assertions/s." % [duration, test_count / duration, assertion_count / duration]
-        message
+    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)"
       end
+      message << "\nin %.6f seconds, %.4f tests/s, %.4f assertions/s." % [duration, test_count / duration, assertion_count / duration]
+      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
-        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
       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)
-
-        ::Guard::Notifier.notify(message, :title => 'MiniTest results', :image => image)
-      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)
 
+      ::Guard::Notifier.notify(message, :title => 'MiniTest results', :image => image)
     end
+
   end
 end

data/lib/guard/minitest/runner.rb

@@ -2,50 +2,73 @@
 module Guard
   class Minitest
     class Runner
+
       class << self
-        attr_reader :seed
 
-        def set_seed(options = {})
-          @seed = options[:seed]
+        def run(paths = [], options = {})
+          Runner.new(options).run(paths, options)
         end
 
-        def set_verbose(options = {})
-          @verbose = !!options[:verbose]
-        end
+      end
 
-        def verbose?
-          !!@verbose
-        end
+      def initialize(options = {})
+        @options = {
+          :verbose => false,
+          :notify => true,
+          :bundler => File.exist?("#{Dir.pwd}/Gemfile"),
+          :rubygems => false
+        }.merge(options)
+      end
 
-        def run(paths, options = {})
-          message = options[:message] || "Running: #{paths.join(' ')}"
-          UI.info message, :reset => true
-          system(minitest_command(paths))
-        end
+      def run(paths, options = {})
+        message = options[:message] || "Running: #{paths.join(' ')}"
+        UI.info message, :reset => true
+        system(minitest_command(paths))
+      end
 
-        private
-
-        def minitest_command(paths)
-          cmd_parts = []
-          cmd_parts << "bundle exec" if bundler?
-          cmd_parts << 'ruby -Itest -Ispec'
-          cmd_parts << '-r bundler/setup' if bundler?
-          paths.each do |path|
-            cmd_parts << "-r #{path}"
-          end
-          cmd_parts << "-r #{File.expand_path('../runners/default_runner.rb', __FILE__)}"
-          cmd_parts << '-e \'MiniTest::Unit.autorun\''
-          cmd_parts << '--'
-          cmd_parts << "--seed #{seed}" unless seed.nil?
-          cmd_parts << '--verbose' if verbose?
-          cmd_parts.join(' ')
-        end
+      def seed
+        @options[:seed]
+      end
 
-        def bundler?
-          @bundler ||= File.exist?("#{Dir.pwd}/Gemfile")
-        end
+      def verbose?
+        @options[:verbose]
+      end
 
+      def notify?
+        @options[:notify]
       end
+
+      def bundler?
+        @options[:bundler]
+      end
+
+      def rubygems?
+        !bundler? && @options[:rubygems]
+      end
+
+      private
+
+      def minitest_command(paths)
+        cmd_parts = []
+        cmd_parts << "bundle exec" if bundler?
+        cmd_parts << 'ruby -Itest -Ispec'
+        cmd_parts << '-r rubygems' if rubygems?
+        cmd_parts << '-r bundler/setup' if bundler?
+        paths.each do |path|
+          cmd_parts << "-r #{path}"
+        end
+        cmd_parts << "-r #{File.expand_path('../runners/default_runner.rb', __FILE__)}"
+        if notify?
+          cmd_parts << '-e \'GUARD_NOTIFY=true; MiniTest::Unit.autorun\''
+        else
+          cmd_parts << '-e \'GUARD_NOTIFY=false; MiniTest::Unit.autorun\''
+        end
+        cmd_parts << '--'
+        cmd_parts << "--seed #{seed}" unless seed.nil?
+        cmd_parts << '--verbose' if verbose?
+        cmd_parts.join(' ')
+      end
+
     end
   end
 end

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

@@ -54,7 +54,7 @@ module MiniTest
       @@out.puts
 
       status
-      Guard::Minitest::Notifier.notify(test_count, assertion_count, failures, errors, skips, duration)
+      Guard::MinitestNotifier.notify(test_count, assertion_count, failures, errors, skips, duration) if GUARD_NOTIFY
 
       @@out.puts
       @@out.puts "Test run options: #{help}"

data/lib/guard/minitest/version.rb

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

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Yann Lugrin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +02:00
+date: 2010-10-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 2
+        version: 0.2.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -106,8 +106,10 @@ homepage: http://rubygems.org/gems/guard-minitest
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
+- --main=README.rdoc
+- --exclude='(lib|test|spec)|(Gem|Guard|Rake)file'
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement