guard-test 0.3.0.rc4 → 0.3.0.rc5

data/README.md

@@ -86,21 +86,11 @@ Available options:
 :bundler        => false              # don't use "bundle exec" to run the test command, default: true if a you have a Gemfile
 :runner         => 'fastfail'         # default: 'default'
 :cli            => "-v"               # pass arbitrary CLI arguments to the Ruby command that runs the tests, default: nil
-:notification   => false              # don't display Growl (or Libnotify) notification after the specs are done running, default: true
 :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
 ```
 
-### Note about the `:notification` option
-
-If you don't want to use Growl or Libnotify with any of your guards, you can set a `GUARD_NOTIFY` environment variable to `false`.
-You can do it by adding the following statement in you `.bashrc`/`.bash_profile`/`.zshrc`:
-
-```bash
-export GUARD_NOTIFY=false
-```
-
 ## Development
 
 - Source hosted on GitHub: https://github.com/guard/guard-test

data/lib/guard/test/inspector.rb

@@ -7,22 +7,23 @@ module Guard
         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)
+            if test_folder?(path)
               paths.delete(path)
-              paths += Dir.glob("#{path}/**/*_test.rb")
+              paths += Dir.glob("#{path}/**/test_*.rb") + Dir.glob("#{path}/**/*_test.rb")
+            else
+              paths.delete(path) unless test_file?(path)
             end
           end
 
           paths.uniq!
           paths.compact!
           clear_test_files_list
-          paths.sort
+          paths.sort - ['test/test_helper.rb']
         end
 
-        private
+      private
 
         def test_folder?(path)
           path.match(/^\/?test/) && !path.match(/\..+$/) && File.directory?(path)

data/lib/guard/test/inspector.rbc

@@ -339,7 +339,7 @@ x
 5
 clean
 i
-55
+52
 20
 0
 49
@@ -354,23 +354,13 @@ i
 15
 20
 0
-56
-2
-50
-3
-0
-19
-0
-15
-20
-0
 49
-4
+2
 0
 56
-5
+3
 50
-6
+4
 0
 15
 20
@@ -387,13 +377,20 @@ i
 15
 5
 48
-7
+5
 15
 20
 0
 49
-8
+6
 0
+7
+7
+64
+35
+1
+82
+8
 11
 I
 3
@@ -412,79 +409,6 @@ uniq!
 x
 8
 compact!
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-5
-clean
-i
-23
-57
-19
-0
-15
-5
-20
-0
-47
-49
-0
-1
-13
-10
-22
-15
-5
-20
-0
-47
-49
-1
-1
-11
-I
-4
-I
-1
-I
-1
-I
-1
-n
-p
-2
-x
-10
-test_file?
-x
-12
-test_folder?
-p
-3
-I
-0
-I
-a
-I
-17
-x
-78
-/Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/inspector.rb
-p
-1
-x
-1
-p
-x
-6
-select
 x
 3
 dup
@@ -501,59 +425,94 @@ x
 5
 clean
 i
-50
+85
 57
 19
 0
 15
-45
-0
-1
+5
 20
 0
+47
 49
-2
+0
 1
 9
-48
+64
 21
 1
 0
 20
 0
 49
-3
+1
 1
 15
 21
 1
 0
 45
-4
-5
+2
+3
 20
 0
 47
 101
+4
+7
+5
+63
+2
+49
 6
+1
+45
+2
 7
+20
+0
+47
+101
+4
 7
+8
 63
 2
 49
-8
+6
 1
 81
 9
+81
+9
 22
 1
 0
 8
+84
+5
+20
+0
+47
 49
+10
+1
+9
+76
+1
+8
+84
+21
+1
+0
+20
+0
+49
+1
 1
 11
 I
-6
+7
 I
 1
 I
@@ -562,14 +521,10 @@ I
 1
 n
 p
-10
-x
-4
-File
-n
+11
 x
-10
-directory?
+12
+test_folder?
 x
 6
 delete
@@ -582,41 +537,48 @@ x
 to_s
 s
 13
-/**/*_test.rb
+/**/test_*.rb
 x
 4
 glob
+n
+s
+13
+/**/*_test.rb
 x
 1
 +
+x
+10
+test_file?
 p
 13
 I
 0
 I
-c
+b
 I
 4
 I
-d
+c
 I
-e
+d
 I
-e
+d
 I
-17
+16
 I
-f
+e
 I
-30
+40
 I
-d
+10
 I
-31
+54
 I
 0
 I
-32
+55
 x
 78
 /Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/inspector.rb
@@ -634,8 +596,14 @@ clear_test_files_list
 x
 4
 sort
-p
+s
 19
+test/test_helper.rb
+x
+1
+-
+p
+17
 I
 -1
 I
@@ -651,29 +619,25 @@ I
 I
 c
 I
-a
-I
-16
-I
-c
-I
-21
-I
-13
+b
 I
-27
+17
 I
 14
 I
-2d
+1d
 I
 15
 I
-31
+23
 I
 16
 I
-37
+27
+I
+17
+I
+34
 x
 78
 /Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/inspector.rb
@@ -812,11 +776,11 @@ p
 I
 -1
 I
-1b
+1c
 I
 0
 I
-1c
+1d
 I
 45
 x
@@ -870,11 +834,11 @@ p
 I
 -1
 I
-1f
+20
 I
 0
 I
-20
+21
 I
 9
 x
@@ -962,11 +926,11 @@ p
 I
 -1
 I
-23
+24
 I
 0
 I
-24
+25
 I
 1d
 x
@@ -1009,11 +973,11 @@ p
 I
 -1
 I
-27
+28
 I
 0
 I
-28
+29
 I
 4
 x
@@ -1030,23 +994,23 @@ I
 I
 10
 I
-19
+1a
 I
 14
 I
-1b
+1c
 I
 22
 I
-1f
+20
 I
 30
 I
-23
+24
 I
 3e
 I
-27
+28
 I
 4c
 x

data/lib/guard/test/runner.rb

@@ -10,7 +10,6 @@ module Guard
       def initialize(options={})
         @runner_name = self.class.runners.detect { |runner| runner == options[:runner] } || self.class.runners[0]
         @options     = {
-          :notification => true,
           :bundler      => File.exist?("#{Dir.pwd}/Gemfile"),
           :rvm          => nil,
           :cli          => nil
@@ -51,10 +50,10 @@ 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 \"GUARD_TEST_NOTIFY=#{@options[:notification]}\""
+          cmd_parts << "-e \"%w[#{paths.join(' ')}].each { |p| load p }\""
         end
 
         paths.each { |path| cmd_parts << "\"./#{path}\"" }