Updated wsjcpp-core and added generate.WsjcppEmploy

Author: sea5kg

CMakeLists.txt

@@ -4,6 +4,9 @@ project(wsjcpp-employees C CXX)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/src.wsjcpp/CMakeLists.txt)
 
+#### BEGIN_WSJCPP_APPEND
+#### END_WSJCPP_APPEND
+
 set(CMAKE_CXX_STANDARD 11)
 set(EXECUTABLE_OUTPUT_PATH ${wsjcpp-employees_SOURCE_DIR})
 
@@ -27,3 +30,4 @@ install(
         /usr/bin
 )
 
+

README.md

@@ -20,7 +20,7 @@ or include this files:
 
 ## How use this
 
-For init you must call `WSJCppEmployees::init({})`
+For init you must call `WsjcppEmployees::init({})`
 
 Example main func:
 ```
@@ -31,15 +31,15 @@ int main(int argc, const char* argv[]) {
     std::string TAG = "MAIN";
     std::string appName = std::string(WSJCPP_NAME);
     std::string appVersion = std::string(WSJCPP_VERSION);
-    if (!WSJCppCore::dirExists(".logs")) {
-        WSJCppCore::makeDir(".logs");
+    if (!WsjcppCore::dirExists(".logs")) {
+        WsjcppCore::makeDir(".logs");
     }
-    WSJCppLog::setPrefixLogFile("wsjcpp-employees");
-    WSJCppLog::setLogDirectory(".logs");
+    WsjcppLog::setPrefixLogFile("wsjcpp-employees");
+    WsjcppLog::setLogDirectory(".logs");
     
     // init employees
-    if (!WSJCppEmployees::init({})) {
-        WSJCppLog::err(TAG, "Could not init employees");
+    if (!WsjcppEmployees::init({})) {
+        WsjcppLog::err(TAG, "Could not init employees");
         return -1;
     }
     return 0;
@@ -58,23 +58,29 @@ Now you can call from any place:
 #inluce <wsjcpp_employees.h>
 
 void someFunc() {
-    WJSCppEmployRuntimeGlobalCache *pCache = findWSJCppEmploy<WJSCppEmployRuntimeGlobalCache>();
+    WJSCppEmployRuntimeGlobalCache *pCache = findWsjcppEmploy<WJSCppEmployRuntimeGlobalCache>();
     pCache->set("name", "value");
 }
 ```
 
