Merge pull request #23 from wsjcpp/version-0.2.1

Version 0.2.1

Author: sea5kg

CMakeLists.txt

@@ -17,8 +17,6 @@ list (APPEND WSJCPP_INCLUDE_DIRS "src")
 
 list (APPEND WSJCPP_SOURCES "src/wsjcpp_core.h")
 list (APPEND WSJCPP_SOURCES "src/wsjcpp_core.cpp")
-list (APPEND WSJCPP_SOURCES "src/wsjcpp_resources_manager.h")
-list (APPEND WSJCPP_SOURCES "src/wsjcpp_resources_manager.cpp")
 
 list (APPEND WSJCPP_SOURCES "src/main.cpp")
 

scripts.wsjcpp/generate.Class renamed to scripts.wsjcpp/generate.Class.wsjcpp-script

@@ -6,35 +6,21 @@
 make_dir "./unit-tests.wsjcpp"
 make_dir "./unit-tests.wsjcpp/src"
 
-var user_class_name
-set_value user_class_name arg1
-normalize_class_name user_class_name
 var class_name
-set_value class_name "UnitTest"
-concat class_name user_class_name
-
-var base_filename
-convert_CamelCase_to_snake_case class_name base_filename
-# log_info base_filename
+set_value class_name arg1
+normalize_class_name class_name
 
 var filename_cpp
-concat filename_cpp "./unit-tests.wsjcpp/src/" base_filename ".cpp"
-
-var filename_h
-concat filename_h "./unit-tests.wsjcpp/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 "
+set_value filename_cpp arg2
 
+var content_source
+concat content_source "
+#include <wsjcpp_core.h>
 #include <wsjcpp_unit_tests.h>
 
