Minor Refactoring

- Added support for more type-specific checks of attribute values.
- Added support for more type-specific attribute rendering.
- Improved generalized methods for checking columns in a report.
- Added unit tests.
- Minor code cleanup.
- Added secret hidden feature for internal testing.

src/Directory.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <unistd.h>

src/Duration.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>
@@ -401,6 +400,13 @@ void Duration::parse (const std::string& input)
   else
     _negative = false;
 
+  // If no units are provided, assume seconds.
+  if (n.depleted ())
+  {
+    _secs = (long) value;
+    return;
+  }
+
   std::string units;
   n.getUntilEOS (units);
 

src/E9.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <iostream>

src/Hooks.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <iostream>

src/Path.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <fstream>

src/RX.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <stdlib.h>

src/Taskmod.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/Timer.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <iostream>

src/Transport.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <iostream>

src/TransportCurl.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <TransportCurl.h>

src/TransportRSYNC.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <text.h>

src/TransportSSH.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <text.h>

src/Uri.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/ViewText.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <ViewText.h>

src/columns/CMakeLists.txt

@@ -27,6 +27,7 @@ set (columns_SRCS Column.cpp Column.h
                   ColTags.cpp ColTags.h
                   ColUntil.cpp ColUntil.h
                   ColUrgency.cpp ColUrgency.h
+                  ColUDA.cpp ColUDA.h
                   ColUUID.cpp ColUUID.h
                   ColWait.cpp ColWait.h)
 

src/columns/ColBg.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/columns/ColDate.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <stdlib.h>

src/columns/ColDepends.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <algorithm>

src/columns/ColDescription.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <stdlib.h>

src/columns/ColDue.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <stdlib.h>

src/columns/ColEnd.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <ColEnd.h>

src/columns/ColEntry.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <ColEntry.h>

src/columns/ColFg.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/columns/ColID.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <math.h>

src/columns/ColIMask.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <math.h>

src/columns/ColMask.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <math.h>

src/columns/ColParent.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <math.h>

src/columns/ColPriority.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/columns/ColProject.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/columns/ColRecur.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/columns/ColStart.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/columns/ColStatus.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/columns/ColString.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/columns/ColTags.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <algorithm>

src/columns/ColUDA.cpp

