all: wrap by cabin namespace (#1086)

Author: ken-matsui

.github/workflows/cpp.yml

@@ -50,8 +50,15 @@ jobs:
       - name: Build Cabin
         run: make RELEASE=1
 
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.*'
+
       - name: Install cpplint
-        run: sudo apt-get install -y cpplint
+        run: pip install cpplint
+
+      - name: Show cpplint version
+        run: cpplint --version
 
       - name: cabin lint
         run: ./build/cabin lint --verbose

src/Algos.cc

@@ -15,6 +15,8 @@
 #include <utility>
 #include <vector>
 
+namespace cabin {
+
 std::string
 toUpper(const std::string_view str) noexcept {
   std::string res;
@@ -178,6 +180,8 @@ findSimilarStr(
   }
 }
 
+}  // namespace cabin
+
 #ifdef CABIN_TEST
 
 #  include "Rustify/Aliases.hpp"
@@ -188,6 +192,8 @@ findSimilarStr(
 
 namespace tests {
 
+using namespace cabin;  // NOLINT(build/namespaces,google-build-using-namespace)
+
 static void
 testLevDistance() {
   // Test bytelength agnosticity

src/Algos.hpp

@@ -8,6 +8,8 @@
 #include <string>
 #include <string_view>
 
+namespace cabin {
+
 std::string toUpper(std::string_view str) noexcept;
 std::string toMacroName(std::string_view name) noexcept;
 std::string
@@ -29,3 +31,5 @@ bool commandExists(std::string_view cmd) noexcept;
 std::optional<std::string_view> findSimilarStr(
     std::string_view lhs, std::span<const std::string_view> candidates
 );
+
+}  // namespace cabin

src/BuildConfig.cc

@@ -34,6 +34,8 @@
 #include <utility>
 #include <vector>
 
+namespace cabin {
+
 std::ostream&
 operator<<(std::ostream& os, VarType type) {
   switch (type) {
@@ -1023,10 +1025,14 @@ getMakeCommand() {
   return makeCommand;
 }
 
+}  // namespace cabin
+
 #ifdef CABIN_TEST
 
 namespace tests {
 
+using namespace cabin;  // NOLINT(build/namespaces,google-build-using-namespace)
+
 // NOTE: These tests are commented out, BuildConfig won't be used in the
 // future.  We can remove these tests then.
 //

src/BuildConfig.hpp

@@ -15,6 +15,8 @@
 #include <unordered_set>
 #include <vector>
 
+namespace cabin {
+
 // clang-format off
 inline const std::unordered_set<std::string> SOURCE_FILE_EXTS{
   ".c", ".c++", ".cc", ".cpp", ".cxx"
@@ -197,3 +199,5 @@ emitCompdb(const Manifest& manifest, bool isDebug, bool includeDevDeps);
 std::string_view modeToString(bool isDebug);
 std::string_view modeToProfile(bool isDebug);
 Command getMakeCommand();
+
+}  // namespace cabin

src/Cli.cc

@@ -15,6 +15,8 @@
 #include <utility>
 #include <vector>
 
+namespace cabin {
+
 static constinit const std::string_view PADDING = "  ";
 
 static void
@@ -540,3 +542,5 @@ Cli::printHelp(const std::span<const std::string_view> args) const noexcept {
   printCmdHelp();
   return EXIT_SUCCESS;
 }
+
+}  // namespace cabin

src/Cli.hpp

@@ -14,6 +14,8 @@
 #include <unordered_map>
 #include <vector>
 
+namespace cabin {
+
 class Opt;
 class Arg;
 class Subcmd;
@@ -257,3 +259,5 @@ class Cli : public CliBase<Cli> {
   /// Print help message for cabin itself.
   void printCmdHelp() const noexcept;
 };
+
+}  // namespace cabin

src/Cmd/Add.cc

@@ -16,6 +16,8 @@
 #include <unordered_map>
 #include <unordered_set>
 
+namespace cabin {
+
 static int addMain(std::span<const std::string_view> args);
 
 const Subcmd ADD_CMD =
@@ -244,3 +246,5 @@ addMain(const std::span<const std::string_view> args) {
       newDeps, isSystemDependency, version, tag, rev, branch
   );
 }
+
+}  // namespace cabin

src/Cmd/Add.hpp

@@ -2,4 +2,8 @@
 
 #include "../Cli.hpp"
 
+namespace cabin {
+
 extern const Subcmd ADD_CMD;
+
+}  // namespace cabin

src/Cmd/Build.cc

@@ -21,6 +21,8 @@
 #include <system_error>
 #include <vector>
 
+namespace cabin {
+
 static int buildMain(std::span<const std::string_view> args);
 
 const Subcmd BUILD_CMD =
@@ -152,3 +154,5 @@ buildMain(const std::span<const std::string_view> args) {
   logger::info("Generated", "{}/compile_commands.json", outDir);
   return EXIT_SUCCESS;
 }
+
+}  // namespace cabin

src/Cmd/Build.hpp

@@ -5,5 +5,9 @@
 
 #include <string>
 
+namespace cabin {
+
 extern const Subcmd BUILD_CMD;
 int buildImpl(const Manifest& manifest, std::string& outDir, bool isDebug);
+
+}  // namespace cabin

src/Cmd/Clean.cc

@@ -10,6 +10,8 @@
 #include <string>
 #include <string_view>
 
+namespace cabin {
+
 static int cleanMain(std::span<const std::string_view> args) noexcept;
 
 const Subcmd CLEAN_CMD =  //
@@ -57,3 +59,5 @@ cleanMain(const std::span<const std::string_view> args) noexcept {
   }
   return EXIT_SUCCESS;
 }
+
+}  // namespace cabin

src/Cmd/Clean.hpp

@@ -2,4 +2,8 @@
 
 #include "../Cli.hpp"
 
+namespace cabin {
+
 extern const Subcmd CLEAN_CMD;
+
+}  // namespace cabin

src/Cmd/Common.hpp

@@ -3,6 +3,8 @@
 #include "../Cli.hpp"
 #include "../Parallelism.hpp"
 
+namespace cabin {
+
 inline constinit const Opt OPT_DEBUG = Opt{ "--debug" }.setShort("-d").setDesc(
     "Build with debug information [default]"
 );
@@ -21,3 +23,5 @@ inline const Opt OPT_JOBS =
         .setDesc("Set the number of jobs to run in parallel")
         .setPlaceholder("<NUM>")
         .setDefault(NUM_DEFAULT_THREADS);
+
+}  // namespace cabin

src/Cmd/Fmt.cc

@@ -18,6 +18,8 @@
 #include <utility>
 #include <vector>
 
+namespace cabin {
+
 static int fmtMain(std::span<const std::string_view> args);
 
 const Subcmd FMT_CMD =
@@ -155,3 +157,5 @@ fmtMain(const std::span<const std::string_view> args) {
 
   return execCmd(clangFormat);
 }
+
+}  // namespace cabin

src/Cmd/Fmt.hpp

@@ -2,4 +2,8 @@
 
 #include "../Cli.hpp"
 
+namespace cabin {
+
 extern const Subcmd FMT_CMD;
+
+}  // namespace cabin

src/Cmd/Help.cc

@@ -5,6 +5,8 @@
 #include <span>
 #include <string_view>
 
+namespace cabin {
+
 static int helpMain(std::span<const std::string_view> args) noexcept;
 
 const Subcmd HELP_CMD =  //
@@ -17,3 +19,5 @@ static int
 helpMain(const std::span<const std::string_view> args) noexcept {
   return getCli().printHelp(args);
 }
+
+}  // namespace cabin

src/Cmd/Help.hpp

@@ -2,4 +2,8 @@
 
 #include "../Cli.hpp"
 
+namespace cabin {
+
 extern const Subcmd HELP_CMD;
+
+}  // namespace cabin

src/Cmd/Init.cc

@@ -12,6 +12,8 @@
 #include <string>
 #include <string_view>
 
+namespace cabin {
+
 static int initMain(std::span<const std::string_view> args);
 
 const Subcmd INIT_CMD =
@@ -61,3 +63,5 @@ initMain(const std::span<const std::string_view> args) {
   );
   return EXIT_SUCCESS;
 }
+
+}  // namespace cabin

src/Cmd/Init.hpp

@@ -2,4 +2,8 @@
 
 #include "../Cli.hpp"
 
+namespace cabin {
+
 extern const Subcmd INIT_CMD;
+
+}  // namespace cabin

src/Cmd/Lint.cc

@@ -15,6 +15,8 @@
 #include <string_view>
 #include <vector>
 
+namespace cabin {
+
 static int lintMain(std::span<const std::string_view> args);
 
 const Subcmd LINT_CMD = Subcmd{ "lint" }
@@ -120,3 +122,5 @@ lintMain(const std::span<const std::string_view> args) {
     return lint(manifest.package.name, cpplintArgs);
   }
 }
+
+}  // namespace cabin

src/Cmd/Lint.hpp

@@ -2,4 +2,8 @@
 
 #include "../Cli.hpp"
 
+namespace cabin {
+
 extern const Subcmd LINT_CMD;
+
+}  // namespace cabin

src/Cmd/New.cc

@@ -15,6 +15,8 @@
 #include <string>
 #include <string_view>
 
+namespace cabin {
+
 static int newMain(std::span<const std::string_view> args);
 
 const Subcmd NEW_CMD =  //
@@ -159,3 +161,5 @@ newMain(const std::span<const std::string_view> args) {
   git2::Repository().init(packageName);
   return EXIT_SUCCESS;
 }
+
+}  // namespace cabin

src/Cmd/New.hpp

@@ -5,5 +5,9 @@
 #include <string>
 #include <string_view>
 
+namespace cabin {
+
 extern const Subcmd NEW_CMD;
 std::string createCabinToml(std::string_view projectName) noexcept;
+
+}  // namespace cabin

src/Cmd/Run.cc

@@ -18,6 +18,8 @@
 #include <system_error>
 #include <vector>
 
+namespace cabin {
+
 static int runMain(std::span<const std::string_view> args);
 
 const Subcmd RUN_CMD =
@@ -83,3 +85,5 @@ runMain(const std::span<const std::string_view> args) {
   const Command command(outDir + "/" + manifest.package.name, runArgs);
   return execCmd(command);
 }
+
+}  // namespace cabin

src/Cmd/Run.hpp

@@ -2,4 +2,8 @@
 
 #include "../Cli.hpp"
 
+namespace cabin {
+
 extern const Subcmd RUN_CMD;
+
+}  // namespace cabin

src/Cmd/Search.cc

@@ -13,6 +13,8 @@
 #include <string>
 #include <string_view>
 
+namespace cabin {
+
 static int searchMain(std::span<const std::string_view> args);
 
 const Subcmd SEARCH_CMD =
@@ -140,3 +142,5 @@ searchMain(const std::span<const std::string_view> args) {
   printTable(packages);
   return EXIT_SUCCESS;
 }
+
+}  // namespace cabin

src/Cmd/Search.hpp

@@ -2,4 +2,8 @@
 
 #include "../Cli.hpp"
 
+namespace cabin {
+
 extern const Subcmd SEARCH_CMD;
+
+}  // namespace cabin

src/Cmd/Test.cc

@@ -21,6 +21,8 @@
 #include <system_error>
 #include <vector>
 
+namespace cabin {
+
 static int testMain(std::span<const std::string_view> args);
 
 const Subcmd TEST_CMD =  //
@@ -162,3 +164,5 @@ testMain(const std::span<const std::string_view> args) {
   }
   return exitCode;
 }
+
+}  // namespace cabin