Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.idea
/target
/completions
**/*.rs.bk
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ edition = "2018"

autotests = false

[build-dependencies]
structopt = "0.3"

[dependencies]
toml = "0.4"
serde = { version = '1.0.83', features = ['derive'] }
Expand Down
16 changes: 16 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
use std::fs;
use structopt::clap::Shell;

include!("src/cli.rs");

fn main() {
let pkg_name = env!("CARGO_PKG_NAME");

if let Ok(outdir) = std::env::var("SHELL_COMPLETIONS_DIR") {

fs::create_dir_all(&outdir).unwrap();
Cli::clap().gen_completions(pkg_name, Shell::Bash, &outdir);
Cli::clap().gen_completions(pkg_name, Shell::Fish, &outdir);
Cli::clap().gen_completions(pkg_name, Shell::Zsh, &outdir);
}
}
3 changes: 1 addition & 2 deletions src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,13 @@ pub struct CliOpts {
}

#[derive(Debug, StructOpt)]
#[structopt(setting = AppSettings::SubcommandsNegateReqs, author)]
#[structopt(setting = AppSettings::SubcommandsNegateReqs, setting = AppSettings::ArgRequiredElseHelp, author)]
/// A simple script management CLI
pub struct Cli {
#[structopt(flatten)]
pub opts: CliOpts,

/// The alias or name for the script.
#[structopt(required_unless = "cmd")]
pub alias: Option<String>,

/// Pier subcommands
Expand Down
3 changes: 3 additions & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ pub enum PierError {
source: std::io::Error,
path: PathBuf,
},
#[snafu(display("error: AliasOrSubcommandRequired: No alias or subcommand supplied."))]
AliasOrSubcommandRequired,

#[snafu(display("error: AliasNotFound: No script found by alias {}", alias))]
AliasNotFound { alias: String },

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pub mod cli;
mod config;
pub mod error;
use config::Config;
mod macros;
pub mod macros;
mod defaults;
use defaults::*;
pub mod script;
Expand Down
13 changes: 9 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
use snafu::ensure;
use std::process;
use structopt::clap::Shell;
use structopt::StructOpt;

use pier::{
cli::{Cli, CliSubcommand},
open_editor,
error::*,
open_editor, pier_err,
script::Script,
Pier, Result,
};

fn main() {
let opt = Cli::from_args();

//Cli::clap().gen_completions(env!("CARGO_PKG_NAME"), Shell::Zsh, "target");
if let Err(err) = handle_subcommands(opt) {
eprintln!("{}", err);
// Only exits the process once the used memory has been cleaned up.
Expand Down Expand Up @@ -73,8 +76,10 @@ fn handle_subcommands(cli: Cli) -> Result<()> {
};
} else {
let arg = "";
let alias = &cli.alias.expect("Alias is required unless subcommand.");
pier.run_script(alias, arg)?;
match &cli.alias {
Some(alias) => pier.run_script(&alias, arg)?,
None => pier_err!(PierError::AliasOrSubcommandRequired),
}
}

Ok(())
Expand Down