dohtest 0.1.50 → 0.1.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce812b03d63d1fa317beca3a8ea8246b8bfd9d4d
-  data.tar.gz: db98a1adc045d4698833a296a4c3f407a9e0ca24
+  metadata.gz: c65ae8542671d9a70fcb9712dc9de692ba6d379d
+  data.tar.gz: b6a395e6f1ffb9977760d8941da898f9b68ce7b3
 SHA512:
-  metadata.gz: cac3d18af47602b25d0f1cdd63e09f181b702c273b1e33bce4f971751d273a0f3ac939a4f14605528eb4e24cdaecd58e1f44434ef5b13fda0f905a22ffd5f099
-  data.tar.gz: c9776a6ed6315b6bc181eed0e9e1e4381a733a577afe71952cf84ff88c3ea66042d3db6a631d20ee6bf67fefa64e880b259836f495c3c897178cdd112ea36285
+  metadata.gz: 581310decdb8a8e6c0d9a1feb9837ba4d3aae2e71009d628629c2da49a124bd13230470e0a592c2a97efb83a4b07d258757b471599ba233479ce763dc88c1890
+  data.tar.gz: 9261d2a26d5144a7cfffa99bda033b06e2f5bf2a1be6e971f51a287fb3a08595a1af3f0de1fe62b3f5148a53bed40e79ad972bcfa584afd4ee3857b4dc2c3d36

data/lib/dohtest/configure.rb

@@ -5,7 +5,7 @@ extend self
 
 def config
   @config ||= {:post_all_callback => [], :pre_group_callback => [], :post_group_callback => [], :pre_test_callback => [],
-    :pre_each_callback => [], :post_each_callback => []}
+    :pre_each_callback => [], :post_each_callback => [], :pre_require_callback => []}
 end
 
 def find_root(start_directory, max_tries = 20)
@@ -20,15 +20,18 @@ def find_root(start_directory, max_tries = 20)
   nil
 end
 
-def load_configuration_files(start_path)
+def load_configuration_file(start_path)
   start_path = File.expand_path(start_path || '.')
   if File.directory?(start_path)
     start_directory = start_path
   else
     start_directory = File.dirname(start_path)
   end
+
   root_directory = find_root(start_directory)
-  raise "unable to determine root directory to run tests from" unless root_directory
+  if !root_directory
+    raise "unable to determine root directory to run tests from"
+  end
   DohTest.config[:root] = root_directory
 
   Doh.find_root_from_path(root_directory)
@@ -58,7 +61,7 @@ end
 
 def configure(start_path)
   add_default_config_values
-  load_configuration_files(start_path)
+  load_configuration_file(start_path)
 end
 
 end

data/lib/dohtest/master_runner.rb

@@ -11,19 +11,22 @@ class MasterRunner
 
   def run
     start_time = Time.now
+    srand(@config[:seed])
+    @output.run_begin(@config)
+
+    paths = @config[:paths]
+    if paths.empty?
+      paths = ['.']
+    end
+    if !DohTest.require_paths(@config[:glob], paths)
+      @output.no_tests_found
+      return 1
+    end
+
     @config[:pre_test_callback].each do |callback|
       callback.call(@output)
     end
-    if @config[:paths].empty?
-      unless DohTest.require_paths(@config[:glob], ['.'])
-        DohTest.require_paths(@config[:glob], [@config[:root]])
-      end
-    else
-      DohTest.require_paths(@config[:glob], @config[:paths])
-    end
 
-    srand(@config[:seed])
-    @output.run_begin(@config)
     total_problems = 0
     # sort them to be the same order no matter what (different machines were returning different results)
     TestGroup.descendants.sort{|a,b|a.to_s<=>b.to_s}.shuffle.each do |group_class|

data/lib/dohtest/require_paths.rb

@@ -1,17 +1,26 @@
 module DohTest
 extend self
 
+def require_test_file(path, callbacks)
+  callbacks.each do |callback|
+    callback.call(path)
+  end
+  require(path)
+end
+
 def require_paths(glob, paths)
   retval = false
   expanded_paths = paths.map {|path| File.expand_path(path) }
+  callbacks = @config[:pre_require_callback]
   expanded_paths.each do |path|
     if File.directory?(path)
       Dir.glob(File.join(path, '**', glob)).each do |filename|
         retval = true
-        require(filename)
+        DohTest.require_test_file(filename, callbacks)
       end
     else
-      require(path)
+      retval = true
+      DohTest.require_test_file(path, callbacks)
     end
   end
   return retval

data/lib/dohtest/stream_output.rb

@@ -127,6 +127,10 @@ class StreamOutput
     @assertions_passed += 1
   end
 
+  def no_tests_found
+    @err_ios.puts("\nno tests found")
+  end
+
 private
   def colorize(type, msg)
     return msg if @no_color

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohtest
 version: !ruby/object:Gem::Version
-  version: 0.1.50
+  version: 0.1.51
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot