dohtest 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c3755cc11d5b29e1bb452676ebc60a9b067729f
-  data.tar.gz: b7c39014b1dc4cc72bd720deba96262f7576c912
+  metadata.gz: 92492bd0677996b9e590fa75c1f1a818312a7670
+  data.tar.gz: 96943715e4ff50b23c805c8a1847e7e093368086
 SHA512:
-  metadata.gz: 5a4ead9a33cbc1adae5eb3c4160ce8d2f85c33f257952e90b9b0b504f804102f0ddccba86e6ac40921fbc5404f9b1c22fa1c9faaccf9640e6a8e3c49af32df45
-  data.tar.gz: 783180920d5995f0d8ac4141a06fd9acc83bba2404379ac3e214761a6065d2cb3bf1503d1477d8e6038f12bd1e46ee64f9a6edda829aaf22b937038aa98f41d6
+  metadata.gz: a589f97c5d3096bcb9aee58e15c41f63d241016c5d50caf4cac9914926be44dcc0879b57fee102aab250d1a052d769db75a09693aac944fb338ac45ed412188e
+  data.tar.gz: d8c7be13ad0cdc5d5524314ae694d016f9dd8d5ba996678757d547973e988032d0d14ea73bc474021f6fdbcca6cb11202fdb87f651fc050504fedf9785c94eaa

data/bin/dohtest

@@ -9,6 +9,8 @@ opts = Doh::Options.new({
 'no_color' => [nil, '-c', '--no_color', "use this if you don't want ANSI color codes"],
 'verbose' => [nil, '-v', '--verbose', "use this to generate more output"],
 'quiet' => [nil, '-q', '--quiet', "use this to generate less output, disables ruby -v mode (which is default) "],
+'max_errors' => [0, '-e', '--max_errors', "stop tests after this many unexpected errors have happened; disabled by default"],
+'max_failures' => [0, '-f', '--max_failures', "stop tests after this many assertion failures have happened; disabled by default"],
 }, true, 'Files or directories may be specified to run tests on.  Directories will be treated recursively.  Defaults to the current directory.')
 
 #generates ruby warnings -- equivalent to ruby -v
@@ -23,5 +25,7 @@ DohTest.config[:seed] = opts.seed.to_i if opts.seed
 DohTest.config[:no_color] = true if opts.no_color
 DohTest.config[:verbose] = true if opts.verbose
 DohTest.config[:quiet] = true if opts.quiet
+DohTest.config[:max_errors] = opts.max_errors
+DohTest.config[:max_failures] = opts.max_failures
 
 exit DohTest::MasterRunner.new(DohTest::StreamOutput.new, DohTest.config, paths).run

data/lib/dohtest/configure.rb

@@ -4,7 +4,7 @@ module DohTest
 extend self
 
 def config
-  @config ||= {}
+  @config ||= {:post_all_callback => []}
 end
 
 def find_root(start_directory, max_tries = 20)

data/lib/dohtest/group_runner.rb

@@ -112,17 +112,15 @@ class GroupRunner
   end
 
   def setup_brink
-    if @config.key?(:max_errors) then
-      @max_errors = @config[:max_errors].to_i
-    end
-    if @config.key?(:max_failures) then
-      @max_failures = @config[:max_failures].to_i
-    end
-    @has_brink = @max_errors || @max_failures
+    @max_errors = @config[:max_errors].to_i
+    @max_failures = @config[:max_failures].to_i
+
+    @has_brink = (@max_errors > 0) || (@max_failures > 0)
   end
 
   def past_brink?
-    (@max_errors && (@error_count > @max_errors)) || (@max_failures && (@assertions_failed > @max_failures))
+    ((@max_errors > 0) && (@error_count >= @max_errors)) ||
+    ((@max_failures > 0) && (@assertions_failed >= @max_failures))
   end
 
   def run_tests

data/lib/dohtest/master_runner.rb

@@ -28,9 +28,9 @@ class MasterRunner
       total_problems += runner.total_problems
       break if brink_hit
     end
-    if @config[:post_all_callback]
-      if (!@config[:post_all_callback].call(total_problems))
-        @output.callback_failed(@config[:post_all_callback].inspect)
+    @config[:post_all_callback].each do |proc|
+      if !proc.call(total_problems)
+        @output.callback_failed(proc.inspect)
       end
     end
     @output.run_end(Time.now - start_time)

data/lib/dohtest/stream_output.rb

@@ -9,7 +9,7 @@ class StreamOutput
 
   def initialize(std_ios = nil, err_ios = nil)
     @error_count = @groups_ran = @groups_skipped = @tests_ran = @tests_skipped = @assertions_failed = @assertions_passed = 0
-    @callback_succeeded = true
+    @callbacks_succeeded = true
     @badness = Set.new
     @std_ios = std_ios || $stdout
     @err_ios = err_ios || $stderr
@@ -64,7 +64,7 @@ class StreamOutput
       assertion_str = "#{total_assertions} assertions: #@assertions_passed passed, #{failed_str}"
     end
 
-    success = (total_assertions > 0) && (@error_count == 0) && (@assertions_failed == 0) && @callback_succeeded
+    success = (total_assertions > 0) && (@error_count == 0) && (@assertions_failed == 0) && @callbacks_succeeded
 
     msg = "#{error_str}; #{group_str}; #{test_str}; #{assertion_str}"
     msg = colorize(:success, msg) if success
@@ -115,9 +115,9 @@ class StreamOutput
     display_badness(group_name, test_name, failure)
   end
 
-  def callback_failed(test_name)
-    @callback_succeeded = false
-    @err_ios.puts colorize(:error, "callback #{test_name} failed")
+  def callback_failed(proc_name)
+    @callbacks_succeeded = false
+    @err_ios.puts colorize(:error, "callback #{proc_name} failed")
   end
 
   def assertion_passed(group_name, test_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohtest
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot