Skip to content

Refatoring repeated code #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alt-art merged 2 commits into from
Oct 9, 2022
Merged

Refatoring repeated code #8

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e74efd9
refactor(commit): Make a function to execute all commands with the sa…
alt-art Oct 9, 2022
9cc0093
refactor: Use git_exec when check staged files
alt-art Oct 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
refactor: Use git_exec when check staged files
  • Loading branch information
@alt-art
alt-art committed Oct 9, 2022
commit 9cc0093583ba9a6802a888d8ba52815c4c72f989
12 changes: 0 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ serde_json = "1.0.79"
clap = { version = "3.1.6", features = ["derive"] }
dirs = "4.0.0"
anyhow = "1.0.56"
colored = "2.0.0"

[dev-dependencies]
assert_fs = "1.0.7"
Expand Down
8 changes: 8 additions & 0 deletions src/commit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,11 @@ pub fn commit(commit_message: &str) -> Result<()> {
.ok_or_else(|| anyhow!("Signal terminated"))?,
);
}

pub fn check_staged_files() -> Result<()> {
let output = git_exec(&["diff", "--cached", "--quiet"])?;
if output.status.code() == Some(0) {
return Err(anyhow!("You have not added anything please do `git add`"));
}
Ok(())
}
21 changes: 4 additions & 17 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@ mod commit;
mod commit_message;
mod config;

use anyhow::anyhow;
use anyhow::Result;
use clap::Parser;
use colored::Colorize;
use std::io::Write;
use std::path::PathBuf;
use std::process::Command;

use commit::{check_staged_files, commit, commit_as_hook};
use commit_message::make_message_commit;

const DEFAULT_CONFIG_FILE: &str = include_str!("../commit-default.json");
Expand Down Expand Up @@ -46,18 +44,7 @@ fn main() -> Result<()> {
std::env::set_current_dir(current_dir)?;
}

if Command::new("git")
.args(["diff", "--cached", "--quiet"])
.output()
.expect("failed to execute process")
.status
.code()
== Some(0)
{
return Err(anyhow!(
"You have not added anything please do `git add`".red()
));
}
check_staged_files()?;

let opt = Opt::parse();
if opt.init {
Expand All @@ -70,10 +57,10 @@ fn main() -> Result<()> {
let commit_message = make_message_commit(pattern)?;

if opt.hook {
commit::commit_as_hook(&commit_message)?;
commit_as_hook(&commit_message)?;
return Ok(());
}

commit::commit(&commit_message)?;
commit(&commit_message)?;
Ok(())
}