Enhancements - Config

- Added processing for context.config overrides, and associated
  argc,argv handling.
- Bug fix in filt.t.cpp, but three tests still fail.  Too big a
  distraction to fix right now.
- Warning: build is not broken, but task is broken.

src/Att.cpp

@@ -103,7 +103,8 @@ bool Att::valid (const std::string& input) const
     if (n.skip (':') &&
         (n.getQuoted ('"', ignored) ||
          n.getUntil  (' ', ignored) ||
-         n.getUntilEOS (ignored)))
+         n.getUntilEOS (ignored)    ||
+         n.depleted ()))
       return true;
 
     return false;

src/Config.cpp

@@ -85,6 +85,8 @@ Config::Config (const std::string& file)
 // not tolerated, but blank lines and comments starting with # are allowed.
 bool Config::load (const std::string& file)
 {
+  this->clear ();
+
   std::ifstream in;
   in.open (file.c_str (), std::ifstream::in);
   if (in.good ())

src/Context.cpp

@@ -145,7 +145,7 @@ void Context::initialize (int argc, char** argv)
 ////////////////////////////////////////////////////////////////////////////////
 int Context::run ()
 {
-  std::cout << "--- start 1.8.0 ---" << std::endl;
+  std::cout << "--- start 1.8.0 ---" << std::endl;
   try
   {
     parse ();
@@ -177,7 +177,7 @@ int Context::run ()
       std::cout << *f << std::endl;
   }
 
-  std::cout << "--- end 1.8.0 ---" << std::endl;
+  std::cout << "--- end 1.8.0 ---" << std::endl;
   return 0;
 }
 
@@ -194,6 +194,9 @@ void Context::loadCorrectConfigFile ()
 
       messages.push_back (std::string ("Using alternate .taskrc file ") + file); // TODO i18n
       config.load (file);
+
+      // No need to handle it again.
+      args.erase (arg);
     }
   }
 
@@ -224,6 +227,9 @@ void Context::loadCorrectConfigFile ()
         messages.push_back (std::string ("Configuration override ") +  // TODO i18n
                            arg->substr (3, std::string::npos));
       }
+
+      // No need to handle it again.
+      args.erase (arg);
     }
   }
 }
@@ -232,19 +238,12 @@ void Context::loadCorrectConfigFile ()
 void Context::parse ()
 {
   command                          = "";
-
+  std::string descCandidate        = "";
   bool terminated                  = false;
   bool foundSequence               = false;
   bool foundSomethingAfterSequence = false;
 
-  std::string descCandidate = "";
-
   foreach (arg, args)
-  {
-    // Skip any argument that starts with "rc:" or "rc." because it has already
-    // been processed.
-    if (arg->substr (0, 3) != "rc:" ||
-        arg->substr (0, 3) != "rc.")
   {
     if (!terminated)
     {
@@ -354,7 +353,6 @@ void Context::parse ()
       descCandidate += *arg;
     }
   }
-  }
 
   if (validDescription (descCandidate))
     task.set ("description", descCandidate);

src/parse.cpp

@@ -440,10 +440,6 @@ void parse (
   {
     std::string arg (args[i]);
 
-    // Ignore any argument that is "rc:...", because that is the command line
-    // specified rc file.
-    if (arg.substr (0, 3) != "rc:")
-    {
     if (!terminated)
     {
       size_t colon;               // Pointer to colon in argument.
@@ -552,7 +548,6 @@ void parse (
       descCandidate += arg;
     }
   }
-  }
 
   if (validDescription (descCandidate))
     task.setDescription (descCandidate);

src/report.cpp

@@ -35,7 +35,7 @@
 #include <pwd.h>
 #include <time.h>
 
-#include "Config.h"
+#include "Context.h"
 #include "Date.h"
 #include "Table.h"
 #include "TDB.h"

src/task.cpp

@@ -36,7 +36,7 @@
 #include <pwd.h>
 #include <time.h>
 
-#include "Config.h"
+#include "Context.h"
 #include "Date.h"
 #include "Duration.h"
 #include "Table.h"
@@ -299,13 +299,15 @@ int main (int argc, char** argv)
   srand (time (NULL));
 #endif
 
+  int status = 0;
+
   try
   {
     context.initialize (argc, argv);
     if (context.args[0].find ("itask") != std::string::npos)
-      /* return */ context.interactive ();
+      status = context.interactive ();
     else
-      /* return */ context.run ();
+      status = context.run ();
 
 // start OBSOLETE
     TDB tdb;
@@ -329,7 +331,7 @@ int main (int argc, char** argv)
                            "overwrite your completed tasks.  Please change it.");
     }
 
-    std::cout << runTaskCommand (argc, argv, tdb);
+    std::cout << runTaskCommand (context.args, tdb);
   }
 
   catch (std::string& error)
@@ -345,7 +347,7 @@ int main (int argc, char** argv)
   }
 // end OBSOLETE
 
-  return 0;
+  return status;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -812,7 +814,12 @@ std::string runTaskCommand (
 {
   std::vector <std::string> args;
   for (int i = 1; i < argc; ++i)
+    if (strncmp (argv[i], "rc:", 3) &&
+        strncmp (argv[i], "rc.", 3))
+{
+std::cout << "arg=" << argv[i] << std::endl;
       args.push_back (argv[i]);
+}
 
   return runTaskCommand (args, tdb, gc, shadow);
 }
@@ -824,12 +831,10 @@ std::string runTaskCommand (
   bool gc /* = false */,
   bool shadow /* = false */)
 {
-  // If argc == 1 and the default.command configuration variable is set,
-  // then use that, otherwise stick with argc/argv.
+  // If argc == 1 and there is a default.command, use it.  Otherwise use
+  // argc/argv.
   std::string defaultCommand = context.config.get ("default.command");
-  if ((args.size () == 0 ||
-      (args.size () == 1 && args[0].substr (0, 3) == "rc:")) &&
-      defaultCommand != "")
+  if (args.size () == 0 || defaultCommand != "")
   {
     // Stuff the command line.
     args.clear ();

src/tests/filt.t.cpp

@@ -57,11 +57,11 @@ int main (int argc, char** argv)
 
   T2 no1;
   no1.set ("name3", "value3");
-  test.notok (f.pass (no0), "no match against mismatch T2");
+  test.notok (f.pass (no1), "no match against mismatch T2");
 
   T2 partial;
   partial.set ("name1", "value1");
-  test.notok (f.pass (no0), "no match against partial T2");
+  test.notok (f.pass (partial), "no match against partial T2");
 
   // Modifiers.
   T2 mods;