Ability to choose dependencies to reset

Author: Neko-Box-Coder

Include/runcpp2/DependenciesHelper.hpp

@@ -21,7 +21,8 @@ namespace runcpp2
     bool CleanupDependencies(   const runcpp2::Data::Profile& profile,
                                 const Data::ScriptInfo& scriptInfo,
                                 const std::vector<Data::DependencyInfo*>& availableDependencies,
-                                const std::vector<std::string>& dependenciesLocalCopiesPaths);
+                                const std::vector<std::string>& dependenciesLocalCopiesPaths,
+                                const std::string& dependenciesToReset);
 
     bool SetupDependenciesIfNeeded( const runcpp2::Data::Profile& profile,
                                     const ghc::filesystem::path& buildDir,

Include/runcpp2/runcpp2.hpp

@@ -16,7 +16,7 @@ namespace runcpp2
         RESET_USER_CONFIG,
         EXECUTABLE,
         HELP,
-        REMOVE_DEPENDENCIES,
+        RESET_DEPENDENCIES,
         LOCAL,
         SHOW_USER_CONFIG,
         SCRIPT_TEMPLATE,

Src/runcpp2/DependenciesHelper.cpp

@@ -1,6 +1,7 @@
 #include "runcpp2/DependenciesHelper.hpp"
 #include "ghc/filesystem.hpp"
 #include "runcpp2/PlatformUtil.hpp"
+#include "runcpp2/StringUtil.hpp"
 #include "ssLogger/ssLog.hpp"
 
 #include <unordered_set>
@@ -345,7 +346,8 @@ bool runcpp2::IsDependencyAvailableForThisPlatform(const Data::DependencyInfo& d
 bool runcpp2::CleanupDependencies(  const runcpp2::Data::Profile& profile,
                                     const Data::ScriptInfo& scriptInfo,
                                     const std::vector<Data::DependencyInfo*>& availableDependencies,
-                                    const std::vector<std::string>& dependenciesLocalCopiesPaths)
+                                    const std::vector<std::string>& dependenciesLocalCopiesPaths,
+                                    const std::string& dependenciesToReset)
 {
     ssLOG_FUNC_DEBUG();
 
@@ -354,8 +356,52 @@ bool runcpp2::CleanupDependencies(  const runcpp2::Data::Profile& profile,
         return true;
 
     assert(availableDependencies.size() == dependenciesLocalCopiesPaths.size());
+    
+    //Split dependency names if not "all"
+    std::unordered_set<std::string> dependencyNames;
+    if(dependenciesToReset != "all")
+    {
+        std::string currentName;
+        for(int i = 0; i < dependenciesToReset.size(); ++i)
+        {
+            if(dependenciesToReset[i] == ',' || i == dependenciesToReset.size() - 1)
+            {
+                if(dependenciesToReset[i] != ',')
+                    currentName += dependenciesToReset[i];
+                
+                if(!currentName.empty())
+                {
+                    runcpp2::Trim(currentName);
+                    //Convert to lowercase for case-insensitive comparison
+                    for(int j = 0; j < currentName.size(); ++j)
+                        currentName[j] = std::tolower(currentName[j]);
+                    
+                    dependencyNames.insert(currentName);
+                    currentName.clear();
+                }
+            }
+            else
+                currentName += dependenciesToReset[i];
+        }
+    }
+
     for(int i = 0; i < availableDependencies.size(); ++i)
     {
+        //Skip if not in the list of dependencies to reset
+        if(!dependencyNames.empty())
+        {
+            //Convert dependency name to lowercase for comparison
+            std::string depName = availableDependencies.at(i)->Name;
+            for(int j = 0; j < depName.size(); ++j)
+                depName[j] = std::tolower(depName[j]);
+            
+            if(dependencyNames.count(depName) == 0)
+            {
+                ssLOG_DEBUG(availableDependencies.at(i)->Name << " not in list to remove");
+                continue;
+            }
+        }
+
         std::error_code e;
         ssLOG_INFO("Running cleanup commands for " << availableDependencies.at(i)->Name);
 
@@ -377,6 +423,8 @@ bool runcpp2::CleanupDependencies(  const runcpp2::Data::Profile& profile,
 
             return false;
         }
+        
+        ssLOG_DEBUG(availableDependencies.at(i)->Name << " removed");
     }
 
     return true;

Src/runcpp2/main.cpp

@@ -195,8 +195,8 @@ int main(int argc, char* argv[])
                 runcpp2::OptionInfo(runcpp2::CmdOptions::HELP, false)
             },
             {
-                "--remove-dependencies", 
-                runcpp2::OptionInfo(runcpp2::CmdOptions::REMOVE_DEPENDENCIES, false)
+                "--reset-dependencies", 
+                runcpp2::OptionInfo(runcpp2::CmdOptions::RESET_DEPENDENCIES, true)
             },
             {
                 "--local",
@@ -235,7 +235,7 @@ int main(int argc, char* argv[])
             {"-c", longOptionsMap.at("--reset-user-config")},
             {"-e", longOptionsMap.at("--executable")},
             {"-h", longOptionsMap.at("--help")},
-            {"-d", longOptionsMap.at("--remove-dependencies")},
+            {"-d", longOptionsMap.at("--reset-dependencies")},
             {"-l", longOptionsMap.at("--local")},
             {"-s", longOptionsMap.at("--show-config-path")},
             {"-t", longOptionsMap.at("--create-script-template")},
@@ -265,7 +265,7 @@ int main(int argc, char* argv[])
         ssLOG_BASE("    -c, --reset-user-[c]onfig               Replace current user config with the default one");
         ssLOG_BASE("    -e, --[e]xecutable                      Runs as executable instead of shared library");
         ssLOG_BASE("    -h, --[h]elp                            Show this help message");
-        ssLOG_BASE("    -d, --remove-[d]ependencies             Remove dependencies listed in the script");
+        ssLOG_BASE("    -d, --reset-[d]ependencies <names>      Reset dependencies (comma-separated names, or \"all\" for all)");
         ssLOG_BASE("    -l, --[l]ocal                           Build in the current working directory under .runcpp2 directory");
         ssLOG_BASE("    -s, --[s]how-config-path                Show where runcpp2 is reading the config from");
         ssLOG_BASE("    -t, --create-script-[t]emplate <file>   Creates/prepend runcpp2 script info template");

Src/runcpp2/runcpp2.cpp

@@ -683,7 +683,7 @@ runcpp2::StartPipeline( const std::string& scriptPath,
         if(!parsableInfo.empty())
         {
             ssLOG_INFO("Parsed script info YAML:");
-            ssLOG_INFO(scriptInfo.ToString(""));
+            ssLOG_INFO("\n" << scriptInfo.ToString(""));
         }
 
         //Create build directory
@@ -787,19 +787,21 @@ runcpp2::StartPipeline( const std::string& scriptPath,
                 return PipelineResult::DEPENDENCIES_FAILED;
             }
 
-            if(currentOptions.count(CmdOptions::REMOVE_DEPENDENCIES) > 0 || scriptInfoChanged)
+            if(currentOptions.count(CmdOptions::RESET_DEPENDENCIES) > 0 || scriptInfoChanged)
             {
                 if(!CleanupDependencies(profiles.at(profileIndex),
                                         scriptInfo,
                                         availableDependencies,
-                                        dependenciesLocalCopiesPaths))
+                                        dependenciesLocalCopiesPaths,
+                                        currentOptions.count(CmdOptions::RESET_DEPENDENCIES) > 0 ?
+                                            currentOptions.at(CmdOptions::RESET_DEPENDENCIES) : "all"))
                 {
                     ssLOG_ERROR("Failed to cleanup dependencies");
                     return PipelineResult::DEPENDENCIES_FAILED;
                 }
             }
 
-            if(currentOptions.count(CmdOptions::REMOVE_DEPENDENCIES) > 0)
+            if(currentOptions.count(CmdOptions::RESET_DEPENDENCIES) > 0)
             {
                 ssLOG_LINE("Removed script dependencies");
                 return PipelineResult::SUCCESS;