refactor: organize imports and dependencies

Cargo.toml

@@ -25,8 +25,7 @@ chrono = "^0"
 config = { version = "^0", default-features = false, features = ["toml"] }
 edit = "^0"
 itertools = "^0"
-serde_derive = "^1"
-serde = "^1"
+serde = { version = "^1", features = ["derive"] }
 tempfile = "^3"
 semver = "^1"
 shell-words = "^1"

src/bin/coco.rs

@@ -1,15 +1,14 @@
 #![cfg(not(tarpaulin_include))]
 use std::fmt::Write;
 
+use cocogitto::{CocoGitto, COMMITS_METADATA};
+
 use anyhow::{bail, Result};
 use conventional_commit_parser::commit::Footer;
 use itertools::Itertools;
 use structopt::clap::{AppSettings, Shell};
 use structopt::StructOpt;
 
-use cocogitto::CocoGitto;
-use cocogitto::COMMITS_METADATA;
-
 const APP_SETTINGS: &[AppSettings] = &[
     AppSettings::UnifiedHelpMessage,
     AppSettings::ColoredHelp,

src/bin/cog.rs

@@ -1,17 +1,17 @@
 #![cfg(not(tarpaulin_include))]
 use std::path::PathBuf;
 
-use anyhow::{Context, Result};
-use structopt::clap::{AppSettings, Shell};
-use structopt::StructOpt;
-
 use cocogitto::conventional::commit;
 use cocogitto::conventional::version::VersionIncrement;
 use cocogitto::git::hook::HookKind;
 use cocogitto::log::filter::{CommitFilter, CommitFilters};
 use cocogitto::log::output::Output;
 use cocogitto::{CocoGitto, SETTINGS};
 
+use anyhow::{Context, Result};
+use structopt::clap::{AppSettings, Shell};
+use structopt::StructOpt;
+
 const APP_SETTINGS: &[AppSettings] = &[
     AppSettings::SubcommandRequiredElseHelp,
     AppSettings::UnifiedHelpMessage,

src/conventional/changelog.rs

@@ -1,11 +1,13 @@
-use crate::conventional::commit::Commit;
-use crate::{OidOf, SETTINGS};
-use anyhow::Result;
-use itertools::Itertools;
 use std::fmt::Write;
 use std::fs;
 use std::path::PathBuf;
 
+use crate::conventional::commit::Commit;
+use crate::{OidOf, SETTINGS};
+
+use anyhow::{anyhow, Result};
+use itertools::Itertools;
+
 pub(crate) struct Changelog {
     pub from: OidOf,
     pub to: OidOf,
@@ -91,6 +93,7 @@ mod test {
     use crate::conventional::changelog::Changelog;
     use crate::conventional::commit::Commit;
     use crate::OidOf;
+
     use anyhow::Result;
     use chrono::Utc;
     use conventional_commit_parser::commit::{CommitType, ConventionalCommit};

src/conventional/commit.rs

@@ -1,14 +1,16 @@
+use std::cmp::Ordering;
+use std::fmt::{self, Formatter};
+
 use crate::error::CocogittoError::CommitFormat;
 use crate::SETTINGS;
-use anyhow::Result;
+
+use anyhow::{anyhow, Result};
 use chrono::{NaiveDateTime, Utc};
 use colored::*;
 use conventional_commit_parser::commit::ConventionalCommit;
 use conventional_commit_parser::error::ParseError;
 use git2::Commit as Git2Commit;
-use std::cmp::Ordering;
-use std::fmt;
-use std::fmt::Formatter;
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Eq, PartialEq)]
 pub struct Commit {
@@ -239,6 +241,7 @@ pub fn verify(author: Option<String>, message: &str) -> Result<(), ParseError> {
 #[cfg(test)]
 mod test {
     use crate::conventional::commit::{verify, Commit};
+
     use chrono::NaiveDateTime;
     use conventional_commit_parser::commit::{CommitType, ConventionalCommit};
     use speculoos::prelude::*;

src/conventional/version.rs

@@ -1,13 +1,13 @@
-use anyhow::Result;
+use crate::conventional::commit::Commit;
+use crate::git::repository::Repository;
+
+use anyhow::{anyhow, bail, Result};
 use colored::*;
 use conventional_commit_parser::commit::CommitType;
 use git2::Commit as Git2Commit;
 use itertools::Itertools;
 use semver::Version;
 
-use crate::conventional::commit::Commit;
-use crate::git::repository::Repository;
-
 #[derive(Debug, PartialEq)]
 pub enum VersionIncrement {
     Major,
@@ -172,16 +172,17 @@ impl VersionIncrement {
 // Auto version tests resides in test/ dir since it rely on git log
 // To generate the version
 mod test {
+    use std::str::FromStr;
+
+    use crate::conventional::commit::Commit;
+    use crate::conventional::version::VersionIncrement;
+
     use anyhow::Result;
     use chrono::Utc;
     use conventional_commit_parser::commit::{CommitType, ConventionalCommit};
     use semver::Version;
     use speculoos::prelude::*;
 
-    use crate::conventional::commit::Commit;
-    use crate::conventional::version::VersionIncrement;
-    use std::str::FromStr;
-
     impl Commit {
         fn commit_fixture(commit_type: CommitType, is_breaking_change: bool) -> Self {
             Commit {

src/error.rs

@@ -1,7 +1,8 @@
+use std::fmt::{self, Debug, Display, Formatter};
+
 use crate::OidOf;
+
 use colored::*;
-use std::fmt;
-use std::fmt::{Debug, Display, Formatter};
 
 #[derive(Debug)]
 pub(crate) enum CocogittoError {

src/git/hook.rs

@@ -1,13 +1,12 @@
-use crate::CocoGitto;
-use anyhow::Result;
-
-use std::fs::Permissions;
+use std::fs::{self, Permissions};
 #[cfg(target_family = "unix")]
 use std::os::unix::fs::PermissionsExt;
-
-use std::fs;
 use std::path::Path;
 
+use crate::CocoGitto;
+
+use anyhow::{anyhow, Result};
+
 pub static PRE_PUSH_HOOK: &[u8] = include_bytes!("assets/pre-push");
 pub static PREPARE_COMMIT_HOOK: &[u8] = include_bytes!("assets/prepare-commit-msg");
 const PRE_COMMIT_HOOK_PATH: &str = ".git/hooks/pre-commit";
@@ -60,14 +59,16 @@ fn create_hook(path: &Path, kind: HookKind) -> Result<()> {
 
 #[cfg(test)]
 mod tests {
-    use crate::git::hook::HookKind;
-    use crate::CocoGitto;
-    use anyhow::Result;
-    use speculoos::prelude::*;
     use std::env;
     use std::fs::File;
     use std::path::PathBuf;
     use std::process::Command;
+
+    use crate::git::hook::HookKind;
+    use crate::CocoGitto;
+
+    use anyhow::Result;
+    use speculoos::prelude::*;
     use tempfile::TempDir;
 
     #[test]

src/git/repository.rs

@@ -1,6 +1,11 @@
+use std::fmt::{Debug, Formatter};
 use std::path::Path;
 
-use anyhow::Result;
+use crate::error::CocogittoError::{self, Git};
+use crate::git::status::Statuses;
+use crate::OidOf;
+
+use anyhow::{anyhow, ensure, Result};
 use colored::Colorize;
 use git2::{
     Commit as Git2Commit, Diff, DiffOptions, IndexAddOption, Object, ObjectType, Oid,
@@ -9,13 +14,6 @@ use git2::{
 use itertools::Itertools;
 use semver::Version;
 
-use crate::error::CocogittoError;
-use crate::error::CocogittoError::Git;
-use crate::OidOf;
-
-use super::status::Statuses;
-use std::fmt::{Debug, Formatter};
-
 pub(crate) struct Repository(pub(crate) Git2Repository);
 
 impl Repository {
@@ -288,12 +286,12 @@ impl Debug for Repository {
 mod test {
     use std::process::{Command, Stdio};
 
-    use anyhow::Result;
-    use tempfile::TempDir;
-
-    use super::Repository;
+    use crate::git::repository::Repository;
     use crate::OidOf;
+
+    use anyhow::Result;
     use speculoos::prelude::*;
+    use tempfile::TempDir;
 
     #[test]
     fn init_repo() -> Result<()> {

src/git/status.rs

@@ -1,9 +1,10 @@
+use std::fmt::{self, Formatter};
+
 use crate::git::status::Changes::{Deleted, Modified, New, Renamed, TypeChange};
+
 use colored::*;
 use git2::StatusEntry as Git2StatusEntry;
 use git2::Statuses as Git2Statuses;
-use std::fmt;
-use std::fmt::Formatter;
 
 pub(crate) struct Statuses(pub Vec<Status>);
 
@@ -103,12 +104,13 @@ impl fmt::Debug for Statuses {
 
 #[cfg(test)]
 mod test {
+    use std::fs;
+
     use crate::git::status::{Changes, Statuses};
-    use anyhow::Result;
-    use git2::Repository;
-    use git2::StatusOptions;
+
+    use anyhow::{anyhow, Result};
+    use git2::{Repository, StatusOptions};
     use speculoos::prelude::*;
-    use std::fs;
     use tempfile::TempDir;
 
     #[test]

src/hook/mod.rs

@@ -1,15 +1,15 @@
+mod parser;
+
 use std::collections::VecDeque;
 use std::fmt;
 use std::ops::Range;
 use std::process::Command;
 use std::str::FromStr;
 
-use anyhow::Result;
-use semver::Version;
-
 use parser::Token;
 
-mod parser;
+use anyhow::{anyhow, ensure, Result};
+use semver::Version;
 
 #[derive(Debug, Eq, PartialEq)]
 pub struct VersionSpan {
@@ -143,10 +143,9 @@ impl Hook {
 mod test {
     use std::str::FromStr;
 
-    use speculoos::prelude::*;
+    use crate::{Hook, Result};
 
-    use crate::Hook;
-    use crate::Result;
+    use speculoos::prelude::*;
 
     #[test]
     fn parse_empty_string() {

src/hook/parser.rs

@@ -1,13 +1,14 @@
 use std::collections::VecDeque;
 
-use pest::iterators::{Pair, Pairs};
-use semver::{BuildMetadata, Prerelease};
-
 use crate::hook::{HookSpan, VersionSpan};
+
+use pest::iterators::{Pair, Pairs};
 use pest::Parser;
+use pest_derive::Parser as ParserDerive;
+use semver::{BuildMetadata, Prerelease};
 
 #[doc(hidden)]
-#[derive(Parser)]
+#[derive(ParserDerive)]
 #[grammar = "hook/version_dsl.pest"]
 struct HookDslParser;
 
@@ -92,11 +93,13 @@ fn parse_operator(tokens: &mut VecDeque<Token>, pairs: Pairs<'_, Rule>) -> anyho
 
 #[cfg(test)]
 mod test {
+    use std::collections::VecDeque;
+
     use crate::hook::parser::Token;
     use crate::hook::{parser, VersionSpan};
+
     use semver::Prerelease;
     use speculoos::prelude::*;
-    use std::collections::VecDeque;
 
     #[test]
     fn parse_version_and_latest() {