Move ccolor to common/utils

[Feature]       Move ccolor.hpp and ccolor.cpp from libs/logger to common/utils
[Cause]         ccolor should be available to the CLI without logger as dependency
[Solution]      N/A
[Verification]  Build, install, run tests

Change-Id: Ic16301b30bd90e60300e243ee8b2dac309eadfac

diff --git a/libs/logger/ccolor.cpp b/common/utils/ccolor.cpp
similarity index 87%
rename from libs/logger/ccolor.cpp
rename to common/utils/ccolor.cpp
index 9cc652d..d95dac9 100644 (file)
--- a/libs/logger/ccolor.cpp
+++ b/common/utils/ccolor.cpp
@@ -19,15 +19,14 @@
 /**
  * @file
  * @author  Dariusz Michaluk (d.michaluk@samsung.com)
- * @brief   Console color for StderrBackend logger
+ * @brief   Console colors utility
  */
 
-#include "logger/config.hpp"
-#include "logger/ccolor.hpp"
+#include "utils/ccolor.hpp"
 
 #include <stdio.h>
 
-namespace logger {
+namespace utils {
 
 std::string getConsoleEscapeSequence(Attributes attr, Color color)
 {
@@ -38,4 +37,4 @@ std::string getConsoleEscapeSequence(Attributes attr, Color color)
     return std::string(command);
 }
 
-} // namespace logger
+} // namespace utils

diff --git a/libs/logger/ccolor.hpp b/common/utils/ccolor.hpp
similarity index 85%
rename from libs/logger/ccolor.hpp
rename to common/utils/ccolor.hpp
index 47cc25e..1700967 100644 (file)
--- a/libs/logger/ccolor.hpp
+++ b/common/utils/ccolor.hpp
@@ -19,15 +19,15 @@
 /**
  * @file
  * @author  Dariusz Michaluk (d.michaluk@samsung.com)
- * @brief   Console color for StderrBackend logger
+ * @brief   Console colors utility
  */
 
-#ifndef COMMON_LOGGER_CCOLOR_HPP
-#define COMMON_LOGGER_CCOLOR_HPP
+#ifndef COMMON_UTILS_CCOLOR_HPP
+#define COMMON_UTILS_CCOLOR_HPP
 
 #include <string>
 
-namespace logger {
+namespace utils {
 
 enum class Color : unsigned int {
     DEFAULT     = 0,
@@ -48,6 +48,6 @@ enum class Attributes : unsigned int {
 
 std::string getConsoleEscapeSequence(Attributes attr, Color color);
 
-} // namespace logger
+} // namespace utils
 
-#endif // COMMON_LOGGER_CCOLOR_HPP
+#endif // COMMON_UTILS_CCOLOR_HPP

diff --git a/libs/logger/CMakeLists.txt b/libs/logger/CMakeLists.txt
index 61027c2..6a65b34 100644 (file)
--- a/libs/logger/CMakeLists.txt
+++ b/libs/logger/CMakeLists.txt
@@ -21,15 +21,17 @@ PROJECT(Logger)
 
 MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for the libLogger...")
-FILE(GLOB HEADERS   *.hpp)
-FILE(GLOB SRCS      *.cpp *.hpp)
+FILE(GLOB HEADERS           *.hpp)
+FILE(GLOB SRCS              *.cpp *.hpp)
+FILE(GLOB HEADERS_UTILS     ${COMMON_FOLDER}/utils/ccolor.hpp)
+FILE(GLOB SRCS_UTILS        ${COMMON_FOLDER}/utils/ccolor.cpp)
 
 SET(_LIB_VERSION_ "${VERSION}")
 SET(_LIB_SOVERSION_ "0")
 SET(PC_FILE "lib${PROJECT_NAME}.pc")
 
 ## Setup target ################################################################
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
+ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS} ${SRCS_UTILS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
     SOVERSION   ${_LIB_SOVERSION_}
     VERSION     ${_LIB_VERSION_}
@@ -40,7 +42,7 @@ IF(NOT WITHOUT_SYSTEMD)
 PKG_CHECK_MODULES(LOGGER_DEPS REQUIRED libsystemd-journal)
 ENDIF(NOT WITHOUT_SYSTEMD)
 
-INCLUDE_DIRECTORIES(${LIBS_FOLDER})
+INCLUDE_DIRECTORIES(${LIBS_FOLDER} ${COMMON_FOLDER})
 INCLUDE_DIRECTORIES(SYSTEM ${LOGGER_DEPS_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${LOGGER_DEPS_LIBRARIES})
 
@@ -57,3 +59,6 @@ INSTALL(TARGETS     ${PROJECT_NAME}
 
 INSTALL(FILES       ${HEADERS}
         DESTINATION ${INCLUDE_INSTALL_DIR}/vasum-tools/logger)
+
+INSTALL(FILES       ${HEADERS_UTILS}
+        DESTINATION ${INCLUDE_INSTALL_DIR}/vasum-tools/logger/utils)

diff --git a/libs/logger/formatter.cpp b/libs/logger/formatter.cpp
index 815a111..17bed53 100644 (file)
--- a/libs/logger/formatter.cpp
+++ b/libs/logger/formatter.cpp
@@ -24,7 +24,7 @@
 
 #include "logger/config.hpp"
 #include "logger/formatter.hpp"
-#include "logger/ccolor.hpp"
+#include "utils/ccolor.hpp"
 
 #include <sys/time.h>
 #include <cassert>
@@ -78,25 +78,25 @@ std::string LogFormatter::getConsoleColor(LogLevel logLevel)
 {
     switch (logLevel) {
     case LogLevel::ERROR:
-        return getConsoleEscapeSequence(Attributes::BOLD, Color::RED);
+        return utils::getConsoleEscapeSequence(utils::Attributes::BOLD, utils::Color::RED);
     case LogLevel::WARN:
-        return getConsoleEscapeSequence(Attributes::BOLD, Color::YELLOW);
+        return utils::getConsoleEscapeSequence(utils::Attributes::BOLD, utils::Color::YELLOW);
     case LogLevel::INFO:
-        return getConsoleEscapeSequence(Attributes::BOLD, Color::BLUE);
+        return utils::getConsoleEscapeSequence(utils::Attributes::BOLD, utils::Color::BLUE);
     case LogLevel::DEBUG:
-        return getConsoleEscapeSequence(Attributes::DEFAULT, Color::GREEN);
+        return utils::getConsoleEscapeSequence(utils::Attributes::DEFAULT, utils::Color::GREEN);
     case LogLevel::TRACE:
-        return getConsoleEscapeSequence(Attributes::DEFAULT, Color::BLACK);
+        return utils::getConsoleEscapeSequence(utils::Attributes::DEFAULT, utils::Color::BLACK);
     case LogLevel::HELP:
-        return getConsoleEscapeSequence(Attributes::BOLD, Color::MAGENTA);
+        return utils::getConsoleEscapeSequence(utils::Attributes::BOLD, utils::Color::MAGENTA);
     default:
-        return getConsoleEscapeSequence(Attributes::DEFAULT, Color::DEFAULT);
+        return utils::getConsoleEscapeSequence(utils::Attributes::DEFAULT, utils::Color::DEFAULT);
     }
 }
 
 std::string LogFormatter::getDefaultConsoleColor(void)
 {
-    return getConsoleEscapeSequence(Attributes::DEFAULT, Color::DEFAULT);
+    return utils::getConsoleEscapeSequence(utils::Attributes::DEFAULT, utils::Color::DEFAULT);
 }
 
 std::string LogFormatter::stripProjectDir(const std::string& file,