guard-minitest 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a09241c76a0ba099f355b5e3eaab0f2c19f70f9
-  data.tar.gz: 7ccf0058158fead7d166775673bb6c195d378ba6
+  metadata.gz: c15c836a1882aa9e328cf6d4b692cdfec305fb89
+  data.tar.gz: 4f0d052115ce23433e839b46b66c80765bf9970a
 SHA512:
-  metadata.gz: 1aab8e10cc6c4e63086298a1ed20e309192ba73121ea0b8b5c9b61869ce6dbfebf10e67a4fd65e6257cc8dd0cbc33ae3822e8d95a6f36c9667495c747644a06c
-  data.tar.gz: d018ea3126b79602c3931a30a225362da779d3959fa36e5a5a620ba393c54da06228595c83c42a5d3252e31012d84800a43bd20871b3453cd6eab7b5f0aa3865
+  metadata.gz: 96bf34afab327f9d62dfc2505ffc62f27dbb4b268b7ec9f83c78c3cdbf96ebb52500484a62f250c23caa7e28e13833e3465fd14dd029c02f89ded61f37bf07eb
+  data.tar.gz: 6aa5c35256bada50a4a035b58186a8d27a63778e14f672a527bfa69a43f8ef87e040910b5318e6d7677609a6e02559dfe5940208df835cbba03dab43e4260c3c

data/README.md

@@ -102,10 +102,15 @@ 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
+env: {}                           # specify some environment variables to be set when the test command is invoked, default: {}
+all_env: {}                       # specify additional environment variables to be set when all tests are being run, default: false
+autorun: false                    # require 'minitest/autorun' automatically, default: true
 ```
 
 ### Options usage examples
 
+#### `:test_folders` and `:test_file_patterns`
+
 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
@@ -114,6 +119,8 @@ guard :minitest, test_folders: 'test/unit', test_file_patterns: '*_test.rb' do
 end
 ```
 
+#### `:cli`
+
 You can pass any of the standard MiniTest CLI options using the `:cli` option:
 
 ```ruby
@@ -122,6 +129,8 @@ guard :minitest, cli: '--seed 123456 --verbose' do
 end
 ```
 
