autotest 4.4.3 → 4.4.4

data/Readme.md

@@ -8,6 +8,7 @@ Improvements over ZenTest
  - `-r` use given config file
  - `-p` use parallel_tests to run tests (Test::Unit only)
  - `-s` use any style you want -> `alias autospec2="autotest --style rspec2"`
+ - `-b` use bundle exec to run tests
  - simplified test setup
  - simplified packaging
  - less globals
@@ -38,6 +39,7 @@ Usage
     -q, --quiet                      Be quiet.
     -r, --rc CONFIG                  Path to config file. (Defaults to ~/.autotest or current_dir/.autotest)
     -s, --style STYLE                Which style to use, e.g. rspec, rspec2
+    -b, --bundle-exec                Use bundle exec to run tests
     -h, --help                       Show this.
 
 Windows needs [diff.exe](http://gnuwin32.sourceforge.net/packages.html)

data/VERSION

@@ -1 +1 @@
-4.4.3
+4.4.4

data/autotest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autotest}
-  s.version = "4.4.3"
+  s.version = "4.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Davis"]
-  s.date = %q{2010-11-15}
+  s.date = %q{2010-11-16}
   s.executables = ["autotest", "unit_diff"]
   s.files = [
     ".autotest",

data/bin/autotest

@@ -26,6 +26,9 @@ BANNER
   opts.on("-s", "--style STYLE", "Which style to use, e.g. rspec, rspec2") do |style|
     options[:style] = style
   end
+  opts.on("-b", "--bundle-exec", "Use bundle exec to run tests") do
+    options[:bundle_exec] = true
+  end
   opts.on("-h", "--help","Show this.") { puts opts;exit }
 end.parse!
 
@@ -61,4 +64,4 @@ unless style.empty?
   puts "style: #{style.map {|s| s.capitalize}.join}"
   target = Autotest.const_get(style.map {|s| s.capitalize}.join)
 end
-target.run
+target.run

data/lib/autotest.rb

@@ -183,7 +183,13 @@ class Autotest
     self.find_directories  = ['.']
     self.unit_diff         = "#{File.expand_path("#{File.dirname(__FILE__)}/../bin/unit_diff")} -u"
 
-    #add Test::Unit mappings
+    add_test_unit_mappings
+
+    #execute custom extensions
+    load_custom_extensions(options[:rc])
+  end
+
+  def add_test_unit_mappings
     #file in /lib -> run test in /test
     self.add_mapping(/^lib\/.*\.rb$/) do |filename, _|
       possible = File.basename(filename).gsub '_', '_?'
@@ -194,9 +200,6 @@ class Autotest
     self.add_mapping(/^test.*\/test_.*rb$/) do |filename, _|
       filename
     end
-
-    #execute custom extensions
-    load_custom_extensions(options[:rc])
   end
 
   def load_custom_extensions(config_file)
@@ -446,12 +449,12 @@ class Autotest
   def make_test_cmd files_to_test
     cmds = []
     full, partial = reorder(files_to_test).partition { |k,v| v.empty? }
-    base_cmd = "#{ruby} -I#{libs} -rubygems"
+    base_cmd = "#{bundle_exec}#{ruby} -I#{libs} -rubygems"
 
     unless full.empty? then
       classes = full.map {|k,v| k}.flatten.uniq
       if options[:parallel] and classes.size > 1
-        cmds << "parallel_test #{escape_filenames(classes).join(' ')}"
+        cmds << "#{bundle_exec}parallel_test #{escape_filenames(classes).join(' ')}"
       else
         classes.unshift testlib
         cmds << "#{base_cmd} -e \"[#{escape_filenames(classes).join(', ')}].each { |f| require f }\" | #{unit_diff}"
@@ -466,6 +469,10 @@ class Autotest
     cmds.join("#{SEP} ")
   end
 
+  def bundle_exec
+    options[:bundle_exec] ? 'bundle exec ' : ''
+  end
+
   def escape_filenames(classes)
     classes.map{|klass| "'#{klass}'"}
   end

data/test/test_autotest.rb

@@ -46,6 +46,8 @@ class TestAutotest < Test::Unit::TestCase
     @a = klassname.split(/::/).inject(Object) { |k,n| k.const_get(n) }.new
     @a.output = StringIO.new
     @a.last_mtime = Time.at(2)
+    @a.options[:bundle_exec] = nil
+    @a.options[:parallel] = nil
 
     @files = {}
     @files[@impl] = Time.at(1)
@@ -359,7 +361,7 @@ test_error2(#{@test_class}):
     assert @a.hook(:blah)
   end
 
-  def test_make_test_cmd
+  def test_make_test_cmd_basics
     f = {
       @test => [],
       'test/test_fooby.rb' => [ 'test_something1', 'test_something2' ]
@@ -379,6 +381,45 @@ test_error2(#{@test_class}):
     assert_equal expected, result
   end
 
+  def test_make_test_cmd_uses_bundle_exec_when_given
+    @a.options[:bundle_exec] = true
+    f = {
+      @test => []
+    }
+    result = @a.make_test_cmd f
+    assert_match /^bundle exec \//,result
+  end
+
+  def test_make_test_cmd_uses_bundle_exec_with_parallel_test
+    @a.options[:bundle_exec] = true
+    @a.options[:parallel] = true
+    f = {
+      'test/a.rb' => [],
+      'test/b.rb' => []
+    }
+    result = @a.make_test_cmd f
+    assert_match /^bundle exec parallel_test/, result
+  end
+
+  def test_make_test_cmd_uses_parallel_with_multiple_files
+    @a.options[:parallel] = true
+    f = {
+      'test/a.rb' => [],
+      'test/b.rb' => []
+    }
+    result = @a.make_test_cmd f
+    assert_match /^parallel_test/, result
+  end
+
+  def test_make_test_cmd_does_not_use_parallel_for_single_file
+    @a.options[:parallel] = true
+    f = {
+      'test/a.rb' => []
+    }
+    result = @a.make_test_cmd f
+    assert_equal nil, (/^parallel_test/ =~ result)
+  end
+
   def test_path_to_classname
     # non-rails
     util_path_to_classname 'TestBlah', 'test/test_blah.rb'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autotest
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 39
   prerelease: false
   segments: 
   - 4
   - 4
-  - 3
-  version: 4.4.3
+  - 4
+  version: 4.4.4
 platform: ruby
 authors: 
 - Ryan Davis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +01:00
+date: 2010-11-16 00:00:00 +01:00
 default_executable: 
 dependencies: []