dohtest 0.1.51 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c65ae8542671d9a70fcb9712dc9de692ba6d379d
-  data.tar.gz: b6a395e6f1ffb9977760d8941da898f9b68ce7b3
+  metadata.gz: a3829322dbd582038ad299b99fdf60f6c5efb97c
+  data.tar.gz: 71fb6741be4f451b02d85e194dfd250b228e04d2
 SHA512:
-  metadata.gz: 581310decdb8a8e6c0d9a1feb9837ba4d3aae2e71009d628629c2da49a124bd13230470e0a592c2a97efb83a4b07d258757b471599ba233479ce763dc88c1890
-  data.tar.gz: 9261d2a26d5144a7cfffa99bda033b06e2f5bf2a1be6e971f51a287fb3a08595a1af3f0de1fe62b3f5148a53bed40e79ad972bcfa584afd4ee3857b4dc2c3d36
+  metadata.gz: ddcd101ea8d3fdc89745e72878a046c75d9d08b72fc55bdbc35a63d69f4cdc22bb61b034cbfe1157855b2ee69a4a6125f6c0f3338301bb6320dfa7b39cf69223
+  data.tar.gz: 8a3e0f4cdfbdf558177e53f2bf2d707e4dee242ed80e11540e65b2850ad14fd906c6d2669d49c95dfd742b3d1feaa4f68176bf30d232606fc41aa66c4ceb522c

data/lib/dohtest/configure.rb

@@ -1,4 +1,5 @@
 require 'dohroot'
+require 'dohtest/find_files'
 
 module DohTest
 extend self
@@ -59,8 +60,17 @@ def add_default_config_values
   DohTest.config[:seed] ||= (Time.new.to_f * 1000).to_i
 end
 
+def set_test_files
+  paths = DohTest.config[:paths]
+  if paths.empty?
+    paths = ['.']
+  end
+  DohTest.config[:test_files] = DohTest.find_test_files(DohTest.config[:glob], paths)
+end
+
 def configure(start_path)
   add_default_config_values
+  set_test_files
   load_configuration_file(start_path)
 end
 

data/lib/dohtest/find_files.rb

@@ -0,0 +1,17 @@
+module DohTest
+extend self
+
+def find_files(glob, paths)
+  retval = []
+  expanded_paths = paths.map {|path| File.expand_path(path) }
+  expanded_paths.each do |path|
+    if File.directory?(path)
+      retval.concat(Dir.glob(File.join(path, '**', glob)).to_a)
+    else
+      retval << path
+    end
+  end
+  return retval
+end
+
+end

data/lib/dohtest/load_test_files.rb

@@ -0,0 +1,18 @@
+module DohTest
+extend self
+
+def require_test_file(path, callbacks)
+  callbacks.each do |callback|
+    callback.call(path)
+  end
+  require(path)
+end
+
+def load_test_files(paths)
+  callbacks = @config[:pre_require_callback]
+  paths.each do |path|
+    require_test_file(path, callbacks)
+  end
+end
+
+end

data/lib/dohtest/master_runner.rb

@@ -1,5 +1,5 @@
 require 'dohtest/group_runner'
-require 'dohtest/require_paths'
+require 'dohtest/load_test_files'
 
 module DohTest
 
@@ -14,15 +14,13 @@ class MasterRunner
     srand(@config[:seed])
     @output.run_begin(@config)
 
-    paths = @config[:paths]
-    if paths.empty?
-      paths = ['.']
-    end
-    if !DohTest.require_paths(@config[:glob], paths)
+    if @config[:test_files].empty?
       @output.no_tests_found
       return 1
     end
 
+    DohTest.load_test_files(@config[:test_files])
+
     @config[:pre_test_callback].each do |callback|
       callback.call(@output)
     end

data/lib/dohtest/stream_output.rb

@@ -16,9 +16,11 @@ class StreamOutput
   end
 
   def run_begin(config)
-    @config = config
-    @std_ios.puts "running tests with config: #{config}"
+    display_config = config.dup
+    display_config.delete(:test_files)
+    @std_ios.puts "running tests with config: #{display_config}"
 
+    @config = config
     has_terminal = @std_ios.tty?
     @no_color = !has_terminal || @config[:no_color]
     @verbose = (has_terminal && !@config[:quiet]) || @config[:verbose]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohtest
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.52
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
@@ -58,9 +58,10 @@ files:
 - lib/dohtest/capture_output.rb
 - lib/dohtest/configure.rb
 - lib/dohtest/failure.rb
+- lib/dohtest/find_files.rb
 - lib/dohtest/group_runner.rb
+- lib/dohtest/load_test_files.rb
 - lib/dohtest/master_runner.rb
-- lib/dohtest/require_paths.rb
 - lib/dohtest/stream_output.rb
 - lib/dohtest/test_group.rb
 - test/test_backtrace_parser.rb

data/lib/dohtest/require_paths.rb

@@ -1,29 +0,0 @@
-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
-        DohTest.require_test_file(filename, callbacks)
-      end
-    else
-      retval = true
-      DohTest.require_test_file(path, callbacks)
-    end
-  end
-  return retval
-end
-
-end