Skip to content
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

Remove failure #151

Merged
merged 1 commit into from
Nov 16, 2019
Merged

Remove failure #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 1 addition & 24 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.

95 changes: 44 additions & 51 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ or network/web services), aiming to provide a large number of features with a
by default: `terminal` and `logging`.
- **configuration**: Simple parsing of TOML configurations to `serde`-parsed
configuration types which can be dynamically updated at runtime.
- **error handling**: generic `Error` type based on the `failure` crate, and a
unified error-handling subsystem.
- **error handling**: unified error-handling subsystem with generic error type.
- **logging**: based on the `log` to provide application-level logging.
- **secrets management**: the (optional) `secrets` module includes a `Secret`
type which derives serde's `Deserialize` and can be used to represent secret
Expand Down Expand Up @@ -103,29 +102,28 @@ default set of features in the application:
| 7 | [canonical-path] | [iqlusion] | Apache-2.0 | Get canonical fs paths |
| 8 | [chrono] | [chronotope] | Apache-2.0/MIT | Time/date library |
| 9 | [color-backtrace] | [@athre0z] | Apache-2.0/MIT | Rich colored backtraces |
| 10 | [failure] | [@withoutboats] | Apache-2.0/MIT | Error handling |
| 11 | [generational-arena] | [@fitzgen] | MPL-2.0 | Component allocator |
| 12 | [gumdrop] | [@Murarth] | Apache-2.0/MIT | Command-line options |
| 13 | [lazy_static] | [rust-lang] | Apache-2.0/MIT | Heap-allocated statics |
| 14 | [libc] | [rust-lang] | Apache-2.0/MIT | C library wrapper |
| 15 | [log] | [rust-lang] | Apache-2.0/MIT | Logging facade library |
| 16 | [num-integer] | [rust-num] | Apache-2.0/MIT | `Integer` trait |
| 17 | [num-traits] | [rust-num] | Apache-2.0/MIT | Numeric traits |
| 18 | [redox_syscall] | [redox-os] | MIT | Redox OS syscall API |
| 19 | [rustc-demangle] | [@alexcrichton] | Apache-2.0/MIT | Symbol demangling |
| 20 | [secrecy] | [iqlusion] | Apache-2.0 | Secret-keeping types |
| 21 | [semver] | [@steveklabnik] | Apache-2.0/MIT | Semantic versioning |
| 22 | [semver-parser] | [@steveklabnik] | Apache-2.0/MIT | Parser for semver spec |
| 23 | [serde] | [serde-rs] | Apache-2.0/MIT | Serialization framework |
| 24 | [signal-hook] | [@vorner] | Apache-2.0/MIT | Unix signal handling |
| 25 | [signal-hook-registry] | [@vorner] | Apache-2.0/MIT | Unix signal registry |
| 26 | [termcolor] | [@BurntSushi] | MIT/Unlicense | Terminal color support |
| 27 | [time] | [rust-lang] | Apache-2.0/MIT | Time/date library |
| 28 | [toml] | [@alexcrichton] | Apache-2.0/MIT | TOML parser library |
| 29 | [winapi]§ | [@retep998] | Apache-2.0/MIT | Windows FFI bindings |
| 30 | [winapi-util] | [@BurntSushi] | MIT/Unlicense | Safe winapi wrappers |
| 31 | [wincolor] | [@BurntSushi] | MIT/Unlicense | Windows console color |
| 32 | [zeroize] | [iqlusion] | Apache-2.0/MIT | Zero out sensitive data |
| 10 | [generational-arena] | [@fitzgen] | MPL-2.0 | Component allocator |
| 11 | [gumdrop] | [@Murarth] | Apache-2.0/MIT | Command-line options |
| 12 | [lazy_static] | [rust-lang] | Apache-2.0/MIT | Heap-allocated statics |
| 13 | [libc] | [rust-lang] | Apache-2.0/MIT | C library wrapper |
| 14 | [log] | [rust-lang] | Apache-2.0/MIT | Logging facade library |
| 15 | [num-integer] | [rust-num] | Apache-2.0/MIT | `Integer` trait |
| 16 | [num-traits] | [rust-num] | Apache-2.0/MIT | Numeric traits |
| 17 | [redox_syscall] | [redox-os] | MIT | Redox OS syscall API |
| 18 | [rustc-demangle] | [@alexcrichton] | Apache-2.0/MIT | Symbol demangling |
| 19 | [secrecy] | [iqlusion] | Apache-2.0 | Secret-keeping types |
| 20 | [semver] | [@steveklabnik] | Apache-2.0/MIT | Semantic versioning |
| 21 | [semver-parser] | [@steveklabnik] | Apache-2.0/MIT | Parser for semver spec |
| 22 | [serde] | [serde-rs] | Apache-2.0/MIT | Serialization framework |
| 23 | [signal-hook] | [@vorner] | Apache-2.0/MIT | Unix signal handling |
| 24 | [signal-hook-registry] | [@vorner] | Apache-2.0/MIT | Unix signal registry |
| 25 | [termcolor] | [@BurntSushi] | MIT/Unlicense | Terminal color support |
| 26 | [time] | [rust-lang] | Apache-2.0/MIT | Time/date library |
| 27 | [toml] | [@alexcrichton] | Apache-2.0/MIT | TOML parser library |
| 28 | [winapi]§ | [@retep998] | Apache-2.0/MIT | Windows FFI bindings |
| 29 | [winapi-util] | [@BurntSushi] | MIT/Unlicense | Safe winapi wrappers |
| 30 | [wincolor] | [@BurntSushi] | MIT/Unlicense | Windows console color |
| 31 | [zeroize] | [iqlusion] | Apache-2.0/MIT | Zero out sensitive data |

