Add -C and -R chdir options.

Author: trans

.option

@@ -6,6 +6,6 @@ rubytest
 
 [coverage]
 rubytest
-  -p task/simplecov.rb
+  -c task/simplecov.rb
   test/*_case.rb
 

HISTORY.md

@@ -9,11 +9,11 @@ work. But the whole thing simply got more complicated than it needed to
 be and it was decided that conventional simplicity, with the option 
 unconventional complexity, was the best approach.
 
-So, to make a long story short. There is no default config file anymore.
+To make a long story short... There is no default config file anymore.
 The `-p/--profile` command line option has been removed; replaced by
-a `-c/--config` option which simply requires a file relative to the current
-project. In addition the configuration API had been changed from `Test.run`
-or `Test.configure`, to adopt the common convention. And it no longer takes
+a `-c/--config` option which requires a file relative to the working
+directory. In addition the configuration API had been changed from `Test.run`
+or `Test.configure`, to adopt the common convention, and it no longer takes
 a profile name for an argument. `Test.run` still has the same interface as
 `Test.configure` but it will now run tests immediately! So be sure to change
 that if you used it the past. Lastly, Ruby Test now supports DotOpts out of
@@ -24,6 +24,7 @@ Changes:
 * Rename `Test.run` to `Test.configure` and remove profile argument.
 * Add new `Test.run` to immediately run tests.
 * Add `-c/--config` option for requiring project file.
+* Add `-C` and `-R` options for changing directory.
 * Add built-in support for DotOpts.
 * Deprecate profiles, removing `-p/--profile` cli option.
 * Deprecate Test::Runner configuration class methods.

MANIFEST.txt

@@ -31,6 +31,7 @@ lib/rubytest/reporters/tapy.rb
 lib/rubytest/reporters/test.rb
 lib/rubytest/runner.rb
 lib/rubytest.rb
+lib/rubytest.yml
 lib/test.rb
 test/basic_case.rb
 test/helper.rb

README.md

@@ -32,7 +32,6 @@ reports.
 Ruby Test handles assertions with [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
 need to be written. The `NotImplementedError` is a standard Ruby exception
@@ -82,13 +81,23 @@ entry might be:
       -r rspecial
       spec/spec_*.rb
 
-There is also a Rake task. In your Rakefile,
+If you are using a build tool to run your tests, such as Rake or Fire, it is
+best to shell out to `rubytest`. This keeps your test environent as prestine
+as possible.
+
+    desc "run tests"
+    task :test
+      sh "rubytest"
+    end
+
+RubyTest comes with a Rake task plugin, but its use is all but deprecated
+because it's basically just a glorified rendition of the above.
 
     require 'rubytest/rake'
 
-    Test::Rake::TestTask.new do |run|
-      require 'lemon'
-      run.files << 'test/test_*.rb'
+    Test::Rake::TestTask.new :test do |run|
+      run.requires << 'lemon'
+      run.files = 'test/test_*.rb'
     end
 
 See the Wiki for more information on the different ways to run tests.

lib/rubytest.rb

@@ -6,6 +6,23 @@
 #require 'brass'  # TODO: Should we require BRASS ?
 require 'ansi/core'
 
+module Test
+  # Load project index on demand.
+  def self.index
+    @index ||= (
+      require 'yaml'
+      __dir__  = File.dirname(__FILE__)
+      file = File.expand_path('rubytest.yml', __dir__)
+      YAML.load_file(file)
+    )
+  end
+
+  # Lookup missing constant in project index.
+  def self.const_missing(name)
+    index[name.to_s.downcase] || super(name)
+  end
+end
+
 if RUBY_VERSION < '1.9'
   require 'rubytest/core_ext'
   require 'rubytest/code_snippet'

lib/rubytest.yml

@@ -0,0 +1 @@
+../.index

lib/rubytest/cli.rb

@@ -18,13 +18,15 @@ def self.run(*argv)
     # @return nothing
     def initialize
       require 'optparse'
+
+      @config = Test.configuration(true)
     end
 
     # Test run configuration.
     #
     # @return [Config]
     def config
-      @config ||= Test.configuration
+      @config
     end
 
     # Run tests.
@@ -55,6 +57,10 @@ def run(argv=nil)
       end
     end
 
+    def preparse_options(argv)
+
+    end
+
     # Setup OptionsParser instance.
     #
     # @return [OptionParser]
@@ -84,52 +90,58 @@ def options
         end
 
         opt.on '-t', '--tag TAG', 'select tests by tag' do |tag|
-          config.tags.concat enlist(tag)
+          config.tags.concat makelist(tag)
         end
         opt.on '-u', '--unit TAG', 'select tests by software unit' do |unit|
-          config.units.concat enlist(unit)
+          config.units.concat makelist(unit)
         end
         opt.on '-m', '--match TEXT', 'select tests by description' do |text|
-          config.match.concat enlist(text)
+          config.match.concat makelist(text)
         end
 
         opt.on '-A', '--autopath', 'automatically add paths to $LOAD_PATH' do |paths|
           config.autopath = true
         end
         opt.on '-I', '--loadpath PATH', 'add given path to $LOAD_PATH' do |paths|
-          #enlist(paths).reverse_each do |path|
+          #makelist(paths).reverse_each do |path|
           #  $LOAD_PATH.unshift path
           #end
-          config.loadpath.concat enlist(paths)
+          config.loadpath.concat makelist(paths)
+        end
+        opt.on '-C', '--chdir DIR', 'change directory before running tests' do |dir|
+          config.chdir = dir
+        end
+        opt.on '-R', '--chroot', 'change to project root directory before running tests' do
+          config.chdir = Config.root
         end
-        #opt.on '-C', '--chdir DIR', 'change directory before running tests' do |dir|
-        #  config.chdir = dir
-        #end
-        #opt.on '-R', '--chroot', 'change to project root directory before running tests' do |bool|
-        #  config.chroot = bool
-        #end
         opt.on '-r', '--require FILE', 'require file' do |file|
           #require file
-          config.requires.concat pathlist(file)
+          config.requires.concat makelist(file)
         end
         opt.on '-c', '--config FILE', "require local config file (immediately)" do |file|
-          Config.require_config(file)
+          config.load_config(file)
         end
         opt.on '-V' , '--verbose', 'provide extra detail in reports' do
           config.verbose = true
         end
-        #opt.on('--log DIRECTORY', 'log directory'){ |dir|
-        #  options[:log] = dir
+        #opt.on('--log PATH', 'log test output to path'){ |path|
+        #  config.log = path
         #}
         opt.on("--[no-]ansi" , 'turn on/off ANSI colors'){ |v| $ansi = v }
         opt.on("--debug" , 'turn on debugging mode'){ $DEBUG = true }
 
         #opt.separator "COMMAND OPTIONS:"
-        #opt.on("--about" , 'display information about rubytest'){
-        #  puts "Ruby Test v#{VERSION}"
-        #  puts "#{COPYRIGHT}"
-        #  exit
-        #}
+        opt.on('--about' , 'display information about rubytest') do
+          puts "Ruby Test v%s" % [Test.index['version']]
+          Test.index['copyrights'].each do |c|
+            puts "(c) %s %s (%s)" % c.values_at('year', 'holder', 'license')
+          end
+          exit
+        end
+        opt.on('--version' , 'display rubytest version') do
+          puts Test::VERSION
+          exit
+        end
         opt.on('-h', '--help', 'display this help message'){
           puts opt
           exit
@@ -142,7 +154,7 @@ def options
     # all strings and not empty.
     #
     # @return [Array<String>]
-    def enlist(list)
+    def makelist(list)
       case list
       when String
         list = list.split(/[:;]/)