Merge branch 'unstable' into stable

markcda · markcda · commit 307a3e7a35a4 · 2025-10-22T01:03:58.000+03:00
diff --git a/.depl/config.yaml b/.depl/config.yaml
@@ -1,160 +1,120 @@
 project_name: smart-patcher
-version: 5
-langs:
-  - rust
-targets:
-  - arch: x86_64
-    os: linux
-    os_derivative: any
-    os_version:
-      type: no
-cache_files:
+version: 7
+ignore_files:
   - .git
+cache_files:
   - Cargo.lock
+  - examples
   - target
-variables: []
+variables:
+  app:
+    is_secret: false
+    value:
+      type: plain
+      value: target/release/smart-patcher
+actions:
+  - info: cargo-fmt@0.1.0
+    action:
+      type: staged
+      stage: build
+      cmd: cargo fmt -- --config tab_spaces=2,max_width=120 */**/*.rs
+  - info: cargo-install-by-copy@0.1.0
+    action:
+      type: staged
+      stage: build
+      cmd: cp -f %bin% ~/.cargo/bin
+      placeholders:
+        - "%bin%"
+  - info: cargo-lint@0.1.0
+    action:
+      type: staged
+      stage: build
+      cmd: cargo clippy
+      show_success_output: true
+  - info: cargo-release@0.1.0
+    tags:
+      - rust
+      - cargo
+    requirements:
+      - type: exists_any
+        paths:
+          - /bin/cargo
+          - ~/.cargo/bin/cargo
+    action:
+      type: staged
+      stage: build
+      cmd: cargo build --release
+  - info: cargo-test@0.1.0
+    action:
+      type: staged
+      stage: build
+      cmd: cargo test --lib
+  - info: sp-copy-tests@0.1.0
+    action:
+      type: custom
+      cmd: cp tests/*.py .
+  - info: sp-generate-examples@0.1.0
+    action:
+      type: staged
+      stage: deploy
+      cmd: cargo run --no-default-features --features=generate-patches -- generate-examples
+  - info: upx@0.1.0
+    requirements:
+      - type: exists_any
+        paths:
+          - /bin/upx
+          - /usr/bin/upx
+          - ~/.local/bin/upx
+    action:
+      type: staged
+      stage: build
+      cmd: upx %af%
+      placeholders:
+        - "%af%"
 pipelines:
-  - title: build
-    desc: Got from `Default Rust Pipeline`.
-    info: rust-default@0.1.0
+  - title: generate-examples
+    desc: Generate example patches and move them to the project folder
+    info: generate-examples@0.1.0
+    tags:
+      - rust
+      - cargo
+    default: false
+    artifacts:
+      - from: examples
+        to: ../examples
+    actions:
+      - title: Generate examples
+        used: sp-generate-examples@0.1.0
+  - title: install
+    desc: Default Rust pipeline to install binary
+    info: rust-default-install@0.1.0
     tags:
       - rust
       - cargo
+      - clippy
+      - fmt
       - upx
     default: true
+    exclusive_exec_tag: ""
     artifacts:
       - from: target/release/smart-patcher
         to: smart-patcher
     actions:
       - title: Lint
-        info: cargo-clippy@0.1.0
-        tags:
-          - cargo
-          - clippy
-        action:
-          type: pre_build
-          supported_langs:
-            - rust
-          commands:
-            - bash_c: cargo clippy --no-default-features
-              show_success_output: true
-      - title: Lint v2
-        info: cargo-clippy@0.1.0
-        tags:
-          - cargo
-          - clippy
-        action:
-          type: pre_build
-          supported_langs:
-            - rust
-          commands:
-            - bash_c: cargo clippy --no-default-features --features=lua,rhai
-              show_success_output: true
+        used: cargo-lint@0.1.0
       - title: Format
-        info: cargo-format@0.1.0
-        tags: []
-        exec_in_project_dir: true
-        action:
-          type: pre_build
-          supported_langs:
-            - rust
-          commands:
-            - bash_c: cargo fmt -- --config tab_spaces=2,max_width=120 */**/*.rs
+        used: cargo-fmt@0.1.0
       - title: Build
-        info: cargo-rel@0.1.0
-        tags:
-          - rust
-          - cargo
-        action:
-          type: build
-          supported_langs:
-            - rust
-          commands:
-            - bash_c: cargo build --release --no-default-features --features=lua,rhai
+        used: cargo-release@0.1.0
+      - title: Copy tests
+        used: sp-copy-tests@0.1.0
       - title: Test
-        info: cargo-test@0.1.0
-        tags:
-          - cargo
-          - rust
-          - test
-        action:
-          type: post_build
-          supported_langs:
-            - rust
-          commands:
-            - bash_c: cp tests/*.py .
-            - bash_c: cargo test --lib --no-default-features --features=lua,rhai
+        used: cargo-test@0.1.0
       - title: Compress
-        info: upx-compress@0.1.0
-        tags:
-          - upx
-        action:
-          type: post_build
-          supported_langs:
-            - rust
-            - go
-            - c
-            - cpp
-            - python
-            - any
-          commands:
-            - bash_c: upx <artifact>
-              ignore_fails: true
-              show_bash_c: false
-              placeholders:
-                - <artifact>
-              replacements:
-                - group:
-                    - from: <artifact>
-                      to:
-                        title: target/release/smart-patcher
-                        is_secret: false
-                        value:
-                          type: plain
-                          value: target/release/smart-patcher
+        used: upx@0.1.0
+        with:
+          "%af%": app
       - title: Install
-        info: install-to-cargo-bin@0.1.0
-        tags:
-          - rust
-          - cargo
-        action:
-          type: post_build
-          supported_langs:
-            - rust
-          commands:
-            - bash_c: cp -f <af> ~/.cargo/bin
-              only_when_fresh: false
-              placeholders:
-                - <af>
-              replacements:
-                - group:
-                    - from: <af>
-                      to:
-                        title: target/release/smart-patcher
-                        is_secret: false
-                        value:
-                          type: plain
-                          value: target/release/smart-patcher
-  - title: generate-patches
-    desc: Got from `Default Rust Pipeline`.
-    info: rust-default@0.1.0
-    tags:
-      - rust
-      - cargo
-      - upx
-    artifacts:
-      - from: target/release/smart-patcher
-        to: smart-patcher
-    actions:
-      - title: Generate patches
-        info: cargo-run@0.1.0
-        tags:
-          - rust
-          - cargo
-        action:
-          type: build
-          supported_langs:
-            - rust
-          commands:
-            - bash_c: cargo run --no-default-features --features=generate-patches -- generate-examples
-              show_success_output: true
+        used: cargo-install-by-copy@0.1.0
+        with:
+          "%bin%": app
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ uuid = { version = "1.18.0", features = ["v4"] }
 walkdir = "2.5"
 
 [features]
-default = []
+default = ["lua", "rhai"]
 generate-patches = ["lua", "rhai"]
 lua = ["dep:mlua"]
 rhai = ["dep:rhai"]
diff --git a/examples/patch1.json b/examples/patch1.json
@@ -15,4 +15,4 @@
       }
     }
   ]
-}
+}
diff --git a/examples/patch10.json b/examples/patch10.json
@@ -14,4 +14,4 @@
       "insert": " v2"
     }
   ]
-}
+}
diff --git a/examples/patch2.json b/examples/patch2.json
@@ -10,4 +10,4 @@
       "insert": " v2"
     }
   ]
-}
+}
diff --git a/examples/patch3.json b/examples/patch3.json
@@ -10,4 +10,4 @@
       "insert": "v2 "
     }
   ]
-}
+}
diff --git a/examples/patch4.json b/examples/patch4.json
@@ -16,4 +16,4 @@
       "insert": " v2"
     }
   ]
-}
+}
diff --git a/examples/patch5.json b/examples/patch5.json
@@ -13,12 +13,12 @@
         "sh": "../tests/test_v5.py"
       },
       "patch_area": [],
-      "insert": {
+      "replace": {
         "from_to": [
           "game",
           "rock"
         ]
       }
     }
   ]
-}
+}
diff --git a/examples/patch6.json b/examples/patch6.json
@@ -16,4 +16,4 @@
       "insert": " v2"
     }
   ]
-}
+}
diff --git a/examples/patch7.json b/examples/patch7.json
@@ -16,4 +16,4 @@
       "insert": " v2"
     }
   ]
-}
+}
diff --git a/examples/patch8.json b/examples/patch8.json
@@ -8,4 +8,4 @@
       }
     }
   ]
-}
+}
diff --git a/examples/patch9.json b/examples/patch9.json
@@ -8,4 +8,4 @@
       }
     }
   ]
-}
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -10,7 +10,7 @@
 //!
 //! See [`PatchFile`] for further details.
 
-#![feature(let_chains, exit_status_error)]
+#![feature(exit_status_error)]
 #![deny(missing_docs)]
 
 pub(crate) mod patch;
diff --git a/src/main.rs b/src/main.rs
@@ -1,4 +1,4 @@
-#![feature(let_chains, exit_status_error)]
+#![feature(exit_status_error)]
 #![deny(warnings, clippy::todo, clippy::unimplemented)]
 
 pub(crate) mod cmd;

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`]`
`18`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`	`"insert": " v2"`
`15`	`15`	`}`
`16`	`16`	`]`
`17`		`-}`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@`
`10`	`10`	`"insert": " v2"`
`11`	`11`	`}`
`12`	`12`	`]`
`13`		`-}`
	`13`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@`
`16`	`16`	`"insert": " v2"`
`17`	`17`	`}`
`18`	`18`	`]`
`19`		`-}`
	`19`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@`
`13`	`13`	`"sh": "../tests/test_v5.py"`
`14`	`14`	`},`
`15`	`15`	`"patch_area": [],`
`16`		`- "insert": {`
	`16`	`+ "replace": {`
`17`	`17`	`"from_to": [`
`18`	`18`	`"game",`
`19`	`19`	`"rock"`
`20`	`20`	`]`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`]`
`24`		`-}`
	`24`	`+}`