From 27fe0cf10c53a4fa2d10ac3178bbdd3af4b862f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kaya=20G=C3=B6kalp?= Date: Fri, 7 Jun 2024 13:21:54 -0700 Subject: [PATCH] feat: add upgrade command to auto update fuelup, switch to latest and update installed channels (#625) * feat: add upgrade command to auto update fuelup, switch to latest and update installed channels * test: add upgrade test --- src/commands/mod.rs | 1 + src/commands/upgrade.rs | 16 ++++++++++++++++ src/fuelup_cli.rs | 8 +++++++- src/ops/fuelup_upgrade.rs | 13 +++++++++++++ src/ops/mod.rs | 1 + tests/upgrade.rs | 15 +++++++++++++++ 6 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/commands/upgrade.rs create mode 100644 src/ops/fuelup_upgrade.rs create mode 100644 tests/upgrade.rs diff --git a/src/commands/mod.rs b/src/commands/mod.rs index 643631f39..558ff428a 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -6,3 +6,4 @@ pub mod fuelup; pub mod show; pub mod toolchain; pub mod update; +pub mod upgrade; diff --git a/src/commands/upgrade.rs b/src/commands/upgrade.rs new file mode 100644 index 000000000..3eb64ce50 --- /dev/null +++ b/src/commands/upgrade.rs @@ -0,0 +1,16 @@ +use anyhow::Result; +use clap::Parser; + +use crate::ops::fuelup_upgrade; + +#[derive(Debug, Parser)] +pub struct UpgradeCommand { + #[clap(long, short)] + pub force: bool, +} + +pub fn exec(force: bool) -> Result<()> { + fuelup_upgrade::upgrade(force)?; + + Ok(()) +} diff --git a/src/fuelup_cli.rs b/src/fuelup_cli.rs index 7c4bd2a52..b1fdf9bbe 100644 --- a/src/fuelup_cli.rs +++ b/src/fuelup_cli.rs @@ -2,7 +2,9 @@ use anyhow::Result; use clap::Parser; use crate::commands::show::ShowCommand; -use crate::commands::{check, completions, component, default, fuelup, show, toolchain, update}; +use crate::commands::{ + check, completions, component, default, fuelup, show, toolchain, update, upgrade, +}; use crate::commands::check::CheckCommand; use crate::commands::completions::CompletionsCommand; @@ -11,6 +13,7 @@ use crate::commands::default::DefaultCommand; use crate::commands::fuelup::FuelupCommand; use crate::commands::toolchain::ToolchainCommand; use crate::commands::update::UpdateCommand; +use crate::commands::upgrade::UpgradeCommand; #[derive(Debug, Parser)] #[clap(name = "fuelup", about = "Fuel Toolchain Manager", version)] @@ -40,6 +43,8 @@ enum Commands { Show(ShowCommand), /// Updates the distributable toolchains, if already installed Update(UpdateCommand), + /// Updates fuelup itself, switches to the `latest` channel and updates components in all channels. + Upgrade(UpgradeCommand), } pub fn fuelup_cli() -> Result<()> { @@ -57,5 +62,6 @@ pub fn fuelup_cli() -> Result<()> { Commands::Show(_command) => show::exec(), Commands::Toolchain(command) => toolchain::exec(command), Commands::Update(_command) => update::exec(), + Commands::Upgrade(command) => upgrade::exec(command.force), } } diff --git a/src/ops/fuelup_upgrade.rs b/src/ops/fuelup_upgrade.rs new file mode 100644 index 000000000..90b615ad7 --- /dev/null +++ b/src/ops/fuelup_upgrade.rs @@ -0,0 +1,13 @@ +use super::{fuelup_default, fuelup_self, fuelup_update}; +use crate::channel::LATEST; +use anyhow::Result; + +pub fn upgrade(force: bool) -> Result<()> { + // self update + fuelup_self::self_update(force)?; + // switch to 'latest' channel. + fuelup_default::default(Some(LATEST.to_owned()))?; + // update channels + fuelup_update::update()?; + Ok(()) +} diff --git a/src/ops/mod.rs b/src/ops/mod.rs index 27c3cfb84..0116ef41a 100644 --- a/src/ops/mod.rs +++ b/src/ops/mod.rs @@ -6,3 +6,4 @@ pub mod fuelup_self; pub mod fuelup_show; pub mod fuelup_toolchain; pub mod fuelup_update; +pub mod fuelup_upgrade; diff --git a/tests/upgrade.rs b/tests/upgrade.rs new file mode 100644 index 000000000..6f029110b --- /dev/null +++ b/tests/upgrade.rs @@ -0,0 +1,15 @@ +use anyhow::Result; +use testcfg::FuelupState; + +pub mod testcfg; + +#[test] +fn fuelup_upgrade() -> Result<()> { + testcfg::setup(FuelupState::LatestToolchainInstalled, &|cfg| { + let output = cfg.fuelup(&["upgrade"]); + let expected_stdout_starts_with = "Already up to date"; + assert!(output.stdout.contains(expected_stdout_starts_with)); + })?; + + Ok(()) +}