Deduplicate code (not compiling yet)

Author: dhilst

include/cloysterhpc/functions.h

@@ -5,8 +5,6 @@
 #include <cloysterhpc/models/cluster.h>
 #include <cloysterhpc/services/log.h>
 #include <cloysterhpc/patterns/singleton.h>
-#include <boost/process/child.hpp>
-#include <boost/process/pipe.hpp>
 #include <cloysterhpc/services/repos.h>
 #include <filesystem>
 #include <list>
@@ -31,73 +29,8 @@ constexpr std::unique_ptr<B> makeUniqueDerived(Args... args)
 using cloyster::services::IRunner;
 using cloyster::models::OS;
 
-/**
- * A command proxy, to us to be able to get the
- * command output while the command is running
- *
- * We will use this in the progress dialog
- */
-/**
- * @struct CommandProxy
- * @brief A command proxy to capture the command output while the command is
- * running.
- *
- * This structure is used to capture the output of a command in real-time,
- * useful for displaying progress in a dialog.
- */
-struct CommandProxy {
-    bool valid = false;
-    boost::process::child child;
-    boost::process::ipstream pipe_stream;
-
-    /**
-     * @brief Gets a line of output from the command.
-     *
-     * @return An optional string containing a line of output if available,
-     * otherwise std::nullopt.
-     */
-    std::optional<std::string> getline();
-
-    std::optional<std::string> getUntil(char c);
-};
-
-enum class Stream { Stdout, Stderr };
-
 /* shell execution */
 
-/**
- * @brief Executes a command and captures its output.
- *
- * @param command The command to execute.
- * @param output A list to store the output lines of the command.
- * @param overrideDryRun A flag to override the dryRun setting.
- * @return The exit code of the command.
- */
-int runCommand(const std::string& command, std::list<std::string>& output,
-    bool overrideDryRun = false);
-
-/**
- * @brief Executes a command.
- *
- * @param command The command to execute.
- * @param overrideDryRun A flag to override the dryRun setting.
- * @return The exit code of the command.
- */
-int runCommand(const std::string& command, bool overrideDryRun = false);
-
-/**
- * @brief Executes a command and provides a proxy to capture its output
- * iteratively.
- *
- * @param command The command to execute.
- * @param overrideDryRun A flag to override the dryRun setting.
- * @return A CommandProxy to capture the command's output.
- */
-CommandProxy runCommandIter(const std::string& command,
-    Stream out = Stream::Stdout, bool overrideDryRun = false);
-
-/* environment variables helper functions */
-
 /**
  * @brief Retrieves the value of an environment variable.
  *

include/cloysterhpc/models/answerfile.h

@@ -8,9 +8,9 @@
 
 #include <boost/asio.hpp>
 #include <cloysterhpc/inifile.h>
+#include <cloysterhpc/utils/enums.h>
 #include <cloysterhpc/mailsystem/postfix.h>
 #include <cloysterhpc/models/os.h>
-#include <cloysterhpc/tools/ITool.h>
 #include <cloysterhpc/ofed.h>
 #include <optional>
 #include <vector>
@@ -135,8 +135,6 @@ class AnswerFile {
         std::vector<AFNode> nodes;
     };
 
-    std::vector<std::shared_ptr<ITool>> m_tools;
-
     struct AFPostfix {
         struct SASL {
             std::string username;
@@ -360,7 +358,6 @@ class AnswerFile {
      */
     void loadFile(const std::filesystem::path& path);
     void dumpFile(const std::filesystem::path& path);
-    std::vector<std::shared_ptr<ITool>> getTools();
 
     AnswerFile();
     explicit AnswerFile(const std::filesystem::path& path);

include/cloysterhpc/models/cluster.h

@@ -19,7 +19,6 @@
 #include <cloysterhpc/models/queuesystem.h>
 #include <cloysterhpc/network.h>
 #include <cloysterhpc/ofed.h>
-#include <cloysterhpc/services/locale.h>
 #include <cloysterhpc/services/repos.h>
 #include <cloysterhpc/services/runner.h>
 #include <cloysterhpc/services/timezone.h>