+// ---------------------------------------------------------------------
+// " class_name "
+
 class " class_name " : public WsjcppUnitTestBase {
     public:
         " class_name "();
@@ -43,17 +29,6 @@ class " class_name " : public WsjcppUnitTestBase {
         virtual bool doAfterTest() override;
 };
 
-#endif // " ifndef_header
-
- 
-var content_source
-concat content_source  "
-#include \"" base_filename ".h\"
-#include <wsjcpp_core.h>
-
-// ---------------------------------------------------------------------
-// " class_name "
-
 REGISTRY_WSJCPP_UNIT_TEST(" class_name ")
 
 " class_name "::" class_name "()
@@ -63,7 +38,7 @@ REGISTRY_WSJCPP_UNIT_TEST(" class_name ")
 // ---------------------------------------------------------------------
 
 bool " class_name "::doBeforeTest() {
-    // nothing
+    // do something before test
     return true;
 }
 
@@ -77,27 +52,19 @@ void " class_name "::executeTest() {
 // ---------------------------------------------------------------------
 
 bool " class_name "::doAfterTest() {
-    // nothing
+    // do somethig after test
     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 "
 ======
 "
-
-wsjcpp_yml_unit_test_add user_class_name filename_h
-wsjcpp_yml_unit_test_add user_class_name filename_cpp

scripts.wsjcpp/generate.WsjcppUnitTest renamed to scripts.wsjcpp/generate.WsjcppUnitTest.wsjcpp-script

@@ -1,7 +1,7 @@
 # Automaticly generated by wsjcpp@v0.1.7
 cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_APP_VERSION="v0.2.0")
+add_definitions(-DWSJCPP_APP_VERSION="v0.2.1")
 add_definitions(-DWSJCPP_APP_NAME="wsjcpp-core")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

src.wsjcpp/CMakeLists.txt

@@ -1213,4 +1213,122 @@ void WsjcppLog::add(WsjcppColorModifier &clr, const std::string &sType, const st
     }
 }
 
+// ---------------------------------------------------------------------
+// WsjcppResourceFile
+
+WsjcppResourceFile::WsjcppResourceFile() {
+    WsjcppResourcesManager::add(this);
+}
+
+// ---------------------------------------------------------------------
+
+
+// ---------------------------------------------------------------------
+// WsjcppResourcesManager
+
+std::vector<WsjcppResourceFile*> *g_pWsjcppResourceFiles = nullptr;
+
+void WsjcppResourcesManager::initGlobalVariables() {
+    if (g_pWsjcppResourceFiles == nullptr) {
+        g_pWsjcppResourceFiles = new std::vector<WsjcppResourceFile*>();
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void WsjcppResourcesManager::add(WsjcppResourceFile* pStorage) {
+    WsjcppResourcesManager::initGlobalVariables();
+    g_pWsjcppResourceFiles->push_back(pStorage);
+}
+
+// ---------------------------------------------------------------------
+
+bool WsjcppResourcesManager::has(const std::string &sFilename) {
+    WsjcppResourcesManager::initGlobalVariables();
+    for (int i = 0; i < WsjcppResourcesManager::list().size(); i++) {
+        if (WsjcppResourcesManager::list()[i]->getFilename() == sFilename) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// ---------------------------------------------------------------------
+
+WsjcppResourceFile* WsjcppResourcesManager::get(const std::string &sFilename) {
+    WsjcppResourcesManager::initGlobalVariables();
+    for (int i = 0; i < WsjcppResourcesManager::list().size(); i++) {
+        if (WsjcppResourcesManager::list()[i]->getFilename() == sFilename) {
+            return WsjcppResourcesManager::list()[i];
+        }
+    }
+    return nullptr;
+}
+
+// ---------------------------------------------------------------------
+
+const std::vector<WsjcppResourceFile*> &WsjcppResourcesManager::list() {
+    return *g_pWsjcppResourceFiles;
+}
+
+// ---------------------------------------------------------------------
+
+/*
+bool WsjcppResourcesManager::make(const std::string &sWorkspace) {
+    if (!WsjcppResourcesManager::createFolders(sWorkspace)) {
+        return false;
+    }
+    return WsjcppResourcesManager::extractFiles(sWorkspace);
+}
+
+// ---------------------------------------------------------------------
+
+bool WsjcppResourcesManager::createFolders(const std::string &sWorkspace) {
+    // prepare folders
+    std::vector<std::string> vCreateDirs;
+    vCreateDirs.push_back(sWorkspace + "/logs");
+    vCreateDirs.push_back(sWorkspace + "/teams");
+    vCreateDirs.push_back(sWorkspace + "/checkers");
+    vCreateDirs.push_back(sWorkspace + "/html");
+    vCreateDirs.push_back(sWorkspace + "/html/css");
+    vCreateDirs.push_back(sWorkspace + "/html/js");
+    vCreateDirs.push_back(sWorkspace + "/html/images");
+    vCreateDirs.push_back(sWorkspace + "/html/images/teams");
+    vCreateDirs.push_back(sWorkspace + "/html/images/states");
+
+    for(int i = 0; i < vCreateDirs.size(); i++) {
+        std::string sPath = vCreateDirs[i];
+        // check dir existing
+        if (!FS::dirExists(sPath)) {
+            // try make dir
+            if (!FS::makeDir(sPath)) {
+                std::cout << "Could not create folder " << sPath << std::endl;
+                return false;
+            } else {
+                std::cout << "Created folder " << sPath << std::endl;
+            }
+        }
+    }
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+bool WsjcppResourcesManager::extractFiles(const std::string &sWorkspace) {
+    // TODO mkdir -p for files
+    const std::vector<WsjcppResourceFile*> list = WsjcppResourcesManager::list();
+    for(int i = 0; i < list.size(); i++) {
+        std::string sFilename = sWorkspace + "/" + list[i]->filename();
+        if (!FS::fileExists(sFilename)) {
+            if (!FS::writeFile(sFilename, list[i]->buffer(), list[i]->bufferSize())) {
+                std::cout << "Could not write file " << sFilename << std::endl;
+                return false;
+            } else {
+                std::cout << "Created file " << sFilename << std::endl;
+            }
+        }
+    }
+    return true;
+}
+*/
 

src/wsjcpp_core.cpp

@@ -194,6 +194,42 @@ class WsjcppLog {
         static void add(WsjcppColorModifier &clr, const std::string &sType, const std::string &sTag, const std::string &sMessage);
 };
 
+// ---------------------------------------------------------------------
+// WsjcppResourceFile
+
+class WsjcppResourceFile {
+    public:
+        WsjcppResourceFile();
+        virtual const std::string &getFilename() const = 0;
+        virtual const std::string &getPackAs() const = 0;
+        virtual int getBufferSize() const = 0;
+        virtual const char *getBuffer() const = 0;
+};
+
+
+// ---------------------------------------------------------------------
+// WsjcppResourcesManager
+
+extern std::vector<WsjcppResourceFile*> *g_pWsjcppResourceFiles;
+
+class WsjcppResourcesManager {
+    public:
+        static void initGlobalVariables();
+        static void add(WsjcppResourceFile*);
+        static const std::vector<WsjcppResourceFile*> &list();
+        static bool has(const std::string &sFilename);
+        static WsjcppResourceFile* get(const std::string &sFilename);
+        static bool make(const std::string &sWorkspace);
+        // static bool createFolders(const std::string &sWorkspace);
+        // static bool extractFiles(const std::string &sWorkspace);
+};
+
+// ---------------------------------------------------------------------
+// Registry WsjcppResourceFile
+#define REGISTRY_WSJCPP_RESOURCE_FILE( classname ) \
+    static classname * pRegistryWsjcppResourceFile ## classname = new classname(); \
+
+
 #endif // WSJCPP_CORE_H