yetangitu/ffsend
1
0
Fork 0
mirror of https://github.com/timvisee/ffsend.git synced 2025-10-03 17:49:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove app constants, update Cargo.toml files

Browse source
This commit is contained in:
timvisee 2018-04-18 22:59:47 +02:00
parent ae7d424b0b
commit 6bec241cf2
No known key found for this signature in database
GPG key ID: 109CBA0BF74036C2
6 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -333,7 +333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "ffsend-api" name = "ffsend-api"
version = "0.1.0" version = "0.0.1"
dependencies = [ dependencies = [
"arrayref 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -356,7 +356,7 @@ dependencies = [
[[package]] [[package]]
name = "ffsend-cli" name = "ffsend-cli"
version = "0.0.1-dev" version = "0.0.1"
dependencies = [ dependencies = [
"clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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 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)", "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)", "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)", "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)", "rpassword 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

5
api/Cargo.toml
View file

@ -1,7 +1,8 @@
[package] [package]
name = "ffsend-api" name = "ffsend-api"
version = "0.1.0" description = "A simple Firefox Send API client."
authors = ["timvisee <timvisee@gmail.com>"] version = "0.0.1"
authors = ["Tim Visee <https://timvisee.com/>"]
workspace = ".." workspace = ".."
[dependencies] [dependencies]

4
cli/Cargo.toml
View file

@ -1,8 +1,8 @@
[package] [package]
name = "ffsend-cli" name = "ffsend-cli"
description = "A simple Firefox Send CLI client." description = "A simple Firefox Send CLI client."
version = "0.0.1-dev" version = "0.0.1"
authors = ["timvisee <timvisee@gmail.com>"] authors = ["Tim Visee <https://timvisee.com/>"]
workspace = ".." workspace = ".."
[[bin]] [[bin]]

11
cli/src/app.rs
View file

@ -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 <https://timvisee.com/>";
/// Application about information.
pub const APP_ABOUT: &'static str = "A simple Firefox Send CLI client.";

10
cli/src/cmd/handler.rs
View file

@ -1,7 +1,5 @@
use clap::{App, AppSettings, Arg, ArgMatches}; use clap::{App, AppSettings, Arg, ArgMatches};
use app::*;
use super::matcher::{ use super::matcher::{
DeleteMatcher, DeleteMatcher,
DownloadMatcher, DownloadMatcher,
@ -31,10 +29,10 @@ pub struct Handler<'a> {
impl<'a: 'b, 'b> Handler<'a> { impl<'a: 'b, 'b> Handler<'a> {
/// Build the application CLI definition. /// Build the application CLI definition.
pub fn build() -> App<'a, 'b> { pub fn build() -> App<'a, 'b> {
App::new(APP_NAME) App::new(crate_name!())
.version(APP_VERSION) .version(crate_version!())
.author(APP_AUTHOR) .author(crate_authors!())
.about(APP_ABOUT) .about(crate_description!())
.global_setting(AppSettings::GlobalVersion) .global_setting(AppSettings::VersionlessSubcommands) .global_setting(AppSettings::GlobalVersion) .global_setting(AppSettings::VersionlessSubcommands)
// TODO: enable below command when it doesn't break `p` anymore. // TODO: enable below command when it doesn't break `p` anymore.
// .global_setting(AppSettings::InferSubcommands) // .global_setting(AppSettings::InferSubcommands)

1
cli/src/main.rs
View file

@ -9,7 +9,6 @@ extern crate ffsend_api;
extern crate rpassword; extern crate rpassword;
mod action; mod action;
mod app;
mod cmd; mod cmd;
mod error; mod error;
mod host; mod host;