ZenTest 4.6.0 → 4.6.1

data/History.txt

@@ -1,3 +1,11 @@
+=== 4.6.1 / 2011-08-11
+
+* 3 bug fixes:
+
+  * Fix for option flags and unhandled error warning in autotest. (dbackeus)
+  * Fix option w/ args handling and restart by storing ARGV in options[:args]
+  * Fixed autotest --rc option handling. (simplybusiness)
+
 === 4.6.0 / 2011-07-22
 
 * 6 minor enhancements:

data/Rakefile

@@ -12,6 +12,8 @@ Hoe.plugin :seattlerb
 Hoe.spec "ZenTest" do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
   developer 'Eric Hodel', 'drbrain@segment7.net'
+
+  require_rubygems_version "~> 1.8"
 end
 
 desc "run autotest on itself"

data/lib/autotest.rb

@@ -84,7 +84,10 @@ class Autotest
 
   def self.parse_options args = ARGV
     require 'optparse'
-    options = {}
+    options = {
+      :args => args.dup
+    }
+
     OptionParser.new do |opts|
       opts.banner = <<-BANNER.gsub(/^        /, '')
         Continuous testing for your ruby app.
@@ -118,7 +121,7 @@ class Autotest
       end
 
       opts.on("-r", "--rc CONF", String, "Override path to config file") do |o|
-        options[:rc] = o
+        options[:rc] = Array(o)
       end
 
       opts.on("-s", "--style STYLE", String,
@@ -134,7 +137,7 @@ class Autotest
         puts opts
         exit 1
       end
-    end.parse args
+    end.parse! args
 
     Autotest.options.merge! options
 
@@ -289,7 +292,8 @@ class Autotest
     self.prefix            = nil
     self.sleep             = 1
     self.testlib           = "test/unit"
-    self.find_directories  = ARGV.empty? ? ['.'] : ARGV.dup
+    specified_directories  = ARGV.reject { |arg| arg.start_with?("-") } # options are not directories
+    self.find_directories  = specified_directories.empty? ? ['.'] : specified_directories
     self.unit_diff         = nil
     self.latest_results    = nil
 
@@ -437,7 +441,7 @@ class Autotest
   def restart
     Process.kill "KILL", @child if @child
 
-    cmd = [$0, *ARGV]
+    cmd = [$0, *options[:args]]
 
     index = $LOAD_PATH.index RbConfig::CONFIG["sitelibdir"]
 
@@ -840,8 +844,7 @@ class Autotest
     HOOKS[name] << block
   end
 
-  add_hook :died do |at, args|
-    err = *args
+  add_hook :died do |at, err|
     warn "Unhandled exception: #{err}"
     warn err.backtrace.join("\n  ")
     warn "Quitting"

data/lib/autotest/restart.rb

@@ -1,6 +1,12 @@
 module Autotest::Restart
+  Autotest.add_hook :initialize do |at|
+    configs = [File.expand_path('~/.autotest'), './.autotest']
+    at.extra_files.concat configs
+    false
+  end
+
   Autotest.add_hook :updated do |at, *args|
-    if args.flatten.include? ".autotest" then
+    unless args.flatten.grep(/\.autotest$/).empty? then
       warn "Detected change to .autotest, restarting"
       at.restart
     end

data/lib/zentest.rb

@@ -57,7 +57,7 @@ end
 
 class ZenTest
 
-  VERSION = '4.6.0'
+  VERSION = '4.6.1'
 
   include ZenTestMapping
 

data/test/test_autotest.rb

@@ -24,6 +24,10 @@ class Autotest
   def self.clear_hooks
     HOOKS.clear
   end
+
+  def self.reset_options
+    @@options = {}
+  end
 end
 
 class TestAutotest < MiniTest::Unit::TestCase
@@ -465,6 +469,17 @@ test_error2(#{@test_class}):
     assert_match @a.testlib, @a.make_test_cmd(f)
   end
 
+  def test_runner_accepts_rc_options
+    begin
+      Autotest.parse_options(['--rc', 'autotest_rc'])
+      Autotest.new
+    rescue
+      deny $!, "It should not throw #{$!.message}"
+    ensure
+      Autotest.reset_options
+    end
+  end
+
   def util_exceptions
     @a.exception_list.sort_by { |r| r.to_s }
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 4
   - 6
-  - 0
-  version: 4.6.0
+  - 1
+  version: 4.6.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -37,7 +37,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-07-23 00:00:00 Z
+date: 2011-08-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -47,11 +47,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 11
         segments: 
         - 2
-        - 3
-        version: "2.3"
+        - 4
+        version: "2.4"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -169,16 +169,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 31
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      version: "1.8"
 requirements: []
 
 rubyforge_project: zentest
-rubygems_version: 1.8.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: "ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby"