Merge branch 'unstable' into stable

Author: markcda

deploy-config.json renamed to .deploy-config.json

@@ -1305,22 +1305,22 @@
               "COPY .docker-fake-files/rust/lib.rs src/lib.rs",
               "COPY .docker-fake-files/rust/main.rs src/main.rs",
               "COPY Cargo.toml .",
-              "COPY deploy-config.json ."
+              "COPY .deploy-config.json ."
             ],
             "pre_cache_cmds": [
-              "RUN /app/deployer run containered --current --containered --no-pipe"
+              "DEPL"
             ]
           },
           {
             "copy_cmds": [
-              "COPY src/ src/"
+              "COPY src/ src/",
+              "COPY DOCS.en.md .",
+              "COPY DOCS.ru.md ."
             ],
             "pre_cache_cmds": [
-              "COPY DOCS.en.md .",
-              "COPY DOCS.ru.md .",
               "RUN touch src/main.rs",
               "RUN touch src/lib.rs",
-              "RUN /app/deployer run containered --current --containered --no-pipe"
+              "DEPL"
             ]
           }
         ]
@@ -1418,22 +1418,22 @@
               "COPY .docker-fake-files/rust/lib.rs src/lib.rs",
               "COPY .docker-fake-files/rust/main.rs src/main.rs",
               "COPY Cargo.toml .",
-              "COPY deploy-config.json ."
+              "COPY .deploy-config.json ."
             ],
             "pre_cache_cmds": [
-              "RUN /app/deployer run ru-containered --current --containered --no-pipe"
+              "DEPL"
             ]
           },
           {
             "copy_cmds": [
-              "COPY src/ src/"
+              "COPY src/ src/",
+              "COPY DOCS.en.md .",
+              "COPY DOCS.ru.md ."
             ],
             "pre_cache_cmds": [
-              "COPY DOCS.en.md .",
-              "COPY DOCS.ru.md .",
               "RUN touch src/main.rs",
               "RUN touch src/lib.rs",
-              "RUN /app/deployer run ru-containered --current --containered --no-pipe"
+              "DEPL"
             ]
           }
         ]

deploy-config.toml renamed to .deploy-config.toml

@@ -1055,18 +1055,20 @@ copy_cmds = [
     "COPY .docker-fake-files/rust/lib.rs src/lib.rs",
     "COPY .docker-fake-files/rust/main.rs src/main.rs",
     "COPY Cargo.toml .",
-    "COPY deploy-config.json .",
+    "COPY .deploy-config.toml .",
 ]
-pre_cache_cmds = ["RUN /app/deployer run containered --current --containered --no-pipe"]
+pre_cache_cmds = ["DEPL"]
 
 [[pipelines.containered_opts.cache_strategies]]
