mock REST API calls in tests

Author: 2bndy5

.github/workflows/binary-builds.yml

@@ -151,7 +151,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          files=$(ls dist/cpp-linter*
+          files=$(ls dist/cpp-linter*)
           gh release create ${{ github.ref_name }} --generate-notes $files
       - run: cargo publish
         working-directory: cpp-linter-lib

.github/workflows/python-packaging.yml

@@ -111,9 +111,6 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
-      - name: Increment version
-        if: startsWith(github.ref, 'refs/tags/')
-        run: python .github/workflows/replace_version_spec.py --new-version=${{ github.ref_name }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -153,7 +150,8 @@ jobs:
       - name: Publish to PyPI
         uses: PyO3/maturin-action@v1
         env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+          MATURIN_PYPI_TOKEN: ${{ contains(github.ref_name, 'rc') && secrets.TEST_PYPI_API_TOKEN || secrets.PYPI_API_TOKEN }}
+          MATURIN_REPOSITORY: ${{ contains(github.ref_name, 'rc') && 'test-pypi' || 'pypi' }}
         with:
           command: upload
           args: --non-interactive --skip-existing dist/*

.github/workflows/run-dev-tests.yml

@@ -76,16 +76,16 @@ jobs:
         with:
           python-version: 3.x
 
-      # - name: Install workflow deps
-      #   run: python3 -m pip install meson
+      - name: Install workflow deps
+        run: python3 -m pip install meson
 
       # # https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages
-      # - name: Install ninja (Linux)
-      #   if: runner.os == 'Linux'
-      #   run: sudo apt-get install ninja-build
-      # - name: Install ninja (Windows)
-      #   if: runner.os == 'Windows'
-      #   run: choco install ninja
+      - name: Install ninja (Linux)
+        if: runner.os == 'Linux'
+        run: sudo apt-get install ninja-build
+      - name: Install ninja (Windows)
+        if: runner.os == 'Windows'
+        run: choco install ninja
 
       - name: Install Linux clang dependencies
         if: runner.os == 'Linux'

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     rev: v4.6.0
     hooks:
       - id: trailing-whitespace
-        exclude: cpp-linter-lib/tests/capture_tools_output/cpp-linter/cpp-linter/test_git_lib.patch
+        exclude: cpp-linter-lib/tests/.*\.(?:patch|diff)
       - id: end-of-file-fixer
       - id: check-docstring-first
       - id: check-added-large-files

Cargo.lock

@@ -8,7 +8,9 @@ documentation.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+chrono = "0.4.38"
 clap = "4.5.16"
+futures = "0.3.30"
 git2 = "0.19.0"
 lenient_semver = "0.4.2"
 log = "0.4.22"
@@ -26,6 +28,7 @@ tokio-stream = "0.1.15"
 which = "6.0.3"
 
 [dev-dependencies]
+mockito = "1.5.0"
 tempfile = "3.9.0"
 
 [features]
@@ -34,3 +37,5 @@ openssl-vendored = ["dep:openssl", "dep:openssl-probe"]
 [[bin]]
 name = "cpp-linter"
 path = "src/main.rs"
+test = false
+bench = false

cpp-linter-lib/Cargo.toml

@@ -77,7 +77,7 @@ impl TidyNotification {
     pub fn diagnostic_link(&self) -> String {
         let ret_val = if let Some((category, name)) = self.diagnostic.split_once('-') {
             format!(
-                "[{}](https://clang.llvm.org/extra/clang-tidy/checks/{category}/{name}).html",
+                "[{}](https://clang.llvm.org/extra/clang-tidy/checks/{category}/{name}.html)",
                 self.diagnostic
             )
         } else {
@@ -153,7 +153,7 @@ fn parse_tidy_output(
                 line: captured[2].parse::<u32>().unwrap(),
                 cols: captured[3].parse::<u32>().unwrap(),
                 severity: String::from(&captured[4]),
-                rationale: String::from(&captured[5]),
+                rationale: String::from(&captured[5]).trim().to_string(),
                 diagnostic: String::from(&captured[6]),
                 suggestion: Vec::new(),
             });

cpp-linter-lib/examples/gh_rest_api.rs

@@ -226,7 +226,7 @@ cpp-linter --extra-arg="-std=c++17" --extra-arg="-Wall"
             Arg::new("thread-comments")
                 .long("thread-comments")
                 .short('g')
-                .value_parser(["true", "on", "1", "false", "off", "0", "updated"])
+                .value_parser(["true", "on", "1", "false", "off", "0", "update"])
                 .default_value("false")
                 .help_heading("feedback options")
                 .help(

cpp-linter-lib/src/clang_tools/clang_tidy.rs

@@ -1,4 +1,7 @@
-use std::{fs, path::Path};
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
 
 use super::FileObj;
 
@@ -82,13 +85,21 @@ impl FileFilter {
     /// Returns a [`Some`] value of the the path/pattern that matches the given `file_name`.
     /// If given `file_name` is not in the specified list, then [`None`] is returned.
     pub fn is_file_in_list(&self, file_name: &Path, is_ignored: bool) -> Option<String> {
+        let file_name = PathBuf::from(format!(
+            "./{}",
+            file_name
+                .as_os_str()
+                .to_string_lossy()
+                .to_string()
+                .replace("\\", "/")
+        ));
         let set = if is_ignored {
             &self.ignored
         } else {
             &self.not_ignored
         };
         for pattern in set {
-            let pat = Path::new(&pattern);
+            let pat = PathBuf::from(&pattern);
             if (pat.is_file() && file_name == pat) || (pat.is_dir() && file_name.starts_with(pat)) {
                 return Some(pattern.to_owned());
             }