guard-minitest 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2da8e0499d7e08f7f8a57a1f4239bcec7b531f05
-  data.tar.gz: cba6e74d584a6a631b4141d0e2f95550ecec6d37
+  metadata.gz: e63896b46638892d2baf185be0cc4f7040120dbe
+  data.tar.gz: 59f0a5a3939759046ccf70500768e567002a10a5
 SHA512:
-  metadata.gz: 8b037a79688a524bab6fdb14801e8e404ccab09cc0abce3295de8816e2815b8f021305bd9dfd7995fa10bec64ca35fe11cb6b310ecdb23ac4c058d838a7f0c41
-  data.tar.gz: 0f87a6bcd7f791f69bfc9e682e15b568f78b5d0d7d821c750f655e2389d0112da4807883b74fe5864b126bffaf44ef7a388202a7f8711157e9e353a445c0b7c8
+  metadata.gz: b08537a1c6899ac67750e7395bec5aeb8b02d7b441c563241690d9b42871a26a9d4c31a3044841794879caec4e529a8acbf6cc315be616eb3e321488584e618b
+  data.tar.gz: decb9b121ee3b71496b45c3b6378a4f29699dfaa6550ecfe15fcf1cec19cc6e5dd5219daf7ff4e79a65bd0bcc2046bac494b5f886c2ec595d094f97138281291

data/lib/guard/minitest.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'guard'
 require 'guard/plugin'
 
@@ -7,6 +6,7 @@ module Guard
 
     require 'guard/minitest/inspector'
     require 'guard/minitest/runner'
+    require 'guard/minitest/utils'
     require 'guard/minitest/version'
 
     def initialize(options = {})
@@ -20,7 +20,7 @@ module Guard
     end
 
     def start
-      UI.info "Guard::Minitest #{MinitestVersion::VERSION} is running, with Minitest::Unit #{_minitest_version}!"
+      UI.info "Guard::Minitest #{MinitestVersion::VERSION} is running, with Minitest::Unit #{Utils.minitest_version}!"
       run_all if @options[:all_on_start]
     end
 
@@ -51,18 +51,5 @@ module Guard
       @inspector.clear_memoized_test_files
     end
 
-    private
-
-    def _minitest_version
-      @_minitest_version ||= begin
-        require 'minitest'
-        ::Minitest::VERSION
-
-      rescue LoadError, NameError
-        require 'minitest/unit'
-        ::MiniTest::Unit::VERSION
-      end
-    end
-
   end
 end

data/lib/guard/minitest/inspector.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Guard
   class Minitest
     class Inspector

data/lib/guard/minitest/notifier.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'guard/notifier'
 
 module Guard

data/lib/guard/minitest/reporter.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'minitest'
 require 'guard/minitest/notifier'
 

data/lib/guard/minitest/reporters/old_reporter.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'minitest'
 require 'guard/minitest/notifier'
 

data/lib/guard/minitest/runner.rb

@@ -1,12 +1,9 @@
-# encoding: utf-8
-require 'rubygems/requirement'
-
 module Guard
   class Minitest
     class Runner
 
       def self.run(paths = [], options = {})
-        Runner.new(options).run(paths, options)
+        new(options).run(paths, options)
       end
 
       def initialize(options = {})
@@ -55,7 +52,7 @@ module Guard
       end
 
       def bundler?
-        @options[:bundler] && ! @options[:spring]
+        @options[:bundler] && !@options[:spring]
       end
 
       def rubygems?
@@ -117,7 +114,7 @@ module Guard
       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 minitest_version_gte_5?
+        cmd_parts << File.expand_path('../runners/old_runner.rb', __FILE__) unless (Utils.minitest_version_gte_5? || command != 'testunit')
         if cli_options.length > 0
           cmd_parts + paths + ['--'] + cli_options
         else
@@ -133,7 +130,7 @@ module Guard
         cmd_parts << '-r minitest/autorun'
         cmd_parts.concat(paths.map { |path| "-r ./#{path}" })
 
-        unless minitest_version_gte_5?
+        unless Utils.minitest_version_gte_5?
           cmd_parts << "-r #{File.expand_path('../runners/old_runner.rb', __FILE__)}"
         end
 
@@ -171,12 +168,6 @@ module Guard
         end
       end
 
-      def minitest_version_gte_5?
-        requirement = Gem::Requirement.new('>= 5')
-        minitest_version = Gem::Version.new(::MiniTest::Unit::VERSION)
-        requirement.satisfied_by?(minitest_version)
-      end
-
     end
   end
 end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'minitest/unit'
 require 'guard/minitest/notifier'
 

data/lib/guard/minitest/utils.rb

@@ -0,0 +1,28 @@
+require 'rubygems/requirement'
+
+module Guard
+  class Minitest
+    class Utils
+
+      def self.minitest_version
+        @@minitest_version ||= begin
+          require 'minitest'
+          ::Minitest::VERSION
+
+        rescue LoadError, NameError
+          require 'minitest/unit'
+          ::MiniTest::Unit::VERSION
+        end
+      end
+
+      def self.minitest_version_gte_5?
+        @@minitest_version_gte_5 ||= Gem::Requirement.new('>= 5').satisfied_by?(Gem::Version.new(minitest_version))
+      end
+
+      def self.minitest_version_gte_5_0_4?
+        @@minitest_version_gte_5_0_4 ||= Gem::Requirement.new('>= 5.0.4').satisfied_by?(Gem::Version.new(minitest_version))
+      end
+
+    end
+  end
+end

data/lib/guard/minitest/version.rb

@@ -1,7 +1,7 @@
 module Guard
   class MinitestVersion
 
-    VERSION = '2.1.1'
+    VERSION = '2.1.2'
 
   end
 end

data/lib/minitest/guard_minitest_plugin.rb

@@ -1,8 +1,6 @@
-require 'rubygems/requirement'
+require 'guard/minitest/utils'
 
-requirement = Gem::Requirement.new('>= 5.0.4')
-minitest_version = Gem::Version.new(::MiniTest::Unit::VERSION)
-if requirement.satisfied_by?(minitest_version)
+if ::Guard::Minitest::Utils.minitest_version_gte_5_0_4?
   require 'guard/minitest/reporter'
 else
   require 'guard/minitest/reporters/old_reporter'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-minitest
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Yann Lugrin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -68,6 +68,7 @@ files:
 - lib/guard/minitest/runner.rb
 - lib/guard/minitest/runners/old_runner.rb
 - lib/guard/minitest/templates/Guardfile
+- lib/guard/minitest/utils.rb
 - lib/guard/minitest/version.rb
 - lib/guard/minitest.rb
 - lib/minitest/guard_minitest_plugin.rb