Rename -p/--profile to -c/--config.

Author: trans

lib/rubytest/cli.rb

@@ -2,6 +2,8 @@ module Test
 
   # Command line interface to test runner.
   #
+  # TODO: Use `cli` based library instead of option parse.
+  #
   class CLI
 
     #
@@ -51,6 +53,14 @@ def run(argv=nil)
       #end
     end
 
+    # These options are parsed prior to any other options.
+    #
+    # TODO: Certain opitons should be parsed before others.
+    #       Some aren't even useful if not, use as -R.
+    def preoptions
+
+    end
+
     #
     # Setup OptionsParser instance.
     #
@@ -61,9 +71,6 @@ def options
         opt.banner = "Usage: #{File.basename($0)} [options] [files ...]"
 
         #opt.separator "PRESET OPTIONS:"
-        #opt.on '-c', '--config FILE', "require local config file" do |file|
-        #  require_config(file)
-        #end
         #pnames = profile_names
         #unless pnames.empty?
         #  pnames.each do |pname|
@@ -92,19 +99,25 @@ def options
           config.match << text 
         end
 
-        opt.on '-a', '--autopath', 'automatically add paths to $LOAD_PATH' do |paths|
+        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|
           paths.split(/[:;]/).reverse_each do |path|
             $LOAD_PATH.unshift path
           end
         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 (immediately)' do |file|
           require file
         end
-        opt.on '-p', '--profile FILE', "require local profile" do |file|
-          Config.require_profile(file)
+        opt.on '-c', '--config FILE', "require local config file" do |file|
+          Config.require_config(file)
         end
         opt.on '-d' , '--details', 'provide extra detail in reports' do
           config.verbose = true

lib/rubytest/config.rb

@@ -84,7 +84,10 @@ def self.dotindex
     end
 
     #
-    def self.require_profile(file)
+    # TODO: Should config files be require relative to project root
+    #       or relatvie to current working directory?
+    #
+    def self.require_config(file)
       #if File.exist?(file)
       #  require file
       #else
@@ -95,10 +98,11 @@ def self.require_profile(file)
       #end
     end
 
-    # Setup $LOAD_PATH based on .index file.
+    # Setup $LOAD_PATH based on project's `.index` file, if an
+    # index file is not found, then default to `lib/` if it exists.
     #
     def self.load_path_setup
-      if load_paths = (dotindex['paths'] || {})['load']
+      if load_paths = (dotindex['paths'] || {})['lib']
         load_paths.each do |path|
           $LOAD_PATH.unshift(File.join(root, path))
         end
@@ -185,6 +189,20 @@ def autopath=(boolean)
       @autopath = !!boolean
     end
 
+    #
+    #attr :chroot
+
+    #def chroot=(boolean)
+    #  @chroot = !!boolean
+    #end
+
+    #
+    #attr :chdir
+
+    #def chdir=(dir)
+    #  @chroot = dir.to_s
+    #end
+
   end
 
 end