Feat: pull changes for every git repo

Author: containerscrew

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
       # args: ['--verbose', '--']
       - id: cargo-check
   - repo: https://github.com/containerscrew/mtoc
-    rev: v0.3.1
+    rev: v0.5.0
     hooks:
       - id: mtoc
         args: [ "-e", "./target" ]

CHANGELOG.md

@@ -1,3 +1,14 @@
+<!-- START OF TOC !DO NOT EDIT THIS CONTENT MANUALLY-->
+**Table of Contents**  *generated with [mtoc](https://github.com/containerscrew/mtoc)*
+- [Changelog](#changelog)
+  - [[2.2.1] - 2025-03-04](#221---2025-03-04)
+  - [[2.2.0] - 2025-02-14](#220---2025-02-14)
+  - [[2.1.1] - 2025-02-14](#211---2025-02-14)
+  - [[2.1.0] - 2025-02-14](#210---2025-02-14)
+  - [[2.0.0] - 2024-08-23](#200---2024-08-23)
+  - [[1.1.0] - 2024-08-23](#110---2024-08-23)
+  - [[1.0.0] - 2024-08-22](#100---2024-08-22)
+<!-- END OF TOC -->
 # Changelog
 
 All notable changes to this project will be documented in this file.

Cargo.lock

@@ -1,13 +1,12 @@
 [package]
 name = "gitrack"
-version = "2.2.1"
+version = "2.3.0"
 edition = "2021"
 authors = ["containerscrew [email protected]"]
 repository = "https://github.com/containerscrew/gitrack"
 rust-version = "1.80.1"
 license-file = "LICENSE"
-description = "Scan local git repositories"
-
+description = "Scan local git repositories and show their status (check untracked files)"
 
 [dependencies]
 clap = { version = "4.5.37", features = ["derive"] }
@@ -16,6 +15,7 @@ git2 = { version = "0.20.2", default-features = false }
 walkdir = "2.5.0"
 home = "0.5.9"
 threadpool = "1.8.1"
+which = "7.0.3"
 
 # Pending to add benchmark
 #[dev-dependencies]

Cargo.toml

@@ -14,11 +14,12 @@
 - [Usage](#usage)
   - [Help](#help)
   - [Scan folders containing git repositories](#scan-folders-containing-git-repositories)
-  - [Scanning for untracked changes (summarized)](#scanning-for-untracked-changes-(summarized))
-  - [Scanning for untracked changes (verbose)](#scanning-for-untracked-changes-(verbose))
+  - [Scanning for untracked changes (summarized)](#scanning-for-untracked-changes-summarized)
+  - [Scanning for untracked changes (verbose)](#scanning-for-untracked-changes-verbose)
   - [Diff files for untracked changes](#diff-files-for-untracked-changes)
-  - [Control number of workers/threads](#control-number-of-workers/threads)
+  - [Control number of workers/threads](#control-number-of-workersthreads)
   - [Exclude directories](#exclude-directories)
+  - [Pulling changes](#pulling-changes)
 - [About threads](#about-threads)
 - [Dev](#dev)
   - [pre-commit](#pre-commit)
@@ -158,7 +159,15 @@ gitrack -p /home/elliot -u -w 6
 ## Exclude directories
 
 ```bash
-gitrack -p /home/elliot -e "/home/elliot/.cache" -e "/home/elliot/.local" -u -w 6
+gitrack -p /home/elliot -e .terragrunt-cache/ -e .terraform/ -u -w 6
+```
+
+## Pulling changes
+
+Run a `git pull` to update local code from remote repositories:
+
+```shell
+gitrack -p /home/elliot/Documents/Code/ -e .terragrunt-cache/ -e .terraform/ --pull
 ```
 
 # About threads

README.md

@@ -65,4 +65,12 @@ pub struct Args {
         required = false
     )]
     pub verbose: bool,
+
+    #[arg(
+        long = "pull",
+        help = "Pull changes using git pull",
+        default_value_t = false,
+        required = false
+    )]
+    pub pull: bool,
 }

src/cli.rs

@@ -3,11 +3,14 @@ use git2::{DiffOptions, Repository, StatusOptions};
 use std::io;
 use std::io::ErrorKind;
 use std::path::{Path, PathBuf};
+use std::process::{Command, Stdio};
 use std::sync::mpsc;
 use std::sync::mpsc::Sender;
 use threadpool::ThreadPool;
 use walkdir::WalkDir;
 
+use crate::utils::find_binary_path;
+
 // Check if a directory should be excluded
 fn is_excluded_dir(entry: &walkdir::DirEntry, exclude_dirs: &[String]) -> bool {
     let path = entry.path(); // Get the full path of the directory
@@ -67,6 +70,27 @@ pub fn check_untracked_files(repo_path: &Path) -> Result<Vec<String>, git2::Erro
     Ok(untracked_files)
 }
 
+// Pull changes in a Git repository
+// TODO: use git2 library instead of command process, like the rest of the code
+pub fn pull_changes(repo_path: &Path) -> Result<String, io::Error> {
+    let git_path = find_binary_path("git").unwrap_or_else(|_| "/usr/bin/git".into());
+
+    // Ejecutar git pull en el directorio correcto
+    let output = Command::new(git_path)
+        .arg("pull")
+        .current_dir(repo_path)
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .output()?;
+
+    if output.status.success() {
+        Ok(String::from_utf8_lossy(&output.stdout).into_owned())
+    } else {
+        let error_msg = String::from_utf8_lossy(&output.stderr);
+        Err(io::Error::new(ErrorKind::Other, error_msg.to_string()))
+    }
+}
+
 // Show the diff for a specific file in a Git repository
 pub fn show_diff(repo_path: &Path, file: &str) -> io::Result<String> {
     let repo = Repository::open(repo_path).expect("Error opening repository");

src/git_ops.rs

@@ -2,6 +2,7 @@ use crate::git_ops::{check_untracked_files, find_git_repos, show_diff};
 use clap::Parser;
 use cli::Args;
 use colored::*;
+use git_ops::pull_changes;
 use std::path::Path;
 
 mod cli;
@@ -41,7 +42,20 @@ fn main() {
 
     // Process each repository
     for repo in git_repos {
-        process_repo(&repo, &args);
+        // Git pull to update the repository
+        if args.pull {
+            println_orange!("Pulling latest changes in: {}", repo.display());
+            match pull_changes(&repo) {
+                Ok(result) => println_orange!(
+                    "Successfully pulled changes in: {}. {}",
+                    repo.display(),
+                    result
+                ),
+                Err(e) => println_light_orange!("{}: {}", "Error pulling changes".red(), e),
+            }
+        } else {
+            process_repo(&repo, &args);
+        }
     }
 }
 

src/main.rs

@@ -1,4 +1,7 @@
+use std::io;
+
 use colored::Colorize;
+use which::which;
 
 pub fn default_home_dir() -> String {
     match home::home_dir() {
@@ -9,3 +12,12 @@ pub fn default_home_dir() -> String {
         }
     }
 }
+
+pub fn find_binary_path(binary_name: &str) -> Result<std::path::PathBuf, io::Error> {
+    which(binary_name).map_err(|e| {
+        io::Error::new(
+            io::ErrorKind::NotFound,
+            format!("'{}' not found: {}", binary_name, e),
+        )
+    })
+}