Use create(Rules|Extensions) for symmetry with createDatabase

This eliminates the 'initialize' member function in the Extension class.
The constructor should handle what is needed to initialize the class.

Signed-off-by: Shaun Ruffell <[email protected]>

Author: sruffell

Diff for: src/Extensions.cpp

@@ -36,7 +36,7 @@
 #include <algorithm>
 
 ////////////////////////////////////////////////////////////////////////////////
-void Extensions::initialize (const std::string& location)
+Extensions::Extensions (const std::string& location)
 {
   // Scan extension directory.
   Directory d (location);
@@ -47,7 +47,9 @@ void Extensions::initialize (const std::string& location)
     std::sort (_scripts.begin (), _scripts.end ());
   }
   else
+  {
     throw std::string ("Extension directory not readable: ") + d._data;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -57,7 +59,7 @@ void Extensions::debug ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::vector <std::string> Extensions::all () const
+const std::vector <std::string>& Extensions::all () const
 {
   return _scripts;
 }

Diff for: src/Extensions.h

@@ -33,10 +33,15 @@
 class Extensions
 {
 public:
-  Extensions () = default;
-  void initialize (const std::string&);
+  Extensions () = delete;
+  Extensions (const std::string&);
+  Extensions (const Extensions&) = delete;
+  Extensions (Extensions&&) = default;
+  Extensions& operator= (const Extensions&) = delete;
+  Extensions& operator= (Extensions&&) = default;
+
   void debug ();
-  std::vector <std::string> all () const;
+  const std::vector <std::string>& all () const;
   int callExtension (const std::string&, const std::vector <std::string>&, std::vector <std::string>&) const;
   std::string dump () const;
 

Diff for: src/Rules.h

@@ -38,6 +38,11 @@ class Rules
 {
 public:
   Rules ();
+  Rules (const Rules&) = delete;
+  Rules (Rules&&) = default;
+  Rules& operator= (const Rules&) = delete;
+  Rules& operator= (Rules&&) = default;
+
   void load (const std::string&, int next = 1);
   std::string file () const;
 

Diff for: src/init.cpp

@@ -120,8 +120,9 @@ void initializeEntities (CLI& cli)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void initializeRules (const CLI& cli, Rules& rules)
+Rules createRules (const CLI& cli)
 {
+  Rules rules;
   // Rose tint my world, make me safe from my trouble and pain.
   rules.set ("color", isatty (STDOUT_FILENO) ? "on" : "off");
 
@@ -210,6 +211,8 @@ void initializeRules (const CLI& cli, Rules& rules)
       debug (format ("Configuration override {1} = {2}", arg.attribute ("name"), arg.attribute ("value")));
     }
   }
+
+  return rules;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -229,23 +232,27 @@ Database createDatabase (Rules& rules)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void initializeExtensions (
-  CLI& cli,
-  const Rules& rules,
-  Extensions& extensions)
+Extensions createExtensions (CLI& cli, const Rules& rules)
 {
+
   Directory extDir (rules.get ("temp.db"));
   extDir += "extensions";
 
-  extensions.initialize (extDir._data);
+  Extensions extensions {extDir._data};
 
   // Add extensions as CLI entities.
-  for (auto& ext : extensions.all ())
+  for (const auto& ext : extensions.all ())
+  {
     cli.entity ("extension", File (ext).name ());
+  }
 
   // Extensions have a debug mode.
   if (rules.getBoolean ("debug"))
+  {
     extensions.debug ();
+  }
+
+  return extensions;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Diff for: src/timew.cpp

@@ -81,14 +81,11 @@ int main (int argc, const char** argv)
     cli.analyze ();
 
     // Prepare the database, but do not read data.
-    Rules rules;
-    initializeRules (cli, rules);
+    Rules rules = createRules (cli);
     Database database = createDatabase (rules);
+    Extensions extensions = createExtensions (cli, rules);
 
-    // Load extension script info.
     // Re-analyze command because of the new extension entities.
-    Extensions extensions;
-    initializeExtensions (cli, rules, extensions);
     cli.analyze ();
 
     // Dispatch to commands.

Diff for: src/timew.h

@@ -64,9 +64,9 @@ void validate (const CLI& cli, const Rules& rules, Database&, Interval&);
 // init.cpp
 bool lightweightVersionCheck (int, const char**);
 void initializeEntities (CLI&);
-void initializeRules (const CLI&, Rules&);
+Rules createRules (const CLI&);
 Database createDatabase (Rules&);
-void initializeExtensions (CLI&, const Rules&, Extensions&);
+Extensions createExtensions (CLI&, const Rules&);
 int dispatchCommand (const CLI&, Database&, Rules&, const Extensions&);
 
 // helper.cpp