Apply environment overrides to cli config.

Author: trans

lib/rubytest/cli.rb

@@ -44,8 +44,9 @@ def run(argv=nil)
 
       config.files.replace(argv) unless argv.empty?
 
-      #Test.run(config)
+      config.apply_environment_overrides
 
+      #Test.run(config)
       runner = Runner.new(config)
       begin
         success = runner.run
@@ -57,10 +58,6 @@ def run(argv=nil)
       end
     end
 
-    def preparse_options(argv)
-
-    end
-
     # Setup OptionsParser instance.
     #
     # @return [OptionParser]

lib/rubytest/config.rb

@@ -364,7 +364,7 @@ def to_shellwords
     #
     # @todo Better name for this method?
     # @return nothing
-    def apply_environmemt_overrides
+    def apply_environment_overrides
       @format   = env(:format,   @format)
       @autopath = env(:autopath, @autopath)
       @files    = env(:files,    @files)
@@ -379,7 +379,7 @@ def apply_environmemt_overrides
     # settings.
     #
     # @return nothing
-    def apply_environmemt_defaults
+    def apply_environment_defaults
       @format   = env(:format,   @format)   if @format.nil?
       @autopath = env(:autopath, @autopath) if @autopath.nil?
       @files    = env(:files,    @files)    if @files.empty?
@@ -415,14 +415,14 @@ def load_config(file)
 
   private
 
-    # Lookup environment variable with name `RUBYTEST_{NAME}`,
+    # Lookup environment variable with name `rubytest_{name}`,
     # and transform in according to the type of the given
     # default. If the environment variable is not set then
     # returns the default.
     #
     # @return [Object]
     def env(name, default=nil)
-      value = ENV["rubytest-#{name}".downcase]
+      value = ENV["rubytest_#{name}".downcase]
 
       case default
       when Array

lib/rubytest/runner.rb

@@ -26,9 +26,6 @@ def self.run(config=nil, &config_proc)
       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]
 
@@ -87,17 +84,14 @@ def upon(type, &block)
     #   Config instance.
     #
     def initialize(config=nil, &block)
-      case config
-      when Hash
-        @config = Config.new(config)
+      if config
+        @config = Hash === config ? Config.new(config) : config
       else
-        @config = config || Test.configuration
+        @config = Test.configuration
       end
 
       block.call(@config) if block
 
-      #@verbose   = @config.verbose
-
       @advice = Advice.new
     end