Add before and after blocks for config.

Author: trans

lib/rubytest/cli.rb

@@ -86,6 +86,7 @@ def options
           config.format = 'tapj'
         end
 
+        # tempted to change -T
         opt.on '-t', '--tag TAG', 'select tests by tag' do |tag|
           config.tags.concat makelist(tag)
         end
@@ -118,6 +119,9 @@ def options
         opt.on '-c', '--config FILE', "require local config file (immediately)" do |file|
           config.load_config(file)
         end
+        #opt.on '-T', '--tests GLOB', "tests to run (if none given as arguments)" do |glob|
+        #  config.files << glob
+        #end
         opt.on '-V' , '--verbose', 'provide extra detail in reports' do
           config.verbose = true
         end

lib/rubytest/config.rb

@@ -323,6 +323,22 @@ def chdir=(dir)
       @chdir = dir.to_s
     end
 
+    # Procedure to call, just before running tests.
+    #
+    # @return [Proc,nil]
+    def before(&proc)
+      @before = proc if proc
+      @before
+    end
+
+    # Procedure to call, just after running tests.
+    #
+    # @return [Proc,nil]
+    def after(&proc)
+      @after = proc if proc
+      @after
+    end
+
     # The mode is only useful for specialied purposes, such as how
     # to run tests via the Rake task. It has no general purpose
     # and can be ignored in most cases.
@@ -390,27 +406,26 @@ def apply_environment_defaults
       @loadpath = env(:loadpath, @loadpath) if @loadpath.empty?
     end
 
-    # Load configuration file.
+    # Load configuration file for project.
+    #
+    # File names are prefixed with `./` to ensure they are from a local
+    # source. An extension of `.rb` is assumed if the file lacks an one.
     #
     # @return [Boolean] true if file was required
     def load_config(file)
-      try_paths = ['etc', 'config']
-      try_paths.concat loadpath
-      try_paths << '.'
-      try_paths = try_paths.uniq
+      file = file + '.rb' if File.extname(file) == ''
 
       if chdir
-        try_paths = try_paths.map{ |path| File.join(chdir, path) }
+        file = File.join(chdir, file)
+      else
+        file = File.join('.', file)
       end
 
-      hold_path = $LOAD_PATH.dup
-      $LOAD_PATH.replace(try_paths)
-      begin
-        success = require file
-      ensure
-        $LOAD_PATH.replace(hold_path)
+      if File.exist?(file)
+        return require(file)
+      else
+        raise "config file not found -- `#{file}'"
       end
-      success
     end
 
   private

lib/rubytest/runner.rb

@@ -1,14 +1,21 @@
 module Test
 
-  # Currently this is an alias for configure, however it is likely
-  # to become an alias for `Runner.run` in the future.
+  # TODO: Support config profile's again?
+
+  # Alias for `Test.configure`.
+  # Use #run! to run tests immediately.
   #
-  # @deprecated Will probably change behavior in future.
   def self.run(config=nil, &config_proc)
     $stderr.puts "configuration profiles no longer supported." if config
     configure(&config_proc)
   end
 
+  # Configure and run immediately.
+  #
+  def run!(config=nil, &config_proc)
+    Runner.run(config, &config_proc)
+  end
+
   # The Test::Runner class handles the execution of tests.
   #
   class Runner
@@ -123,6 +130,8 @@ def run
           require test_file
         end
 
+        config.before.call if config.before
+
         @reporter  = reporter_load(format)
         @recorder  = Recorder.new
 
@@ -131,6 +140,8 @@ def run
         observers.each{ |o| o.begin_suite(suite) }
         run_thru(suite)
         observers.each{ |o| o.end_suite(suite) }
+
+        config.after.call if config.after
       end
 
       recorder.success?