autotest 4.2.6 → 4.2.7

data/VERSION

@@ -1 +1 @@
-4.2.6
+4.2.7

data/autotest.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autotest}
-  s.version = "4.2.6"
+  s.version = "4.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Davis"]

data/bin/autotest

@@ -45,8 +45,8 @@ unless style.empty? then
   puts "loading #{mod}" unless options[:quiet]
   begin
     require mod
-  rescue LoadError
-    abort "Autotest style #{mod} doesn't seem to exist. Aborting."
+  rescue LoadError => e
+    abort "Error loading Autotest style #{mod} (#{e.to_s}). Aborting."
   end
   puts "style: #{style.map {|s| s.capitalize}.join}"
   target = Autotest.const_get(style.map {|s| s.capitalize}.join)

data/lib/autotest.rb

@@ -157,8 +157,6 @@ class Autotest
     @exception_list = []
     @test_mappings = []
 
-    ENV['UNIT_DIFF'] ||= File.expand_path("#{File.dirname(__FILE__)}/../bin/unit_diff")
-
     self.completed_re = /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/
     self.extra_class_map   = {}
     self.extra_files       = []
@@ -172,7 +170,7 @@ class Autotest
     self.sleep             = 1
     self.testlib           = "test/unit"
     self.find_directories  = ['.']
-    self.unit_diff         = "#{ENV['UNIT_DIFF']} -u"
+    self.unit_diff         = "#{File.expand_path("#{File.dirname(__FILE__)}/../bin/unit_diff")} -u"
 
     #add Test::Unit mappings
     #file in /lib -> run test in /test

data/test/test_autotest.rb

@@ -362,8 +362,10 @@ test_error2(#{@test_class}):
       'test/test_fooby.rb' => [ 'test_something1', 'test_something2' ]
     }
 
-    expected = [ "#{RUBY} -I.:lib:test -rubygems -e \"%w[test/unit #{@test}].each { |f| require f }\" | #{ENV['UNIT_DIFF']} -u",
-                 "#{RUBY} -I.:lib:test -rubygems test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\" | #{ENV['UNIT_DIFF']} -u" ].join("; ")
+    unit_diff = File.expand_path("#{File.dirname(__FILE__)}/../bin/unit_diff")
+
+    expected = [ "#{RUBY} -I.:lib:test -rubygems -e \"%w[test/unit #{@test}].each { |f| require f }\" | #{unit_diff} -u",
+                 "#{RUBY} -I.:lib:test -rubygems test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\" | #{unit_diff} -u" ].join("; ")
 
     result = @a.make_test_cmd f
     assert_equal expected, result

data/test/test_autotest_integration.rb

@@ -11,12 +11,8 @@ class TestAutotestIntegration < Test::Unit::TestCase
     '../../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}`
+    `cd #{temp_dir} && #{autotest_executable} #{flag_string}`
   end
 
   def write(file, text)
@@ -33,7 +29,6 @@ class TestAutotestIntegration < Test::Unit::TestCase
   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}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autotest
 version: !ruby/object:Gem::Version 
-  version: 4.2.6
+  version: 4.2.7
 platform: ruby
 authors: 
 - Ryan Davis