Merge branch 'unstable' into stable

markcda · markcda · commit a5ec80e0b6bb · 2025-03-05T15:52:19.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ 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.4.1] - 2025-03-05
+
+### Changed
+
+- Added support of `daemon_wait_seconds` field in `CustomCommand`.
+
 ## [1.4.0-beta-7] - 2025-02-20
 
 ### Changed
@@ -459,6 +465,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Build support.
 - TUI.
 
+[1.4.1]:          https://github.com/impulse-sw/deployer/compare/1.4.0-beta-7...1.4.1
 [1.4.0-beta-7]:   https://github.com/impulse-sw/deployer/compare/1.4.0-beta-6...1.4.0-beta-7
 [1.4.0-beta-6]:   https://github.com/impulse-sw/deployer/compare/1.4.0-beta-5...1.4.0-beta-6
 [1.4.0-beta-5]:   https://github.com/impulse-sw/deployer/compare/1.4.0-beta-4...1.4.0-beta-5
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deployer"
-version = "1.4.0-beta-7"
+version = "1.4.1"
 edition = "2024"
 
 [dependencies]
diff --git a/DOCS.en.md b/DOCS.en.md
@@ -125,7 +125,9 @@ The command description for Deployer is as follows:
   "show_success_output": false,
   "show_bash_c": false,
   "only_when_fresh": false,
-  "remote_exec": []
+  "remote_exec": [],
+  "daemon": false,
+  "daemon_wait_seconds": null
 }
 ```
 
@@ -136,6 +138,8 @@ The command description for Deployer is as follows:
 - `show_bash_c` tells the Deployer whether to print the full command text on the screen; this can be useful when the command contains vulnerable variables
 - `only_when_fresh` tells Deployer that this action should only be performed on a fresh build (either on the first build, or when explicitly instructed to rebuild from scratch with the `-f` option)
 - `remote_exec` contains a list of short hostnames on which this command will need to be executed
+- `daemon` tells Deployer whether to run this command as a daemon process or not
+- `daemon_wait_seconds` tells Deployer how many seconds to wait for the daemon process to start before moving to the next command
 
 When a command is specialized for a particular project, it gains an additional property - `replacements`:
 
diff --git a/DOCS.ru.md b/DOCS.ru.md
@@ -125,7 +125,9 @@
   "show_success_output": false,
   "show_bash_c": false,
   "only_when_fresh": false,
-  "remote_exec": []
+  "remote_exec": [],
+  "daemon": false,
+  "daemon_wait_seconds": null
 }
 ```
 
@@ -136,6 +138,8 @@
 - `show_bash_c` говорит Деплойеру, нужно ли печатать на экране полный текст команды; это может быть полезным, когда команда содержит уязвимые переменные
 - `only_when_fresh` говорит Деплойеру, что это действие нужно выполнять только при свежей сборке (либо при первой сборке, либо при явном указании пересобрать с нуля при помощи опции `-f`)
 - `remote_exec` содержит список коротких имён хостов, на которых необходимо будет выполнить эту команду
+- `daemon` говорит Деплойеру, нужно ли запускать команду в фоновом режиме
+- `daemon_wait_seconds` содержит время ожидания в секундах перед запуском следующей команды
 
 Когда команда специализируется для конкретного проекта, она обрастает дополнительным свойством - `replacements`:
 
@@ -708,7 +712,7 @@ deployer new content
 
 > [!NOTE]
 > При сборке в контейнерах Деплойер не поддерживает Действия `interrupt`, `observe`, `add_to_storage` и `use_from_storage`, а при запуске - Действия `add_to_storage` и `use_from_storage`.
-> 
+>
 > Для решения проблем синхронизации каких-то файлов или выполнения операций ввода-вывода вы можете использовать Пайплайн с опциями контейнеризированной сборки внутри другого Пайплайна, который уже сможет использовать нужные вам Действия.
 
 Посмотрим на пример контейнеризированного Пайплайна:
diff --git a/TODO.md b/TODO.md
@@ -3,9 +3,6 @@
 - [ ] make `Transfer` Actions to sync only selected files to and from remote
 - [ ] make `deployer share content` command
 
-## Road to stable v1.4.0
+## Road to v1.4.2
 
-- [x] make `deployer run --containered` option for builds inside the container (ignore `Observe` and other Actions)
-- [x] translate and colorize containered run output
-- [x] add documentation for automated Dockerfile generation
 - [ ] add variables and secrets forwarding to containered builds
