guard-minitest 1.0.0.rc.2 → 1.0.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db71d83f0be42030ab23615199f6c5bee71cdc2d
-  data.tar.gz: d1f7ef82f176e014b8829a6dbde1a99c987bfe64
+  metadata.gz: 62bede663636e879d9ff397f906ff30fe4ef3b76
+  data.tar.gz: e4e2b0a5f32a0a318bc7c4685b08a61f34837027
 SHA512:
-  metadata.gz: b0e1db26c8352155e8cb3e305832277f08d7f1612c6d97139d0b687dd233677f03a8bd86b3ad671215a85ef69c989fdc1610fba2e2435921faaddbc38330d8ee
-  data.tar.gz: d670ccae2dcb550a1c3e75887a710f14da58cd0f90116fca264f0bde8a627e6f4263f9b00b049da9fe2862a4ea4b0dcf8b011cf7a124f12a046c70ff9fc464fe
+  metadata.gz: 8bedf120fee341516e402066089e4d4009f46880cc54e3d7fae27935ff163e308739c5c5d8ffbeb0e3f732a90ed28ffb5bb317c6d615b25904cfa547cd5004ea
+  data.tar.gz: 468176f1a886768246426c728fcc6a65167e06e36b51f8a02d5984d257e5bd6034a07ee6c7428c5be55f355e9060053e6f8f986361416f61d876013d48a6be83

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 ## Unreleased Changes
 
-[Full Changelog](https://github.com/guard/guard-minitest/compare/v1.0.0.rc.2...master)
+[Full Changelog](https://github.com/guard/guard-minitest/compare/v1.0.0.rc.3...master)
+
+## 1.0.0.rc.3 - Jun 22, 2013
+
+[Full Changelog](https://github.com/guard/guard-minitest/compare/v1.0.0.rc.2...v1.0.0.rc.3)
+
+### Improvements
+
+* [#70][] Use `-r minitest/autorun` instead of `-e 'Minitest.autorun'` in the runner. ([@kejadlen][])
+* Refactor / simplify `Guard::Minitest::Inspector`. ([@rymai][])
+* [#69][] Use `Gem::Requirement.new` to compare versions. ([@kejadlen][])
+* [#68][] Remove the unused test directory. ([@kejadlen][])
 
 ## 1.0.0.rc.2 - Jun 19, 2013
 
@@ -143,6 +154,9 @@ First stable release.
 [#62]: https://github.com/guard/guard/issues/62
 [#65]: https://github.com/guard/guard/issues/65
 [#66]: https://github.com/guard/guard/issues/66
+[#68]: https://github.com/guard/guard/issues/68
+[#69]: https://github.com/guard/guard/issues/69
+[#70]: https://github.com/guard/guard/issues/70
 [@aflock]: https://github.com/aflock
 [@arronmabrey]: https://github.com/arronmabrey
 [@aspiers]: https://github.com/aspiers

data/lib/guard/minitest/inspector.rb

@@ -6,8 +6,8 @@ module Guard
       attr_reader :test_folders, :test_file_patterns
 
       def initialize(test_folders, test_file_patterns)
-        @test_folders = test_folders.uniq.compact.freeze
-        @test_file_patterns = test_file_patterns.uniq.compact.freeze
+        @test_folders = test_folders.uniq.compact
+        @test_file_patterns = test_file_patterns.uniq.compact
       end
 
       def clean_all
@@ -15,57 +15,37 @@ module Guard
       end
 
       def clean(paths)
-        paths = paths.uniq.compact unless paths == @test_folders
-        paths = paths.select { |p| test_file?(p) || test_folder?(p) }
-
-        paths.dup.each do |path|
+        paths.reduce([]) do |memo, path|
           if File.directory?(path)
-            paths.delete(path)
-            paths += test_files_for_paths([path])
+            memo += _test_files_for_paths(path)
+          else
+            memo << path if _test_file?(path)
           end
-        end
-
-        paths.uniq!
-        paths.compact!
-        clear_test_files_list
-        paths
+          memo
+        end.uniq
       end
 
       private
 
-      def test_folder_regex
-        @_test_folder_regex ||= begin
-          folders = test_folders.map { |f| Regexp.quote(f) }.join('|')
-          Regexp.new("^/?(?:#{folders})(?:/|$)")
-        end
-      end
+      def _test_files_for_paths(paths = test_folders)
+        paths = _join_for_glob(Array(paths))
+        files = _join_for_glob(test_file_patterns)
 
-      def test_folder?(path)
-        path.match(test_folder_regex) && !path.match(/\..+$/) && File.directory?(path)
+        Dir["#{paths}/**/#{files}"]
       end
 
-      def test_file?(path)
-        test_files.include?(path)
+      def _all_test_files
+        @_all_test_files ||= _test_files_for_paths
       end
 
-      def test_files
-        @_test_files ||= test_files_for_paths(test_folders)
+      def _test_file?(path)
+        _all_test_files.include?(path)
       end
 
-      def join_for_glob(fragments)
+      def _join_for_glob(fragments)
         "{#{fragments.join(',')}}"
       end
 
-      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
-      end
-
     end
   end
 end

data/lib/guard/minitest/runner.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'rubygems/requirement'
+
 module Guard
   class Minitest
     class Runner
@@ -95,23 +97,29 @@ module Guard
 
       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 << File.expand_path('../runners/old_runner.rb', __FILE__) unless minitest_version_gte_5?
 
         cmd_parts + relative_paths(paths)
       end
 
       def ruby_command(paths)
         cmd_parts  = ['ruby']
-        cmd_parts += test_folders.map {|f| %[-I"#{f}"] }
+        cmd_parts.concat(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 minitest/autorun'
+        cmd_parts.concat(paths.map { |path| "-r ./#{path}" })
+
+        unless minitest_version_gte_5?
           cmd_parts << "-r #{File.expand_path('../runners/old_runner.rb', __FILE__)}"
-          cmd_parts << '-e \'MiniTest::Unit.autorun\''
         end
+
+        # All the work is done through minitest/autorun
+        # and requiring the test files, so this is just
+        # a placeholder so Ruby doesn't try to exceute
+        # code from STDIN.
+        cmd_parts << '-e ""'
+
         cmd_parts << '--'
         cmd_parts += cli_options
       end
@@ -136,6 +144,12 @@ 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/version.rb

@@ -1,7 +1,7 @@
 module Guard
   class MinitestVersion
 
-    VERSION = '1.0.0.rc.2'
+    VERSION = '1.0.0.rc.3'
 
   end
 end

data/lib/minitest/guard_minitest_plugin.rb

@@ -1,5 +1,8 @@
-minitest_version = ::MiniTest::Unit::VERSION.split(/\./)
-if minitest_version[0].to_i >= 5 && (minitest_version[1].to_i > 0 || minitest_version[2].to_i >= 4)
+require 'rubygems/requirement'
+
+requirement = Gem::Requirement.new('>= 5.0.4')
+minitest_version = Gem::Version.new(::MiniTest::Unit::VERSION)
+if requirement.satisfied_by?(minitest_version)
   require 'guard/minitest/reporter'
 else
   require 'guard/minitest/reporters/old_reporter'
@@ -10,6 +13,6 @@ module Minitest
   end
 
   def self.plugin_guard_minitest_init(options) # :nodoc:
-    self.reporter << ::Guard::Minitest::Reporter.new(File.open('/dev/null', 'w'))
+    self.reporter << ::Guard::Minitest::Reporter.new
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-minitest
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.2
+  version: 1.0.0.rc.3
 platform: ruby
 authors:
 - Yann Lugrin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard