Merge pull request #7 from wsjcpp/version-0.2.1

Version 0.2.1

Author: sea5kg

CHANGELOG.md

@@ -5,10 +5,23 @@ All notable changes to wsjcpp-yaml project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v0.2.0] - 2025-06-29 (2025 Jule 29)
+## [v0.2.1] - 2026-03-05 (2026 March 5)
+
+- Fixed: renamed 'recoursiveTestDependencies' to 'recursiveTestDependencies'
+- Fixed-names: renamed 'inited' to 'initialized'
+- Added define REGISTRY_WSJCPP_EMPLOY
+- Fixed namings: renamed REGISTRY_WJSCPP_SERVICE_LOCATOR to REGISTRY_WSJCPP_SERVICE_LOCATOR
+- Fixed build tests
+- Removed define WSJCPP_EMPLOYEES_VERSION_0_2_0
+- Added define WSJCPP_EMPLOYEES_VERSION_0_2_1
+- Removed define REGISTRY_WSJCPP_SERVICE_LOCATOR
+- Moved all tests for ctest (before exclude dependency wsjcpp_core)
+- Fixed #6 remove dependencies to wsjcpp-core
+
+## [v0.2.0] - 2025-06-29 (2025 July 29)
 
 - Updated wsjcpp-core to v0.2.3 (Up C++ from 11 to 17)
-- Change single name registartion to multiple names
+- Change single name registration to multiple names
 - Added silent mode
 - Added class for simplify init `WsjcppEmployeesInit`
 - Added copyrights to files

CMakeLists.txt

@@ -31,4 +31,6 @@ install(
         /usr/bin
 )
 
-
+# enable testing functionality
+enable_testing()
+add_subdirectory(src/tests)

README.md

@@ -1,6 +1,6 @@
 # wsjcpp-employees
 
