Merge branch 'unstable' into stable

Author: markcda

CHANGELOG.md

@@ -7,6 +7,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.0-1] - 2025-06-17
+
+### Added
+
+- You can choose in what format Deployer should `cat` your Actions, Pipelines or project configurations, by using `deployer cat ... -f json/toml/yaml`.
+
+### Changed
+
+- Small CI fixes with Rust `nightly-1.89.0` on GitHub.
+
 ## [1.5.0] - 2025-06-17
 
 ### Added

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deployer"
-version = "1.5.0"
+version = "1.5.0-1"
 edition = "2024"
 
 [dependencies]

src/actions.rs

@@ -2,6 +2,8 @@
 //!
 //! Action is the main entity of Deployer. Actions as part of Pipelines are used to build, install, and deploy processes.
 
+#[cfg(feature = "tui")]
+use anyhow::bail;
 #[cfg(feature = "tui")]
 use colored::Colorize;
 use serde::{Deserialize, Serialize};
@@ -28,7 +30,7 @@ use crate::actions::{
   test::TestAction,
 };
 #[cfg(feature = "tui")]
-use crate::cmd::{CatActionArgs, NewActionArgs};
+use crate::cmd::{CatActionArgs, EditActionArgs, NewActionArgs};
 #[cfg(feature = "tui")]
 use crate::configs::{DeployerGlobalConfig, DeployerProjectOptions};
 #[cfg(feature = "tui")]
@@ -274,7 +276,7 @@ pub fn list_actions(globals: &DeployerGlobalConfig) {
   for action in actions {
     let action_info = action.info.to_str();
     let action_title = if let Some(title) = &action.title {
-      &format!("[{}]", title)
+      &format!("[{title}]")
     } else {
       ""
     };
@@ -313,7 +315,7 @@ pub fn remove_action(globals: &mut DeployerGlobalConfig) -> anyhow::Result<()> {
         action.info.to_str(),
         {
           if let Some(title) = &action.title {
-            format!(" - `{}`", title)
+            format!(" - `{title}`")
           } else {
             "".into()
           }
@@ -353,7 +355,7 @@ pub fn new_action(globals: &mut DeployerGlobalConfig, args: &NewActionArgs) -> a
     let ext = ConfigExtension::decide(&std::path::PathBuf::from(from_file))?;
     let action = read_checked::<DescribedAction>(from_file, ext)
       .map_err(|e| {
-        panic!("Can't read provided Action file due to: {}", e);
+        panic!("Can't read provided Action file due to: {e}");
       })
       .unwrap();
     actions.insert(action.info.clone(), action.clone());
@@ -365,7 +367,7 @@ pub fn new_action(globals: &mut DeployerGlobalConfig, args: &NewActionArgs) -> a
   Ok(described_action)
 }
 
-/// Prints Action as JSON.
+/// Prints Action as JSON/TOML/YAML.
 #[cfg(feature = "tui")]
 pub fn cat_action(globals: &DeployerGlobalConfig, args: &CatActionArgs) -> anyhow::Result<()> {
   let action = match globals
@@ -376,15 +378,20 @@ pub fn cat_action(globals: &DeployerGlobalConfig, args: &CatActionArgs) -> anyho
     Some(action) => action,
   };
 
-  let action_json = serde_json::to_string_pretty(&action).unwrap();
-  println!("{}", action_json);
+  let action_ser = match args.format.as_deref() {
+    Some("json") | None => serde_json::to_string_pretty(&action).unwrap(),
+    Some("toml") => toml::to_string_pretty(&action).unwrap(),
+    Some("yaml") | Some("yml") => serde_yaml::to_string_pretty(&action).unwrap(),
+    _ => bail!("Unsupported output format!"),
+  };
+  println!("{action_ser}");
 
   Ok(())
 }
 
 /// Edits the Action.
 #[cfg(feature = "tui")]
-pub fn edit_action(globals: &mut DeployerGlobalConfig, args: &CatActionArgs) -> anyhow::Result<()> {
+pub fn edit_action(globals: &mut DeployerGlobalConfig, args: &EditActionArgs) -> anyhow::Result<()> {
   let described_action = match globals
     .actions_registry
     .get_mut(&args.action_short_info_and_version.to_info()?)

src/actions/observe.rs

@@ -44,15 +44,15 @@ impl Execute for ObserveAction {
       let (jrtx, jrrx) = mpsc::channel(1);
       let (jftx, mut jfrx) = mpsc::channel(1);
       if let Err(e) = cli.tx.send((jrrx, jftx)).await {
-        crate::rw::log(format!("Can't send task exchange channels! Error: {:?}", e));
+        crate::rw::log(format!("Can't send task exchange channels! Error: {e:?}"));
         return Ok((false, vec![]));
       }
 
       let owned_env = OwnedEnvironment::new(env.run_dir);
       let observe = self.clone();
 
       if let Err(e) = jrtx.send((observe, owned_env)).await {
-        crate::rw::log(format!("Can't send `observe` task! Error: {:?}", e));
+        crate::rw::log(format!("Can't send `observe` task! Error: {e:?}"));
         return Ok((false, vec![]));
       }
 

src/actions/patch.rs

@@ -45,10 +45,7 @@ impl Execute for PatchAction {
       Ok(0) if self.ignore_fails.is_none_or(|v| !v) => Ok((false, vec![format!("{}", i18n::PATCH_DONE_ZERO_TIMES)])),
       Ok(num) => Ok((
         true,
-        vec![format!(
-          "{}",
-          i18n::PATCH_DONE.replace("{}", format!("{}", num).as_str())
-        )],
+        vec![format!("{}", i18n::PATCH_DONE.replace("{}", format!("{num}").as_str()))],
       )),
     }
   }

src/ansible.rs

@@ -167,7 +167,7 @@ pub async fn execute_pipeline_with_ansible(
   }
 
   CustomCommand {
-    bash_c: format!("ansible-playbook -i inventory.ini {}", playbook_filename),
+    bash_c: format!("ansible-playbook -i inventory.ini {playbook_filename}"),
     ..Default::default()
   }
   .execute_observer(env)

src/cmd.rs

@@ -109,33 +109,24 @@ pub enum CatType {
   Remote(CatRemoteArgs),
 }
 
-/// `Edit` types.
-#[derive(Subcommand)]
-pub enum EditType {
-  /// Edits an Action
-  Action(CatActionArgs),
-  /// Edits a Pipeline
-  Pipeline(CatPipelineArgs),
-  /// Edits Project settings
-  #[clap(visible_alias("."))]
-  Project,
-  /// Edits an information about remote hosts
-  #[cfg(feature = "ssh-remotes")]
-  Remote(CatRemoteArgs),
-}
-
 /// Cat Actions' options.
 #[derive(Args)]
 pub struct CatActionArgs {
   /// {short-name}@{version}
   pub action_short_info_and_version: String,
+  /// Output format (JSON by default)
+  #[arg(short('f'), long)]
+  pub format: Option<String>,
 }
 
 /// Cat Pipelines' options.
 #[derive(Args)]
 pub struct CatPipelineArgs {
   /// {short-name}@{version}
   pub pipeline_short_info_and_version: String,
+  /// Output format (JSON by default)
+  #[arg(short('f'), long)]
+  pub format: Option<String>,
 }
 
 /// Cat Project' options.
@@ -144,6 +135,9 @@ pub struct CatProjectArgs {
   /// Prints all `bash` commands instead of JSON.
   #[arg(short('n'), long)]
   pub cat_all_shell_commands: bool,
+  /// Output format (JSON by default)
+  #[arg(short('f'), long)]
+  pub format: Option<String>,
 }
 
 /// Cat Remote' options.
@@ -153,6 +147,42 @@ pub struct CatRemoteArgs {
   pub remote_host_short_info: String,
 }
 
+/// `Edit` types.
+#[derive(Subcommand)]
+pub enum EditType {
+  /// Edits an Action
+  Action(EditActionArgs),
+  /// Edits a Pipeline
+  Pipeline(EditPipelineArgs),
+  /// Edits Project settings
+  #[clap(visible_alias("."))]
+  Project,
+  /// Edits an information about remote hosts
+  #[cfg(feature = "ssh-remotes")]
+  Remote(EditRemoteArgs),
+}
+
+/// Edit Actions' options.
+#[derive(Args)]
+pub struct EditActionArgs {
+  /// {short-name}@{version}
+  pub action_short_info_and_version: String,
+}
+
+/// Edit Pipelines' options.
+#[derive(Args)]
+pub struct EditPipelineArgs {
+  /// {short-name}@{version}
+  pub pipeline_short_info_and_version: String,
+}
+
+/// Edit Remote' options.
+#[derive(Args)]
+pub struct EditRemoteArgs {
+  /// Remote host shortname.
+  pub remote_host_short_info: String,
+}
+
 /// `New` types.
 #[derive(Subcommand)]
 pub enum NewType {

src/containered.rs

@@ -52,7 +52,7 @@ CMD ["/app/deployer", "run", "{pipeline-name}", "--current"{no-pipe}]
 async fn run_simple(env: &RunEnvironment<'_>, bash_c: String) -> anyhow::Result<()> {
   if !(CustomCommand {
     bash_c: {
-      log(format!("Given command: `{}`", bash_c));
+      log(format!("Given command: `{bash_c}`"));
       bash_c
     },
     ignore_fails: None,
@@ -132,10 +132,10 @@ pub fn generate_single_pipeline_config(
   }
 
   let config_filepath = DEPL_CONFIG_FILE.replace("{pipeline-name}", pipeline.title.as_str());
-  log(format!("Prev config on {:?}", config_filepath));
+  log(format!("Prev config on {config_filepath:?}"));
   let prev_config = crate::rw::read::<DeployerProjectOptions>(env.run_dir, config_filepath.as_str());
   if prev_config != minimal_project_config {
-    log(format!("Saving minimal pipeline config on {:?}", config_filepath));
+    log(format!("Saving minimal pipeline config on {config_filepath:?}"));
     crate::rw::write(env.run_dir, config_filepath.as_str(), &minimal_project_config);
     fs::set_permissions(
       env.run_dir.join(config_filepath.as_str()),
@@ -215,7 +215,7 @@ pub fn generate_dockerfile(
     )
     .replace("{pipeline-name}", &pipeline.title)
     .replace("{no-pipe}", if env.no_pipe { r#", "--no-pipe""# } else { "" });
-  let filepath = env.run_dir.join(format!("Dockerfile.{}", exclusive_exec_tag));
+  let filepath = env.run_dir.join(format!("Dockerfile.{exclusive_exec_tag}"));
   let mut dockerfile = fs::File::options()
     .create(true)
     .write(true)
@@ -299,7 +299,7 @@ async fn check_and_pull_once(
       exit(1);
     }
     repls.base_from = opts.base_image.as_deref().unwrap_or(BASE_IMAGE).to_owned();
-    repls.base_to = format!("{}_executor:latest", exclusive_exec_tag);
+    repls.base_to = format!("{exclusive_exec_tag}_executor:latest");
   }
   if repls
     .depl_from
@@ -347,7 +347,7 @@ async fn check_and_pull_once(
       .as_deref()
       .unwrap_or(BASE_IMAGE)
       .to_owned();
-    repls.depl_to = format!("{}_builder:latest", exclusive_exec_tag);
+    repls.depl_to = format!("{exclusive_exec_tag}_builder:latest");
   }
   opts.base_image = Some(repls.base_to.to_owned());
   opts.build_deployer_base_image = Some(repls.depl_to.to_owned());
@@ -397,8 +397,7 @@ pub async fn execute_pipeline_containered(
     exclusive_exec_tag,
     if opts.use_containerd_local_storage_cache.is_some_and(|v| v) && is_docker(&opts) {
       format!(
-        " --cache-to type=local,dest=.docker-cache/{},compression=zstd --cache-from type=local,src=.docker-cache/{}",
-        exclusive_exec_tag, exclusive_exec_tag
+        " --cache-to type=local,dest=.docker-cache/{exclusive_exec_tag},compression=zstd --cache-from type=local,src=.docker-cache/{exclusive_exec_tag}"
       )
     } else {
       String::from("")
@@ -436,7 +435,7 @@ pub async fn execute_pipeline_containered(
       if let Some(port_bindings) = opts.port_bindings {
         port_bindings
           .iter()
-          .map(|PortBinding { from, to }| format!(" -p {}:{}", from, to))
+          .map(|PortBinding { from, to }| format!(" -p {from}:{to}"))
           .collect::<Vec<_>>()
           .join("")
       } else {

src/entities/containered_opts.rs

@@ -138,7 +138,7 @@ impl ContainerizedRunStrategy {
 
   fn concat(&self, env: &RunEnvironment, config_filepath: &str) -> String {
     self.copy_cmds.join("\n")
-      + format!("\nCOPY {} deploy-config.yaml\n", config_filepath).as_str()
+      + format!("\nCOPY {config_filepath} deploy-config.yaml\n").as_str()
       + self
         .pre_cache_cmds
         .iter()

src/entities/custom_command.rs

@@ -164,7 +164,7 @@ impl Execute for CustomCommand {
     }
 
     for bash_c in &cmds {
-      let bash_c_info = format!(r#"{} -c "{}""#, shell, bash_c).green();
+      let bash_c_info = format!(r#"{shell} -c "{bash_c}""#).green();
 
       let mut cmd = async_process::Command::new(&shell);
       cmd.current_dir(env.run_dir).arg("-c").arg(bash_c);
@@ -181,10 +181,10 @@ impl Execute for CustomCommand {
 
       if self.daemon.is_some_and(|v| v) {
         self.start_daemon(env, child).await?;
-        if let Some(daemon_wait_seconds) = self.daemon_wait_seconds {
-          if daemon_wait_seconds > 0 {
-            std::thread::sleep(std::time::Duration::from_secs(daemon_wait_seconds));
-          }
+        if let Some(daemon_wait_seconds) = self.daemon_wait_seconds
+          && daemon_wait_seconds > 0
+        {
+          std::thread::sleep(std::time::Duration::from_secs(daemon_wait_seconds));
         }
         continue;
       }
@@ -345,7 +345,7 @@ impl CustomCommand {
 
       let mut session = remote.open_session(&rt)?;
       for bash_c in &cmds {
-        let bash_c_info = format!(r#"{} -c "{} && echo $?""#, shell, bash_c).green();
+        let bash_c_info = format!(r#"{shell} -c "{bash_c} && echo $?""#).green();
         let (s, out) = remote.exec(bash_c, &mut session, &rt)?;
 
         let mut composed = compose_output(
@@ -406,7 +406,7 @@ pub fn compose_output(
       if i == total && line.trim().is_empty() {
         break;
       }
-      output.push(format!(">>> {}", line));
+      output.push(format!(">>> {line}"));
     }
   }
   if !stderr.trim().is_empty() {
@@ -419,7 +419,7 @@ pub fn compose_output(
       if i == total && line.trim().is_empty() {
         break;
       }
-      output.push(format!(">>> {}", line));
+      output.push(format!(">>> {line}"));
     }
   }