@@ -0,0 +1,155 @@
+////////////////////////////////////////////////////////////////////////////////
+// taskwarrior - a command line task list manager.
+//
+// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#define L10N                                           // Localization complete.
+
+#include <Context.h>
+#include <Duration.h>
+#include <Date.h>
+#include <ColUDA.h>
+#include <text.h>
+#include <i18n.h>
+
+extern Context context;
+
+////////////////////////////////////////////////////////////////////////////////
+ColumnUDA::ColumnUDA ()
+{
+  _name  = "<uda>";
+  _type  = "string";
+  _style = "default";
+  _label = "";
+
+  _hyphenate = (_type == "string") ? true : false;
+
+  _styles.push_back (_style);
+
+  // TODO _examples.push_back ("?");
+}
+
+////////////////////////////////////////////////////////////////////////////////
+ColumnUDA::~ColumnUDA ()
+{
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Set the minimum and maximum widths for the value.
+//
+void ColumnUDA::measure (Task& task, int& minimum, int& maximum)
+{
+  if (_style == "default")
+  {
+    std::string value = task.get (_name);
+
+    if (_type == "date")
+    {
+      // Determine the output date format, which uses a hierarchy of definitions.
+      //   rc.report.<report>.dateformat
+      //   rc.dateformat.report
+      //   rc.dateformat.
+      Date date ((time_t) strtol (value.c_str (), NULL, 10));
+      std::string format = context.config.get ("report." + _report + ".dateformat");
+      if (format == "")
+        format = context.config.get ("dateformat.report");
+      if (format == "")
+        format = context.config.get ("dateformat");
+
+      minimum = maximum = date.toString (format).length ();
+    }
+    else if (_type == "duration")
+    {
+      minimum = maximum = Duration (value).formatCompact ().length ();
+    }
+    else if (_type == "string")
+    {
+      std::string stripped = Color::strip (value);
+      maximum = longestLine (stripped);
+      minimum = longestWord (stripped);
+    }
+    else if (_type == "numeric")
+    {
+      minimum = maximum = value.length ();
+    }
+  }
+  else
+    throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ColumnUDA::render (
+  std::vector <std::string>& lines,
+  Task& task,
+  int width,
+  Color& color)
+{
+  if (_style == "default")
+  {
+    std::string value = task.get (_name);
+
+    if (_type == "date")
+    {
+      // Determine the output date format, which uses a hierarchy of definitions.
+      //   rc.report.<report>.dateformat
+      //   rc.dateformat.report
+      //   rc.dateformat.
+      std::string format = context.config.get ("report." + _report + ".dateformat");
+      if (format == "")
+        format = context.config.get ("dateformat.report");
+      if (format == "")
+        format = context.config.get ("dateformat");
+
+      lines.push_back (
+        color.colorize (
+          leftJustify (
+            Date ((time_t) strtol (value.c_str (), NULL, 10))
+              .toString (format), width)));
+    }
+    else if (_type == "duration")
+    {
+      lines.push_back (
+        color.colorize (
+          rightJustify (
+            Duration (value).formatCompact (),
+            width)));
+    }
+    else if (_type == "string")
+    {
+      std::vector <std::string> raw;
+      wrapText (raw, value, width, _hyphenate);
+
+      std::vector <std::string>::iterator i;
+      for (i = raw.begin (); i != raw.end (); ++i)
+        lines.push_back (color.colorize (leftJustify (*i, width)));
+    }
+    else if (_type == "numeric")
+    {
+      lines.push_back (color.colorize (rightJustify (value, width)));
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////

src/columns/ColUDA.h

@@ -0,0 +1,52 @@
+////////////////////////////////////////////////////////////////////////////////
+// taskwarrior - a command line task list manager.
+//
+// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDED_COLUDA
+#define INCLUDED_COLUDA
+#define L10N                                           // Localization complete.
+
+#include <vector>
+#include <string>
+#include <Column.h>
+#include <Color.h>
+#include <Task.h>
+
+class ColumnUDA : public Column
+{
+public:
+  ColumnUDA ();
+  ~ColumnUDA ();
+
+  void measure (Task&, int&, int&);
+  void render (std::vector <std::string>&, Task&, int, Color&);
+
+private:
+  bool _hyphenate;
+};
+
+#endif
+////////////////////////////////////////////////////////////////////////////////

src/columns/ColUUID.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <math.h>

src/columns/ColUntil.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <ColUntil.h>

src/columns/ColUrgency.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/columns/ColWait.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <ColWait.h>

src/columns/Column.cpp

@@ -50,6 +50,7 @@
 #include <ColUntil.h>
 #include <ColUrgency.h>
 #include <ColUUID.h>
+#include <ColUDA.h>
 #include <ColWait.h>
 #include <text.h>
 #include <i18n.h>
@@ -103,6 +104,11 @@ Column* Column::factory (const std::string& name, const std::string& report)
 
   // Special non-task column.
   else if (column_name == "string")      c = new ColumnString ();
+
+  // UDA.
+  else if (context.config.get ("uda." + column_name + ".type") != "")
+    c = Column::uda (column_name);
+
   else
     throw format (STRING_COLUMN_BAD_NAME, column_name);
 
@@ -138,6 +144,55 @@ void Column::factory (std::map <std::string, Column*>& all)
   c = new ColumnUrgency ();        all[c->_name] = c;
   c = new ColumnUUID ();           all[c->_name] = c;
   c = new ColumnWait ();           all[c->_name] = c;
+
+  Column::uda (all);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void Column::uda (std::map <std::string, Column*>& all)
+{
+  // For each UDA, instantiate and initialize ColumnUDA().
+  std::map <std::string, int> udas;
+  std::vector <std::string> names;
+  context.config.all (names);
+
+  std::vector <std::string>::iterator i;
+  for (i = names.begin (); i != names.end (); ++i)
+  {
+    if (i->substr (0, 4) == "uda.")
+    {
+      std::string::size_type period = 4;
+      if ((period = i->find ('.', period)) != std::string::npos)
+        udas[i->substr (4, period - 4)] = 0;
+    }
+  }
+
+  std::map <std::string, int>::iterator uda;
+  for (uda = udas.begin (); uda != udas.end (); ++uda)
+  {
+    Column* c = Column::uda (uda->first);
+    all[c->_name] = c;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+Column* Column::uda (const std::string& name)
+{
+  Column* c = new ColumnUDA ();
+  c->_name = name;
+
+  std::string key = "uda." + name + ".type";
+  c->_type = context.config.get (key);
+  if (c->_type != "string"   &&
+      c->_type != "date"     &&
+      c->_type != "duration" &&
+      c->_type != "numeric")
+    throw std::string (STRING_UDA_TYPE);
+
+  key = "uda." + name + ".label";
+  if (context.config.get (key) != "")
+    c->_label = context.config.get (key);
+  return c;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

src/columns/Column.h

@@ -39,6 +39,8 @@ class Column
 public:
   static Column* factory (const std::string&, const std::string&);
   static void factory (std::map <std::string, Column*>&);
+  static void uda (std::map <std::string, Column*>&);
+  static Column* uda (const std::string&);
 
   Column ();
   Column (const Column&);

src/commands/CmdBurndown.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdCalendar.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdColor.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdColumns.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <algorithm>

src/commands/CmdCommands.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdConfig.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdCount.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/commands/CmdCustom.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdDiagnostics.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <iomanip>

src/commands/CmdExec.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <stdlib.h>

src/commands/CmdExport.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/commands/CmdHelp.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <algorithm>

src/commands/CmdHistory.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdImport.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <iostream>

src/commands/CmdInfo.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>
@@ -308,6 +307,23 @@ int CmdInfo::execute (std::string& output)
     view.set (row, 0, STRING_COLUMN_LABEL_URGENCY);
     view.set (row, 1, trimLeft (format (task->urgency (), 4, 4)));
 
+    // Show any UDAs
+    std::vector <std::string> all = task->all ();
+    std::vector <std::string>::iterator att;
+    for (att = all.begin (); att != all.end (); ++att)
+    {
+      if (context.config.get ("uda." + *att + ".type") != "")
+      {
+        Column* col = context.columns[*att];
+        if (col)
+        {
+          row = view.addRow ();
+          view.set (row, 0, col->label ());
+          view.set (row, 1, task->get (*att));
+        }
+      }
+    }
+
     // Create a second table, containing undo log change details.
     ViewText journal;
 

src/commands/CmdInstall.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <CmdInstall.h>

src/commands/CmdLog.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/commands/CmdLogo.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <CmdLogo.h>

src/commands/CmdMerge.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <fstream>

src/commands/CmdProjects.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdPull.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <fstream>

src/commands/CmdPush.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <fstream>

src/commands/CmdReports.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdShell.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <iostream>

src/commands/CmdShow.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <vector>
@@ -232,6 +231,7 @@ int CmdShow::execute (std::string& output)
           i->substr (0,  5) != "push."                 &&
           i->substr (0,  5) != "pull."                 &&
           i->substr (0,  6) != "merge."                &&
+          i->substr (0,  4) != "uda."                  &&
           i->substr (0, 21) != "urgency.user.project." &&
           i->substr (0, 17) != "urgency.user.tag.")
       {

src/commands/CmdSummary.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdTags.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdTimesheet.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdUndo.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <Context.h>

src/commands/CmdUrgency.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/CmdVersion.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/commands/Command.cpp

@@ -30,6 +30,8 @@
 #include <iostream>
 #include <vector>
 #include <stdlib.h>
+#include <Date.h>
+#include <Duration.h>
 #include <E9.h>
 #include <text.h>
 #include <util.h>
@@ -487,15 +489,56 @@ void Command::modify_task (
 
             // If the date value is less than 5 years, it is a duration, not a
             // date, therefore add 'now'.
-            long l = strtol (result.c_str (), NULL, 10);
+            long l = (long) strtod (result.c_str (), NULL);
             if (labs (l) < 5 * 365 * 86400)
             {
+              Duration dur (result);
               Date now;
               now += l;
+              //now += dur;
               task.set (name, now.toEpochString ());
             }
             else
+            {
+              Date d (result, context.config.get ("dateformat"));
+              task.set (name, d.toEpochString ());
+            }
+          }
+
+          // Durations too.
+          else if (column->type () == "duration")
+          {
+            // All values must be eval'd first.
+            A3 value_tokens;
+            value_tokens.capture (value);
+            value_tokens = value_tokens.postfix (value_tokens.tokenize (value_tokens));
+
+            E9 e (value_tokens);
+            std::string result = e.evalExpression (task);
+            context.debug (std::string ("Eval '") + value + "' --> '" + result + "'");
+
+            Duration d (result);
+            task.set (name, result);
+          }
+
+          // Need handling for numeric types, used by UDAs.
+          else if (column->type () == "numeric")
+          {
+            A3 value_tokens;
+            value_tokens.capture (value);
+            value_tokens = value_tokens.postfix (value_tokens.tokenize (value_tokens));
+
+            E9 e (value_tokens);
+            std::string result = e.evalExpression (task);
+            context.debug (std::string ("Eval '") + value + "' --> '" + result + "'");
+
+            Nibbler n (result);
+            double d;
+            if (n.getNumber (d) &&
+                n.depleted ())
               task.set (name, result);
+            else
+              throw format (STRING_UDA_NUMERIC, result);
           }
 
           // By default, just add/remove it.

src/en-US.h

@@ -574,7 +574,7 @@
 #define STRING_DOM_CANNOT_SET        "DOM: Cannot set '{1}'."
 
 // Duration
-#define STRING_DURATION_UNRECOGNIZED "The duration '{1}' was not recognized."
+#define STRING_DURATION_UNRECOGNIZED "The date/duration '{1}' was not recognized."
 
 // E9
 #define STRING_E9_UNSUPPORTED        "Unsupported operator '{1}'."
@@ -657,6 +657,8 @@
 #define STRING_TRIVIAL_INPUT         "You must specify a command or a task to modify."
 #define STRING_ASSUME_INFO           "No command specified - assuming 'information'."
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
+#define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
+#define STRING_UDA_NUMERIC           "The value '{1}' is not a valid numeric value."
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."

src/interactive.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/legacy.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <sstream>

src/recur.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <iostream>

src/rules.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <iostream>

src/sort.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <algorithm>

src/utf8.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #define L10N                                           // Localization complete.
 
 #include <string>

test/duration.t.cpp

@@ -49,7 +49,7 @@ int convertDuration (const std::string& input)
 
 int main (int argc, char** argv)
 {
-  UnitTest t (643);
+  UnitTest t (644);
 
   Duration d;
 
@@ -791,6 +791,10 @@ int main (int argc, char** argv)
     left -= right;
     t.is ((int)(time_t)left,   1, "3 -= 2, 3 is now 1");
     t.is ((int)(time_t)right,  2, "3 -= 2, 2 is still 2");
+
+    // Assorted regression tests.
+    left = Duration ("-864000.00000");
+    t.is ((int)(time_t)left, 864000, "-864000.00000 -> 864000");
   }
 
   catch (const std::string& e) { t.diag (e); }

test/nibbler.t.cpp

@@ -39,15 +39,15 @@ int main (int argc, char** argv)
 {
 #ifdef NIBBLER_FEATURE_DATE
 #ifdef NIBBLER_FEATURE_REGEX
-  UnitTest t (296);
+  UnitTest t (299);
 #else
-  UnitTest t (272);
+  UnitTest t (275);
 #endif
 #else
 #ifdef NIBBLER_FEATURE_REGEX
-  UnitTest t (246);
+  UnitTest t (249);
 #else
-  UnitTest t (222);
+  UnitTest t (225);
 #endif
 #endif
 
@@ -303,6 +303,11 @@ int main (int argc, char** argv)
     t.is    (d, 2.0, 0.000001,        "'2.0' : getNumber ()                -> '2.0'");
     t.ok    (n.depleted (),           "            '' : depleted ()        -> true");
 
+    n = Nibbler ("-864000.00000");
+    t.ok    (n.getNumber (d),         "'-864000.00000' : getNumber ()      -> true");
+    t.is    (d, -864000.0,            "'-864000.00000' : getNumber ()      -> -864000.0");
+    t.ok    (n.depleted (),           "             '' : depleted ()       -> true");
+
     // bool getLiteral (const std::string&);
     t.diag ("Nibbler::getLiteral");
     n = Nibbler ("foobar");