Support some old config code temporarily.

Author: trans

.test

@@ -40,17 +40,17 @@ def run(argv=nil)
 
       config.files.replace(argv) unless argv.empty?
 
-      Test.run(config)
-
-      #runner = Runner.new(config)
-      #begin
-      #  success = runner.run
-      #  exit -1 unless success
-      #rescue => error
-      #  raise error if $DEBUG
-      #  $stderr.puts('ERROR: ' + error.to_s)
-      #  exit -1
-      #end
+      #Test.run(config)
+
+      runner = Runner.new(config)
+      begin
+        success = runner.run
+        exit -1 unless success
+      rescue => error
+        raise error if $DEBUG
+        $stderr.puts('ERROR: ' + error.to_s)
+        exit -1
+      end
     end
 
     # These options are parsed prior to any other options.

lib/rubytest/cli.rb

@@ -15,42 +15,54 @@ def self.configuration
     @config ||= Config.new
   end
 
-  # Handle test run configruation.
-  #
-  # @todo Why not use the instace level for `Test.config` ?
+  ##
+  # Encapsulates test run configruation.
   #
   class Config
 
     # Default report is in the old "dot-progress" format.
     DEFAULT_FORMAT = 'dotprogress'
 
-    ## RubyTest configuration file can be in `etc/test.rb` or `config/test.rb`,
-    ## or the hidden file `.test.rb`.
-    #GLOB_CONFIG = '{.,task/,etc/,config/}test{.rb,}'
-
     # Glob used to find project root directory.
     GLOB_ROOT = '{.index,.gemspec,.git,.hg,_darcs,lib/}'
 
-    ##
-    ## Load configuration file. This will first look for a root level `Testfile.rb`
-    ## or `.test.rb` file. Failing that it will look for `task/*.test.rb` files.
-    ## An example entry into any of these look like:
-    ##
-    ##   Test.run :name do |run|
-    ##     run.files << 'test/case_*.rb'
-    ##   end
-    ##
-    ## Use `default` for name for non-specific profile and `common` for code that
-    ## should apply to all configurations.
-    ##
-    #def self.load_config
-    #  require config_file if config_file
-    #end
+    # RubyTest configuration file can be in `.test`, '.test.rb`, `etc/test.rb`
+    # or `config/test.rb`.
+    #
+    # @deprecated Use manual -c/--config option instead.
+    GLOB_CONFIG = '{.test,.test.rb,etc/test.rb,config/test.rb}'
 
-    ## Find traditional configuration file.
-    #def self.config_file
-    #  @config_file ||= Dir.glob(File.join(root, GLOB_CONFIG)).first
-    #end
+    #
+    def self.assertionless
+      @assertionless
+    end
+
+    #
+    def self.assertionless=(boolean)
+      @assertionaless = !!boolean
+    end
+
+    # Load configuration file. An example file might look like:
+    #
+    #   Test.configure do |run|
+    #     run.files << 'test/case_*.rb'
+    #   end
+    #
+    # @deprecated Planned for deprecation in April 2013.
+    def self.load_config
+      if config_file
+        file = config_file.sub(Dir.pwd+'/','')
+        $stderr.puts "Automatic #{file} loading has been deprecated. Use -c option for future version."
+        load config_file
+      end
+    end
+
+    # Find traditional configuration file.
+    #
+    # @deprecated
+    def self.config_file
+      @config_file ||= Dir.glob(File.join(root, GLOB_CONFIG)).first
+    end
 
     # Find and cache project root directory.
     #
@@ -83,10 +95,14 @@ def self.dotindex
       )
     end
 
+    # Require a configuration file.
     #
     # TODO: Should config files be require relative to project root
     #       or relatvie to current working directory?
     #
+    # TODO: Use load instead of require?
+    #
+    # @return nothing.
     def self.require_config(file)
       #if File.exist?(file)
       #  require file
@@ -114,12 +130,13 @@ def self.load_path_setup
       end
     end
 
-    #
+    # Initialize new Config instance.
     def initialize(&block)
+      self.class.load_config
       apply(&block)
     end
 
-    #
+    # Evaluate configuration block.
     def apply(&block)
       block.call(self) if block
     end
@@ -142,17 +159,17 @@ def format
       @format || ENV['RUBYTEST_FORMAT'] || DEFAULT_FORMAT
     end
 
-    #
+    # Set test report format.
     def format=(format)
       @format = format
     end
 
-    #
+    # Provide extra details in reports?
     def verbose
       @verbose
     end
 
-    #
+    # Set verbose mode.
     def verbose=(boolean)
       @verbose = !!boolean
     end
@@ -174,7 +191,7 @@ def units
 
     # Hard is a synonym for assertionless.
     def hard
-      @hard || Runner.assertionless
+      @hard || self.class.assertionless
     end
 
     # Hard is a synonym for assertionless.

lib/rubytest/config.rb

@@ -1,6 +1,6 @@
 require 'rake/tasklib'
 
-module Ruth
+module Test
 
   #
   module Rake
@@ -91,9 +91,8 @@ def run
       end
 
       # Resolve test globs.
-      #--
-      # TODO: simplify?
-      #++
+      #
+      # TODO: Can this code be simplifed?
       def test_files
         files = tests
         files = files.map{ |f| Dir[f] }.flatten

lib/rubytest/rake.rb

@@ -1,32 +1,37 @@
 module Test
 
-  # TODO: Wrap run in at_exit ?
+  # Currently this is an alias for configure, however it is likely
+  # to become an alias for `Runner.run` in the future.
+  #
+  # @deprecated Will probably change behavior in future.
   def self.run(config=nil, &config_proc)
-    runner = Runner.new(config, &config_proc)
-    begin
-      success = runner.run
-      exit -1 unless success
-    rescue => error
-      raise error if $DEBUG
-      $stderr.puts('ERROR: ' + error.to_s)
-      exit -1
-    end
+    $stderr.puts "configuration profiles no longer supported." if config
+    configure(&config_proc)
   end
 
   # The Test::Runner class handles the execution of tests.
   #
   class Runner
 
+    # TODO: Wrap run in at_exit ?
+    def self.run(config=nil, &config_proc)
+      runner = Runner.new(config, &config_proc)
+      begin
+        success = runner.run
+        exit -1 unless success
+      rescue => error
+        raise error if $DEBUG
+        $stderr.puts('ERROR: ' + error.to_s)
+        exit -1
+      end
+    end
+
     # Default report is in the old "dot-progress" format.
     DEFAULT_FORMAT = 'dotprogress'
 
     # Exceptions that are not caught by test runner.
     OPEN_ERRORS = [NoMemoryError, SignalException, Interrupt, SystemExit]
 
-    class << self
-      attr_accessor :assertionless
-    end
-
     # / / / A T T R I B U T E S / / /
 
     # Test suite to run. This is a list of compliant test units and test cases.