guard-test 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,4 +1,20 @@
-## 0.3.0.rc5 - June 9, 2011 - ([@rymai][])
+## 0.3.1 - September 11, 2011
+
+### New features:
+
+- Pull request [#13](https://github.com/guard/guard-test/pull/13): New `test_paths` option to look for test files under other paths than `test`. ([@Ask11][])
+
+### Improvements:
+
+- Pull request [#15](https://github.com/guard/guard-test/pull/15): Simplify some checks. ([@dasch][])
+
+## 0.3.0 - June 14, 2011
+
+### Improvements:
+
+- Internal cleaning. ([@rymai][])
+
+## 0.3.0.rc5 - June 9, 2011
 
 ### Bugs fixes:
 
@@ -63,6 +79,8 @@
 
 - Pull request [#1](https://github.com/guard/guard-test/pull/1): Include errors count to determine the "flag" to display in notification. ([@gregorymostizky][])
 
+[@Ask11]: https://github.com/Ask11
+[@dasch]: https://github.com/dasch
 [@gregorymostizky]: https://github.com/gregorymostizky
 [@jgrau]: https://github.com/jgrau
 [@rymai]: https://github.com/rymai

data/README.md

@@ -6,14 +6,14 @@ If you have any questions about Guard or Guard::Test, please join us on our [Goo
 
 ## Features
 
-- Compatible with Test::Unit >= 2.2 and Minitest (Ruby 1.9).
+- Compatible with Test::Unit >= 2.2.
 - Tested on Ruby 1.8.7, 1.9.2, REE, Rubinius and JRuby.
 
 ## Install
 
 Please be sure to have [Guard](https://github.com/guard/guard) installed before continue.
 
-If you're using Bundler, add it to your `Gemfile` (inside the `test` group):
+If you're using Bundler, add it to your `Gemfile` (inside the `development` group):
 
 ```ruby
 gem 'guard-test'
@@ -79,6 +79,14 @@ Guard::Test allows you to choose between two different runners (Guard::Test's ru
              and print failures/errors messages & backtraces when all the tests are finished. Obviously, this is the guard-test default.
 - `fastfail`: Display tests results as they happen and print failures/errors messages & backtraces immediately.
 
+By default, guard-test will only look for test files within `test/` in your project root. You can add any paths using the `:test_paths` option:
+
+```ruby
+guard 'test', :test_paths => ['test', 'vendor/plugins/recaptcha/test', 'any/path/test'] do
+  # ...
+end
+```
+
 Available options:
 
 ```ruby
@@ -89,6 +97,7 @@ Available options:
 :all_on_start   => false              # don't run all the tests at startup, default: true
 :all_after_pass => false              # don't run all tests after changed tests pass, default: true
 :keep_failed    => false              # keep failed tests until them pass, default: true
+:test_paths     => ['spec']           # specify an array of paths that contain test files
 ```
 
 ## Development
@@ -96,7 +105,13 @@ Available options:
 - Source hosted on GitHub: https://github.com/guard/guard-test
 - Report issues and feature requests to GitHub Issues: https://github.com/guard/guard-test/issues
 
-Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change you make. Please do not change the version in your pull-request.
+Pull requests are very welcome! Please try to follow these simple "rules", though:
+
+- Please create a topic branch for every separate change you make;
+- Make sure your patches are well tested;
+- Update the README (if applicable);
+- Update the CHANGELOG (maybe not for a typo but don't hesitate!);
+- Please do not change the version number.
 
 For questions please join us on our [Google group](http://groups.google.com/group/guard-dev) or on `#guard` (irc.freenode.net).
 

data/lib/guard/test/inspector.rb

@@ -4,6 +4,14 @@ module Guard
     module Inspector
 
       class << self
+        def test_paths
+          @test_paths || []
+        end
+
+        def test_paths=(path_array)
+          @test_paths = Array(path_array)
+        end
+
         def clean(paths)
           paths.uniq!
           paths.compact!
@@ -11,7 +19,7 @@ module Guard
           paths.dup.each do |path|
             if test_folder?(path)
               paths.delete(path)
-              paths += Dir.glob("#{path}/**/test_*.rb") + Dir.glob("#{path}/**/*_test.rb")
+              paths += check_test_files(path)
             else
               paths.delete(path) unless test_file?(path)
             end
@@ -26,7 +34,8 @@ module Guard
       private
 
         def test_folder?(path)
-          path.match(/^\/?test/) && !path.match(/\..+$/) && File.directory?(path)
+          paths = test_paths.join("|")
+          path.match(%r{^\/?(#{paths})}) && !path.match(/\..+$/) && File.directory?(path)
         end
 
         def test_file?(path)
@@ -34,12 +43,16 @@ module Guard
         end
 
         def test_files
-          @test_files ||= Dir.glob('test/**/test_*.rb') + Dir.glob('test/**/*_test.rb')
+          @test_files ||= test_paths.collect { |path| check_test_files(path) }.flatten
         end
 
         def clear_test_files_list
           @test_files = nil
         end
+
+        def check_test_files(path)
+          Dir[File.join(path, '**', 'test_*.rb')] + Dir[File.join(path, '**', '*_test.rb')]
+        end
       end
 
     end

data/lib/guard/test/notifier.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'guard'
 require 'guard/notifier'
 require 'guard/test/result_helpers'
 

data/lib/guard/test/runner.rb

@@ -25,21 +25,15 @@ module Guard
       end
 
       def rvm?
-        if @rvm.nil?
-          @rvm = @options[:rvm] && @options[:rvm].respond_to?(:join)
-        end
-        @rvm
+        @rvm ||= @options[:rvm] && @options[:rvm].respond_to?(:join)
       end
 
       def turn?
-        if @turn.nil?
-          @turn = begin
-            require 'turn'
-          rescue LoadError => ex
-            false
-          end
+        @turn ||= begin
+          require 'turn'
+        rescue LoadError
+          false
         end
-        @turn
       end
 
     private
@@ -50,7 +44,7 @@ module Guard
         cmd_parts << "bundle exec" if @options[:bundler] && !turn?
         cmd_parts << "#{turn? ? 'turn' : 'ruby'} -Itest"
         cmd_parts << "-r bundler/setup" if @options[:bundler] && !turn?
-        
+
         unless turn?
           cmd_parts << "-r #{File.expand_path("../runners/#{@runner_name}_guard_test_runner", __FILE__)}"
           cmd_parts << "-e \"%w[#{paths.join(' ')}].each { |p| load p }\""

data/lib/guard/test/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Guard
   module TestVersion
-    VERSION = "0.3.0" unless defined? TestVersion::VERSION
+    VERSION = "0.3.1" unless defined? TestVersion::VERSION
   end
 end

data/lib/guard/test.rb

@@ -15,7 +15,8 @@ module Guard
       @options = {
         :all_on_start   => true,
         :all_after_pass => true,
-        :keep_failed    => true
+        :keep_failed    => true,
+        :test_paths     => ['test']
       }.update(options)
       @last_failed  = false
       @failed_paths = []
@@ -29,7 +30,9 @@ module Guard
     end
 
     def run_all
-      passed = @runner.run(Inspector.clean(['test']), :message => 'Running all tests')
+      Inspector.test_paths = @options[:test_paths]
+      test_paths = @options[:test_paths].clone # because clean - cleaning variable
+      passed = @runner.run(Inspector.clean(test_paths), :message => 'Running all tests')
 
       @failed_paths = [] if passed
       @last_failed  = !passed
@@ -40,6 +43,7 @@ module Guard
     end
 
     def run_on_change(paths)
+      Inspector.test_paths = @options[:test_paths]
       paths += @failed_paths if @options[:keep_failed]
       paths  = Inspector.clean(paths)
       passed = @runner.run(paths)

metadata

@@ -1,73 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guard-test
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
-- "R\xC3\xA9my Coutable"
+authors:
+- Rémy Coutable
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-14 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-11 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: guard
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157114800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157114800
+- !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2157113380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.2"
+      - !ruby/object:Gem::Version
+        version: 2.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157113380
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2157112120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157112120
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2157111180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *2157111180
 description: Guard::Test automatically run your tests on file modification.
-email: 
+email:
 - rymai@rymai.me
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/guard/test/formatter.rbc
+files:
 - lib/guard/test/inspector.rb
 - lib/guard/test/inspector.rbc
 - lib/guard/test/notifier.rb
@@ -92,36 +86,28 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: https://github.com/guard/guard-test
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-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 
-      hash: 907163475134337955
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+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-test
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Guard gem for Test::Unit
+summary: Guard gem for test-unit 2
 test_files: []
-