-copy_cmds = ["COPY src/ src/"]
-pre_cache_cmds = [
+copy_cmds = [
+    "COPY src/ src/",
     "COPY DOCS.en.md .",
     "COPY DOCS.ru.md .",
+]
+pre_cache_cmds = [
     "RUN touch src/main.rs",
     "RUN touch src/lib.rs",
-    "RUN /app/deployer run containered --current --containered --no-pipe",
+    "DEPL",
 ]
 
 [[pipelines]]
@@ -1148,18 +1150,20 @@ copy_cmds = [
     "COPY .docker-fake-files/rust/lib.rs src/lib.rs",
     "COPY .docker-fake-files/rust/main.rs src/main.rs",
     "COPY Cargo.toml .",
-    "COPY deploy-config.json .",
+    "COPY .deploy-config.toml .",
 ]
-pre_cache_cmds = ["RUN /app/deployer run ru-containered --current --containered --no-pipe"]
+pre_cache_cmds = ["DEPL"]
 
 [[pipelines.containered_opts.cache_strategies]]
-copy_cmds = ["COPY src/ src/"]
-pre_cache_cmds = [
+copy_cmds = [
+    "COPY src/ src/",
     "COPY DOCS.en.md .",
     "COPY DOCS.ru.md .",
+]
+pre_cache_cmds = [
     "RUN touch src/main.rs",
     "RUN touch src/lib.rs",
-    "RUN /app/deployer run ru-containered --current --containered --no-pipe",
+    "DEPL",
 ]
 
 [[place_artifacts_into_project_root]]

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deployer"
-version = "1.4.0-beta-2"
+version = "1.4.0-beta-3"
 edition = "2024"
 
 [dependencies]
@@ -16,6 +16,7 @@ fs_extra = "1.2"
 indicatif = "0.17"
 inquire = { optional = true, git = "https://github.com/markcda/inquire.git", branch = "feat/reorder-values", features = ["reorder"] }
 mimalloc = "0.1.43"
+nix = { version = "0.29", features = ["signal", "user"] }
 regex = "1.11"
 russh = "0.49"
 safe-path = "0.1"

DOCS.ru.md

@@ -463,7 +463,7 @@ deployer new content
 }
 ```
 
-#### 1.7. Другие действия - `Interrupt`, `Observe` и `Test`
+#### 1.7. Другие действия - `interrupt`, `observe` и `test`
 
 > [!NOTE]
 > Нет нужного примера конфигурации? Создайте действие самостоятельно при помощи команды `deployer new action` и выведите его на экран при помощи `deployer cat action my-action@x.y.z`.

TODO.md

@@ -1,7 +1,5 @@
 # `deployer`'s TODO list
 
-- [ ] make requirement checks at remote hosts
-- [ ] maybe, make some `env` variable to set Deployer to execute only local actions
 - [ ] make `Transfer` Actions to sync only selected files to and from remote
 - [ ] make `deployer share content` command
 

content-examples/get-know-rust-package-version/.depl/rust-crate-ver.py

@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+import tomllib
+
+with open('Cargo.toml', 'rb') as f:
+  data = tomllib.load(f)
+  print(data['package']['version'])

deploy-config.yaml

@@ -837,17 +837,19 @@ pipelines:
       - COPY .docker-fake-files/rust/lib.rs src/lib.rs
       - COPY .docker-fake-files/rust/main.rs src/main.rs
       - COPY Cargo.toml .
-      - COPY deploy-config.json .
+      - COPY deploy-config.yaml .
       pre_cache_cmds:
-      - RUN /app/deployer run containered --current --containered --no-pipe
+      - DEPL
     - copy_cmds:
       - COPY src/ src/
-      pre_cache_cmds:
       - COPY DOCS.en.md .
       - COPY DOCS.ru.md .
+      pre_cache_cmds:
       - RUN touch src/main.rs
       - RUN touch src/lib.rs
-      - RUN /app/deployer run containered --current --containered --no-pipe
+      - DEPL
+    use_containerd_local_storage_cache: true
+    prevent_metadata_loading: true
   exclusive_exec_tag: containered
 - title: ru-containered
   desc: Got from `Deployer Pipeline`.
@@ -911,18 +913,20 @@ pipelines:
       - COPY .docker-fake-files/rust/lib.rs src/lib.rs
       - COPY .docker-fake-files/rust/main.rs src/main.rs
       - COPY Cargo.toml .
-      - COPY deploy-config.json .
+      - COPY deploy-config.yaml .
       pre_cache_cmds:
-      - RUN /app/deployer run ru-containered --current --containered --no-pipe
+      - DEPL
     - copy_cmds:
       - COPY src/ src/
-      pre_cache_cmds:
       - COPY DOCS.en.md .
       - COPY DOCS.ru.md .
+      pre_cache_cmds:
       - RUN touch src/main.rs
       - RUN touch src/lib.rs
-      - RUN /app/deployer run ru-containered --current --containered --no-pipe
-  exclusive_exec_tag: containered
+      - DEPL
+    use_containerd_local_storage_cache: true
+    prevent_metadata_loading: true
+  exclusive_exec_tag: ru-containered
 artifacts:
 - target/release/deployer
 variables: []

src/actions/buildlike.rs

@@ -58,7 +58,7 @@ pub type PostBuildAction = BuildAction;
 
 impl Execute for BuildAction {
   /// Executes commands with given run environment.
-  fn execute(&self, env: RunEnvironment) -> anyhow::Result<(bool, Vec<String>)> {
+  fn execute(&self, env: &RunEnvironment) -> anyhow::Result<(bool, Vec<String>)> {
     let mut total_output = vec![];
 
     for cmd in &self.commands {

src/actions/deploylike.rs

@@ -49,7 +49,7 @@ pub type PostDeployAction = DeployAction;
 
 impl Execute for DeployAction {
   /// Executes commands with given run environment.
-  fn execute(&self, env: RunEnvironment) -> anyhow::Result<(bool, Vec<String>)> {
+  fn execute(&self, env: &RunEnvironment) -> anyhow::Result<(bool, Vec<String>)> {
     let mut total_output = vec![];
 
     for cmd in &self.commands {

src/actions/observe.rs

@@ -31,15 +31,21 @@ pub struct ObserveAction {
 
 impl Execute for ObserveAction {
   /// Executes commands with given run environment without I/O redirection.
-  fn execute(&self, env: RunEnvironment) -> anyhow::Result<(bool, Vec<String>)> {
-    let mut observe_env = env;
+  fn execute(&self, env: &RunEnvironment) -> anyhow::Result<(bool, Vec<String>)> {
+    let mut observe_env = RunEnvironment {
+      daemons: env.daemons.clone(),
+      ..(*env)
+    };
     observe_env.no_pipe = true;
-    self.command.execute(observe_env)
+    self.command.execute(&observe_env)
   }
 
-  fn execute_observer(&self, env: RunEnvironment) -> anyhow::Result<(bool, Vec<String>)> {
-    let mut observe_env = env;
+  fn execute_observer(&self, env: &RunEnvironment) -> anyhow::Result<(bool, Vec<String>)> {
+    let mut observe_env = RunEnvironment {
+      daemons: env.daemons.clone(),
+      ..(*env)
+    };
     observe_env.no_pipe = true;
-    self.command.execute_observer(observe_env)
+    self.command.execute_observer(&observe_env)
   }
 }