Merge pull request #5 from ethankhall/add-maven-support

Adding maven support

src/common/commands/exec.rs

@@ -2,11 +2,13 @@ use std::path::PathBuf;
 
 use clap::ArgMatches;
 
-use crate::common::error::*;
 use crate::common::*;
 use crate::crom_lib::*;
 
-pub fn exec_update_version(args: &ArgMatches, project: &dyn Project) -> Result<i32, CromError> {
+pub fn exec_update_version(
+    args: &ArgMatches,
+    project: &dyn Project,
+) -> Result<i32, ErrorContainer> {
     let modifier = parse_pre_release(args);
 
     let latest_version = match args.value_of("override_version") {
@@ -19,18 +21,21 @@ pub fn exec_update_version(args: &ArgMatches, project: &dyn Project) -> Result<i
     Ok(0)
 }
 
-pub fn exec_upload_artifacts(args: &ArgMatches, project: &dyn Project) -> Result<i32, CromError> {
+pub fn exec_upload_artifacts(
+    args: &ArgMatches,
+    project: &dyn Project,
+) -> Result<i32, ErrorContainer> {
     let names = args.values_of("NAMES").unwrap().map(|x| s!(x)).collect();
 
     let version = project.find_latest_version(VersionModification::None);
 
-    let root_artifact_path = args.value_of("root_artifact_path").map(|x| PathBuf::from(x));
+    let root_artifact_path = args.value_of("root_artifact_path").map(PathBuf::from);
     project.publish(&version, names, root_artifact_path)?;
 
     Ok(0)
 }
 
-pub fn exec_claim_version(args: &ArgMatches, project: &dyn Project) -> Result<i32, CromError> {
+pub fn exec_claim_version(args: &ArgMatches, project: &dyn Project) -> Result<i32, ErrorContainer> {
     let allow_dirty_repo = if !args.is_present("ignore_changes") {
         true
     } else {

src/common/commands/get.rs

@@ -1,9 +1,8 @@
 use clap::ArgMatches;
 
-use crate::common::error::CromError;
 use crate::crom_lib::*;
 
-pub fn handle_get_command(args: &ArgMatches, project: &dyn Project) -> Result<i32, CromError> {
+pub fn handle_get_command(args: &ArgMatches, project: &dyn Project) -> Result<i32, ErrorContainer> {
     match args.subcommand() {
         ("current-version", Some(run_matches)) => {
             let modifier = if run_matches.is_present("no_snapshot") {
@@ -24,7 +23,7 @@ pub fn handle_get_command(args: &ArgMatches, project: &dyn Project) -> Result<i3
 fn print_version(
     project: &dyn Project,
     modification: VersionModification,
-) -> Result<i32, CromError> {
+) -> Result<i32, ErrorContainer> {
     let latest_version = project.find_latest_version(modification);
 
     info!("{}", latest_version);

src/common/commands/init.rs

@@ -4,11 +4,9 @@ use std::path::Path;
 
 use clap::ArgMatches;
 
-use crate::common::error::*;
-
 use crate::crom_lib::*;
 
-pub fn handle_init_command(args: &ArgMatches) -> Result<i32, CromError> {
+pub fn handle_init_command(args: &ArgMatches) -> Result<i32, ErrorContainer> {
     let path = std::env::current_dir()?.join(CONFIG_FILE);
     let pattern = match args.value_of("bumper").unwrap() {
         "semver" => "v0.1.%d",
@@ -32,7 +30,10 @@ pub fn handle_init_command(args: &ArgMatches) -> Result<i32, CromError> {
     Ok(0)
 }
 
-fn write_default_config<P: AsRef<Path>>(default_format: &str, dest: P) -> Result<(), CromError> {
+fn write_default_config<P: AsRef<Path>>(
+    default_format: &str,
+    dest: P,
+) -> Result<(), ErrorContainer> {
     let default_config = build_default_config(default_format);
 
     let mut file = File::create(dest)?;

src/common/mod.rs

@@ -1,16 +1,14 @@
 pub mod commands;
-pub mod error;
 mod logging;
 
 use clap::ArgMatches;
 use std::io::Write;
 
 pub use self::logging::configure_logging;
 
-use self::error::*;
 use crate::crom_lib::*;
 
-type CromResult<T> = Result<T, CromError>;
+type CromResult<T> = Result<T, ErrorContainer>;
 
 fn are_you_sure(default: bool) -> CromResult<bool> {
     std::io::stdout().flush()?;
@@ -21,7 +19,7 @@ fn are_you_sure(default: bool) -> CromResult<bool> {
         "n" => Ok(!default),
         _ => {
             error!("Didn't understand. Please try again.");
-            Err(CromError::UserInput)
+            Err(ErrorContainer::UserInput)
         }
     }
 }

src/crom_lib/artifact/compress.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::prelude::*;
-use std::path::{PathBuf, Path};
+use std::path::{Path, PathBuf};
 
 use libflate::gzip::Encoder;
 use std::io::Write;
@@ -47,7 +47,9 @@ fn zip(
         art_path.push(Path::new(path));
 
         if !art_path.exists() {
-            return Err(ErrorContainer::Compress(CompressError::UnableToFindArtifact(art_path.to_str().unwrap().to_string())));
+            return Err(ErrorContainer::Compress(
+                CompressError::UnableToFindArtifact(art_path.to_str().unwrap().to_string()),
+            ));
         }
 
         let mut file = File::open(art_path)?;

src/crom_lib/artifact/github.rs

@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::error::Error;
 use std::path::PathBuf;
 
 use hyper::client::HttpConnector;
@@ -24,7 +23,6 @@ pub fn make_upload_request(
     artifacts: ProjectArtifacts,
     root_artifact_path: Option<PathBuf>,
 ) -> Result<Vec<ArtifactContainer>, ErrorContainer> {
-
     let (owner, repo) = match &details.remote {
         RepoRemote::GitHub(owner, repo) => (owner, repo),
     };
@@ -48,15 +46,12 @@ pub fn make_upload_request(
     let res = rt.block_on(client.request(request)).unwrap();
     let upload_url = extract_upload_url(res)?;
 
-    let root_path = root_artifact_path.unwrap_or(details.path.clone());
+    let root_path = root_artifact_path.unwrap_or_else(|| details.path.clone());
 
     match artifacts.compress {
-        Some(compression) => compress_artifact(
-            &upload_url,
-            root_path,
-            &artifacts.paths,
-            &compression,
-        ),
+        Some(compression) => {
+            compress_artifact(&upload_url, root_path, &artifacts.paths, &compression)
+        }
         None => build_artifact_containers(&upload_url, root_path, &artifacts.paths),
     }
 }
@@ -126,7 +121,7 @@ fn extract_upload_url(res: Response<Body>) -> Result<Url, ErrorContainer> {
                 Err(err) => {
                     debug!("Body was: {}", body_text);
                     return Err(ErrorContainer::GitHub(
-                        GitHubError::UnkownCommunicationError(err.description().to_lowercase()),
+                        GitHubError::UnkownCommunicationError(err.to_string().to_lowercase()),
                     ));
                 }
             }
@@ -157,7 +152,7 @@ fn extract_upload_url(res: Response<Body>) -> Result<Url, ErrorContainer> {
     match Url::parse(upload_url) {
         Ok(it) => Ok(it),
         Err(e) => Err(ErrorContainer::GitHub(GitHubError::UnableToGetUploadUrl(
-            e.description().to_string(),
+            e.to_string(),
         ))),
     }
 }

src/crom_lib/artifact/mod.rs

@@ -36,7 +36,9 @@ pub fn upload_artifacts(
 
     for art in artifacts {
         let res = match art.target {
-            ProjectArtifactTarget::GitHub => github::make_upload_request(details, version, art, root_artifact_path.clone()),
+            ProjectArtifactTarget::GitHub => {
+                github::make_upload_request(details, version, art, root_artifact_path.clone())
+            }
         };
 
         match res {

src/crom_lib/config/mod.rs

@@ -51,7 +51,12 @@ impl Project for ParsedProjectConfig {
         )
     }
 
-    fn publish(&self, version: &Version, names: Vec<String>, root_artifact_path: Option<PathBuf>) -> Result<(), ErrorContainer> {
+    fn publish(
+        &self,
+        version: &Version,
+        names: Vec<String>,
+        root_artifact_path: Option<PathBuf>,
+    ) -> Result<(), ErrorContainer> {
         let mut artifacts: Vec<ProjectArtifacts> = Vec::new();
 
         for name in names {
@@ -62,12 +67,19 @@ impl Project for ParsedProjectConfig {
         }
 
         if artifacts.is_empty() {
-            return Err(ErrorContainer::State(StateError::ArtifactNotFound(s!("No aritifact defined"))));
+            return Err(ErrorContainer::State(StateError::ArtifactNotFound(s!(
+                "No aritifact defined"
+            ))));
         }
 
         debug!("Artifacts to upload: {:?}", artifacts);
 
-        crate::crom_lib::artifact::upload_artifacts(&self.repo_details, version, artifacts, root_artifact_path)
+        crate::crom_lib::artifact::upload_artifacts(
+            &self.repo_details,
+            version,
+            artifacts,
+            root_artifact_path,
+        )
     }
 
     fn tag_version(