Fix reference to config, and be able to apply a hash.

Author: trans

lib/rubytest/config.rb

@@ -12,7 +12,7 @@ def self.configure(profile=nil, &block)
     if reconfigure?
       configuration(profile).apply(profile, &block)
     else
-      @config[profile.to_s] = Config.new(&block)
+      config[profile.to_s] = Config.new(&block)
     end
   end
 
@@ -30,7 +30,7 @@ def self.reconfigure?
   # @return [Config]
   def self.configuration(profile=nil, reconfigurable=false)
     @reconfigure = true if reconfigurable
-    @config[profile.to_s] ||= Config.new
+    config[profile.to_s] ||= Config.new
   end
 
   ##
@@ -116,19 +116,16 @@ def initialize(settings={}, &block)
 
       #apply_environment
 
-      settings.each do |k,v|
-        send("#{k}=", v)
-      end
-
-      self.class.load_config # deprecated!!!
-
-      apply(&block)
+      apply(settings, &block)
     end
 
     # Evaluate configuration block.
     #
     # @return nothing
-    def apply(&block)
+    def apply(hash={}, &block)
+      hash.each do |k,v|
+        send("#{k}=", v)
+      end
       block.call(self) if block
     end
 

lib/rubytest/runner.rb

@@ -13,7 +13,7 @@ def self.run(profile=nil, &config_proc)
   # @todo Wrap run in at_exit ?
   #
   # @return [void]
-  def run!(config=nil, &config_proc)
+  def self.run!(config=nil, &config_proc)
     begin
       success = Runner.run(config, &config_proc)
       exit -1 unless success
@@ -44,7 +44,7 @@ def self.run(config=nil) #:yield:
         config = Test.configuration(config)
       end
 
-      yeild config if block_given?
+      yeild(config) if block_given?
 
       runner = Runner.new(config)
       runner.run
@@ -108,6 +108,7 @@ def upon(type, &block)
     #   Config instance.
     #
     def initialize(config)
+      @config = config
       @advice = Advice.new
     end