@@ -70,7 +69,7 @@ class Cluster {
     bool m_firewall { false };
     SELinuxMode m_selinux { SELinuxMode::Disabled };
     Timezone m_timezone;
-    Locale m_locale; /* Default locale cluster wide */
+    std::string m_locale; /* Default locale cluster wide */
     std::string m_domainName;
 
     std::list<std::unique_ptr<Network>> m_network;
@@ -96,8 +95,7 @@ class Cluster {
     void setSELinux(SELinuxMode);
     [[nodiscard]] Timezone& getTimezone();
     void setTimezone(const std::string& tz);
-    [[nodiscard]] const Locale& getLocale() const;
-    void setLocale(const Locale& locale);
+    [[nodiscard]] const std::string& getLocale() const;
     void setLocale(const std::string& locale);
     [[nodiscard]] const std::string getDomainName() const;
     void setDomainName(const std::string& domainName);

include/cloysterhpc/services/execution.h

@@ -14,7 +14,6 @@ class Execution {
 public:
     virtual ~Execution() = default;
 
-    // virtual void runCommand(const std::string&) = 0;
     virtual void install() = 0;
 };
 

include/cloysterhpc/services/locale.h

@@ -40,17 +40,27 @@ class IOSService {
     [[nodiscard]] virtual std::string getKernelInstalled() const = 0;
     [[nodiscard]] virtual std::string getKernelRunning() const = 0;
 
+    [[nodiscard]] virtual std::string getLocale() const = 0;
+    [[nodiscard]] virtual std::vector<std::string> getAvailableLocales() const = 0;
+
     // These methods are const because the implementation is expected to be stateless
-    // The implementation is expect to be stateless to avoid double source of true,
-    // the internal state vs the OS runtime state
+    // The implementation is expect to be stateless to avoid double source of true.
+    // In-memory state should live in the OS model
     virtual bool install(std::string_view package) const = 0;
+    virtual bool groupInstall(std::string_view package) const = 0;
     virtual bool remove(std::string_view package) const = 0;
     virtual bool update(std::string_view package) const = 0;
     virtual bool update() const = 0;
     virtual void check() const = 0;
     virtual void clean() const = 0;
     virtual std::vector<std::string> repolist() const = 0;
 
+    virtual bool enableService(std::string_view service) const = 0;
+    virtual bool disableService(std::string_view service) const = 0;
+    virtual bool startService(std::string_view service) const = 0;
+    virtual bool stopService(std::string_view service) const = 0;
+    virtual bool restartService(std::string_view service) const = 0;
+
     static std::unique_ptr<IOSService> factory(const OS& osinfo);
 };
 

include/cloysterhpc/services/osservice.h

@@ -6,50 +6,83 @@
 #ifndef CLOYSTERHPC_RUNNER_H_
 #define CLOYSTERHPC_RUNNER_H_
 
+#include <boost/process.hpp>
+
 #include <string>
 #include <vector>
 
 namespace cloyster::services {
 
+/**
+ * @struct CommandProxy
+ * @brief A command proxy to capture the command output while the command is
+ * running.
+ *
+ * This structure is used to capture the output of a command in real-time,
+ * useful for displaying progress in a dialog.
+ */
+struct CommandProxy {
+    bool valid = false;
+    boost::process::child child;
+    boost::process::ipstream pipe_stream;
+
+    /**
+     * @brief Gets a line of output from the command.
+     *
+     * @return An optional string containing a line of output if available,
+     * otherwise std::nullopt.
+     */
+    std::optional<std::string> getline();
+    std::optional<std::string> getUntil(char chr);
+};
+
+enum class Stream : std::uint8_t { Stdout, Stderr };
+
 /**
  * Works as an abstraction for command execution.
  */
 class IRunner {
 public:
+    IRunner() = default;
+    IRunner(const IRunner&) = default;
+    IRunner(IRunner&&) = delete;
+    IRunner& operator=(const IRunner&) = default;
+    IRunner& operator=(IRunner&&) = delete;
+    virtual ~IRunner() = default;
+
     virtual int executeCommand(const std::string&) = 0;
+    virtual CommandProxy executeCommandIter(const std::string&, Stream out = Stream::Stdout) = 0;
     virtual void checkCommand(const std::string&) = 0;
     virtual std::vector<std::string> checkOutput(const std::string&) = 0;
 
     virtual int downloadFile(const std::string& url, const std::string& file);
-
-    virtual ~IRunner() = default;
 };
 
-class Runner : public IRunner {
+class Runner final : public IRunner {
 public:
-    int executeCommand(const std::string&) override;
-    void checkCommand(const std::string&) override;
-    std::vector<std::string> checkOutput(const std::string&) override;
-
-    virtual ~Runner() = default;
+    CommandProxy executeCommandIter(const std::string& cmd, Stream out = Stream::Stdout) override;
+    int executeCommand(const std::string& cmd) override;
+    void checkCommand(const std::string& cmd) override;
+    std::vector<std::string> checkOutput(const std::string& cmd) override;
+    int downloadFile(const std::string& url, const std::string& file) override;
 };
 
-class DryRunner : public IRunner {
+class DryRunner final : public IRunner {
 public:
-    int executeCommand(const std::string&) override;
-    void checkCommand(const std::string&) override;
-    std::vector<std::string> checkOutput(const std::string&) override;
-
-    virtual ~DryRunner() = default;
+    CommandProxy executeCommandIter(const std::string& cmd, Stream out = Stream::Stdout) override;
+    int executeCommand(const std::string& cmd) override;
+    void checkCommand(const std::string& cmd) override;
+    std::vector<std::string> checkOutput(const std::string& cmd) override;
+    int downloadFile(const std::string& url, const std::string& file) override;
 };
 
-class MockRunner : public IRunner {
+class MockRunner final : public IRunner {
 public:
-    int executeCommand(const std::string&) override;
-    void checkCommand(const std::string&) override;
-    std::vector<std::string> checkOutput(const std::string&) override;
-
-    virtual ~MockRunner() = default;
+    CommandProxy executeCommandIter(const std::string& cmd, Stream out = Stream::Stdout) override;
+    int executeCommand(const std::string& cmd) override;
+    void checkCommand(const std::string& cmd) override;
+    std::vector<std::string> checkOutput(const std::string& cmd) override;
+    int downloadFile(const std::string& url, const std::string& file) override;
 
     [[nodiscard]] const std::vector<std::string>& listCommands() const;
 

include/cloysterhpc/services/runner.h

@@ -8,6 +8,7 @@
 
 #include <boost/lexical_cast.hpp>
 #include <cloysterhpc/functions.h>
+#include <cloysterhpc/services/runner.h>
 #include <cloysterhpc/services/log.h>
 #include <cloysterhpc/view/view.h>
 #include <fmt/format.h>
@@ -277,8 +278,8 @@ class Newt : public View {
      * into a percent (a 0 to 100 value)
      */
     bool progressMenu(const char* title, const char* message,
-        cloyster::CommandProxy&&,
-        std::function<std::optional<double>(cloyster::CommandProxy&)> fPercent);
+        cloyster::services::CommandProxy&&,
+        std::function<std::optional<double>(cloyster::services::CommandProxy&)> fPercent);
 
     // TODO:
     //  * Optimize for std::string_view and std::string.