Skip to content
Merged
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
20 changes: 20 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ default = []
# CLI parser
clap = { version = "4.5", features = ["derive", "env"] }
console = "0.15"
dialoguer = "0.11"
dialoguer = { version = "0.11", features = ["fuzzy-select"] }
indicatif = "0.17"
thiserror = "2"
anyhow = "1"
Expand Down
11 changes: 11 additions & 0 deletions src/cli.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use clap::{Parser, Subcommand};
use console::style;
use std::io::Write;
use std::path::PathBuf;

pub const VERSION_NUMBER: &str = env!("CARGO_PKG_VERSION");
Expand Down Expand Up @@ -85,6 +86,16 @@ pub fn init() -> Arguments {
env_logger::builder()
.parse_default_env()
.filter_level(log_level)
.format(|buf, record| {
let level = match record.level() {
log::Level::Error => style(record.level()).red(),
log::Level::Warn => style(record.level()).yellow(),
log::Level::Info => style(record.level()).blue(),
log::Level::Debug => style(record.level()).cyan(),
log::Level::Trace => style(record.level()).white(),
};
writeln!(buf, "[{:^5}] {}", level, record.args())
})
.format_module_path(false)
.init();

Expand Down
29 changes: 19 additions & 10 deletions src/interactive.rs
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
use crate::config::Config;
use crate::{WorkflowMode, config::BumpMode, defaults::Defaults};
use anyhow::{Result, anyhow};
use dialoguer::Select;
use dialoguer::theme::ColorfulTheme;
use dialoguer::{FuzzySelect, Select};
use log::debug;

pub fn select_mode() -> Result<WorkflowMode> {
let selection = Select::new()
pub fn select_mode(config: &Config) -> Result<WorkflowMode> {
let mut modes = Vec::new();
if !config.version.is_some() {

Check warning

Code scanning / clippy

this boolean expression can be simplified Warning

this boolean expression can be simplified

Check warning

Code scanning / clippy

this boolean expression can be simplified Warning

this boolean expression can be simplified
modes.push("Init");
}
modes.push("Display");
modes.push("Bump");

let selection = FuzzySelect::with_theme(&ColorfulTheme::default())
.with_prompt("Select Mode")
.default(0)
.item("Init")
.item("Display")
.item("Bump")
.items(modes.as_slice())
.interact()?;

match selection {
0 => Ok(interactive_init()?),
1 => Ok(WorkflowMode::Display),
2 => {
let text = modes.get(selection).ok_or(anyhow!("Invalid selection"))?;

match *text {
"Init" => Ok(interactive_init()?),
"Display" => Ok(WorkflowMode::Display),
"Bump" => {
let bump_mode = select_bump_mode()?;
Ok(WorkflowMode::Bump(bump_mode))
}
Expand Down
8 changes: 7 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#![deny(unsafe_code)]

use anyhow::Result;
use console::style;
use defaults::Defaults;
use log::debug;
use log::info;
Expand Down Expand Up @@ -94,7 +95,7 @@ async fn main() -> Result<()> {
WorkflowMode::Bump(bump_mode)
}
Some(ArgumentCommands::Display) => WorkflowMode::Display,
None => select_mode()?,
None => select_mode(&config)?,
};

let workflow = Workflow::init()
Expand Down Expand Up @@ -131,6 +132,11 @@ async fn main() -> Result<()> {
info!("Configuration saved");
}
WorkflowMode::Display => {
info!(
"Current Version - {}",
style(config.version.unwrap_or_default()).green()
);

workflow.display()?;
}
WorkflowMode::Bump(mode) => {
Expand Down