-[![Build Status](https://api.travis-ci.org/wsjcpp/wsjcpp-employees.svg?branch=master)](https://travis-ci.org/wsjcpp/wsjcpp-employees) [![Github Stars](https://img.shields.io/github/stars/wsjcpp/wsjcpp-employees.svg?label=github%20%E2%98%85)](https://github.com/wsjcpp/wsjcpp-employees/stargazers) [![Github Stars](https://img.shields.io/github/contributors/wsjcpp/wsjcpp-employees.svg)](https://github.com/wsjcpp/wsjcpp-employees/) [![Github Forks](https://img.shields.io/github/forks/wsjcpp/wsjcpp-employees.svg?label=github%20forks)](https://github.com/wsjcpp/wsjcpp-employees/network/members) [![Total alerts](https://img.shields.io/lgtm/alerts/g/wsjcpp/wsjcpp-employees.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/wsjcpp/wsjcpp-employees/alerts/) [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/wsjcpp/wsjcpp-employees.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/wsjcpp/wsjcpp-employees/context:cpp)
+[![Github Stars](https://img.shields.io/github/stars/wsjcpp/wsjcpp-employees.svg?label=github%20%E2%98%85)](https://github.com/wsjcpp/wsjcpp-employees) [![Github Stars](https://img.shields.io/github/contributors/wsjcpp/wsjcpp-employees.svg)](https://github.com/wsjcpp/wsjcpp-employees/) [![Github Forks](https://img.shields.io/github/forks/wsjcpp/wsjcpp-employees.svg?label=github%20forks)](https://github.com/wsjcpp/wsjcpp-employees/network/members) [![Total alerts](https://img.shields.io/lgtm/alerts/g/wsjcpp/wsjcpp-employees.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/wsjcpp/wsjcpp-employees/alerts/) [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/wsjcpp/wsjcpp-employees.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/wsjcpp/wsjcpp-employees/context:cpp)
 
 C++ classes for service-architecture
 
@@ -13,8 +13,6 @@ $ wsjcpp install https://github.com/wsjcpp/wsjcpp-employees:master
 
 or include this files:
 
-- src.wsjcpp/wsjcpp_core/wsjcpp_core.h
-- src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp
 - src/wsjcpp_employees.h
 - src/wsjcpp_employees.cpp
 
@@ -27,6 +25,30 @@ Example main func:
 #include <wsjcpp_core.h>
 #include <wsjcpp_employees.h>
 
+// logger
+class EmployeesLogger : public IWsjcppEmployeesLogger {
+public:
+  virtual void info(const std::string &tag, const std::string &message) override {
+    WsjcppLog::info(tag, message);
+  }
+
+  virtual void ok(const std::string &tag, const std::string &message) override {
+    WsjcppLog::ok(tag, message);
+  }
+
+  virtual void warn(const std::string &tag, const std::string &message) override {
+    WsjcppLog::warn(tag, message);
+  }
+
+  virtual void err(const std::string &tag, const std::string &message) override {
+    WsjcppLog::err(tag, message);
+  }
+
+  virtual void throw_err(const std::string &tag, const std::string &message) override {
+    WsjcppLog::throw_err(tag, message);
+  }
+};
+
 int main(int argc, const char* argv[]) {
     std::string TAG = "MAIN";
     std::string appName = std::string(WSJCPP_NAME);
@@ -36,11 +58,12 @@ int main(int argc, const char* argv[]) {
     }
     WsjcppLog::setPrefixLogFile("wsjcpp-employees");
     WsjcppLog::setLogDirectory(".logs");
+    WsjcppEmployees::setLogger(new EmployeesLogger());
 
     // init employees
     bool bSilent = false;
-    WsjcppEmployeesInit empls({}, bSilent);
-    if (!empls.inited) {
+    WsjcppEmployeesInit employees({}, bSilent);
+    if (!employees.initialized) {
         WsjcppLog::err(TAG, "Could not init employees");
         return -1;
     }
@@ -53,6 +76,8 @@ Example output:
 % ./wsjcpp-employees
 2020-03-22 11:32:31.750, 0x0x110c21dc0 [INFO] WJSCppEmployRuntimeGlobalCache: init
 2020-03-22 11:32:31.750, 0x0x110c21dc0 [OK] Employees_init: Init WJSCppEmployRuntimeGlobalCache ... OK
+2026-03-05 16:49:45.106, 0x00007139fa6fb740 [INFO] WsjcppEmployRuntimeGlobalCache: deinit
+2026-03-05 16:49:45.106, 0x00007139fa6fb740 [OK] WsjcppEmployees::deinit: WsjcppEmployRuntimeGlobalCache ... DEINIT_OK
 ```
 
 Now you can call from any place:
@@ -120,7 +145,7 @@ Example source-code `src/employ_my_impl.cpp`:
 // ---------------------------------------------------------------------
 // EmployMyImpl
 
-REGISTRY_WJSCPP_SERVICE_LOCATOR(EmployMyImpl)
+REGISTRY_WSJCPP_EMPLOY(EmployMyImpl)
 
 EmployMyImpl::EmployMyImpl()
 : WsjcppEmployBase({IMyImpl::name()}, {}) {
@@ -158,6 +183,13 @@ void someFunc() {
     pYourEmploy->doSomething();
 }
 
+void someFunc2() {
+    // if not found then no call throw exception
+    YourEmploy *pYourEmploy2 = findWsjcppEmploy<YourEmploy2>(false);
+    if (pYourEmploy2)
+        pYourEmploy2->doSomething();
+}
+
 void main() {
     ...
     WsjcppEmployeesInit empls({});

build_simple.sh

@@ -1,10 +1,29 @@
 #!/bin/bash
 
-if [ ! -d tmp ]; then
-	mkdir -p tmp
-fi
 
-cd tmp
-cmake ..
-make
+check_ret() {
+    if [ $1 -ne 0 ]; then
+        echo ""
+        echo "!!! FAIL: $2"
+        echo "********************************************************************************"
+        echo ""
+        exit $1
+    else
+        echo ""
+        echo "*** SUCCESS: $2"
+        echo "********************************************************************************"
+        echo ""
+    fi
+}
 
+# if [ ! -d tmp ]; then
+#     mkdir -p tmp
+# fi
+
+cmake -H. -Btmp/release -DCMAKE_BUILD_TYPE=Release
+check_ret $? "configure"
+
+cmake --build tmp/release --config Release
+check_ret $? "make"
+
+cd ./tmp/release && ctest --output-on-failure

scripts.wsjcpp/generate.WsjcppEmploy.wsjcpp-script

@@ -80,7 +80,7 @@ concat content_source  "
 // ---------------------------------------------------------------------
 // " class_name "
 
-REGISTRY_WJSCPP_SERVICE_LOCATOR(" class_name ")
+REGISTRY_WSJCPP_EMPLOY(" class_name ")
 
 " class_name "::" class_name "()
 : WsjcppEmployBase({I" employ_name "::name()}, {}) {

src.wsjcpp/.gitkeep

@@ -1,7 +1,7 @@
-# Automaticly generated by wsjcpp@v0.2.5
+# Automaticly generated by wsjcpp@v0.2.7
 cmake_minimum_required(VERSION 3.5)
 
-add_definitions(-DWSJCPP_APP_VERSION="v0.2.0")
+add_definitions(-DWSJCPP_APP_VERSION="v0.2.1")
 add_definitions(-DWSJCPP_APP_NAME="wsjcpp-employees")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -17,7 +17,7 @@ set (WSJCPP_SOURCES "")
 find_package(Threads REQUIRED)
 list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 
-# wsjcpp-core:v0.2.3
+# wsjcpp-core:v0.2.4
 list (APPEND WSJCPP_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_core/")
 list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp")
 list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_core/wsjcpp_core.h")

src.wsjcpp/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_cxx_standard: 17
 cmake_minimum_required: 3.0
 
 name: wsjcpp-core
-version: v0.2.3
+version: v0.2.4
 description: Basic Utils for wsjcpp
 issues: https://github.com/wsjcpp/wsjcpp-core/issues
 repositories:
@@ -21,32 +21,32 @@ distribution:
   - source-file: src/wsjcpp_core.cpp
     target-file: wsjcpp_core.cpp
     type: "source-code"
-    sha1: "9153a6eff17ea98ac510d96de7060dd25053bdb3"
+    sha1: "602b7a2a8e909e7ba439261f81a6eaf3c87d135f"
   - source-file: src/wsjcpp_core.h
     target-file: wsjcpp_core.h
     type: "source-code" # todo must be header-file
-    sha1: "c2056e306e9cda6b90b764e83709b3c4e0199b8d"
+    sha1: "14a1d9a252631de959962d12c32122e8d8fe5444"
   - source-file: "src/wsjcpp_unit_tests.cpp"
     target-file: "wsjcpp_unit_tests.cpp"
     type: "unit-tests"
-    sha1: "fd5989d1a83c8b90bdc4d5e9bc9c3051eaa1e6d2"
+    sha1: "b96d9d06775069d0777cb168da16d432f019d5e9"
   - source-file: "src/wsjcpp_unit_tests.h"
     target-file: "wsjcpp_unit_tests.h"
     type: "unit-tests"
-    sha1: "83d4b6e046b6b58c42882ccae4be413e03c401c1"
+    sha1: "aa581f5678795a4a6b0ecc488181bb5289a03c6b"
   - source-file: "src/wsjcpp_unit_tests_main.cpp"
     target-file: "wsjcpp_unit_tests_main.cpp"
     type: "unit-tests"
-    sha1: "388ae269b325c5e161f6c3a5c598575714a4bffc"
+    sha1: "cd50e0ba4b0ff7501ad0dc8e6c6ce9f5c735a787"
   - source-file: "scripts.wsjcpp/generate.WsjcppUnitTest.wsjcpp-script"
     target-file: "generate.WsjcppUnitTest.wsjcpp-script"
     type: "safe-scripting-generate"
     sha1: "a7c9c2d19bf81c5b00e659384b0b92a99319a4c1"
   - source-file: "scripts.wsjcpp/generate.Class.wsjcpp-script"
     target-file: "generate.Class.wsjcpp-script"
     type: "safe-scripting-generate"
-
     sha1: "de1799907c685d606b93e08b821b540c2faa2db1"
+
 unit-tests:
   cases:
     - name: CoreNormalizePath

src.wsjcpp/wsjcpp_core/wsjcpp.hold.yml

@@ -1,11 +1,37 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2019-2026 Evgenii Sopov
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+*/
+
+// original source-code: https://github.com/wsjcpp/wsjcpp-core
+
 #include "wsjcpp_core.h"
 
 #ifndef _MSC_VER
     #include <dirent.h>
     #include <sys/time.h>
     #include <unistd.h>
     #include <arpa/inet.h>
-#else 
+#else
     #include <direct.h>
     #define PATH_MAX 256
 #endif
@@ -1297,3 +1323,36 @@ bool WsjcppResourcesManager::extractFiles(const std::string &sWorkspace) {
 }
 */
 
+namespace wsjcpp {
+
+const std::string &Core::englishAlphabetLowerCase() {
+    static const std::string ret = "abcdefghijklmnopqrstuvwxyz";
+    return ret;
+}
+
+const std::string &Core::englishAlphabetUpperCase() {
+    static const std::string ret = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    return ret;
+}
+
+const std::string &Core::englishAlphabetBothCase() {
+    static const std::string ret = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    return ret;
+}
+
+const std::string &Core::englishAlphabetBothCaseAndNumbers() {
+    static const std::string ret = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+    return ret;
+}
+
+std::string Core::randomString(const std::string &alphabet, int length) {
+    std::string ret = "";
+    ret.resize(length, alphabet[0]);
+    int alphabet_len = alphabet.length();
+    for (int i = 0; i < length; i++) {
+        ret[i] = alphabet[rand() % alphabet_len];
+    }
+    return ret;
+}
+
+} // namespace wsjcpp

src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp

@@ -1,6 +1,36 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2019-2026 Evgenii Sopov
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+*/
+
+// original source-code: https://github.com/wsjcpp/wsjcpp-core
+
 #ifndef WSJCPP_CORE_H
 #define WSJCPP_CORE_H
 
+#define WSJCPP_CORE_VER_0
+#define WSJCPP_CORE_VER_0_2
+#define WSJCPP_CORE_VER_0_2_4
+
 #include <string>
 #include <vector>
 #include <map>
@@ -234,6 +264,18 @@ class WsjcppResourcesManager {
 #define REGISTRY_WSJCPP_RESOURCE_FILE( classname ) \
     static classname * pRegistryWsjcppResourceFile ## classname = new classname(); \
 
+namespace wsjcpp {
+
+class Core {
+  public:
+    static const std::string &englishAlphabetLowerCase();
+    static const std::string &englishAlphabetUpperCase();
+    static const std::string &englishAlphabetBothCase();
+    static const std::string &englishAlphabetBothCaseAndNumbers();
+    static std::string randomString(const std::string &alphabet, int length);
+};
+
+} // namespace wsjcpp
 
 #endif // WSJCPP_CORE_H