double copy issue fixed with copyToTmpDir

frate-dev · Dec 16, 2023 · 7b35f2e · 7b35f2e
1 parent 3f2abad
commit 7b35f2e
Show file tree

Hide file tree

Showing 29 changed files with 85 additions and 4,138 deletions.
diff --git a/compile_commands.json.tmpf72ae b/compile_commands.json.tmpf72ae
diff --git a/include/Frate/Test/Test.hpp b/include/Frate/Test/Test.hpp
@@ -64,6 +64,7 @@ namespace Tests::Command {
    */
   bool testAddMode(std::string mode_name);
   bool testAddDuplicateMode(std::string mode_name);
+
   bool testRemoveMode(std::string mode_name);
 
   /* --------------------

diff --git a/src/Generators/ProjectGenerator/DownloadTemplates.cpp b/src/Generators/ProjectGenerator/DownloadTemplates.cpp
@@ -60,6 +60,8 @@ namespace Frate::Generators::Project {
     std::filesystem::rename(project_path / "template/frate-callbacks/scripts",
         project_path / "template/scripts");
 
+    path tmp_path = Utils::copyToTmpPath(project_path / "template/frate-callbacks",
+        "frate-callbacks-");
 
     std::filesystem::remove_all(project_path / "template/frate-callbacks");
 

diff --git a/src/Test/Commands/Author/TestAddDuplicateAuthor.cpp b/src/Test/Commands/Author/TestAddDuplicateAuthor.cpp
@@ -4,7 +4,7 @@
 
 namespace Tests::Command {
   bool testAddDuplicateAuthor(std::string name){
-    Frate::Utils::info << "Testing add duplicate author command normal conditions" << std::endl;
+    Utils::info << "Testing add duplicate author command normal conditions" << std::endl;
 
     if(!testNew()) return false;
 

diff --git a/src/Test/Commands/Author/TestAddMultiple.cpp b/src/Test/Commands/Author/TestAddMultiple.cpp
@@ -6,13 +6,13 @@ namespace Tests::Command {
   bool testAddAuthorMultiple(std::vector<std::string> names) {
 
 
-    Frate::Utils::info << "Testing add author command with names: " << std::endl;
+    Utils::info << "Testing add author command with names: " << std::endl;
     for(auto name : names){
-      Frate::Utils::info << name << std::endl;
+      Utils::info << name << std::endl;
     }
 
     if (!testNew()) {
-      Frate::Utils::error << "Failed to create new project" << std::endl;
+      Utils::error << "Failed to create new project" << std::endl;
       return false;
     }
 
@@ -24,15 +24,15 @@ namespace Tests::Command {
     auto [failed, inter] = init(command);
 
     if (failed) {
-      Frate::Utils::error << "Failed to init" << std::endl;
+      Utils::error << "Failed to init" << std::endl;
 
       return false;
     }
 
     if (inter->pro->authors.size() != names.size()) {
 
-      Frate::Utils::error << "Failed to add author project wrong number of authors" << std::endl;
-      Frate::Utils::error << "Got: " << inter->pro->authors.size() << std::endl;
+      Utils::error << "Failed to add author project wrong number of authors" << std::endl;
+      Utils::error << "Got: " << inter->pro->authors.size() << std::endl;
       return false;
     }
     for(auto name : names){
@@ -43,8 +43,8 @@ namespace Tests::Command {
         }
       }
       if(!found){
-        Frate::Utils::error << "Failed to add author project" << std::endl;
-        Frate::Utils::error << "Got: " << inter->pro->authors[0] << std::endl;
+        Utils::error << "Failed to add author project" << std::endl;
+        Utils::error << "Got: " << inter->pro->authors[0] << std::endl;
 
         return false;
       }

diff --git a/src/Test/Commands/Author/TestAddSingle.cpp b/src/Test/Commands/Author/TestAddSingle.cpp
@@ -5,7 +5,7 @@
 namespace Tests::Command {
   bool testAddAuthorSingle(std::string name){
 
-    Frate::Utils::info << "Testing add author command with name: " << name << std::endl;
+    Utils::info << "Testing add author command with name: " << name << std::endl;
     if(!testNew()) return false;
 
     std::string command = "frate add author " + name;
@@ -15,14 +15,14 @@ namespace Tests::Command {
 
     if(inter->pro->authors.size() != 1){
 
-      Frate::Utils::error << "Failed to add author project wrong number of authors" << std::endl;
-      Frate::Utils::error << "Got: " << inter->pro->authors.size() << std::endl;
+      Utils::error << "Failed to add author project wrong number of authors" << std::endl;
+      Utils::error << "Got: " << inter->pro->authors.size() << std::endl;
       return false;
     }
 
     if(inter->pro->authors[0] != name){
-      Frate::Utils::error << "Failed to add author project" << std::endl;
-      Frate::Utils::error << "Got: " << inter->pro->authors[0] << std::endl;
+      Utils::error << "Failed to add author project" << std::endl;
+      Utils::error << "Got: " << inter->pro->authors[0] << std::endl;
 
       return false;
     }

diff --git a/src/Test/Commands/Author/TestRemoveAuthor.cpp b/src/Test/Commands/Author/TestRemoveAuthor.cpp
@@ -4,7 +4,7 @@
 
 namespace Tests::Command {
   bool testRemoveAuthor(std::string name){
-    Frate::Utils::info << "Testing remove author command normal conditions" << std::endl;
+    Utils::info << "Testing remove author command normal conditions" << std::endl;
     if(!testNew()){
       return false;
     }

diff --git a/src/Test/Commands/Flags/TestAddFlagMultiple.cpp b/src/Test/Commands/Flags/TestAddFlagMultiple.cpp
@@ -15,18 +15,18 @@ namespace Tests::Command {
 
     if(inter->pro->flags.size() != 2){
 
-      Frate::Utils::error << "Failed to add flags project wrong number of flags" << std::endl;
+      Utils::error << "Failed to add flags project wrong number of flags" << std::endl;
       return false;
     }
 
     if(inter->pro->flags[0] != "-g"){
 
-      Frate::Utils::error << "Failed to add flags project" << std::endl;
+      Utils::error << "Failed to add flags project" << std::endl;
       return false;
     }
     if(inter->pro->flags[1] != "-O3"){
 
-      Frate::Utils::error << "Failed to add flags project" << std::endl;
+      Utils::error << "Failed to add flags project" << std::endl;
       return false;
     }
 

diff --git a/src/Test/Commands/Flags/TestAddFlagSingle.cpp b/src/Test/Commands/Flags/TestAddFlagSingle.cpp
@@ -5,21 +5,22 @@
 namespace Tests::Command {
   bool testAddFlagsSingle(){
     if(!testNew()) return false;
-    Frate::Utils::info << "Testing add flags command normal conditions" << std::endl;
+    Utils::info << "Testing add flags command normal conditions" << std::endl;
     auto [failed, inter] = init("frate add flags '-O3'");
 
     if(failed) return false;
 
     if(inter->pro->flags.size() != 1){
 
-      Frate::Utils::error << "Failed to add flags project wrong number of flags" << std::endl;
-      Frate::Utils::error << "Got: " << inter->pro->flags.size() << std::endl;
+      Utils::error << "Failed to add flags project wrong number of flags" << std::endl;
+      Utils::error << "Got: " << inter->pro->flags.size() << std::endl;
       return false;
     }
 
     if(inter->pro->flags[0] != "-O3"){
-      Frate::Utils::error << inter->pro->flags[0] << std::endl;
-      Frate::Utils::error << "Failed to add flags project" << std::endl;
+      Utils::error << inter->pro->flags[0] << std::endl;
+
+      Utils::error << "Failed to add flags project" << std::endl;
       return false;
     }
 

diff --git a/src/Test/Commands/Flags/TestAddFlagWithMode.cpp b/src/Test/Commands/Flags/TestAddFlagWithMode.cpp
@@ -6,19 +6,19 @@ namespace Tests::Command {
   bool testAddFlagsWithMode(){
     std::cout << "Testing add flags command with a mode specified" << std::endl;
     if(!testNew()){
-      Frate::Utils::error << "Failed to create new project" << std::endl;
+      Utils::error << "Failed to create new project" << std::endl;
       return false;
     }
 
     auto [failed, inter] = init("frate add flags -m Release '-O3'");
     if (failed) {
-      Frate::Utils::error << "Failed to init" << std::endl;
+      Utils::error << "Failed to init" << std::endl;
       return false;
     }
     if (inter->pro->modes[0].flags[1] != "-O3") {
       std::cout << inter->pro->modes[0].flags[0] << std::endl;
 
-      Frate::Utils::error << "Failed to add flags project" << std::endl;
+      Utils::error << "Failed to add flags project" << std::endl;
       return false;
     }
 

diff --git a/src/Test/Commands/Flags/TestRemoveFlagSingle.cpp b/src/Test/Commands/Flags/TestRemoveFlagSingle.cpp
@@ -1,7 +1,7 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
 bool Tests::Command::testRemoveFlagsSingle(std::string name){
-  Frate::Utils::info << "Testing remove flags command normal conditions" << std::endl;
+  Utils::info << "Testing remove flags command normal conditions" << std::endl;
   if(!testNew()){
     return false;
   }

diff --git a/src/Test/Commands/Mode/TestAddModeDuplicate.cpp b/src/Test/Commands/Mode/TestAddModeDuplicate.cpp
@@ -2,7 +2,7 @@
 #include <Frate/Test/Test.hpp>
 
 bool Tests::Command::testAddDuplicateMode(std::string mode_name){
-  Frate::Utils::info << "Testing add mode command with duplicate mode" << std::endl;
+  Utils::info << "Testing add mode command with duplicate mode" << std::endl;
   if(!testNew()) return false;
 
   auto [failed, inter] = init("frate add mode " + mode_name );

diff --git a/src/Test/Commands/Mode/TestAddModeSingle.cpp b/src/Test/Commands/Mode/TestAddModeSingle.cpp
@@ -3,7 +3,7 @@
 #ifdef TEST
 
 bool Tests::Command::testAddMode(std::string mode_name){
-  Frate::Utils::info << "Testing add mode command normal conditions" << std::endl;
+  Utils::info << "Testing add mode command normal conditions" << std::endl;
   if(!testNew()) return false;
 
   auto [failed, inter] = init("frate add mode " + mode_name);
@@ -18,7 +18,7 @@ bool Tests::Command::testAddMode(std::string mode_name){
     }
   }
 
-  Frate::Utils::error << "Failed to add mode : could not find " << mode_name << " in frate-project.json" << std::endl;
+  Utils::error << "Failed to add mode : could not find " << mode_name << " in frate-project.json" << std::endl;
   return true;
 }
 #endif
diff --git a/src/Test/Commands/Mode/TestRemoveModeSingle.cpp b/src/Test/Commands/Mode/TestRemoveModeSingle.cpp
@@ -2,7 +2,7 @@
 #include <Frate/Test/Test.hpp>
 
 bool Tests::Command::testRemoveMode(std::string mode){
-  Frate::Utils::info << "Testing remove mode command normal conditions" << std::endl;
+  Utils::info << "Testing remove mode command normal conditions" << std::endl;
   if(!testNew()) return false;
 
   auto [failed, inter] = init("frate add mode " + mode);

diff --git a/src/Test/Commands/New/TestNormal.cpp b/src/Test/Commands/New/TestNormal.cpp
@@ -1,12 +1,12 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
 bool Tests::Command::testNew(){
-  Frate::Utils::info << "Testing new command normal conditions" << std::endl;
+  Utils::info << "Testing new command normal conditions" << std::endl;
 
   test_path = genTestDirectory();
   auto [failed, inter] = init("frate new test -d");
   if(failed){
-    Frate::Utils::error << "Failed to create new project" << std::endl;
+    Utils::error << "Failed to create new project" << std::endl;
     return false;
   }
 

diff --git a/src/Test/Commands/New/TestWithLang.cpp b/src/Test/Commands/New/TestWithLang.cpp
@@ -3,13 +3,13 @@
 #include <Frate/Utils/General.hpp>
 bool Tests::Command::testNewWithLang(std::string lang){
 
-  Frate::Utils::info << "Testing new command with lang: " << lang << std::endl;
+  Utils::info << "Testing new command with lang: " << lang << std::endl;
   test_path = genTestDirectory();
   auto[failed, inter] = init("frate new test -d -l "+lang);
 
   if(inter->pro->lang != lang){
 
-    Frate::Utils::error << "Failed to create new project : project lang not set" << std::endl;
+    Utils::error << "Failed to create new project : project lang not set" << std::endl;
     return false;
   }
 

diff --git a/src/Test/Commands/New/TestWithType.cpp b/src/Test/Commands/New/TestWithType.cpp
@@ -2,15 +2,15 @@
 #include "Frate/Utils/General.hpp"
 #include <Frate/Test/Test.hpp>
 bool Tests::Command::testNewWithType(std::string type){
-  Frate::Utils::info << "Testing new command with type: " << type << std::endl;
+  Utils::info << "Testing new command with type: " << type << std::endl;
   test_path = genTestDirectory(); 
   auto[failed,inter] = init("frate new -d -t " + type);
 
   if(failed) return false;
 
   if(inter->pro->type != type){
 
-    Frate::Utils::error << "Failed to create new project : project type: " 
+    Utils::error << "Failed to create new project : project type: " 
       << type << " not set" 
       << std::endl;
     return false;

diff --git a/src/Test/Commands/Nuke/TestNuke.cpp b/src/Test/Commands/Nuke/TestNuke.cpp
@@ -7,14 +7,14 @@ namespace Tests::Command {
     std::cout << "Testing nuke command" << std::endl;
 
     if(!testNew()){
-      Frate::Utils::error << "Failed to create new project" << std::endl;
+      Utils::error << "Failed to create new project" << std::endl;
       return false;
     }
     std::cout << "Testing nuke command normal conditions" << std::endl;
     auto [failed, inter] = init("frate nuke",false);
 
     if(failed){
-      Frate::Utils::error << "Failed to init nuke command" << std::endl;
+      Utils::error << "Failed to init nuke command" << std::endl;
       return false;
     }
 
@@ -24,7 +24,7 @@ namespace Tests::Command {
     }
 
     if(count != 0){
-      Frate::Utils::error << "Failed to nuke project had: " << count << " files left" << std::endl;
+      Utils::error << "Failed to nuke project had: " << count << " files left" << std::endl;
 
       return false;
     }

diff --git a/src/Test/Commands/Package/TestAddPackageMultiple.cpp b/src/Test/Commands/Package/TestAddPackageMultiple.cpp
@@ -40,7 +40,7 @@ bool Tests::Command::testAddPackageMultiple(std::vector<std::string> packages) {
 
   for(auto &p : package_results){
     if(!p.second){
-      Frate::Utils::error << "Failed to add package : could not find " << p.first << " in frate-project.json" << std::endl;
+      Utils::error << "Failed to add package : could not find " << p.first << " in frate-project.json" << std::endl;
       return false;
     }
   }

diff --git a/src/Test/Commands/Package/TestAddPackageSingle.cpp b/src/Test/Commands/Package/TestAddPackageSingle.cpp
@@ -7,7 +7,7 @@ bool Tests::Command::testAddPackage(std::string package_name) {
   auto [failed, inter] = init("frate add p "+package_name+" -l");
 
   if(failed){
-    Frate::Utils::error << "Failed to add package : could not initialize interface" << std::endl;
+    Utils::error << "Failed to add package : could not initialize interface" << std::endl;
     return false;
   }
 
@@ -17,12 +17,12 @@ bool Tests::Command::testAddPackage(std::string package_name) {
     config_file >> config;
     if(config["dependencies"].size() != 1){
 
-      Frate::Utils::error << "Failed to add package : no pacakge add dected frate-project.json" << std::endl;
+      Utils::error << "Failed to add package : no pacakge add dected frate-project.json" << std::endl;
       return false;
     }
   }catch(...){
 
-    Frate::Utils::error << "Failed to add package : could not open file - file possibly never created" << std::endl;
+    Utils::error << "Failed to add package : could not open file - file possibly never created" << std::endl;
     return false;
   }
 

diff --git a/src/Test/Commands/Package/TestAddPackageWithDuplicate.cpp b/src/Test/Commands/Package/TestAddPackageWithDuplicate.cpp
@@ -4,7 +4,7 @@
 namespace Tests::Command {
 
   bool testAddPackageWithDuplicate(std::string package_name){
-    Frate::Utils::info << "Testing add package command with duplicate package" << std::endl;
+    Utils::info << "Testing add package command with duplicate package" << std::endl;
     if(!testNew()) return false;
 
     auto [failed, inter] = init("frate add package " + package_name + " -l");
@@ -17,7 +17,7 @@ namespace Tests::Command {
     auto [failed_dup, inter_dup] = init("frate add package " + package_name + " -l");
 
     if(!failed_dup){ 
-      Frate::Utils::error << "Failed to detect duplicate package" << std::endl;
+      error << "Failed to detect duplicate package" << std::endl;
       return false;
     }
 

diff --git a/src/Test/Commands/Package/TestAddPackageWithMode.cpp b/src/Test/Commands/Package/TestAddPackageWithMode.cpp
@@ -5,12 +5,12 @@ bool Tests::Command::testAddPackageToMode(std::string mode_name, std::string pac
   std::cout << "Testing add package to mode command" << std::endl;
 
   if(!testNew()){
-    Frate::Utils::error << "Failed to create new project" << std::endl;
+    Utils::error << "Failed to create new project" << std::endl;
     return false;
   }
   auto [failed,inter] = init("frate add p "+package_name + " -m " + mode_name + " -l");
   if(failed){
-    Frate::Utils::error << "Failed to add package" << std::endl;
+    Utils::error << "Failed to add package" << std::endl;
     return false;
   }
 
@@ -26,7 +26,7 @@ bool Tests::Command::testAddPackageToMode(std::string mode_name, std::string pac
     }
   }
 
-  Frate::Utils::error << "Failed to add package to mode "+mode_name+" : the selected mode either doesn't exist or we couldn't find " + package_name << std::endl;
+  Utils::error << "Failed to add package to mode "+mode_name+" : the selected mode either doesn't exist or we couldn't find " + package_name << std::endl;
 
   return false;
 

diff --git a/src/Test/Commands/Package/TestRemovePackageMultiple.cpp b/src/Test/Commands/Package/TestRemovePackageMultiple.cpp
@@ -23,7 +23,7 @@ namespace Tests::Command {
     for(auto &dep : config["dependencies"]){
       for(auto &p : packages){
         if(dep["name"] == p){
-          Frate::Utils::error << "Failed to remove package : found " << p << " in frate-project.json" << std::endl;
+          Utils::error << "Failed to remove package : found " << p << " in frate-project.json" << std::endl;
           return false;
         }
       }