### Build / Development / Testing Dependencies

Expand All @@ -138,24 +136,23 @@ default set of features in the application:
| 5 | [darling] | [@TedDriggs] | MIT | Nifty attribute parser |
| 6 | [darling_core] | [@TedDriggs] | MIT | Attribute parser core |
| 7 | [darling_macro] | [@TedDriggs] | MIT | Attribute parser macros |
| 8 | [failure_derive] | [@withoutboats] | Apache-2.0/MIT | `failure` custom derive |
| 9 | [fnv] | [@alexcrichton] | Apache-2.0/MIT | Fast hash function |
| 10 | [gumdrop_derive] | [@Murarth] | Apache-2.0/MIT | Command-line options |
| 11 | [ident_case] | [@TedDriggs] | Apache-2.0/MIT | Case conversion utils |
| 12 | [memchr] | [@BurntSushi] | MIT/Unlicense | Optimized byte search |
| 13 | [proc-macro2] | [@alexcrichton] | Apache-2.0/MIT | Shim for Macros 2.0 API |
| 14 | [quote] | [@dtolnay] | Apache-2.0/MIT | Rust AST to token macro |
| 15 | [regex] | [rust-lang] | Apache-2.0/MIT | Regular expressions |
| 16 | [regex-syntax] | [rust-lang] | Apache-2.0/MIT | Regex syntax impl |
| 17 | [serde_derive] | [serde-rs] | Apache-2.0/MIT | `serde` custom derive |
| 18 | [strsim] | [@dguo] | MIT | String similarity utils |
| 19 | [syn] | [@dtolnay] | Apache-2.0/MIT | Rust source code parser |
| 20 | [synstructure] | [@mystor] | Apache-2.0/MIT | `syn` structure macros |
| 21 | [thread_local] | [@Amanieu] | Apache-2.0/MIT | Per-object thread local |
| 22 | [ucd-util] | [@BurntSushi] | Apache-2.0/MIT | Unicode utilities |
| 23 | [unicode-xid] | [unicode-rs] | Apache-2.0/MIT | Identify valid Unicode |
| 24 | [utf8-ranges] | [@BurntSushi] | MIT/Unlicense | UTF-8 codepoint ranges |
| 25 | [wait-timeout] | [@alexcrichton] | Apache-2.0/MIT | Timeouts for waitpid |
| 8 | [fnv] | [@alexcrichton] | Apache-2.0/MIT | Fast hash function |
| 9 | [gumdrop_derive] | [@Murarth] | Apache-2.0/MIT | Command-line options |
| 10 | [ident_case] | [@TedDriggs] | Apache-2.0/MIT | Case conversion utils |
| 11 | [memchr] | [@BurntSushi] | MIT/Unlicense | Optimized byte search |
| 12 | [proc-macro2] | [@alexcrichton] | Apache-2.0/MIT | Shim for Macros 2.0 API |
| 13 | [quote] | [@dtolnay] | Apache-2.0/MIT | Rust AST to token macro |
| 14 | [regex] | [rust-lang] | Apache-2.0/MIT | Regular expressions |
| 15 | [regex-syntax] | [rust-lang] | Apache-2.0/MIT | Regex syntax impl |
| 16 | [serde_derive] | [serde-rs] | Apache-2.0/MIT | `serde` custom derive |
| 17 | [strsim] | [@dguo] | MIT | String similarity utils |
| 18 | [syn] | [@dtolnay] | Apache-2.0/MIT | Rust source code parser |
| 19 | [synstructure] | [@mystor] | Apache-2.0/MIT | `syn` structure macros |
| 20 | [thread_local] | [@Amanieu] | Apache-2.0/MIT | Per-object thread local |
| 21 | [ucd-util] | [@BurntSushi] | Apache-2.0/MIT | Unicode utilities |
| 22 | [unicode-xid] | [unicode-rs] | Apache-2.0/MIT | Identify valid Unicode |
| 23 | [utf8-ranges] | [@BurntSushi] | MIT/Unlicense | UTF-8 codepoint ranges |
| 24 | [wait-timeout] | [@alexcrichton] | Apache-2.0/MIT | Timeouts for waitpid |

