Spin-off parts as plugins.

* Add support for config profiles.
* Remove rubytest command, along with rake task.
* Bump version to 0.7.0.

Author: trans

.index

@@ -53,9 +53,9 @@ paths:
 created: '2011-07-23'
 summary: Ruby Universal Test Harness
 title: Ruby Test
-version: 0.6.1
+version: 0.7.0
 name: rubytest
 description: ! "Ruby Test is a universal test harness for Ruby. It can handle any
   compliant \ntest framework, even running tests from multiple frameworks in a single
   pass."
-date: '2013-02-14'
+date: '2013-02-17'

HISTORY.md

@@ -1,20 +1,36 @@
 # RELEASE HISTORY
 
-## 0.6.1 / 2013-02-15
+## 0.7.0 / 2013-02-18
+
+Version 0.7 is a significant release. The library has been simplified
+by spinning-off the both the command-line tool and the Rake task as
+`rubytest-cli` and `rubytest-rake` respectively. This was done for a
+couple of good reasons: a) It focuses the the library on it's core
+functionality and b) and it makes the library suitable for becoming
+a Ruby standard library, should that ever become a possibility.
+
+Changes:
+
+* Spun off command-line tool as `rubytest-cli`.
+* Spun off Rake task as `rubytest-rake`.
+
+
+## 0.6.1 / 2013-02-16
 
 Configurations can now supply a before and after procedure to be
 run right before or right after tests are run. This can be useful
 for setting up coverage tools Simplecov, which has to be setup
 before the applicable code is required but after all supporting
 test infrustructure is required. This release also fixes
 the `-c/--config` option, to prevent name clashes between gems and
-local config files, and it is simplifed to always load locally.
+local config files.
 
 Changes:
 
 * Add before and after config procs.
 * Fix -c/--config loading.
 * Remove use of DotOpts, it is not good enough yet.
+* Move Rake plugin to separate plugin project.
 
 
 ## 0.6.0 / 2013-02-11

bin/ruby-test

@@ -1,13 +1,18 @@
 module Test
 
+  # Stores test configurations.
+  def self.config
+    @config ||= {}
+  end
+
   # Configure test run via a block then will be passed a `Config` instance.
   #
   # @return [Config]
-  def self.configure(&block)
+  def self.configure(profile=nil, &block)
     if reconfigure?
-      configuration.apply(&block)
+      configuration(profile).apply(profile, &block)
     else
-      @config = Config.new(&block)
+      @config[profile.to_s] = Config.new(&block)
     end
   end
 
@@ -23,9 +28,9 @@ def self.reconfigure?
   # Get the current configuration.
   #
   # @return [Config]
-  def self.configuration(reconfigurable=false)
+  def self.configuration(profile=nil, reconfigurable=false)
     @reconfigure = true if reconfigurable
-    @config ||= Config.new
+    @config[profile.to_s] ||= Config.new
   end
 
   ##
@@ -39,12 +44,6 @@ class Config
     # Glob used to find project root directory.
     GLOB_ROOT = '{.index,.gemspec,.git,.hg,_darcs,lib/}'
 
-    # RubyTest configuration file can be in '.test.rb`, `etc/test.rb`
-    # or `config/test.rb`, `.test`, in that order of precedence.
-    #
-    # @deprecated Use manual -c/--config option instead.
-    GLOB_CONFIG = '{.test.rb,etc/test.rb,config/test.rb,.test}'
-
     #
     def self.assertionless
       @assertionless
@@ -55,28 +54,6 @@ 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.\nUse -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.
     #
     # @return [String] Project's root path.

bin/rubytest

@@ -1,36 +1,53 @@
 module Test
 
-  # TODO: Support config profile's again?
-
   # Alias for `Test.configure`.
   # Use #run! to run tests immediately.
   #
-  def self.run(config=nil, &config_proc)
-    $stderr.puts "configuration profiles no longer supported." if config
-    configure(&config_proc)
+  def self.run(profile=nil, &config_proc)
+    configure(profile, &config_proc)
   end
 
   # Configure and run immediately.
   #
+  # @todo Should this method return the success instead of exiting?
+  # @todo Wrap run in at_exit ?
+  #
+  # @return [void]
   def run!(config=nil, &config_proc)
-    Runner.run(config, &config_proc)
+    begin
+      success = Runner.run(config, &config_proc)
+      exit -1 unless success
+    rescue => error
+      raise error if $DEBUG
+      $stderr.puts('ERROR: ' + error.to_s)
+      exit -1
+    end
   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
+    # Run tests.
+    #
+    # @param [Config,Hash,String,Symbol] config
+    #   Either a Config instance, a hash to construct a Config
+    #   instance with, or a name of a configuration profile.
+    #
+    # @return [Boolean] Success of test run.
+    def self.run(config=nil) #:yield:
+      case config
+      when Config
+      when Hash
+        config = Config.new(config)
+      else
+        config = Test.configuration(config)
       end
+
+      yeild config if block_given?
+
+      runner = Runner.new(config)
+      runner.run
     end
 
     # Exceptions that are not caught by test runner.
@@ -90,15 +107,7 @@ def upon(type, &block)
     # @param [Config] config
     #   Config instance.
     #
-    def initialize(config=nil, &block)
-      if config
-        @config = Hash === config ? Config.new(config) : config
-      else
-        @config = Test.configuration
-      end
-
-      block.call(@config) if block
-
+    def initialize(config)
       @advice = Advice.new
     end
 
@@ -123,15 +132,17 @@ def run
 
         ignore_callers
 
-        config.loadpath.each{ |path| $LOAD_PATH.unshift(path) }
-        config.requires.each{ |file| require file }
+        config.loadpath.flatten.each{ |path| $LOAD_PATH.unshift(path) }
+        config.requires.flatten.each{ |file| require file }
+
+        # Config before advice occurs after loadpath and require are
+        # applied and before test files are required.
+        config.before.call if config.before
 
         test_files.each do |test_file|
           require test_file
         end
 
-        config.before.call if config.before
-
         @reporter  = reporter_load(format)
         @recorder  = Recorder.new
 

lib/rubytest/config.rb

@@ -1 +1 @@
-0.6.1
+0.7.0