Fixed #5 No show 'Subcommand. Try help for more.' when no options

Author: sea5kg

src/ArgumentProcessors/argument_processor_main.cpp

@@ -14,6 +14,7 @@ ArgumentProcessorMain::ArgumentProcessorMain()
     registryParameterArgument("-param2", "P", "Param 2");
     registryExample("wsjcpp --single1 -param1 1");
     registryProcessor(new ArgumentProcessorSubcommand1());
+    registryProcessor(new ArgumentProcessorNothing());
 }
 
 // ---------------------------------------------------------------------
@@ -41,7 +42,6 @@ int ArgumentProcessorMain::exec(const std::vector<std::string> &vRoutes, const s
     return -1;
 }
 
-
 // ---------------------------------------------------------------------
 // ArgumentProcessorSubcommand1
 
@@ -97,3 +97,21 @@ int ArgumentProcessorSubcommand1::exec(const std::vector<std::string> &vRoutes,
     return 0;
 }
 
+// ---------------------------------------------------------------------
+// ArgumentProcessorNothing
+
+ArgumentProcessorNothing::ArgumentProcessorNothing() 
+: WsjcppArgumentProcessor(
+    {"nothing", "n"}, 
+    "nothing",
+    "Example of nothing with long description must be here 12345678901234567890 lol again"
+) {
+    TAG = "ArgumentProcessorSubcommand1";
+}
+
+// ---------------------------------------------------------------------
+
+int ArgumentProcessorNothing::exec(const std::vector<std::string> &vRoutes, const std::vector<std::string> &vSubParams) {
+    std::cout << "Nothing" << std::endl;
+    return 0;
+}

src/ArgumentProcessors/argument_processor_main.h

@@ -26,4 +26,10 @@ class ArgumentProcessorSubcommand1 : public WsjcppArgumentProcessor {
         int m_nTimesTest;
 };
 
+class ArgumentProcessorNothing : public WsjcppArgumentProcessor {
+    public:
+        ArgumentProcessorNothing();
+        virtual int exec(const std::vector<std::string> &vRoutes, const std::vector<std::string> &vSubParams) override;
+};
+
 #endif // ARGUMENT_PROCESSOR_MAIN_H

src/wsjcpp_arguments.cpp

@@ -293,20 +293,38 @@ int WsjcppArgumentProcessor::help(
 
         for (int i = 0; i < m_vProcessors.size(); i++) {
             WsjcppArgumentProcessor *pProc = m_vProcessors[i];
-
-            std::cout 
-                << "     " << pProc->getNamesAsString() << " [<options>...]"
-                << std::endl
-                << "          Subcommand. Try help for more. " << pProc->getDescription()
-                << std::endl
-                << std::endl;
+            std::cout << "     " << pProc->getNamesAsString();
+
+            if (pProc->hasMoreOptions()) {
+                std::cout 
+                    << " [<options>...]"
+                    << std::endl
+                    << "          Subcommand. Try help for more. " << pProc->getDescription()
+                    << std::endl
+                ;
+            } else {
+                std::cout 
+                    << std::endl
+                    << "          " << pProc->getDescription()
+                    << std::endl
+                ;
+            }
+            std::cout << std::endl;            
         }
     }
     return 0;
 }
 
 // ---------------------------------------------------------------------
 
+bool WsjcppArgumentProcessor::hasMoreOptions() {
+    return m_vProcessors.size() > 0
+        || m_vSingleArguments.size() > 0
+        || m_vParameterArguments.size() > 0;
+}
+
+// ---------------------------------------------------------------------
+
 bool WsjcppArgumentProcessor::applySingleArgument(const std::string &sProgramName, const std::string &sArgumentName) {
     WsjcppLog::throw_err(TAG, "No support single argument '" + sArgumentName + "'");
     return false;

src/wsjcpp_arguments.h

@@ -67,13 +67,14 @@ class WsjcppArgumentProcessor {
         WsjcppArgumentParameter *findRegisteredParameterArgument(const std::string &sArgumentName);
 
         bool hasRegisteredArgumentName(const std::string &sArgumentName);
-        
+
         bool getValueOfParam(const std::string &sArgumentName);
         int help(
             const std::vector<std::string> &vRoutes, 
             const std::vector<std::string> &vSubParams
         );
-
+        bool hasMoreOptions();
+        
         virtual bool applySingleArgument(const std::string &sProgramName, const std::string &sArgumentName);
         virtual bool applyParameterArgument(const std::string &sProgramName, const std::string &sArgumentName, const std::string &sValue);
         virtual int exec(const std::vector<std::string> &vRoutes, const std::vector<std::string> &vSubParams);

unit-tests.wsjcpp/src/unit_test_arguments_with_params.cpp

@@ -1,4 +1,4 @@
-#include "unit_test_arguments_with_params.h"
+#include <wsjcpp_unit_tests.h>
 #include <vector>
 #include <wsjcpp_core.h>
 #include <wsjcpp_arguments.h>
@@ -52,6 +52,15 @@ class ArgumentProcessorUninstall : public WsjcppArgumentProcessor {
 };
 
 // ---------------------------------------------------------------------
+// UnitTestArgumentsWithParams
+
+class UnitTestArgumentsWithParams : public WsjcppUnitTestBase {
+    public:
+        UnitTestArgumentsWithParams();
+        virtual bool doBeforeTest() override;
+        virtual void executeTest() override;
+        virtual bool doAfterTest() override;
+};
 
 REGISTRY_WSJCPP_UNIT_TEST(UnitTestArgumentsWithParams)
 

unit-tests.wsjcpp/src/unit_test_arguments_with_params.h

@@ -1,4 +1,4 @@
-#include "unit_test_simple_arguments.h"
+#include <wsjcpp_unit_tests.h>
 #include <vector>
 #include <wsjcpp_core.h>
 #include <wsjcpp_arguments.h>
@@ -171,6 +171,14 @@ int ArgumentProcessorProgram1::exec(const std::vector<std::string> &vRoutes, con
 // ---------------------------------------------------------------------
 // UnitTestSimpleArguments
 
+class UnitTestSimpleArguments : public WsjcppUnitTestBase {
+    public:
+        UnitTestSimpleArguments();
+        virtual bool doBeforeTest() override;
+        virtual void executeTest() override;
+        virtual bool doAfterTest() override;
+};
+
 REGISTRY_WSJCPP_UNIT_TEST(UnitTestSimpleArguments)
 
 UnitTestSimpleArguments::UnitTestSimpleArguments()