autotest 4.2.3 → 4.2.4

data/README.markdown

@@ -5,9 +5,11 @@ This is a fork of the ZenTest package to extract autotest from it.
 Improvements over ZenTest
 =========================
  - possibility to not run all tests after a failed test passes
+ - possibility to use alternative config file
  - simplified test setup
  - simplified packaging
  - less globals flying around
+ - integration tests
 
 Install
 =======
@@ -24,12 +26,14 @@ Usage
  - run autotest
 
 ### Options
-    -f, --fast-start                 Do not run all tests at start
-    -c, --no-full-after-failed       Do not run all tests after failed test passes
+    -f, --fast-start                 Do not run full tests at start
+    -c, --no-full-after-failed       Do not run full tests after failed test passed
     -v, --verbose                    Be verbose. Prints files that autotest doesn't know how to map to tests
     -q, --quiet                      Be quiet.
+    -r, --rc                         Path to config file. (Defaults to ~/.autotest or current_dir/.autotest)
     -h, --help                       Show this.
 
+
 Tips
 ====
  - you need diff.exe on windows. Try http://gnuwin32.sourceforge.net/packages.html
@@ -47,8 +51,9 @@ TODO
 License
 =======
 
-###This is a stripped down version of ZenTest
-Stripper: [Michael Grosser](http://pragmatig.wordpress.com)
+### This is a stripped down version of ZenTest, stripping done by
+ - [Shane Liebling](http://github.com/shanel)
+ - [Michael Grosser](http://pragmatig.wordpress.com)
 
 ### ZenTest Authors
  - http://www.zenspider.com/ZSS/Products/ZenTest/

data/VERSION

@@ -1 +1 @@
-4.2.3
+4.2.4

data/autotest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autotest}
-  s.version = "4.2.3"
+  s.version = "4.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Davis"]
-  s.date = %q{2010-01-19}
+  s.date = %q{2010-01-31}
   s.executables = ["unit_diff", "autotest"]
   s.extra_rdoc_files = [
     "README.markdown"
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/unit_diff.rb",
      "test/helper.rb",
      "test/test_autotest.rb",
+     "test/test_autotest_integration.rb",
      "test/test_unit_diff.rb"
   ]
   s.homepage = %q{http://github.com/grosser/autotest}
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Autotest, without ZenTest}
   s.test_files = [
     "test/test_autotest.rb",
+     "test/test_autotest_integration.rb",
      "test/helper.rb",
      "test/test_unit_diff.rb"
   ]

data/bin/autotest

@@ -14,6 +14,9 @@ BANNER
   opts.on("-c", "--no-full-after-failed","Do not run full tests after failed test passed") { options[:no_full_after_failed] = true }
   opts.on("-v", "--verbose","Be verbose. Prints files that autotest doesn't know how to map to tests") { options[:verbose] = true }
   opts.on("-q", "--quiet","Be quiet.") { options[:quiet] = true }
+  opts.on("-r", "--rc", String, "Path to config file. (Defaults to ~/.autotest or current_dir/.autotest)") do |opt|
+    options[:rc] = opt
+  end
   opts.on("-h", "--help","Show this.") { puts opts;exit }
 end.parse!
 

data/bin/unit_diff

@@ -13,7 +13,11 @@
 #    -u unified diff
 #    -v display version
 
-require 'unit_diff'
+begin
+  require 'unit_diff'
+rescue LoadError
+  require File.dirname(__FILE__) + '/../lib/unit_diff'
+end
 
 ############################################################
 

data/lib/autotest.rb

@@ -157,6 +157,8 @@ class Autotest
     @exception_list = []
     @test_mappings = []
 
+    ENV['UNIT_DIFF'] ||= 'unit_diff'
+
     self.completed_re = /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/
     self.extra_class_map   = {}
     self.extra_files       = []
@@ -170,7 +172,7 @@ class Autotest
     self.sleep             = 1
     self.testlib           = "test/unit"
     self.find_directories  = ['.']
-    self.unit_diff         = "unit_diff -u"
+    self.unit_diff         = "#{ENV['UNIT_DIFF']} -u"
 
     #add Test::Unit mappings
     #file in /lib -> run test in /test
@@ -185,7 +187,17 @@ class Autotest
     end
 
     #execute custom extensions
-    [File.expand_path('~/.autotest'), './.autotest'].each do |f|
+    load_custom_extensions(options[:rc])
+  end
+
+  def load_custom_extensions(config_file)
+    configs = ['./.autotest']
+    if config_file
+      configs << File.expand_path(config_file)
+    else
+      configs << File.expand_path('~/.autotest')
+    end
+    configs.each do |f|
       load f if File.exist? f
     end
   end

data/test/test_autotest_integration.rb

@@ -0,0 +1,83 @@
+require 'test/helper'
+require 'autotest'
+require 'shoulda'
+
+class TestAutotestIntegration < Test::Unit::TestCase
+  def temp_dir
+    "#{File.dirname(__FILE__)}/tmp"
+  end
+
+  def autotest_executable
+    '../../bin/autotest'
+  end
+  
+  def unit_diff_executable
+    File.expand_path("./#{File.dirname(__FILE__)}/../bin/unit_diff")
+  end
+
+  def run_autotest(flag_string='')
+      `cd #{temp_dir} && #{autotest_executable} #{flag_string}`
+  end
+
+  def write(file, text)
+    file = "#{temp_dir}/#{file}"
+    dir = File.dirname(file)
+    `mkdir -p #{dir}` unless File.directory?(dir)
+    File.open(file, 'w'){|f| f.write text } 
+  end
+
+  def write_passing_tests times
+    write('test/test_x.rb', %{ class TestX < Test::Unit::TestCase; #{times}.times{|i| define_method("test_\#{i}"){ assert true }}; end })
+  end
+
+  context 'integration' do
+    context 'green run' do
+      setup do
+        ENV['UNIT_DIFF'] = unit_diff_executable
+        `rm -rf #{temp_dir}`
+        `mkdir #{temp_dir}`
+        write('.autotest', "Autotest.add_hook(:all_good){print 'all_good';exit}")
+      end
+
+      teardown do
+        `rm -rf #{temp_dir}`
+      end
+
+      should 'do nothing when run inside an empty directory' do
+        assert_equal run_autotest, 'all_good'
+      end
+
+      should 'runs all tests' do
+        write('test/test_x.rb', '')
+        assert_match %r{test/test_x.rb}, run_autotest
+      end
+
+      should 'include output from tests' do
+        write('test/test_x.rb', "print 'YES'")
+        assert_match %r{YES}, run_autotest
+      end
+
+      should 'show one dot per passing test' do
+        write_passing_tests 10
+        assert_match %r{[^\.]#{'\.'*10}[^\.]}, run_autotest
+      end
+
+      should 'show test summary' do
+        write_passing_tests 10
+        assert_match /Finished in \d\.\d+ seconds\.\s*10 tests, 10 assertions, 0 failures, 0 errors/m, run_autotest
+      end
+
+      should 'call good hooks in correct order' do
+        write('.autotest', "Autotest::ALL_HOOKS.each{|hook| Autotest.add_hook(hook){print hook;hook == :all_good ? exit : nil }}")
+        write_passing_tests 1
+        assert_match /\n#{%w[ran_command green all_good died]*''}$/m, run_autotest
+      end
+      
+      should 'run with alternate config file location' do
+        write('.autotest_alternate', "Autotest.add_hook(:all_good){print 'all_good';exit}")
+        assert_equal run_autotest('-r .autotest_alternate'), 'all_good'
+      end
+      
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autotest
 version: !ruby/object:Gem::Version 
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors: 
 - Ryan Davis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 +01:00
+date: 2010-01-31 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -43,6 +43,7 @@ files:
 - lib/unit_diff.rb
 - test/helper.rb
 - test/test_autotest.rb
+- test/test_autotest_integration.rb
 - test/test_unit_diff.rb
 has_rdoc: true
 homepage: http://github.com/grosser/autotest
@@ -74,5 +75,6 @@ specification_version: 3
 summary: Autotest, without ZenTest
 test_files: 
 - test/test_autotest.rb
+- test/test_autotest_integration.rb
 - test/helper.rb
 - test/test_unit_diff.rb