dohtest 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dc0d7a060ca99f77aabbef3a6645158ff6fec34
-  data.tar.gz: c02538b1f17eacd94dae243d6578f0b1c03da526
+  metadata.gz: d1fdf2db3fe1625dbaa12e7c08465abd3494b5d4
+  data.tar.gz: 10ea4118de3da5152355c6c7e930dc8db16e7271
 SHA512:
-  metadata.gz: 0cb9fede3798ca92734113ef176dc8e6307baf256c271dd0cd6286a5350fdd9ab4999218ee52fd2f20cdac353688334d718b276dd751f2aaa14423ffc94e96ee
-  data.tar.gz: 11c02cee2a502f5962c2444d0ffb902e3aa5ccd7d9c1dd7f4b02598f19ddb2c5e4904ee12e280fbf49d20ff892f98f184e9c1d1d3cd2c7c492b020fcdcc3800c
+  metadata.gz: 48ab77e357128d6635947f09611543d4b7eb22ee48d044e8860d7994293ab52d8207c22d583d14e95ae815e6cdcb0974e04c548d792db014280f65e62f8b6814
+  data.tar.gz: bd7949258961d19fab200e89efeed2b44721d7307ec040cd52eead405aa43bec98013cd15bdb2f3e2b34bc60d54e149db6ff5dcaf67519d5215bacd1f4c90594

data/bin/dohtest

@@ -14,9 +14,9 @@ opts = Doh::Options.new({
 #generates ruby warnings -- equivalent to ruby -v
 $VERBOSE = true unless opts.quiet
 
-paths = (if opts.varargs.empty? then ['.'] else opts.varargs end)
+paths = opts.varargs
 
-DohTest.configure(paths[0])
+DohTest.configure(paths.first)
 DohTest.config[:grep] = opts.grep if opts.grep
 DohTest.config[:glob] = opts.glob if opts.glob
 DohTest.config[:seed] = opts.seed.to_i if opts.seed

data/lib/dohtest/configure.rb

@@ -1,38 +1,58 @@
-require 'dohroot'
-
 module DohTest
+extend self
 
-def self.config
+def config
   @config ||= {}
 end
 
-def self.load_configuration_files(start_path)
-  start_path = File.expand_path(start_path)
+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'))
+      return curr_directory
+    end
+    curr_directory = File.expand_path(File.join(curr_directory, '..'))
+  end
+  nil
+end
+
+def load_configuration_files(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 = Doh.find_root(start_directory)
+  root_directory = find_root(start_directory)
+  raise "unable to determine root directory to run tests from" unless root_directory
+  DohTest.config[:root] = root_directory
 
-  local_filename = Doh.findup(start_directory, 'configure_dohtest.rb')
-  if local_filename && File.exist?(local_filename)
-    require(local_filename)
+  libdir = File.join(root_directory, 'lib')
+  if File.directory?(libdir) && !$LOAD_PATH.include?(libdir)
+    $LOAD_PATH << libdir
+  end
+
+  cfgfile = File.join(root_directory, 'dohtest.rb')
+  if File.exist?(cfgfile)
+    require(cfgfile)
     return
   end
 
-  if root_directory
-    root_filename = File.join(root_directory, 'config', 'dohtest.rb')
-    require(root_filename) if File.exist?(root_filename)
+  cfgfile = File.join(root_directory, 'config', 'dohtest.rb')
+  if File.exist?(cfgfile)
+    require(cfgfile)
+    return
   end
+
 end
 
-def self.add_default_config_values
+def add_default_config_values
   DohTest.config[:glob] ||= '*.dt.rb'
   DohTest.config[:seed] ||= (Time.new.to_f * 1000).to_i
 end
 
-def self.configure(start_path)
+def configure(start_path)
   load_configuration_files(start_path)
   add_default_config_values
 end

data/lib/dohtest/master_runner.rb

@@ -11,7 +11,14 @@ class MasterRunner
   def run
     start_time = Time.now
     @config[:pre_test_callback].call(@output) if @config[:pre_test_callback]
-    DohTest::require_paths(@config[:glob], @paths)
+    if @paths.empty?
+      unless DohTest.require_paths(@config[:glob], ['.'])
+        DohTest.require_paths(@config[:glob], [@config[:root]])
+      end
+    else
+      DohTest.require_paths(@config[:glob], @paths)
+    end
+
     srand(@config[:seed])
     @output.run_begin(@config)
     total_problems = 0

data/lib/dohtest/require_paths.rb

@@ -1,13 +1,19 @@
 module DohTest
+extend self
 
-def self.require_paths(glob, paths)
+def require_paths(glob, paths)
+  retval = false
   paths.collect {|elem| File.expand_path(elem) }.each do |onepath|
     if File.directory?(onepath)
-      Dir.glob(File.join(onepath, '**', glob)).each {|filename| require(filename)}
+      Dir.glob(File.join(onepath, '**', glob)).each do |filename|
+        retval = true
+        require(filename)
+      end
     else
       require(File.expand_path(onepath))
     end
   end
+  retval
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohtest
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: minimalist unit test framework