+### Example of define you employ use a wsjcpp
+
+```
+wsjcpp generate WsjcppEmploy MyImpl
+```
+
 ### Example of define you employ (simple)
 
 (don't foget add to build)
 
 Example Header `your_employ.h`:
 ```
-#ifndef WSJCPP_EMPLOYEES_H
-#define WSJCPP_EMPLOYEES_H
+#ifndef YOUR_EMPLOY_H
+#define YOUR_EMPLOY_H
 
 #include <wsjcpp_employees.h>
 
-class YourEmploy : public WSJCppEmployBase {
+class YourEmploy : public WsjcppEmployBase {
     public:
         YourEmploy();
         static std::string name() { return "YourEmploy"; }
@@ -85,7 +91,7 @@ class YourEmploy : public WSJCppEmployBase {
         std::string TAG;
 };
 
-#endif // WSJCPP_EMPLOYEES_H
+#endif // YOUR_EMPLOY_H
 ```
 
 Example source-code `your_employ.cpp`:
@@ -95,39 +101,39 @@ Example source-code `your_employ.cpp`:
 REGISTRY_WJSCPP_EMPLOY(YourEmploy)
 
 YourEmploy::YourEmploy()
-    : WSJCppEmployBase(YourEmploy::name(), {}) {
+    : WsjcppEmployBase(YourEmploy::name(), {}) {
     TAG = YourEmploy::name();
 }
 
 bool YourEmploy::init() {
-    WSJCppLog::info(TAG, "init called");
+    WsjcppLog::info(TAG, "init called");
     return true; 
 }
 
 bool YourEmploy::deinit() {
-    WSJCppLog::info(TAG, "deinit called");
+    WsjcppLog::info(TAG, "deinit called");
     return true;
 }
 
 void YourEmploy::doSomething() {
-    WSJCppLog::info(TAG, "doSomething called");
+    WsjcppLog::info(TAG, "doSomething called");
 }
 ```
 
-1. For call ::init you must call `WSJCppEmployees::init({})` in main function
+1. For call ::init you must call `WsjcppEmployees::init({})` in main function
 2. find employ and call you method from any place
 
 ```
 #inluce <your_employ.h>
 
 void someFunc() {
-    YourEmploy *pYourEmploy = findWSJCppEmploy<YourEmploy>();
+    YourEmploy *pYourEmploy = findWsjcppEmploy<YourEmploy>();
     pYourEmploy->doSomething();
 }
 
 void main() {
     ...
-    WSJCppEmployees::init({});
+    WsjcppEmployees::init({});
     someFunc();
 }
 ```
@@ -140,7 +146,7 @@ void main() {
 
 // second - will be init after 
 SecondEmploy::SecondEmploy()
-    : WSJCppEmployBase(SecondEmploy::name(), {"FirstEmploy"}) {
+    : WsjcppEmployBase(SecondEmploy::name(), {"FirstEmploy"}) {
     TAG = SecondEmploy::name();
 }
 
@@ -150,7 +156,7 @@ bool SecondEmploy::init() {
 
 // first employ - will be init every time
 FirstEmploy::FirstEmploy()
-    : WSJCppEmployBase(FirstEmploy::name(), {}) {
+    : WsjcppEmployBase(FirstEmploy::name(), {}) {
     TAG = FirstEmploy::name();
 }
 
@@ -171,7 +177,7 @@ UsersEmploy
 
 Also you can define on init:
 ```
-WSJCppEmployees::init({"server-start"})
+WsjcppEmployees::init({"server-start"})
 ```
 So it will be call "::init" employees only there which has this requirements.
 

scripts.wsjcpp/generate.WsjcppEmploy

@@ -0,0 +1,101 @@
+#!/usr/bin/wsjcpp-safe-scripting
+
+# log_info rootdir
+# log_info script_filename
+
+make_dir "src"
+
+var employ_name
+set_value employ_name arg1
+normalize_class_name employ_name
+convert_CamelCase_to_snake_case employ_name employ_name
+
+var class_name
+concat class_name "Employ" arg1
+normalize_class_name class_name
+
+var base_filename
+convert_CamelCase_to_snake_case class_name base_filename
+# log_info base_filename
+
+var filename_cpp
+concat filename_cpp "./src/" base_filename ".cpp"
+
+var filename_h
+concat filename_h "./src/" base_filename ".h"
+
+var ifndef_header
+set_value ifndef_header base_filename
+concat ifndef_header "_H"
+
+to_upper_case ifndef_header
+
+var content_header
+concat content_header "#ifndef " ifndef_header "
+#define " ifndef_header "
+
+#include <wsjcpp_employees.h>
+
+class " class_name " : public WsjcppEmployBase {
+    public:
+        " class_name "();
+        static std::string name() { return \"" class_name "\"; }
+        virtual bool init() override;
+        virtual bool deinit() override;
+
+    private:
+        std::string TAG;
+};
+
+#endif // " ifndef_header
+
+ 
+var content_source
+concat content_source  "
+#include \"" base_filename ".h\"
+#include <wsjcpp_core.h>
+
+// ---------------------------------------------------------------------
+// " class_name "
+
+REGISTRY_WJSCPP_EMPLOY(" class_name ")
+
+" class_name "::" class_name "() 
+: WsjcppEmployBase(" class_name "::name(), {}) {
+    TAG = " class_name "::name();
+}
+
+// ---------------------------------------------------------------------
+
+bool " class_name "::init() {
+    WsjcppLog::info(TAG, \"init\");
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+bool " class_name "::deinit() {
+    WsjcppLog::info(TAG, \"deinit\");
+    return true;
+}
+
+"
+
+var file_source
+concat file_source "src/" filename_cpp
+
+write_file filename_h content_header
+write_file filename_cpp content_source
+
+log_info "
+======
+Generated class:
+    - " class_name "
+Generated files:
+    - " filename_h "
+    - " filename_cpp "
+======
+"
+
+cmakelists_txt_append_wsjcpp filename_h
+cmakelists_txt_append_wsjcpp filename_cpp

src.wsjcpp/CMakeLists.txt

@@ -17,7 +17,7 @@ set (WSJCPP_SOURCES "")
 find_package(Threads REQUIRED)
 list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 
-# wsjcpp-core:v0.0.8
+# wsjcpp-core:v0.1.1
 list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_core/")
 list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp")
 list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.h")

src.wsjcpp/wsjcpp_core/wsjcpp.hold.yml

@@ -3,7 +3,7 @@ cmake_cxx_standard: 11
 cmake_minimum_required: 3.0
 
 name: wsjcpp-core
-version: v0.0.8
+version: v0.1.1
 description: Basic Utils for wsjcpp
 issues: https://github.com/wsjcpp/wsjcpp-core/issues
 repositories:
@@ -64,3 +64,7 @@ unit-tests:
       description: "Test create empty file"
     - name: "ReadFileToBuffer"
       description: "test for readFileToBuffer"
+    - name: "Join"
+      description: "Test join function"
+    - name: "getHumanSizeBytes"
+      description: "Test function get human size in bytes"