From 7434ad59c2d1c7b122ee21c067677588c0342813 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 17 Mar 2016 18:02:58 -0400
Subject: [PATCH] Timew: Added rules object to assorted calls

---
 src/init.cpp  | 19 +++++++++++--------
 src/timew.cpp |  2 +-
 src/timew.h   |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 6174c20a..eac6386e 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -65,13 +65,13 @@ void initializeData (
   char* override = getenv ("TIMEWARRIORDB");
   if (override)
   {
-    std::cout << "# TIMEWARRIORDB " << override << "\n";
+    log.write ("info", std::string ("TIMEWARRIORDB ") + override);
     dbLocation = Directory (override);
   }
   else
   {
     dbLocation = Directory ("~/.timewarrior");
-    std::cout << "# Using default DB location " << dbLocation._data << "\n";
+    log.write ("info", std::string ("Using default DB location ") + dbLocation._data);
   }
 
   // If dbLocation does not exist, ask whether it should be created.
@@ -80,7 +80,7 @@ void initializeData (
       confirm ("Create new database in " + dbLocation._data + "?"))
   {
     dbLocation.create (0700);
-    std::cout << "# Created missing database in " << dbLocation._data << "\n";
+    log.write ("info", std::string ("Created missing database in ") + dbLocation._data);
     shinyNewDatabase = true;
   }
 
@@ -115,7 +115,7 @@ void initializeData (
   // located the config file, the 'db' location is already known. This is just
   // for subsequent internal use.
   configuration.set ("db", dbLocation._data);
-  std::cout << "#   rc.db=" << configuration.get ("db") << "\n";
+  log.write ("info", std::string ("  rc.db=") + configuration.get ("db"));
 
   // Perhaps some subsequent code would like to know this is a new db and
   // possibly a first run.
@@ -127,11 +127,11 @@ void initializeData (
   // TODO Give the log file a temp fake name.  To be removed.
   log.file (dbLocation._data + "/timewarrior.log");
 
-  std::cout << "# Configuration\n";
+  log.write ("info", "Configuration");
   for (const auto& name : configuration.all ())
-    std::cout << "#   " << name << "=" << configuration[name] << "\n";
+    log.write ("info", std::string ("  ") + name + "=" + configuration[name]);
 
-  std::cout << database.dump ();
+  log.write ("info", database.dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -154,12 +154,15 @@ void initializeRules (
   ruleParser.initialize (ruleGrammar);
 */
 
-  std::cout << "# " << rules.dump ();
+  rules.load (configuration.get ("db") + "/timewarrior.cfg");
+
+  log.write ("info", rules.dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void initializeExtensions (
   Configuration& configuration,
+  Rules& rules,
   Extensions& extensions,
   Log& log)
 {
diff --git a/src/timew.cpp b/src/timew.cpp
index a87b37d6..7fdef7dd 100644
--- a/src/timew.cpp
+++ b/src/timew.cpp
@@ -90,7 +90,7 @@ int main (int argc, const char** argv)
 
     // Load extension script info.
     Extensions extensions;
-    initializeExtensions (configuration, extensions, log);
+    initializeExtensions (configuration, rules, extensions, log);
 
     // Dispatch to commands.
     status = dispatchCommand (args, configuration, database, rules, extensions, log);
diff --git a/src/timew.h b/src/timew.h
index 038fe4b0..fc68440d 100644
--- a/src/timew.h
+++ b/src/timew.h
@@ -37,7 +37,7 @@
 bool lightweightVersionCheck (const std::vector <std::string>&);
 void initializeData (Configuration&, Database&, Log&);
 void initializeRules (Configuration&, Rules&, Log&);
-void initializeExtensions (Configuration&, Extensions&, Log&);
+void initializeExtensions (Configuration&, Rules&, Extensions&, Log&);
 int dispatchCommand (const std::vector <std::string>&, Configuration&, Database&, Rules&, Extensions&, Log&);
 
 // utiŀ.cpp