guard-minitest 0.4.0 → 0.5.0.rc1

data/README.rdoc

@@ -1,5 +1,7 @@
 = Guard::Minitest
 
+{<img src="https://secure.travis-ci.org/guard/guard-minitest.png" />}[http://travis-ci.org/guard/guard-minitest]
+
 Minitest guard allows to automatically & intelligently launch tests with
 {minitest framework}[http://github.com/seattlerb/minitest] when files are modified.
 
@@ -35,7 +37,7 @@ Please read {guard doc}[http://github.com/guard/guard#readme] for more info abou
 
     guard 'minitest' do
       watch(%r|^test/test_(.*)\.rb|)
-      watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+      watch(%r{^lib/(.*/)?([^/]+)\.rb$})  { |m| "test/#{m[1]}test_#{m[2]}.rb" }
       watch(%r|^test/test_helper\.rb|)    { "test" }
     end
 
@@ -43,7 +45,7 @@ Please read {guard doc}[http://github.com/guard/guard#readme] for more info abou
 
     guard 'minitest' do
       watch(%r|^spec/(.*)_spec\.rb|)
-      watch(%r|^lib/(.*)\.rb|)            { |m| "spec/#{m[1]}_spec.rb" }
+      watch(%r{^lib/(.*/)?([^/]+)\.rb$})  { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
       watch(%r|^spec/spec_helper\.rb|)    { "spec" }
     end
 
@@ -61,6 +63,12 @@ You can set minitest verbose mode with:
       ...
     end
 
+You can change the default location and pattern of minitest files:
+
+    guard 'minitest', test_folders: 'test/unit', test_file_patterns: '*_test.rb' do
+      ...
+    end
+
 You can disable desktop notification with:
 
     guard 'minitest', :notify => false do

data/lib/guard/minitest.rb

@@ -12,6 +12,7 @@ module Guard
       super
 
       @runner ||= Runner.new(options)
+      @inspector= Inspector.new(@runner.test_folders, @runner.test_file_patterns)
     end
 
     def start
@@ -27,13 +28,13 @@ module Guard
     end
 
     def run_all
-      paths = Inspector.clean(['test', 'spec'])
+      paths = @inspector.clean_all
       return @runner.run(paths, :message => 'Running all tests') unless paths.empty?
       true
     end
 
     def run_on_change(paths = [])
-      paths = Inspector.clean(paths)
+      paths = @inspector.clean(paths)
       return @runner.run(paths) unless paths.empty?
       true
     end

data/lib/guard/minitest/inspector.rb

@@ -1,46 +1,70 @@
 # encoding: utf-8
 module Guard
   class Minitest
-    module Inspector
-      class << self
-
-        def clean(paths)
-          paths.uniq!
-          paths.compact!
-          paths = paths.select { |p| test_file?(p) || test_folder?(p) }
-
-          paths.dup.each do |path|
-            if File.directory?(path)
-              paths.delete(path)
-              paths += Dir.glob("#{path}/**/test_*.rb") + Dir.glob('test/**/*_test.rb') + Dir.glob("#{path}/**/*_spec.rb")
-            end
-          end
+    class Inspector
 
-          paths.uniq!
-          paths.compact!
-          clear_test_files_list
-          paths
-        end
+      attr_reader :test_folders, :test_file_patterns
 
-      private
+      def initialize(test_folders, test_file_patterns)
+        @test_folders = test_folders.uniq.compact.freeze
+        @test_file_patterns = test_file_patterns.uniq.compact.freeze
+      end
 
-        def test_folder?(path)
-          path.match(/^\/?(test|spec)/) && !path.match(/\..+$/) && File.directory?(path)
-        end
+      def clean_all
+        clean self.test_folders
+      end
 
-        def test_file?(path)
-          test_files.include?(path)
-        end
+      def clean(paths)
+        paths = paths.uniq.compact unless paths == @test_folders
+        paths = paths.select { |p| test_file?(p) || test_folder?(p) }
 
-        def test_files
-          @test_files ||= Dir.glob('test/**/test_*.rb') + Dir.glob('test/**/*_test.rb') + Dir.glob('{test,spec}/**/*_spec.rb')
+        paths.dup.each do |path|
+          if File.directory?(path)
+            paths.delete(path)
+            paths += test_files_for_pathes([path])
+          end
         end
 
-        def clear_test_files_list
-          @test_files = nil
-        end
+        paths.uniq!
+        paths.compact!
+        clear_test_files_list
+        paths
+      end
+
+    private
+      def test_folder_regex
+        @test_folder_regex ||= (
+          folders= self.test_folders.map {|f| Regexp.quote f}.join '|'
+          Regexp.new("^/?(?:#{folders})(?:/|$)")
+        )
+      end
 
+      def test_folder?(path)
+        path.match(test_folder_regex) && !path.match(/\..+$/) && File.directory?(path)
       end
+
+      def test_file?(path)
+        test_files.include?(path)
+      end
+
+      def test_files
+        @test_files ||= test_files_for_pathes(self.test_folders)
+      end
+
+      def join_for_glob(fragments)
+        "{#{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)
+      end
+
+      def clear_test_files_list
+        @test_files = nil
+      end
+
     end
   end
-end
+end

data/lib/guard/minitest/runner.rb

@@ -17,8 +17,12 @@ module Guard
           :notify   => true,
           :bundler  => File.exist?("#{Dir.pwd}/Gemfile"),
           :rubygems => false,
-          :drb      => false
+          :drb      => false,
+          :test_folders       => %w[test spec],
+          :test_file_patterns => %w[*_test.rb test_*.rb *_spec.rb],
         }.merge(options)
+        [:test_folders,:test_file_patterns].each {|k| (@options[k]= [@options[k]].flatten.uniq.compact).freeze}
+        options= options.freeze
       end
 
       def run(paths, options = {})
@@ -51,6 +55,14 @@ module Guard
         @options[:drb]
       end
 
+      def test_folders
+        @options[:test_folders]
+      end
+
+      def test_file_patterns
+        @options[:test_file_patterns]
+      end
+
       private
 
       def minitest_command(paths)
@@ -58,13 +70,22 @@ module Guard
         cmd_parts << "bundle exec" if bundler?
         if drb?
           cmd_parts << 'testdrb'
-          cmd_parts << 'test/test_helper.rb' if File.exist?('test/test_helper.rb')
-          cmd_parts << 'spec/spec_helper.rb' if File.exist?('spec/spec_helper.rb')
+          cmd_parts << "-r #{File.expand_path('../runners/default_runner.rb', __FILE__)}"
+          if notify?
+            cmd_parts << '-e \'::GUARD_NOTIFY=true\''
+          else
+            cmd_parts << '-e \'::GUARD_NOTIFY=false\''
+          end
+          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
           paths.each do |path|
             cmd_parts << "./#{path}"
           end
         else
-          cmd_parts << 'ruby -Itest -Ispec'
+          cmd_parts << 'ruby'
+          cmd_parts.concat test_folders.map{|f| %[-I"#{f}"]}
           cmd_parts << '-r rubygems' if rubygems?
           cmd_parts << '-r bundler/setup' if bundler?
           paths.each do |path|
@@ -80,7 +101,9 @@ module Guard
           cmd_parts << "--seed #{seed}" unless seed.nil?
           cmd_parts << '--verbose' if verbose?
         end
-        cmd_parts.join(' ')
+        cmd= cmd_parts.join(' ')
+        puts "Running: #{cmd}\n\n" if verbose?
+        cmd
       end
 
     end

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

@@ -10,7 +10,7 @@ module MiniTest
       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
+      ::Guard::MinitestNotifier.notify(test_count, assertion_count, failures, errors, skips, duration) if GUARD_NOTIFY
     end
 
   end

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

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

data/lib/guard/minitest/templates/Guardfile

@@ -1,11 +1,15 @@
 guard 'minitest' do
   # with Minitest::Unit
-  watch(%r|^test/test_(.*)\.rb|)
+  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]}_spec.rb" }
+  # watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
   # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+
+  # Rails
+  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/functional/#{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,6 @@
 # encoding: utf-8
 module Guard
   module MinitestVersion
-    VERSION = '0.4.0'
+    VERSION = '0.5.0.rc1'
   end
 end

metadata

@@ -1,112 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guard-minitest
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.5.0.rc1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Yann Lugrin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-15 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: guard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70142535118700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70142535118700
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70142535117960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70142535117960
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70142535117260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70142535117260
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70142535116720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id004
-description: Guard::Minitest automatically run your tests with MiniTest framework (much like autotest)
-email: 
+  prerelease: false
+  version_requirements: *70142535116720
+description: Guard::Minitest automatically run your tests with MiniTest framework
+  (much like autotest)
+email:
 - yann.lugrin@sans-savoir.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/guard/minitest/runners/version_1_runner.rb
-- lib/guard/minitest/runners/version_2_runner.rb
-- lib/guard/minitest/runners/default_runner.rb
+files:
 - lib/guard/minitest/inspector.rb
-- lib/guard/minitest/templates/Guardfile
 - lib/guard/minitest/notifier.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/templates/Guardfile
 - lib/guard/minitest/version.rb
 - lib/guard/minitest.rb
 - LICENSE
 - README.rdoc
-has_rdoc: true
 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: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -417848504522317774
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: guard-minitest
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Guard gem for MiniTest framework
 test_files: []
-