dohtest 0.1.49 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2553b75b56da7e2f61c1e915b141fc9fc1ab64d5
-  data.tar.gz: dd631e9f6f19c4bafa23d69dd19b25e73f852553
+SHA256:
+  metadata.gz: f671b0ee5564d932bd5cf2edd188c31292a0fee261a8ad5207e446450b93cb1e
+  data.tar.gz: 92e6b918b818a6e1b3824cde7e08c7964999a1e8088d024ed3f7b6ee2f365a14
 SHA512:
-  metadata.gz: d2d9f188d411cd08fd1f143c66b8dd3a5c5795b0937362c86d449c45d8f1b93d1bc21dfed925fb2aea6fd4642dd65840c1abcc0b5c66107050a3c42ed2d61f7b
-  data.tar.gz: e738221c256c5924f3f23338dbf93657f203343a82aac04d95c54cab845f2e62de6ac42bdfccf764e9aa0986f8ab07886b21495789f8f2d2d04e498494225457
+  metadata.gz: 98d77e960acc16540bd4e52588af6cb0a98c051d3d068b4cdd49632b247bc46ce164c55cffa0927622b0f28a01d33ab66f7ee171623e798da435203adacf75a3
+  data.tar.gz: 7a64336cbb411d9056253ba1e2c9ab8a0d99ed857ffea18751272a8ede1b38bc8838f04e2133caf53ed0ac4aa64753869a5cbcb49c08d7e354d332e00f07200b

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Makani Mason, Kem Mason
+Copyright (c) 2007 ATPSoft
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/dohtest/configure.rb

@@ -1,18 +1,21 @@
 require 'dohroot'
+require 'dohtest/find_files'
 
 module DohTest
 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)
   curr_directory = start_directory
   max_tries.times do
     return nil if curr_directory == '/'
-    if File.directory?(File.join(curr_directory, 'test')) || File.exist?(File.join(curr_directory, 'dohtest.rb'))
+    if (File.exist?(File.join(curr_directory, 'dohroot')) ||
+        File.directory?(File.join(curr_directory, 'test')) ||
+        File.exist?(File.join(curr_directory, 'dohtest.rb')))
       return curr_directory
     end
     curr_directory = File.expand_path(File.join(curr_directory, '..'))
@@ -20,15 +23,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)
@@ -56,9 +62,18 @@ 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_files(DohTest.config[:glob], paths)
+end
+
 def configure(start_path)
   add_default_config_values
-  load_configuration_files(start_path)
+  set_test_files
+  load_configuration_file(start_path)
 end
 
 end

data/lib/dohtest/{require_paths.rb → find_files.rb}

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

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,31 +1,30 @@
 require 'dohtest/group_runner'
-require 'dohtest/require_paths'
+require 'dohtest/load_test_files'
 
 module DohTest
 
 class MasterRunner
-  def initialize(output, config, paths = nil)
+  def initialize(output, config)
     @output = output
     @config = config
-    # temporary for ease of transition
-    @config[:paths] ||= paths
   end
 
   def run
     start_time = Time.now
+    srand(@config[:seed])
+    @output.run_begin(@config)
+
+    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
-    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/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]
@@ -127,6 +129,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,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dohtest
 version: !ruby/object:Gem::Version
-  version: 0.1.49
+  version: 0.1.54
 platform: ruby
 authors:
-- Makani Mason
-- Kem Mason
+- ATPSoft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
@@ -58,9 +57,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
@@ -77,15 +77,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.2.11
 signing_key: 
 specification_version: 4
 summary: minimalist unit test framework