diff --git a/Cargo.lock b/Cargo.lock index 486da50..d141d97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,7 +333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ffsend-api" -version = "0.1.0" +version = "0.0.1" dependencies = [ "arrayref 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -356,7 +356,7 @@ dependencies = [ [[package]] name = "ffsend-cli" -version = "0.0.1-dev" +version = "0.0.1" dependencies = [ "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)", "clipboard 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -364,7 +364,7 @@ dependencies = [ "derive_builder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ffsend-api 0.1.0", + "ffsend-api 0.0.1", "open 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "pbr 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rpassword 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/api/Cargo.toml b/api/Cargo.toml index f39e0e8..17aa1c9 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -1,7 +1,8 @@ [package] name = "ffsend-api" -version = "0.1.0" -authors = ["timvisee "] +description = "A simple Firefox Send API client." +version = "0.0.1" +authors = ["Tim Visee "] workspace = ".." [dependencies] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index ae664be..525a680 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "ffsend-cli" description = "A simple Firefox Send CLI client." -version = "0.0.1-dev" -authors = ["timvisee "] +version = "0.0.1" +authors = ["Tim Visee "] workspace = ".." [[bin]] diff --git a/cli/src/app.rs b/cli/src/app.rs deleted file mode 100644 index 5c5b318..0000000 --- a/cli/src/app.rs +++ /dev/null @@ -1,11 +0,0 @@ -/// The application name. -pub const APP_NAME: &'static str = "ffsend"; - -/// The application version. -pub const APP_VERSION: &'static str = "0.0.1-dev"; - -/// The application author. -pub const APP_AUTHOR: &'static str = "Tim Visee "; - -/// Application about information. -pub const APP_ABOUT: &'static str = "A simple Firefox Send CLI client."; diff --git a/cli/src/cmd/handler.rs b/cli/src/cmd/handler.rs index b53167b..b4f2914 100644 --- a/cli/src/cmd/handler.rs +++ b/cli/src/cmd/handler.rs @@ -1,7 +1,5 @@ use clap::{App, AppSettings, Arg, ArgMatches}; -use app::*; - use super::matcher::{ DeleteMatcher, DownloadMatcher, @@ -31,10 +29,10 @@ pub struct Handler<'a> { impl<'a: 'b, 'b> Handler<'a> { /// Build the application CLI definition. pub fn build() -> App<'a, 'b> { - App::new(APP_NAME) - .version(APP_VERSION) - .author(APP_AUTHOR) - .about(APP_ABOUT) + App::new(crate_name!()) + .version(crate_version!()) + .author(crate_authors!()) + .about(crate_description!()) .global_setting(AppSettings::GlobalVersion) .global_setting(AppSettings::VersionlessSubcommands) // TODO: enable below command when it doesn't break `p` anymore. // .global_setting(AppSettings::InferSubcommands) diff --git a/cli/src/main.rs b/cli/src/main.rs index 4f1f997..5fb1961 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -9,7 +9,6 @@ extern crate ffsend_api; extern crate rpassword; mod action; -mod app; mod cmd; mod error; mod host;