Updated wsjcpp-core and wsjcpp.yml

Author: sea5kg

.gitignore

@@ -1,6 +1,8 @@
 wsjcpp-arguments
 tmp/*
 .vscode/*
+.wsjcpp-logs/*
+.wsjcpp-cache/*
 
 # Prerequisites
 *.d

src.wsjcpp/CMakeLists.txt

@@ -10,7 +10,7 @@ set (WSJCPP_LIBRARIES "")
 set (WSJCPP_INCLUDE_DIRS "")
 set (WSJCPP_SOURCES "")
 
-# wsjcpp-core
-list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp-core")
-list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp-core/wsjcpp_core.h")
-list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp-core/wsjcpp_core.cpp")
+# wsjcpp/wsjcpp-core
+list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_wsjcpp_core")
+list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.h")
+list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.cpp")

src.wsjcpp/wsjcpp-core/wsjcpp.hold.yml

@@ -0,0 +1,39 @@
+wsjcpp_version: v0.0.1
+cmake_cxx_standard: 11
+cmake_minimum_required: 3.0
+
+name: wsjcpp/wsjcpp-core
+version: v0.0.2
+description: Basic Utils for wsjcpp
+issues: https://github.com/wsjcpp/wsjcpp-core/issues
+repositories:
+  - type: main
+    url: "https://github.com/wsjcpp/wsjcpp-core"
+keywords:
+  - c++
+  - wsjcpp
+
+authors:
+  - name: Evgenii Sopov
+    email: [email protected]
+
+required-libraries:
+  - pthread
+
+distribution:
+  - source-file: src/wsjcpp_core.cpp
+    target-file: wsjcpp_core.cpp
+    sha1: "bede8216bc5aaf105e86a9572c3d9066a71026b7"
+    type: "source-code"
+  - source-file: src/wsjcpp_core.h
+    target-file: wsjcpp_core.h
+    sha1: "b3d842d01fe13c5463fc3af61c5408ac437c65aa"
+    type: "source-code"
+
+unit-tests:
+  folder: unit-tests # default
+  files:
+    - unit-tests/src/main.cpp
+    - unit-tests/src/unit_tests.h
+    - unit-tests/src/unit_tests.cpp
+

src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp.hold.yml

@@ -96,6 +96,34 @@ std::string WSJCppCore::doNormalizePath(const std::string & sPath) {
 
 // ---------------------------------------------------------------------
 
+std::string WSJCppCore::extractFilename(const std::string &sPath) {
+    // split path by /
+    std::vector<std::string> vNames;
+    std::string s = "";
+    int nStrLen = sPath.length();
+    for (int i = 0; i < sPath.length(); i++) {
+        if (sPath[i] == '/') {
+            vNames.push_back(s);
+            s = "";
+            if (i == nStrLen-1) {
+                vNames.push_back("");
+            }
+        } else {
+            s += sPath[i];
+        }
+    }
+    if (s != "") {
+         vNames.push_back(s);
+    }
+    std::string sRet;
+    if (vNames.size() > 0) {
+        sRet = vNames[vNames.size()-1];
+    }
+    return sRet;
+}
+
+// ---------------------------------------------------------------------
+
 std::string WSJCppCore::getCurrentDirectory() {
     char cwd[PATH_MAX];
     if (getcwd(cwd, sizeof(cwd)) == NULL) {
@@ -275,20 +303,20 @@ bool WSJCppCore::makeDir(const std::string &sDirname) {
         std::cout << "FAILED create folder " << sDirname << std::endl;
         return false;
     }
-    std::cout << "nStatus: " << nStatus << std::endl;
+    // std::cout << "nStatus: " << nStatus << std::endl;
     return true;
 }
 
 // ---------------------------------------------------------------------
 
 bool WSJCppCore::writeFile(const std::string &sFilename, const std::string &sContent) {
 
-    std::ofstream f(sFilename, std::ifstream::in);
+    // std::ofstream f(sFilename, std::ifstream::in);
+    std::ofstream f(sFilename, std::ios::out);
     if (!f) {
-        std::cout << "FAILED could not create file to wtite " << sFilename << std::endl;
+        WSJCppLog::err("WSJCppCore", "Could not create file to write '" + sFilename + "'");
         return false;
     }
-
     f << sContent << std::endl;
     f.close();
     return true;
@@ -492,3 +520,5 @@ void WSJCppLog::add(WSJCppColorModifier &clr, const std::string &sType, const st
     logFile << sLogMessage << std::endl;
     logFile.close();
 }
+
+

src.wsjcpp/wsjcpp-core/wsjcpp_core.cpp renamed to src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.cpp

@@ -18,7 +18,8 @@ class WSJCppCore {
             const std::string &sLibraryNameForExports
         );
 
-        static std::string doNormalizePath(const std::string & sPath);
+        static std::string doNormalizePath(const std::string &sPath);
+        static std::string extractFilename(const std::string &sPath);
         static std::string getCurrentDirectory();
 
         static long currentTime_milliseconds();
@@ -95,11 +96,12 @@ class WSJCppLog {
         static void ok(const std::string &sTag, const std::string &sMessage);
         static void setLogDirectory(const std::string &sDirectoryPath);
         static void setPrefixLogFile(const std::string &sPrefixLogFile);
-        // static nlohmann::json getLastLogs();
         static void initGlobalVariables();
 
     private:
         static void add(WSJCppColorModifier &clr, const std::string &sType, const std::string &sTag, const std::string &sMessage);
 };
 
 #endif // WSJCPP_CORE_H
+
+

src.wsjcpp/wsjcpp-core/wsjcpp_core.h renamed to src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.h

@@ -363,3 +363,4 @@ std::string WSJCppArguments::help() {
 }
 
 // ---------------------------------------------------------------------
+

src/wsjcpp_arguments.cpp

@@ -116,3 +116,4 @@ class WSJCppArguments {
 // ---------------------------------------------------------------------
 
 #endif // WSJCPP_ARGUMENTS_H
+

src/wsjcpp_arguments.h

@@ -1,4 +1,3 @@
-
 wsjcpp_version: v0.0.1
 cmake_cxx_standard: 11
 cmake_minimum_required: 3.0
@@ -21,22 +20,24 @@ authors:
   - name: Evgenii Sopov
     email: [email protected]
 
-requirements:
-  libs:
-    - pthread
-  packages:
-    - name: "wsjcpp/wsjcpp-core"
-      version: "v0.0.1"
-      url: "https://github.com/wsjcpp/wsjcpp-core:v0.0.1"
+required-libraries:
+  - pthread
+
+dependencies:
+  - name: "wsjcpp/wsjcpp-core"
+    version: "v0.0.2"
+    url: "https://github.com/wsjcpp/wsjcpp-core:master"
+    origin: "https://github.com/"
+    installation-dir: "./src.wsjcpp/wsjcpp_wsjcpp_core"
 
 distribution:
   - source-file: src/wsjcpp_arguments.cpp
     target-file: wsjcpp_arguments.cpp
-    sha1: "99c2b2d74c99f5427b28df9e2211545ec0c1c6c2"
+    sha1: "a6d1156597470cabdf368e5733b75a22d8a7fe1f"
     type: "source-code"
   - source-file: src/wsjcpp_arguments.h
     target-file: wsjcpp_arguments.h
-    sha1: "7029bc352d471e9aa778573a8aee162f2bd5cf95"
+    sha1: "cfc5cce21522378a594a25b11ac61d6a4a3f2863"
     type: "source-code"
 
 unit-tests: