feat: add status subcommand

src/main.cpp

@@ -2,22 +2,24 @@
 #include <git2.h>  // For version number only
 #include <iostream>
 
-#include "git_exception.hpp"
+#include "src/utils/git_exception.hpp"
 #include "version.hpp"
 #include "subcommand/init_subcommand.hpp"
+#include "subcommand/status_subcommand.hpp"
 
 int main(int argc, char** argv)
 {
     int exitCode = 0;
     try
     {
+        const libgit2_object lg2_obj;
         CLI::App app{"Git using C++ wrapper of libgit2"};
 
         // Top-level command options.
         auto version = app.add_flag("-v,--version", "Show version");
 
         // Sub commands
-        InitSubcommand init(app);
+        init_subcommand init(lg2_obj, app);
 
         app.parse(argc, argv);
 

src/meson.build

@@ -1,7 +1,7 @@
 subdir('subcommand')
+subdir('utils')
 subdir('wrapper')
 
 src_files = files([
-    'git_exception.cpp',
     'main.cpp'
-]) + subcommand_files + wrapper_files
+]) + subcommand_files + utils_files + wrapper_files

src/subcommand/init_subcommand.cpp

@@ -1,8 +1,8 @@
-#include <filesystem>
+// #include <filesystem>
 #include "init_subcommand.hpp"
-#include "../wrapper/repository_wrapper.hpp"
+#include "src/wrapper/repository_wrapper.hpp"
 
-InitSubcommand::InitSubcommand(CLI::App& app)
+init_subcommand::init_subcommand(const libgit2_object&, CLI::App& app)
 {
     auto *sub = app.add_subcommand("init", "Explanation of init here");
 
@@ -11,13 +11,12 @@ InitSubcommand::InitSubcommand(CLI::App& app)
     // If directory not specified, uses cwd.
     sub->add_option("directory", directory, "info about directory arg")
         ->check(CLI::ExistingDirectory | CLI::NonexistentPath)
-        ->default_val(std::filesystem::current_path());
+        ->default_val(get_current_git_path());
 
     sub->callback([this]() { this->run(); });
 }
 
-void InitSubcommand::run()
+void init_subcommand::run()
 {
-    RepositoryWrapper repo;
-    repo.init(directory, bare);
+    repository_wrapper::init(directory, bare);
 }

src/subcommand/init_subcommand.hpp

@@ -1,12 +1,16 @@
 #pragma once
 
 #include <string>
-#include "base_subcommand.hpp"
 
