Add shell runner to rake task.

trans · trans · commit 1bd8ea37139f · 2013-02-10T21:37:25.000-05:00
diff --git a/README.md b/README.md
@@ -29,9 +29,9 @@ over as a test case with each entry handled in the same manner. All test
 objects must respond to `#to_s` so their description can be used in test
 reports.
 
-Any raised exception that responds to `#assertion?` in the affirmative is taken
-to be a failed assertion rather than simply an error. Ruby Test extends the
-Exception class to support this method for all exceptions.
+Ruby Test handles assertions via [BRASS](http://rubyworks.github.com/brass)
+compliance. Any raised exception that responds to `#assertion?` in the
+affirmative is taken to be a failed assertion rather than simply an error. 
 
 A test framework may raise a `NotImplementedError` to have a test recorded
 as *todo* --a _pending_ exception to remind the developer of tests that still
@@ -46,7 +46,17 @@ additional features that can makes its usage even more convenient.
 See the [Wiki](http://github.com/rubyworks/test/wiki) for further details.
 
 
-## Usage
+## Installation
+
+Ruby Test is available as a Gem package.
+
+    $ gem install rubytest
+
+Ruby Test is compliant with Setup.rb layout standard, so it can
+also be installed in an FHS compliant fashion if necessary.
+
+
+## Running Tests
 
 There are a few ways to run tests. First, there is the command line tool
 e.g.
@@ -81,42 +91,30 @@ There is also a Rake task. In your Rakefile,
       run.files << 'test/test_*.rb'
     end
 
-A Detroit plugin is in the works and should be available soon.
-
 See the Wiki for more information on the different ways to run tests.
 
 
-Notice the use of `Test.configure` which is .
-
-
-
-## Installation
-
-Ruby Test is available as Gem package.
-
-    $ gem install rubytest
-
-
 ## Requirements
 
 Ruby Test uses the [ANSI](http://rubyworks.github.com/ansi) gem for color output.
 
 Because of the "foundational" nature of this library we will look at removing
-this dependencies for future versions, but for early development the 
+this dependency for future versions, but for early development the 
 requirements does the job and does it well.
 
 
 ## Development
 
 Ruby Test is still a "nuby" gem. Please feel OBLIGATED to help improve it ;-)
 
-Ruby Test is a [RubyWorks](http://rubyworks.github.com) project. If you can't
+Ruby Test is a [Rubyworks](http://rubyworks.github.com) project. If you can't
 contribue code, you can still help out by contributing to our development fund.
 
 
 ## Reference Material
 
-[1] [Standard Definition Of Unit Test](http://c2.com/cgi/wiki?StandardDefinitionOfUnitTest)
+* [Standard Definition Of Unit Test](http://c2.com/cgi/wiki?StandardDefinitionOfUnitTest)
+* [BRASS Assertions Standard](http:rubyworks.github.com/brass)
 
 
 ## Copyrights
@@ -125,5 +123,5 @@ Copyright (c) 2011 Rubyworks
 
 Made available according to the terms of the <b>FreeBSD license</b>.
 
-See NOTICE.md for details.
+See LICENSE.txt for details.
 
diff --git a/lib/rubytest/rake.rb b/lib/rubytest/rake.rb
@@ -1,17 +1,19 @@
+require 'rubytest'
 require 'rake/tasklib'
 
 module Test
 
+  ##
+  # Rake subspace.
   #
   module Rake
 
-    # TODO: The test task uses #fork. Maybe it should shell out instead?
-    #  Or provide the option for either?
-
+    ##
     # Define a test rake task.
     #
     # The `TEST` environment variable can be used to select tests
-    # when using the task.
+    # when using this task. Note, this is just a more convenient
+    # way than using `RUBYTEST_FILES`.
     #
     class TestTask < ::Rake::TaskLib
 
@@ -23,76 +25,67 @@ class TestTask < ::Rake::TaskLib
         'test/**/*_test.rb'
       ]
 
-      # Test scripts to load. Can be a file glob.
-      attr_accessor :tests
-
-      # Paths to add to $LOAD_PATH.
-      attr_accessor :loadpath
-
-      # Scripts to load prior to loading tests.
-      attr_accessor :requires
-
-      # Report format to use.
-      attr_accessor :format
-
-      # Filter tests based by tags.
-      attr_accessor :tags
-
-      # Filter tests by matching description.
-      attr_accessor :match
-
-      # From Rake's own TestTask.
-      alias_method :libs, :loadpath
-      alias_method :test_files, :tests
+      # Test run configuration.
+      #
+      # @return [Config]
+      attr :config
 
+      # Initialize new Rake::TestTask instance.
       #
-      def initialize(name='test', desc="run tests", &block)
-        @name       = name
-        @desc       = desc
+      def initialize(name='test', desc='run tests', &block)
+        @name = name || 'test'
+        @desc = desc
+
+        @config = Test::Config.new
 
-        @loadpath   = ['lib']
-        @requires   = []
-        @tests      = [ENV['TEST'] || DEFAULT_TESTS].flatten
-        @format     = nil
-        @match      = nil
-        @tags       = []
+        @config.files << default_tests if @config.files.empty?
+        @config.loadpath << 'lib' if @config.loadpath.empty?
 
-        block.call(self)
+        block.call(@config)
 
         define_task
       end
 
+      # Define rake task for testing.
       #
+      # @return nothing
       def define_task
         desc @desc
         task @name do
-          @tests ||= default_tests
-          run
+          config.mode == 'shell' ? run_shell : run
         end
       end
 
+      # Run tests, via fork is possible, otherwise straight out.
       #
+      # @return nothing
       def run
-        fork {
-          #require 'rubytest'
-          require 'rubytest/runner'
-
-          loadpath.each   { |d| $LOAD_PATH.unshift(d) }
-          requires.each   { |f| require f }
-          test_files.each { |f| require f }
-
-          suite   = $TEST_SUITE || []
-          runner  = new(suite, :format=>format, :tags=>tags, :match=>match)
+        if Process.respond_to?(:fork)
+          fork {
+            runner  = Test::Runner.new(config)
+            success = runner.run
+            exit -1 unless success
+          }
+          Process.wait
+        else
+          runner  = Test::Runner.new(config)
           success = runner.run
-
           exit -1 unless success
-        }
-        Process.wait
+        end
+      end
+
+      # Run test via command line shell.
+      #
+      # @return nothing
+      def shell_run
+        success = ruby(*config.to_shellwords)
+        exit -1 unless success
       end
 
       # Resolve test globs.
       #
-      # TODO: Can this code be simplifed?
+      # @todo Implementation probably cna be simplified.
+      # @return [Array<String>] List of test files.
       def test_files
         files = tests
         files = files.map{ |f| Dir[f] }.flatten
@@ -102,19 +95,40 @@ def test_files
         files
       end
 
+      # Default test globs. For extra convenience will look for list in
+      # `ENV['TEST']` first.
       #
+      # @return [Array<String>]
       def default_tests
-        if ENV['tests']
-          ENV['tests'].split(/[:;]/)
+        if ENV['TEST']
+          ENV['TEST'].split(/[:;]/)
         else
           DEFAULT_TESTS
         end
       end
 
+=begin
+      # Shell out to current ruby command.
       #
-      #def ruby_command
-      #  File.join(RbConfig::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
-      #end
+      # @return [Boolean] Success of shell call.
+      def ruby(*argv)
+        system(ruby_command, *argv)
+      end
+
+      # Get current ruby shell command.
+      #
+      # @return [String] Ruby shell command.
+      def ruby_command
+        @ruby_command ||= (
+          require 'rbconfig'
+          ENV['RUBY'] ||
+            File.join(
+              RbConfig::CONFIG['bindir'],
+              RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']
+            ).sub(/.*\s.*/m, '"\&"')
+        )
+      end
+=end
 
     end
 
