feat: upgrade is now a cargo feature

Author: alexpasmantier

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "grip-grab"
-version = "0.5.4"
+version = "0.5.5"
 edition = "2021"
 authors = ["Alexandre Pasmantier <alex.pasmant@gmail.com>"]
 license = "Apache-2.0"
@@ -18,19 +18,28 @@ categories = [
 
 
 [dependencies]
-anyhow = "1.0.86"
 clap = { version = "4.5.9", features = ["derive"] }
 devicons = "0.6.7"
 grep = "0.3.1"
 ignore = "0.4.22"
 serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.120"
 termcolor = "1.4.1"
+thiserror = "1.0.64"
 
 [[bin]]
 name = "gg"
 path = "src/main.rs"
 
+
+[features]
+default = []
+upgrade = []
+
+[profile.dev]
+opt-level = 0
+debug = true
+
 [profile.release]
 opt-level = 3
 debug = "none"

Cargo.toml

@@ -2,6 +2,7 @@ use std::path::PathBuf;
 
 use crate::{printer::PrintMode, utils};
 use clap::{ArgAction, Parser, Subcommand};
+use thiserror::Error;
 
 #[derive(Parser, Debug)]
 #[command(name = "grip-grab")]
@@ -148,7 +149,11 @@ impl Default for PostProcessedCli {
     }
 }
 
-pub fn process_cli_args(mut cli: Cli) -> anyhow::Result<PostProcessedCli> {
+#[derive(Error, Debug)]
+#[error("Error processing CLI arguments")]
+pub struct CliProcessingError {}
+
+pub fn process_cli_args(mut cli: Cli) -> Result<PostProcessedCli, CliProcessingError> {
     cli.validate();
 
     if cli.paths.is_empty() {

src/cli.rs

@@ -1,5 +1,4 @@
-use anyhow::Result;
-use ignore::{types::TypesBuilder, WalkBuilder};
+use ignore::{types::TypesBuilder, Error, WalkBuilder};
 
 use std::path::{Path, PathBuf};
 
@@ -43,7 +42,7 @@ pub fn walk_builder(
     builder
 }
 
-fn add_custom_filetypes(types_builder: &mut TypesBuilder) -> Result<()> {
+fn add_custom_filetypes(types_builder: &mut TypesBuilder) -> Result<(), Error> {
     Ok(types_builder.add("pystrict", "*.py")?)
 }
 

src/fs.rs

@@ -1,15 +1,16 @@
-use std::io::{stdin, Read};
+use std::io::{self, stdin, Read};
 use std::path::PathBuf;
 use std::sync::{mpsc, Arc};
 
 use clap::Parser;
 
-use cli::Commands;
+use cli::{CliProcessingError, Commands};
 use fs::is_readable_stdin;
-use grep::regex::RegexMatcher;
+use grep::regex::{self, RegexMatcher};
 use ignore::DirEntry;
 use printer::PrinterConfig;
 use search::{build_searcher, search_reader};
+use thiserror::Error;
 use upgrade::upgrade_gg;
 
 use crate::cli::{process_cli_args, Cli};
@@ -24,7 +25,17 @@ mod search;
 mod upgrade;
 mod utils;
 
-pub fn main() -> anyhow::Result<()> {
+#[derive(Error, Debug)]
+pub enum GGError {
+    #[error("Erorr processing CLI arguments")]
+    Cli(#[from] CliProcessingError),
+    #[error(transparent)]
+    Io(#[from] io::Error),
+    #[error(transparent)]
+    Regex(#[from] regex::Error),
+}
+
+pub fn main() -> Result<(), GGError> {
     let cli_args = process_cli_args(Cli::parse())?;
 
     if let Some(subcommand) = cli_args.sub_command {

src/main.rs

@@ -1,9 +1,9 @@
-use std::fmt;
+use std::{fmt, io};
 use std::{path::PathBuf, slice::Iter};
 
 use grep::{
     matcher::{Match, Matcher},
-    regex::{RegexMatcher, RegexMatcherBuilder},
+    regex::{self, RegexMatcher, RegexMatcherBuilder},
     searcher::{sinks::UTF8, Searcher, SearcherBuilder},
 };
 use serde::Serialize;
@@ -185,7 +185,7 @@ pub fn search_file<'a>(
     path: PathBuf,
     matcher: &RegexMatcher,
     searcher: &mut Searcher,
-) -> anyhow::Result<FileResults> {
+) -> Result<FileResults, io::Error> {
     let mut partial_results: Vec<PartialSearchResult> = Vec::new();
 
     searcher.search_path(
@@ -236,11 +236,13 @@ pub fn search_file<'a>(
     Ok(FileResults { path, results })
 }
 
+// io::Error
+// std::fmt::Display
 pub fn search_reader(
     reader: impl std::io::BufRead,
     matcher: &RegexMatcher,
     searcher: &mut Searcher,
-) -> anyhow::Result<Vec<SearchResult>> {
+) -> Result<Vec<SearchResult>, io::Error> {
     let mut results = Vec::new();
     let mut line_number = 0;
     searcher.search_reader(
@@ -266,8 +268,9 @@ pub fn search_reader(
     Ok(results)
 }
 
-pub fn build_matcher(patterns: &Vec<String>) -> anyhow::Result<RegexMatcher> {
+pub fn build_matcher(patterns: &Vec<String>) -> Result<RegexMatcher, regex::Error> {
     let builder = RegexMatcherBuilder::new();
+    // matcher Error
     Ok(builder.build_many(patterns)?)
 }
 

src/search.rs

@@ -1,12 +1,31 @@
-use std::{
-    io::{BufRead, BufReader},
-    process::Command,
-    thread::{self},
-};
-
 use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
 
+#[cfg(not(feature = "upgrade"))]
+pub fn upgrade_gg(_force: bool) {
+    let mut colored_stdout = StandardStream::stdout(ColorChoice::Always);
+    colored_stdout
+        .set_color(ColorSpec::new().set_fg(Some(Color::Red)).set_italic(true))
+        .expect("Failed to set color");
+
+    println!("\n┌────────────────────────────────────────────┐");
+    println!("│ Upgrade feature is not enabled.            │");
+    println!("│ Please recompile with `upgrade` feature    │");
+    println!("│ enabled to use this feature:               │");
+    println!("│                                            │");
+    println!("│ cargo install grip-grab --features=upgrade │");
+    println!("└────────────────────────────────────────────┘\n");
+
+    colored_stdout.reset().expect("Failed to reset color");
+}
+
+#[cfg(feature = "upgrade")]
 pub fn upgrade_gg(force: bool) {
+    use std::{
+        io::{BufRead, BufReader},
+        process::Command,
+        thread::{self},
+    };
+
     let mut colored_stdout = StandardStream::stdout(ColorChoice::Always);
     colored_stdout
         .set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_italic(true))