-class InitSubcommand : public BaseSubcommand
+#include <CLI/CLI.hpp>
+
+#include "../utils/common.hpp"
+
+class init_subcommand
 {
 public:
-    InitSubcommand(CLI::App& app);
+
+    explicit init_subcommand(const libgit2_object&, CLI::App& app);
     void run();
 
 private:

src/utils/common.cpp

@@ -0,0 +1,25 @@
+#include <filesystem>
+
+#include <git2.h>
+
+#include "common.hpp"
+
+libgit2_object::libgit2_object()
+{
+    git_libgit2_init();
+}
+
+libgit2_object::~libgit2_object()
+{
+    git_libgit2_shutdown();
+}
+
+std::string get_current_git_path()
+{
+    return std::filesystem::current_path();  // TODO: make sure that it goes to the root
+}
+
+// // If directory not specified, uses cwd.
+// sub->add_option("directory", directory, "info about directory arg")
+//     ->check(CLI::ExistingDirectory | CLI::NonexistentPath)
+//     ->default_val(std::filesystem::current_path());

src/utils/common.hpp

@@ -0,0 +1,59 @@
+#pragma once
+
+#include <string>
+#include <utility>
+
+class noncopiable_nonmovable
+{
+public:
+    noncopiable_nonmovable(const noncopiable_nonmovable&) = delete;
+    noncopiable_nonmovable& operator=(const noncopiable_nonmovable&) = delete;
+    noncopiable_nonmovable(noncopiable_nonmovable&&) = delete;
+    noncopiable_nonmovable& operator=(noncopiable_nonmovable&&) = delete;
+
+protected:
+    noncopiable_nonmovable() = default;
+    ~noncopiable_nonmovable() = default;
+};
+
+template <class T>
+class wrapper_base
+{
+public:
+    using ressource_type = T;
+
+    wrapper_base(const wrapper_base&) = delete;
+    wrapper_base& operator=(const wrapper_base&) = delete;
+
+    wrapper_base(wrapper_base&& rhs)
+        : p_ressource(rhs.p_ressource)
+    {
+        rhs.p_ressource = nullptr;
+    }
+    wrapper_base& operator=(wrapper_base&& rhs)
+    {
+        std::swap(p_ressource, rhs.p_ressource);
+        return this;
+    }
+
+    operator ressource_type*() const noexcept
+    {
+        return p_ressource;
+    }
+
+protected:
+    // Allocation and deletion of p_ressource must be handled by inheriting class.
+    wrapper_base() = default;
+    ~wrapper_base() = default;
+    ressource_type* p_ressource = nullptr;
+};
+
+class libgit2_object : private noncopiable_nonmovable
+{
+public:
+
+    libgit2_object();
+    ~libgit2_object();
+};
+
+std::string get_current_git_path();

src/utils/meson.build

@@ -0,0 +1,4 @@
+utils_files = files([
+    'common.cpp',
+    'git_exception.cpp',
+])

src/wrapper/meson.build

@@ -1,4 +1,3 @@
 wrapper_files = files([
-  'base_wrapper.cpp',
   'repository_wrapper.cpp',
 ])

src/wrapper/repository_wrapper.cpp

@@ -1,22 +1,23 @@
-#include <iostream>
-#include <string>
-
-#include "../git_exception.hpp"
+#include "../utils/git_exception.hpp"
 #include "repository_wrapper.hpp"
 
-RepositoryWrapper::RepositoryWrapper()
-    : _repo(nullptr)
-{}
 
-RepositoryWrapper::~RepositoryWrapper()
+repository_wrapper::~repository_wrapper()
+{
+    git_repository_free(p_ressource);
+    p_ressource=nullptr;
+}
+
+repository_wrapper repository_wrapper::open(const std::string& directory)
 {
-    if (_repo != nullptr) {
-        git_repository_free(_repo);  // no return
-    }
+    repository_wrapper rw;
+    throwIfError(git_repository_open(&(rw.p_ressource), directory.c_str()));
+    return rw;
 }
 
-void RepositoryWrapper::init(const std::string& directory, bool bare)
+repository_wrapper repository_wrapper::init(const std::string& directory, bool bare)
 {
-    // what if it is already initialised?  Throw exception or delete and recreate?
-    throwIfError(git_repository_init(&_repo, directory.c_str(), bare));
+    repository_wrapper rw;
+    throwIfError(git_repository_init(&(rw.p_ressource), directory.c_str(), bare));
+    return rw;
 }

src/wrapper/repository_wrapper.hpp

@@ -1,16 +1,24 @@
 #pragma once
 
-#include "base_wrapper.hpp"
+#include <string>
 
-class RepositoryWrapper : public BaseWrapper
+#include <git2.h>
+
+#include "../utils/common.hpp"
+
+class repository_wrapper : public wrapper_base<git_repository>
 {
 public:
-    RepositoryWrapper();
 
-    virtual ~RepositoryWrapper();
+    ~repository_wrapper();
 
-    void init(const std::string& directory, bool bare);
+    repository_wrapper(repository_wrapper&&) = default;
+    repository_wrapper& operator=(repository_wrapper&&) = default;
+
+    static repository_wrapper init(const std::string& directory, bool bare);
+    static repository_wrapper open(const std::string& directory);
 
 private:
-    git_repository *_repo;
+
+    repository_wrapper() = default;
 };