diff --git a/src/actions.rs b/src/actions.rs
@@ -341,7 +341,7 @@ pub fn edit_action(globals: &mut DeployerGlobalConfig, args: &CatActionArgs) ->
     Some(action) => action,
   };
 
-  described_action.edit_action_from_prompt()?;
+  described_action.edit_action_from_prompt(None)?;
 
   Ok(())
 }
diff --git a/src/actions/test.rs b/src/actions/test.rs
@@ -97,6 +97,10 @@ impl Execute for TestAction {
       }
     }
 
+    if self.success_when_found.is_none() && self.success_when_not_found.is_none() {
+      output = command_out;
+    }
+
     Ok((true, output))
   }
 }
diff --git a/src/configs.rs b/src/configs.rs
@@ -175,6 +175,7 @@ impl Default for DeployerGlobalConfig {
             only_when_fresh: None,
             remote_exec: None,
             daemon: None,
+            daemon_wait_seconds: None,
           }],
         }),
         requirements: Some(vec![Requirement::Exists {
diff --git a/src/configs/migrate.rs b/src/configs/migrate.rs
@@ -32,6 +32,7 @@ fn migrate_custom_v3_to_v4(prev_cmd: &CustomCommandV3) -> CustomCommand {
     only_when_fresh: prev_cmd.only_when_fresh,
     remote_exec: prev_cmd.remote_exec.clone(),
     daemon: None,
+    daemon_wait_seconds: None,
     replacements: if let Some(prev_repls) = &prev_cmd.replacements {
       let mut repl_grps = vec![];
       for i1 in prev_repls {
diff --git a/src/containered.rs b/src/containered.rs
@@ -58,6 +58,7 @@ pub fn run_simple(env: &RunEnvironment, bash_c: String) -> anyhow::Result<()> {
     show_bash_c: true,
     show_success_output: true,
     daemon: None,
+    daemon_wait_seconds: None,
   })
   .execute(&RunEnvironment {
     no_pipe: true,
diff --git a/src/entities/custom_command.rs b/src/entities/custom_command.rs
@@ -62,6 +62,10 @@ pub struct CustomCommand {
   #[serde(skip_serializing_if = "Option::is_none")]
   pub daemon: Option<bool>,
 
+  /// Flag to spawn process as controlled daemon.
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub daemon_wait_seconds: Option<u64>,
+
   /// Command placeholders. You can specify several placeholders in single command.
   #[serde(skip_serializing_if = "Option::is_none")]
   pub placeholders: Option<Vec<String>>,
@@ -164,6 +168,11 @@ impl Execute for CustomCommand {
 
       if self.daemon.is_some_and(|v| v) {
         self.start_daemon(env, child)?;
+        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));
+          }
+        }
         continue;
       }
 
@@ -191,10 +200,6 @@ impl Execute for CustomCommand {
         command_output.status.success()
       };
 
-      if self.daemon.is_some_and(|v| v) {
-        return Ok((true, output));
-      }
-
       if !self.ignore_fails && !success {
         return Ok((false, output));
       }
@@ -379,7 +384,7 @@ pub fn compose_output(
     return output;
   }
 
-  if !stdout.trim().is_empty() && !stderr.trim().is_empty() {
+  if !stdout.trim().is_empty() || !stderr.trim().is_empty() {
     if show_bash_c {
       output.push(format!("{} `{}`:", i18n::EXECUTING, bash_c_info));
     } else {
diff --git a/src/i18n/en.rs b/src/i18n/en.rs
@@ -221,6 +221,8 @@ tr!(
   ACTION_REGISTRY_CHOOSE_TO_REMOVE,
   "Select Action for removing from Actions' Registry:"
 );
+tr!(ACTION_EXPORT_TO_REGISTRY, "Export this Action to the Registry");
+tr!(ACTION_EXPORTED, "Action is exported successfully.");
 
 tr!(ARE_YOU_SURE, "Are you sure? (y/n)");
 
@@ -298,6 +300,8 @@ tr!(
   "Select Pipeline for removing from Pipeline's Registry:"
 );
 tr!(PIPELINES_REORDER, "Reorder Pipelines inside your project:");
+tr!(PIPELINE_EXPORT_TO_REGISTRY, "Export this Pipeline to the Registry");
+tr!(PIPELINE_EXPORTED, "Pipeline is exported successfully.");
 
 tr!(
   NO_SUCH_PIPELINE,
@@ -328,6 +332,7 @@ tr!(
 tr!(PIPELINE_EDIT, "Edit Pipeline `{1}` - `{2}`");
 tr!(SELECT_PIPELINE_TO_CHANGE, "Select a concrete Pipeline to change");
 tr!(PIPELINE, "Pipeline");
+tr!(PIPELINE_NAMED, "Pipeline `{1}` - `{2}`");
 tr!(PIPELINE_REORDER_ACTIONS, "Reorder Pipeline's Actions:");
 tr!(PIPELINE_REMOVE, "Remove Pipeline `{1}` - `{2}`");
 tr!(SELECT_PIPELINE_TO_ADD_TO, "Select a Pipeline:");
diff --git a/src/i18n/ru.rs b/src/i18n/ru.rs
@@ -239,6 +239,8 @@ tr!(
   ACTION_REGISTRY_CHOOSE_TO_REMOVE,
   "Выберите Действие для удаления из реестра Деплойера:"
 );
+tr!(ACTION_EXPORT_TO_REGISTRY, "Экспортировать это Действие в Реестр");
+tr!(ACTION_EXPORTED, "Действие экспортировано успешно.");
 
 tr!(ARE_YOU_SURE, "Вы уверены? (y/n)");
 
@@ -316,6 +318,8 @@ tr!(
   "Выберите Пайплайн для удаления из реестра Деплойера:"
 );
 tr!(PIPELINES_REORDER, "Упорядочьте Пайплайны внутри своего проекта:");
+tr!(PIPELINE_EXPORT_TO_REGISTRY, "Экспортировать этот Пайплайн в Реестр");
+tr!(PIPELINE_EXPORTED, "Пайплайн успешно экспортирован.");
 
 tr!(
   NO_SUCH_PIPELINE,
@@ -346,6 +350,7 @@ tr!(
 tr!(PIPELINE_EDIT, "Редактировать Пайплайн `{1}` - `{2}`");
 tr!(SELECT_PIPELINE_TO_CHANGE, "Выберите Пайплайн для редактирования");
 tr!(PIPELINE, "Пайплайн");
+tr!(PIPELINE_NAMED, "Пайплайн `{1}` - `{2}`");
 tr!(PIPELINE_REORDER_ACTIONS, "Упорядочьте Действия в Пайплайне:");
 tr!(PIPELINE_REMOVE, "Удалить Пайплайн `{1}` - `{2}`");
 tr!(SELECT_PIPELINE_TO_ADD_TO, "Выберите Пайплайн:");
diff --git a/src/pipelines.rs b/src/pipelines.rs
@@ -405,7 +405,7 @@ pub fn edit_pipeline(globals: &mut DeployerGlobalConfig, args: &CatPipelineArgs)
     }
   };
 
-  pipeline.edit_pipeline_from_prompt(globals)?;
+  pipeline.edit_pipeline_from_prompt(globals, true)?;
   globals.pipelines_registry.insert(pipeline.info.clone(), pipeline);
 
   Ok(())
diff --git a/src/tui/add.rs b/src/tui/add.rs
@@ -304,6 +304,7 @@ impl TestAction {
         only_when_fresh: None,
         remote_exec: None,
         daemon: None,
+        daemon_wait_seconds: None,
       },
     })
   }
@@ -345,6 +346,7 @@ impl TestAction {
         only_when_fresh: None,
         remote_exec: None,
         daemon: None,
+        daemon_wait_seconds: None,
       },
     })
   }
@@ -903,6 +905,7 @@ impl CustomCommand {
       replacements: None,
       remote_exec,
       daemon,
+      daemon_wait_seconds: None,
     })
   }
 
@@ -926,6 +929,7 @@ impl CustomCommand {
       replacements: None,
       remote_exec: None,
       daemon: None,
+      daemon_wait_seconds: None,
     })
   }
 }
diff --git a/src/tui/edit.rs b/src/tui/edit.rs

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ pub fn edit_action(globals: &mut DeployerGlobalConfig, args: &CatActionArgs) ->`
`341`	`341`	`Some(action) => action,`
`342`	`342`	`};`
`343`	`343`
`344`		`- described_action.edit_action_from_prompt()?;`
	`344`	`+ described_action.edit_action_from_prompt(None)?;`
`345`	`345`
`346`	`346`	`Ok(())`
`347`	`347`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,10 @@ impl Execute for TestAction {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
	`100`	`+ if self.success_when_found.is_none() && self.success_when_not_found.is_none() {`
	`101`	`+ output = command_out;`
	`102`	`+ }`
	`103`	`+`
`100`	`104`	`Ok((true, output))`
`101`	`105`	`}`
`102`	`106`	`}`