removed some scuff added key checker for frate-project.json

cpm-package-lock.cmake

@@ -42,3 +42,10 @@ CPMDeclarePackage(libgit2
 #  OPTIONS
 #    "ENABLE_VERSIONED_SYMBOLS ON"
 #)
+# cpptrace
+CPMDeclarePackage(cpptrace
+  VERSION 0.2.1
+  GITHUB_REPOSITORY jeremy-rifkin/cpptrace
+  SYSTEM YES
+  EXCLUDE_FROM_ALL YES
+)

include/Frate/Command.hpp

@@ -101,6 +101,7 @@ namespace Command {
       Mode{.name= "Test", .flags={"-g"}}
     };
     std::vector<std::string> authors;
+    std::vector<std::string> keywords;
     std::string src_dir{"src"};
     std::string include_dir{"include"};
     std::vector<RemoteServer> build_servers;
@@ -113,6 +114,8 @@ namespace Command {
     std::vector<std::string> toolchains {};
     void fromJson(json j);
     nlohmann::json toJson();
+    bool writeConfig();
+    void checkKeys(json j);
   } Project;
   typedef struct Handler_s Handler;
   typedef struct Handler_s {
@@ -132,58 +135,13 @@ namespace Command {
   } Handler;
 
   class Interface{
-    private:
-      //Commands;
-      //TODO: We really should define top level commands as seperate modules
-      bool init();
-      [[deprecated("use Command::Actions::Add::run instead")]]
-      bool add();
-      [[deprecated("use Command::Actions::Get::run instead")]]
-      bool get();
-      [[deprecated("use Command::Actions::Set::run instead")]]
-      bool set();
-      [[deprecated("use Command::Actions::Remove::run instead")]]
-      bool remove();
-      [[deprecated("use Command::Actions::Update::run instead")]]
-      bool update();
-      [[deprecated("use Command::Actions::Run::run instead")]]
-      bool run();
-      [[deprecated("use Command::Actions::Help::run instead")]]
-      bool help();
-      [[deprecated("use Command::Actions::Search::run instead")]]
-      bool search();
-      [[deprecated("use Command::Actions::FTP::run instead")]]
-      bool ftp();
-      [[deprecated("use Command::Actions::Watch::run instead")]]
-      bool watch();
-      [[deprecated("use Command::Actions::Clean::run instead")]]
-      bool clean();
-      [[deprecated("use Command::Actions::Build::run instead")]]
-      bool build();
-      [[deprecated("use Command::Actions::List::run instead")]]
-      bool list();
     public:
       void getHelpString(std::string name,std::vector<Handler> &handlers,bool is_subcommand = false);
       void getHelpString(Handler &handler);
       bool runCommand(std::string,std::vector<Handler>&);
       std::shared_ptr<Project> pro;
       bool project_present{false};
       std::vector<Handler> commands{};
-      //All sub command getters
-      [[deprecated("use Command::Actions::handlers instead")]]
-      std::vector<Handler> getAddHandlers();
-      [[deprecated("use Command::Actions::handlers instead")]]
-      std::vector<Handler> getGetHandlers();
-      [[deprecated("use Command::Actions::handlers instead")]]
-      std::vector<Handler> getSetHandlers();
-      [[deprecated("use Command::Actions::handlers instead")]]
-      std::vector<Handler> getListHandlers();
-      [[deprecated("use Command::Actions::handlers instead")]]
-      std::vector<Handler> getSearchHandlers();
-      [[deprecated("use Command::Actions::handlers instead")]]
-      std::vector<Handler> getRemoveHandlers();
-      [[deprecated("use Command::Actions::handlers instead")]]
-      std::vector<Handler> getUpdateHandlers();
 
       bool execute();
       bool skip_prompts{false};
@@ -201,29 +159,7 @@ namespace Command {
   };
 
   namespace OptionsInit{
-      //Top level commands
-      //TODO: We really should decouple the options from top level commands
-      bool Init(Interface*);
-      bool Search(Interface*);
-      bool Add(Interface*);
-      bool Set(Interface*);
-      bool Remove(Interface*);
-      bool Update(Interface*);
-      bool Watch(Interface*);
-      bool Clean(Interface*);
-      bool List(Interface*);
-      bool Build(Interface*);
       bool Main(Interface*);
-
-
-      [[deprecated("put options in the specific module")]]
-      bool Server(Interface*);
-      [[deprecated("put options in the specific module")]]
-      bool Packages(Interface*);
-      [[deprecated("put options in the specific module")]]
-      bool Flags(Interface*);
-      [[deprecated("put options in the specific module")]]
-      bool Mode(Interface*);
   };
 
   std::string downloadIndex();

include/Frate/Command/Keywords.hpp

@@ -0,0 +1,7 @@
+#include <Frate/Command.hpp>
+namespace Command::Keywords {
+  bool options(Interface* inter);
+
+
+  bool add(Interface* inter);
+}

include/Frate/Command/Modes.hpp

@@ -6,7 +6,7 @@ namespace Command{
     bool add(Interface* interface);
     bool remove(Interface* interface);
     bool list(Interface* interface);
-    bool Options(Interface* interface);
+    bool options(Interface* interface);
   }
 }
 

include/Frate/Command/Name.hpp

@@ -0,0 +1,7 @@
+#include <Frate/Command.hpp>
+
+namespace Command::Name {
+
+  bool options(Interface* inter);
+  bool set(Interface* inter);
+}

include/Frate/Generators.hpp

@@ -62,6 +62,7 @@ namespace Generators{
       std::string lang_version;
       std::string authors_str;
     } Config;
+    [[deprecated("Use project->writeConfig() instead")]]
     bool writeConfig(std::shared_ptr<Command::Project>& ctx);
   }
 

src/Command/Actions/Add.cpp

@@ -2,6 +2,7 @@
 #include <Frate/Command/Package.hpp>
 #include <Frate/Command/Flags.hpp>
 #include <Frate/Command/Toolchains.hpp>
+#include <Frate/Command/Keywords.hpp>
 #include <Frate/Command/Author.hpp>
 #include <Frate/Command/Modes.hpp>
 #include <Frate/Command/RemoteServers.hpp>
@@ -75,7 +76,7 @@ namespace Command::Add {
           .positional_args = {"mode-name"},
           .docs = "Adds a build mode to your project",
           .callback = [inter]() {
-            Modes::Options(inter);
+            Modes::options(inter);
             return Modes::add(inter);
           },
         },
@@ -112,6 +113,15 @@ namespace Command::Add {
             return Author::add(inter);
           },
         },
+        Handler{
+          .aliases = {"keywords","kw"},
+          .positional_args = {"keyword,..."},
+          .docs = "Add keywords to your project",
+          .callback = [inter]() {
+            Keywords::add(inter);
+            return false;
+          },
+        },
     };
   }
 }

src/Command/Actions/Remove.cpp

@@ -48,7 +48,7 @@ namespace Command::Remove {
         .positional_args = {"mode"},
         .docs = "Remove a mode from the project",
         .callback = [inter]() {
-          Modes::Options(inter);
+          Modes::options(inter);
           return Modes::remove(inter);
         },
       }

src/Command/Actions/Set.cpp

@@ -2,8 +2,8 @@
 #include <Frate/Command/Actions/Set.hpp>
 #include <Frate/Command/Flags.hpp>
 #include <Frate/Command/License.hpp>
+#include <Frate/Command/Name.hpp>
 #include <Frate/Command/RemoteServers.hpp>
-#include <Frate/Command/Set.hpp>
 namespace Command::Set {
 
   bool options(Interface *inter) {
@@ -30,7 +30,7 @@ namespace Command::Set {
         .aliases = {"name","n"},
         .docs = "Set the project's name",
         .callback = [inter]() {
-          name(inter);
+          Name::set(inter);
           return true;//Name::set(inter);
         },
       },

src/Command/Author/Author.cpp

@@ -3,9 +3,18 @@
 
 namespace Command::Author {
 
-
+  bool options(Interface *inter){
+    inter->InitHeader();
+    inter->options->parse_positional({"command","subcommand","args"});
+    inter->options->add_options()
+      ("command", "Command to run", cxxopts::value<std::string>())
+      ("subcommand", "Subcommand to run", cxxopts::value<std::string>())
+      ("args", "Authors", cxxopts::value<std::vector<std::string>>());
+    return true;
+  }
   bool add(Interface *inter){
-    if (inter->pro->args->count("args") == 0) {
+    options(inter);
+    if (inter->pro->args->count("args") > 0) {
       for (auto author : inter->pro->args->operator[]("args").as<std::vector<std::string>>()) {
         inter->pro->authors.push_back(author);
       }