+#### `:spring`
+
 [Spring](https://github.com/jonleighton/spring) is supported (Ruby 1.9.X / Rails 3.2+ only), but you must enable it:
 
 ```ruby
@@ -130,15 +139,18 @@ guard :minitest, spring: true do
 end
 ```
 
-From `spring 0.9.1`, `spring testunit` command has been moved to [spring-commands-testunit](https://github.com/jonleighton/spring-commands-testunit). If you are using 
-rails >=4.0 and spring >=0.9.1
+Since version 2.3.0, the default Spring command works is `bin/rake test` making the integration with your Rails >= 4.1 app effortless.
+
+If you're using an older version of Rails (or no Rails at all), you might want to customize the Spring command, e.g.:
 
 ```ruby
-guard :minitest, spring: 'rake test' do
+guard :minitest, spring: 'spring rake test' do
   # ...
 end
 ```
 
+#### `:zeus`
+
 [Zeus](https://github.com/burke/zeus) is supported, but you must enable it.
 Please note that notifications support is very basic when using Zeus. The zeus client exit status is evaluated, and
 a Guard `:success` or `:failed` notification is triggered. It does not include the test results though.
@@ -158,6 +170,8 @@ guard :minitest, zeus: true do
 end
 ```
 
+#### `:drb`
+
 [Spork / spork-testunit](https://github.com/sporkrb/spork-testunit) is supported, but you must enable it:
 
 ```ruby
@@ -183,6 +197,8 @@ For questions please join us in our [Google group](http://groups.google.com/grou
 
 ## Maintainer
 
+**I'm currently looking for new maintainers, don't hesitate!**
+
 [Rémy Coutable](https://github.com/rymai)
 
 ## Author

data/lib/guard/minitest.rb

@@ -32,11 +32,11 @@ module Guard
     end
 
     def run_all
-      runner.run_all
+      throw_on_failed_tests { runner.run_all }
     end
 
     def run_on_modifications(paths = [])
-      runner.run_on_modifications(paths)
+      throw_on_failed_tests { runner.run_on_modifications(paths) }
     end
 
     def run_on_additions(paths)
@@ -47,5 +47,11 @@ module Guard
       runner.run_on_removals(paths)
     end
 
+    private
+
+    def throw_on_failed_tests
+      throw :task_has_failed unless yield
+    end
+
   end
 end

data/lib/guard/minitest/notifier.rb

@@ -18,7 +18,7 @@ module Guard
 
       # failed | pending (skip) | success
       def self.guard_image(failure_count, skip_count)
-        icon = if failure_count > 0
+        if failure_count > 0
           :failed
         elsif skip_count > 0
           :pending

data/lib/guard/minitest/runner.rb

@@ -13,10 +13,13 @@ module Guard
           drb:                false,
           zeus:               false,
           spring:             false,
+          all_env:            {},
+          env:                {},
           include:            [],
           test_folders:       %w[test spec],
           test_file_patterns: %w[*_test.rb test_*.rb *_spec.rb],
-          cli:                nil
+          cli:                nil,
+          autorun:            true
         }.merge(options)
 
         parse_deprecated_options
@@ -32,17 +35,7 @@ module Guard
         message = "Running: #{options[:all] ? 'all tests' : paths.join(' ')}"
         UI.info message, reset: true
 
-        status = if bundler?
-          system(minitest_command(paths))
-        else
-          if defined?(::Bundler)
-            ::Bundler.with_clean_env do
-              system(minitest_command(paths))
-            end
-          else
-            system(minitest_command(paths))
-          end
-        end
+        status = _run_command(paths, options[:all])
 
         # When using zeus or spring, the Guard::Minitest::Reporter can't be used because the minitests run in another
         # process, but we can use the exit status of the client process to distinguish between :success and :failed.
@@ -76,6 +69,8 @@ module Guard
         inspector.clear_memoized_test_files
       end
 
+      private
+
       def cli_options
         @cli_options ||= Array(@options[:cli])
       end
@@ -116,13 +111,26 @@ module Guard
         @options[:test_file_patterns]
       end
 
-      private
+      def autorun?
+        @options[:autorun]
+      end
 
-      def minitest_command(paths)
-        cmd_parts = []
+      def _run_command(paths, all)
+        if bundler?
+          system(*minitest_command(paths, all))
+        else
+          if defined?(::Bundler)
+            ::Bundler.with_clean_env do
+              system(*minitest_command(paths, all))
+            end
+          else
+            system(*minitest_command(paths, all))
+          end
+        end
+      end
 
-        cmd_parts << 'bundle exec' if bundler?
-        cmd_parts << if drb?
+      def _commander(paths)
+        if drb?
           drb_command(paths)
         elsif zeus?
           zeus_command(paths)
@@ -131,8 +139,18 @@ module Guard
         else
           ruby_command(paths)
         end
+      end
 
-        cmd_parts.compact.join(' ')
+      def minitest_command(paths, all)
+        cmd_parts = []
+
+        cmd_parts << 'bundle exec' if bundler?
+        cmd_parts << _commander(paths)
+
+        [cmd_parts.compact.join(' ')].tap do |args|
+          env = generate_env(all)
+          args.unshift(env) if env.length > 0
+        end
       end
 
       def drb_command(paths)
@@ -145,9 +163,9 @@ module Guard
       end
 
       def spring_command(paths)
-        command = @options[:spring].is_a?(String) ? @options[:spring] : 'testunit'
-        cmd_parts = ['spring', command]
-        cmd_parts << File.expand_path('../runners/old_runner.rb', __FILE__) unless (Utils.minitest_version_gte_5? || command != 'testunit')
+        command = @options[:spring].is_a?(String) ? @options[:spring] : 'bin/rake test'
+        cmd_parts = [command]
+        cmd_parts << File.expand_path('../runners/old_runner.rb', __FILE__) unless (Utils.minitest_version_gte_5? || command != 'spring testunit')
         if cli_options.length > 0
           cmd_parts + paths + ['--'] + cli_options
         else
@@ -160,7 +178,7 @@ module Guard
         cmd_parts.concat(generate_includes)
         cmd_parts << '-r rubygems' if rubygems?
         cmd_parts << '-r bundler/setup' if bundler?
-        cmd_parts << '-r minitest/autorun'
+        cmd_parts << '-r minitest/autorun' if autorun?
         cmd_parts.concat(paths.map { |path| "-r ./#{path}" })
 
         unless Utils.minitest_version_gte_5?
@@ -181,6 +199,22 @@ module Guard
         (test_folders + include_folders).map {|f| %[-I"#{f}"] }
       end
 
+      def generate_env(all=false)
+        base_env.merge(all ? all_env : {})
+      end
+
+      def base_env
+        Hash[(@options[:env] || {}).map{|key, value| [key.to_s, value.to_s]}]
+      end
+
+      def all_env
+        if @options[:all_env].kind_of? Hash
+          Hash[@options[:all_env].map{|key, value| [key.to_s, value.to_s]}]
+        else
+          {@options[:all_env].to_s => "true"}
+        end
+      end
+
       def relative_paths(paths)
         paths.map { |p| "./#{p}" }
       end

data/lib/guard/minitest/version.rb

@@ -1,7 +1,7 @@
 module Guard
   class MinitestVersion
 
-    VERSION = '2.2.0'
+    VERSION = '2.3.0'
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-minitest
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Yann Lugrin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Guard plugin for the Minitest framework