Add printer (#18)

CMakeLists.txt

@@ -6,6 +6,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 add_library(time_tracker_common STATIC
     src/db.cc
+    src/printer.cc
     src/record.cc
     src/timestamp.cc
     src/type.cc
@@ -21,8 +22,9 @@ find_package(SQLite3 REQUIRED)
 
 target_link_libraries(time_tracker_common
     PRIVATE
-    fmt::fmt
     SQLite::SQLite3
+    PUBLIC
+    fmt::fmt
 )
 
 add_executable(time_tracker
@@ -39,6 +41,7 @@ target_link_libraries(time_tracker
 
 add_executable(time_tracker_test
     test/db_test.cc
+    test/printer_test.cc
     test/record_test.cc
     test/timestamp_test.cc
     test/type_test.cc

src/main.cc

@@ -1,4 +1,5 @@
 #include "db.h"
+#include "printer.h"
 #include "record.h"
 #include "type.h"
 
@@ -27,6 +28,7 @@ int main(int argc, char** argv)
         po::store(po::parse_command_line(argc, argv, options_description), variables_map);
 
         Db db;
+        Printer printer;
         if(variables_map.count("start"))
         {
             const Record record{Type::kStart};
@@ -41,15 +43,7 @@ int main(int argc, char** argv)
         }
         else if(variables_map.count("summary"))
         {
-            std::cout << "+-------+---------------------+\n";
-            std::cout << "| Type  | Timestamp           |\n";
-            std::cout << "+-------+---------------------+\n";
-            auto records{db.GetRecords()};
-            for(const auto& record: records)
-            {
-                std::cout << "| " << record.GetType() << " | " << record.GetTimestamp() << " |\n";
-            }
-            std::cout << "+-------+---------------------+\n";
+            printer.PrintRecords(db.GetRecords());
 
             std::cout << "\nTotal time: " << db.Summary() << "\n";
         }

src/printer.cc

@@ -0,0 +1,26 @@
+#include "printer.h"
+
+#include "record.h"
+#include "timestamp.h"
+#include "type.h"
+
+#include <fmt/format.h>
+
+Printer::Printer(std::ostream& sink):
+    sink_{sink}
+{
+}
+
+void Printer::PrintRecords(const std::vector<Record> records)
+{
+    sink_ << "+-------+---------------------+\n";
+    sink_ << "| Type  | Timestamp           |\n";
+    sink_ << "+-------+---------------------+\n";
+
+    for(const auto& record: records)
+    {
+        sink_ << fmt::format("| {:<5} | {:<19} |\n", record.GetType(), record.GetTimestamp());
+    }
+
+    sink_ << "+-------+---------------------+\n";
+}

src/printer.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "record.h"
+
+#include <iostream>
+#include <ostream>
+#include <vector>
+
+class Printer
+{
+    std::ostream& sink_;
+
+public:
+    Printer(std::ostream& sink = std::cout);
+
+    void PrintRecords(const std::vector<Record> records);
+};

src/timestamp.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <fmt/ostream.h>
+
 #include <ostream>
 #include <string>
 
@@ -27,3 +29,7 @@ bool operator==(const Timestamp& lhs, const Timestamp& rhs);
 bool operator!=(const Timestamp& lhs, const Timestamp& rhs);
 
 std::ostream& operator<<(std::ostream& os, const Timestamp& timestamp);
+
+template<>
+struct fmt::formatter<Timestamp>: ostream_formatter
+{};

src/type.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <fmt/ostream.h>
+
 #include <ostream>
 
 enum class Type
@@ -9,3 +11,7 @@ enum class Type
 };
 
 std::ostream& operator<<(std::ostream& os, const Type& type);
+
+template<>
+struct fmt::formatter<Type>: ostream_formatter
+{};

test/printer_test.cc

@@ -0,0 +1,17 @@
+#include "printer.h"
+
+#include <gtest/gtest.h>
+
+#include <sstream>
+
+TEST(PrinterTest, PrintNoRecords)
+{
+    std::ostringstream sink;
+    Printer printer{sink};
+
+    std::vector<Record> records;
+
+    printer.PrintRecords(records);
+
+    ASSERT_EQ("+-------+---------------------+\n| Type  | Timestamp           |\n+-------+---------------------+\n+-------+---------------------+\n", sink.str());
+}