### Dependency Relationships

Expand All @@ -172,7 +169,7 @@ so you only compile the parts you need.
| [arc-swap] | `signals` | [signal-hook-registry] |
| [atty] | `terminal` | [color-backtrace] |
| [autocfg] | `time` | [num-integer] |
| [backtrace] | - | [failure] |
| [backtrace] | - | [abscissa_core] |
| [backtrace-sys] | - | [backtrace] |
| [canonical-path] | - | [abscissa_core] |
| [cc] | - | [backtrace-sys] |
Expand All @@ -182,8 +179,6 @@ so you only compile the parts you need.
| [darling] | - | [abscissa_derive] |
| [darling_core] | - | [darling], [darling_macro] |
| [darling_macro] | - | [darling] |
| [failure] | - | [abscissa_core] |
| [failure_derive] | - | [failure] |
| [fnv] | - | [darling_core] |
| [generational-arena] | `application` | [abscissa_core] |
| [gumdrop] | `options` | [abscissa_core] |
Expand All @@ -195,8 +190,8 @@ so you only compile the parts you need.
| [memchr] | `testing` | [aho-corasick] |
| [num-integer] | `time` | [chrono] |
| [num-traits] | `time` | [chrono], [num-integer] |
| [proc-macro2] | - | [abscissa_derive], [darling], [failure_derive], [quote], [serde_derive], [syn] |
| [quote] | - | [abscissa_derive], [darling], [failure_derive], [gumdrop_derive], [serde_derive] |
| [proc-macro2] | - | [abscissa_derive], [darling], [quote], [serde_derive], [syn] |
| [quote] | - | [abscissa_derive], [darling], [gumdrop_derive], [serde_derive] |
| [redox_syscall] | `time` | [time] |
| [regex] | `testing` | [abscissa_core] |
| [rustc-demangle] | - | [backtrace] |
Expand All @@ -208,7 +203,7 @@ so you only compile the parts you need.
| [signal-hook] | `signals` | [abscissa_core] |
| [signal-hook-registry] | `signals` | [signal-hook] |
| [strsim] | - | [darling_core] |
| [syn] | - | [abscissa_derive], [darling], [failure_derive], [gumdrop_derive], [serde_derive] |
| [syn] | - | [abscissa_derive], [darling], [gumdrop_derive], [serde_derive] |
| [termcolor] | `terminal` | [abscissa_core] |
| [thread_local] | `testing` | [regex] |
| [time] | `logging` | [chrono] |
Expand Down Expand Up @@ -361,8 +356,6 @@ read the [CONTRIBUTING.md] and [CODE_OF_CONDUCT.md] files first.
[darling]: https://crates.io/crates/darling
[darling_core]: https://crates.io/crates/darling_core
[darling_macro]: https://crates.io/crates/darling_macro
[failure]: https://crates.io/crates/failure
[failure_derive]: https://crates.io/crates/failure_derive
[fnv]: https://crates.io/crates/fnv
[generational-arena]: https://github.com/fitzgen/generational-arena
[gumdrop]: https://crates.io/crates/gumdrop
Expand Down
1 change: 0 additions & 1 deletion cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ keywords = ["abscissa", "cli", "application", "framework", "service"]
maintenance = { status = "actively-developed" }

