guard-test 0.1.4 → 0.1.6

data/LICENSE

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,6 +1,6 @@
 = Guard::Test
 
-Guard::Test allows to automatically & intelligently launch tests when files are modified or created.
+Test::Unit guard allows to automatically & intelligently launch tests when files are modified or created.
 
 == Compatibility
 
@@ -9,7 +9,7 @@ Guard::Test allows to automatically & intelligently launch tests when files are
 
 == Install
 
-Please be sure to have {guard}[http://github.com/guard/guard] installed before continue.
+Please be sure to have {Guard}[https://github.com/guard/guard] installed before continue.
 
 Install the gem:
 
@@ -19,41 +19,40 @@ Add it to your Gemfile (inside test group):
 
   gem 'guard-test'
 
-Add guard definition to your Guardfile by running this command:
+Add Guard definition to your Guardfile by running this command:
 
   guard init test
 
 == Usage
 
-Please read {guard usage doc}[http://github.com/guard/guard#readme].
+Please read {Guard usage doc}[https://github.com/guard/guard#readme].
 
 == Guardfile
 
 Guard::Test can be adapted to many kind of projects.
-Please read {guard doc}[http://github.com/guard/guard#readme] for more info about Guardfile DSL.
 
 === Standard Ruby project
 
   guard 'test' do
-    watch('^lib/(.*)\.rb')        { |m| "test/lib/#{m[1]}_test.rb" }
-    watch('^test/(.*)_test.rb')   
-    watch('^test/test_helper.rb') { "test" }
+    watch(%r{lib/(.*)\.rb})      { |m| "test/#{m[1]}_test.rb" }
+    watch(%r{test/.*_test\.rb})
+    watch('test/test_helper.rb') { "test" }
   end
 
 === Ruby On Rails project
 
   guard 'test' do
-    watch('^app/models/(.*)\.rb')                       { |m| "test/unit/#{m[1]}_test.rb" }
-    watch('^app/controllers/(.*)\.rb')                  { |m| "test/functional/#{m[1]}_test.rb" }
-    watch('^app/controllers/application_controller.rb') { "test/functional" }
-    watch('^app/controllers/application_controller.rb') { "test/integration" }
-    watch('^app/views/(.*)\.rb')                        { "test/integration" }
-    watch('^lib/(.*)\.rb')                              { |m| "test/lib/#{m[1]}_test.rb" }
-    watch('^test/(.*)_test.rb')
-    watch('^test/factories.rb')                         { "test/unit" }
-    watch('^test/test_helper.rb')                       { "test" }
+    watch(%r{app/models/(.*)\.rb})                     { |m| "test/unit/#{m[1]}_test.rb" }
+    watch(%r{app/controllers/(.*)\.rb})                { |m| "test/functional/#{m[1]}_test.rb" }
+    watch(%r{app/views/.*\.rb})                        { "test/integration" }
+    watch(%r{lib/(.*)\.rb})                            { |m| "test/#{m[1]}_test.rb" }
+    watch(%r{test/.*_test.rb})
+    watch('app/controllers/application_controller.rb') { ["test/functional", "test/integration"] }
+    watch('test/test_helper.rb')                       { "test" }
   end
 
+Please read {Guard doc}[https://github.com/guard/guard#readme] for more info about Guardfile DSL.
+
 == Options
 
 Guard::Test allows you to choose between two different runners (Guard::Test's runners are inherited from Test::Unit's console runner):
@@ -62,8 +61,8 @@ Guard::Test allows you to choose between two different runners (Guard::Test's ru
 
 Available options:
 
-    :runner => 'fastfail' # default to 'default'
-    :bundler => false # don't use "bundle exec"
+    :runner => 'fastfail'      # default to 'default'
+    :bundler => false          # don't use "bundle exec"
     :rvm => ['1.8.7', '1.9.2'] # directly run your specs on multiple ruby
 
 Set the desired options as follow method:
@@ -74,8 +73,8 @@ Set the desired options as follow method:
 
 == Development
 
-- Source hosted on GitHub: http://github.com/guard/guard-test
-- Report issues/Questions/Feature requests on GitHub Issues: http://github.com/guard/guard-test/issues
+- Source hosted on GitHub: https://github.com/guard/guard-test
+- Report issues/Questions/Feature requests on GitHub Issues: https://github.com/guard/guard-test/issues
 
 Pull requests are very welcome!
 Make sure your patches are well tested.
@@ -83,8 +82,8 @@ Please create a topic branch for every separate change you make.
 
 == Author
 
-{Rémy Coutable}[http://github.com/rymai]
+{Rémy Coutable}[https://github.com/rymai]
 
-== Kudo
+== Kudos
 
-Many thanks to {Thibaud Guillaume-Gentil}[http://github.com/thibaudgg] for creating the excellent Guard gem.
+Many thanks to {Thibaud Guillaume-Gentil}[https://github.com/thibaudgg] for creating the excellent Guard gem.

data/lib/guard/test.rb

@@ -3,28 +3,29 @@ require 'guard/guard'
 
 module Guard
   class Test < Guard
-    
+
     autoload :Runner,    'guard/test/runner'
     autoload :Inspector, 'guard/test/inspector'
-    
+
     def start
       Runner.set_test_unit_runner(options)
       UI.info "Guard::Test is guarding your tests!"
     end
-    
+
     def run_all
       clean_and_run(["test"], :message => "Running all tests")
     end
-    
+
     def run_on_change(paths)
       clean_and_run(paths)
     end
-    
+
   private
-    
-    def clean_and_run(paths, options = {})
+
+    def clean_and_run(paths, options={})
       paths = Inspector.clean(paths)
       Runner.run(paths, options) unless paths.empty?
     end
+    
   end
-end
+end

data/lib/guard/test/formatter.rb

@@ -1,62 +1,62 @@
 module Formatter
-  
-  def print_results(test_count, assertion_count, failure_count, error_count, duration, options = {})
+
+  def print_results(test_count, assertion_count, failure_count, error_count, duration, options={})
     puts_with_color(duration_text(duration, options)) if options[:with_duration]
     color = (failure_count > 0 ? "failure" : (error_count > 0 ? "error" : "pass"))
     puts_with_color(results_text(test_count, assertion_count, failure_count, error_count), color)
   end
-  
+
   def notify_results(test_count, assertion_count, failure_count, error_count, duration)
     notify(
       results_text(test_count, assertion_count, failure_count, error_count) + duration_text(duration, :short => true),
       image(failure_count + error_count)
     )
   end
-  
-  def print_and_notify_results(test_count, assertion_count, failure_count, error_count, duration, options = {})
+
+  def print_and_notify_results(test_count, assertion_count, failure_count, error_count, duration, options={})
     print_results(test_count, assertion_count, failure_count, error_count, duration, options)
     notify_results(test_count, assertion_count, failure_count, error_count, duration)
   end
-  
+
   def image(failure_count)
     failure_count > 0 ? :failed : :success
   end
-  
+
   def notify(message, image)
     Guard::Notifier.notify(message, :title => "Test::Unit results", :image => image)
   end
-  
-  def print_with_color(something, color_name = "reset")
+
+  def print_with_color(something, color_name="reset")
     something = "%s%s%s" % [color_sequence(color_name), something, color_sequence("reset")]
     $stdout.write(something)
     $stdout.flush
     true
   end
-  
-  def puts_with_color(something, color_name = "reset")
+
+  def puts_with_color(something, color_name="reset")
     print_with_color(something, color_name)
     $stdout.puts
   end
-  
+
 private
-  
-  def color_sequence(color_name = "reset")
+
+  def color_sequence(color_name="reset")
     "\e[0#{color_code(color_name)}m"
   end
-  
-  def color_code(name = "reset")
+
+  def color_code(name="reset")
     { "pass" => ";32", "failure" => ";31", "pending" => ";33", "error" => ";35", "reset" => "" }[name]
   end
-  
+
   def results_text(test_count, assertion_count, failure_count, error_count)
     "#{test_count} tests, #{assertion_count} asserts, #{failure_count} fails, #{error_count} errors"
   end
-  
-  def duration_text(duration, options = {})
+
+  def duration_text(duration, options={})
     "\n\n#{"Finished " unless options[:short]}in #{round_float(duration)} seconds\n"
   end
-  
-  def round_float(float, decimals = 4)
+
+  def round_float(float, decimals=4)
     if Float.instance_method(:round).arity == 0 # Ruby 1.8
       factor = 10**decimals
       (float*factor).round / factor.to_f
@@ -64,5 +64,5 @@ private
       float.round(decimals)
     end
   end
-  
-end
+
+end

data/lib/guard/test/inspector.rb

@@ -2,44 +2,44 @@ module Guard
   class Test
     module Inspector
       class << self
-        
+
         def clean(paths)
           paths.uniq!
           paths.compact!
           clean_paths = paths.select { |p| test_file?(p) || test_folder?(p) }
-          
+
           paths.each do |path|
             if File.directory?(path)
               clean_paths.delete(path)
               clean_paths = clean_paths + Dir.glob("#{path}/**/*_test.rb")
             end
           end
-          
+
           clean_paths.uniq!
           clean_paths.compact!
           clear_test_files_list
           clean_paths.sort
         end
-        
+
       private
-        
+
         def test_folder?(path)
           path.match(/^\/?test/) && !path.match(/\..+$/)
         end
-        
+
         def test_file?(path)
           test_files.include?(path)
         end
-        
+
         def test_files
           @test_files ||= Dir.glob("test/**/*_test.rb")
         end
-        
+
         def clear_test_files_list
           @test_files = nil
         end
-        
+
       end
     end
   end
-end
+end

data/lib/guard/test/runner.rb

@@ -3,39 +3,39 @@ module Guard
     module Runner
       class << self
         attr_reader :test_unit_runner
-        
+
         AVAILABLE_TEST_UNIT_RUNNERS = %w[default fastfail]
-        
-        def set_test_unit_runner(options = {})
+
+        def set_test_unit_runner(options={})
           @test_unit_runner = AVAILABLE_TEST_UNIT_RUNNERS.include?(options[:runner]) ? options[:runner] : 'default'
         end
-        
-        def run(paths, options = {})
+
+        def run(paths, options={})
           message = "\n" + (options[:message] || "Running (#{@test_unit_runner} runner): #{paths.join(' ') }")
           UI.info(message, :reset => true)
           system(test_unit_command(paths, options))
         end
-        
+
       private
-        
-        def test_unit_command(files, options = {})
+
+        def test_unit_command(files, options={})
           cmd_parts = []
-          cmd_parts << "rvm #{options[:rvm].join(',')} exec" if options[:rvm].is_a?(Array)
+          cmd_parts << "rvm #{options[:rvm].join(',')} exec" if options[:rvm].respond_to?(:join)
           cmd_parts << "bundle exec" if bundler? && options[:bundler] != false
           cmd_parts << "ruby -rubygems"
           cmd_parts << "-r#{File.dirname(__FILE__)}/runners/#{@test_unit_runner}_test_unit_runner"
-          cmd_parts << "-Itest"
+          cmd_parts << "-Ilib:test"
           cmd_parts << "-e \"%w[#{files.join(' ')}].each { |f| load f }\""
           cmd_parts << files.map { |f| "\"#{f}\"" }.join(' ')
           cmd_parts << "--runner=guard-#{@test_unit_runner}"
           cmd_parts.join(' ')
         end
-        
+
         def bundler?
           @bundler ||= File.exist?("#{Dir.pwd}/Gemfile")
         end
-        
+
       end
     end
   end
-end
+end

data/lib/guard/test/runners/default_test_unit_runner.rb

@@ -6,52 +6,52 @@ require 'test/unit/ui/console/testrunner'
 
 # Thanks to Adam Sanderson for the really good starting point:
 # http://endofline.wordpress.com/2008/02/11/a-custom-testrunner-to-scratch-an-itch/
-# 
+#
 # This class inherits from Test::Unit' standard console TestRunner
 # I'm just overriding some callbacks methods to display some nicer results
 class DefaultGuardTestRunner < Test::Unit::UI::Console::TestRunner
   include Formatter
-  
+
   def initialize(suite, options = {})
     super
     @use_color = true
   end
-  
+
 protected
-  
+
   # Test::Unit::UI::Console::TestRunner overrided methods
   def setup_mediator
     @mediator = Test::Unit::UI::TestRunnerMediator.new(@suite)
   end
-  
+
   def started(result)
     @result = result
   end
-  
+
   def test_started(name) # silence!
   end
-  
+
   def add_fault(fault)
     @faults << fault
     print_with_color(fault.single_character_display, fault_color_name(fault))
     @already_outputted = true
   end
-  
+
   def test_finished(name)
     print_with_color(".", "pass") unless @already_outputted
     @already_outputted = false
   end
-  
+
   def finished(elapsed_time)
     nl
     super
     notify_results(@result.run_count, @result.assertion_count, @result.failure_count, @result.error_count, elapsed_time)
   end
-  
+
   def fault_color_name(fault)
     fault.class.name.split(/::/).last.downcase
   end
-  
+
 end
 
-Test::Unit::AutoRunner::RUNNERS["guard-default"] = Proc.new { |r| DefaultGuardTestRunner }
+Test::Unit::AutoRunner::RUNNERS["guard-default"] = Proc.new { |r| DefaultGuardTestRunner }

data/lib/guard/test/runners/fastfail_test_unit_runner.rb

@@ -5,20 +5,20 @@ require "#{File.dirname(__FILE__)}/default_test_unit_runner"
 # It inherits DefaultGuardTestRunner and redefines only 2 methods in order to display failures
 # as they happen (the default display them when all the tests are finished).
 class FastfailGuardTestUnitRunner < DefaultGuardTestRunner
-  
+
 private
-  
+
   def add_fault(fault)
     @faults << fault
     nl
     puts_with_color("%3d) %s" % [@faults.length, fault.long_display])
     @already_outputted = true
   end
-  
+
   def finished(elapsed_time)
     print_and_notify_results(@result.run_count, @result.assertion_count, @result.failure_count, @result.error_count, elapsed_time, :with_duration => true)
   end
-  
+
 end
 
-Test::Unit::AutoRunner::RUNNERS["guard-fastfail"] = Proc.new { |r| FastfailGuardTestUnitRunner }
+Test::Unit::AutoRunner::RUNNERS["guard-fastfail"] = Proc.new { |r| FastfailGuardTestUnitRunner }

data/lib/guard/test/templates/Guardfile

@@ -1,13 +1,11 @@
 guard 'test' do
-  watch('^lib/(.*)\.rb')                              { |m| "test/lib/#{m[1]}_test.rb" }
-  watch('^test/(.*)_test.rb')
-  watch('^test/test_helper.rb')                       { "test" }
-  
+  watch(%r{lib/(.*)\.rb})      { |m| "test/#{m[1]}_test.rb" }
+  watch(%r{test/.*_test\.rb})
+  watch('test/test_helper.rb') { "test" }
+
   # Rails example
-  watch('^app/models/(.*)\.rb')                       { |m| "test/unit/#{m[1]}_test.rb" }
-  watch('^app/controllers/(.*)\.rb')                  { |m| "test/functional/#{m[1]}_test.rb" }
-  watch('^app/controllers/application_controller.rb') { "test/functional" }
-  watch('^app/controllers/application_controller.rb') { "test/integration" }
-  watch('^app/views/(.*)\.rb')                        { "test/integration" }
-  watch('^test/factories.rb')                         { "test/unit" }
+  watch(%r{app/models/(.*)\.rb})                     { |m| "test/unit/#{m[1]}_test.rb" }
+  watch(%r{app/controllers/(.*)\.rb})                { |m| "test/functional/#{m[1]}_test.rb" }
+  watch(%r{app/views/.*\.rb})                        { "test/integration" }
+  watch('app/controllers/application_controller.rb') { ["test/functional", "test/integration"] }
 end

data/lib/guard/test/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module TestVersion
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-test
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - "R\xC3\xA9my Coutable"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 +01:00
+date: 2011-01-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
         - 0
-        - 2
-        - 2
-        version: 0.2.2
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,11 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 2
         - 1
-        version: "2.1"
+        - 2
+        version: 2.1.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -89,12 +90,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
         - 2
-        - 3
+        - 4
         - 0
-        version: 2.3.0
+        version: 2.4.0
   type: :development
   version_requirements: *id005
 description: Guard::Test automatically run your tests and notify you of the result when a file is modified.
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guard-test
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Guard gem for Test::Unit