[dependencies]
failure = "0.1"
gumdrop = "0.7"
handlebars = "2"
ident_case = "1"
Expand Down
65 changes: 47 additions & 18 deletions cli/src/commands/new.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
#![allow(clippy::never_loop)]

use crate::{
error::{Error, ErrorKind},
prelude::*,
properties::{self, Properties},
template::{Collection, Template},
};
use abscissa_core::{status_err, status_info, status_ok, status_warn, Command, Options, Runnable};
use failure::{bail, format_err, Error};
use ident_case::RenameRule;
use std::{
fs, io,
Expand Down Expand Up @@ -70,7 +71,7 @@ impl NewCommand {
fn app_path(&self) -> Result<&Path, Error> {
match &self.app_path {
Some(path) => Ok(path.as_ref()),
None => bail!("no app_path given"),
None => fail!(ErrorKind::Path, "no app_path given"),
}
}

Expand All @@ -83,15 +84,25 @@ impl NewCommand {
status_info!("Exists", "`{}` (application directory)", app_path.display());
return Ok(());
} else {
fatal_error(format_err!(
"destination `{}` already exists",
app_path.display()
));
fatal_error(
format_err!(
ErrorKind::Path,
"destination `{}` already exists",
app_path.display()
)
.into(),
);
}
}

fs::create_dir(app_path)
.map_err(|e| format_err!("couldn't create {}: {}", app_path.display(), e))?;
fs::create_dir(app_path).map_err(|e| {
format_err!(
ErrorKind::Path,
"couldn't create {}: {}",
app_path.display(),
e
)
})?;

status_ok!(
"Created",
Expand All @@ -116,22 +127,38 @@ impl NewCommand {
if self.force {
status_warn!("overwriting: {}", output_path.display())
} else {
fatal_error(format_err!(
"file already exists: {}",
output_path.display()
));
fatal_error(
format_err!(
ErrorKind::Path,
"file already exists: {}",
output_path.display()
)
.into(),
);
}
}

// We should always have a parent directory
let output_dir = output_path.parent().unwrap();

// Create all of the necessary parent directories
fs::create_dir_all(output_dir)
.map_err(|e| format_err!("error creating {}: {}", output_dir.display(), e))?;

let mut output_file = fs::File::create(&output_path)
.map_err(|e| format_err!("couldn't create {}: {}", output_path.display(), e))?;
fs::create_dir_all(output_dir).map_err(|e| {
format_err!(
ErrorKind::Path,
"error creating {}: {}",
output_dir.display(),
e
)
})?;

let mut output_file = fs::File::create(&output_path).map_err(|e| {
format_err!(
ErrorKind::Path,
"couldn't create {}: {}",
output_path.display(),
e
)
})?;

app_template.render(template_file, &app_properties, &mut output_file)?;
status_ok!("Created", "new file: {}", output_path_rel.display());
Expand Down Expand Up @@ -170,7 +197,9 @@ impl NewCommand {
// Ignore errors if git isn't installed
Err(e) => {
if e.kind() != io::ErrorKind::NotFound {
fatal_error(format_err!("error running git init: {}", e));
fatal_error(
format_err!(ErrorKind::Git, "error running git init: {}", e).into(),
);
}
}
}
Expand Down
Loading