merge main

Author: wolfv

.github/workflows/coverage.yml

@@ -12,6 +12,7 @@ on:
 
 jobs:
   test:
+    if: false
     name: coverage
     runs-on: ubuntu-latest
     container:

.gitignore

@@ -1 +1,4 @@
 /target
+# pixi environments
+.pixi/*
+!.pixi/config.toml

Cargo.lock

@@ -40,6 +40,25 @@ cargo r -- ./scripts/hello_world.sh
 cargo r -- ./scripts/hello_world.sh --interact
 ```
 
+## How to build and run using pixi
+
+These commands will install Rust, Cargo and build and run the project.
+
+```bash
+pixi r build
+pixi r run
+```
+
+## How to build a pixi package
+
+This creates a conda package for `shell` and installs it globally
+
+```bash
+cd crates/shell
+pixi build
+pixi global install --path ./shell-0.3.0-hbf21a9e_0.conda
+```
+
 ## License
 
 The project is licensed under the MIT License. It is an extension of the existing `deno_task_shell` project (also licensed under the MIT License, by the authors of `deno`).

README.md

@@ -153,7 +153,7 @@ EXIT_STATUS = ${ "$?" }
 // Operators
 OPERATOR = _{
     AND_IF | OR_IF | DSEMI | DLESS | DGREAT | LESSAND | GREATAND | LESSGREAT | DLESSDASH | CLOBBER |
-    "," |"(" | ")" | "{" | "}" | ";" | "&" | "|" | "<" | ">"
+    "(" | ")" | "{" | "}" | ";" | "&" | "|" | "<" | ">"
 }
 
 // Reserved words
@@ -177,10 +177,10 @@ Stdout = ${ "|" ~ !"|" ~ !"&"}
 StdoutStderr = { "|&" }
 
 RESERVED_WORD = _{
-    If | Then | Else | Elif | Fi | Do | Done |
+    (If | Then | Else | Elif | Fi | Done | Do |
     Case | Esac | While | Until | For |
     Lbrace | Rbrace | Bang | In |
-    StdoutStderr | Stdout
+    StdoutStderr | Stdout) ~ &(WHITESPACE | NEWLINE | EOI)
 }
 
 // Main grammar rules

crates/deno_task_shell/src/grammar.pest

@@ -74,7 +74,7 @@ enum CommandName {
 
 struct ResolvedCommand<'a> {
     command_name: CommandName,
-    args: Cow<'a, Vec<String>>,
+    args: Cow<'a, [String]>,
 }
 
 #[derive(Error, Debug)]
@@ -112,7 +112,7 @@ impl FailedShebangError {
 async fn resolve_command<'a>(
     command_name: &UnresolvedCommandName,
     context: &mut ShellCommandContext,
-    original_args: &'a Vec<String>,
+    original_args: &'a [String],
 ) -> Result<ResolvedCommand<'a>, ResolveCommandError> {
     let command_path = match resolve_command_path(
         &command_name.name,

crates/deno_task_shell/src/shell/command.rs

@@ -30,7 +30,7 @@ impl ArgKind<'_> {
     }
 }
 
-pub fn parse_arg_kinds(flags: &[String]) -> Vec<ArgKind> {
+pub fn parse_arg_kinds(flags: &[String]) -> Vec<ArgKind<'_>> {
     let mut result = Vec::new();
     let mut had_dash_dash = false;
     for arg in flags {

crates/deno_task_shell/src/shell/commands/args.rs

@@ -1187,7 +1187,7 @@ async fn execute_pipe_sequence(
 
     let (all_handles, changes): (Vec<_>, Vec<_>) = results
         .into_iter()
-        .map(|r| (r.into_handles_and_changes()))
+        .map(|r| r.into_handles_and_changes())
         .unzip();
     let all_handles: Vec<JoinHandle<i32>> =
         all_handles.into_iter().flatten().collect();
@@ -1929,7 +1929,7 @@ fn evaluate_word_parts(
     eval_glob: EvaluateGlob,
     stdin: ShellPipeReader,
     stderr: ShellPipeWriter,
-) -> LocalBoxFuture<Result<WordPartsResult, EvaluateWordTextError>> {
+) -> LocalBoxFuture<'_, Result<WordPartsResult, EvaluateWordTextError>> {
     fn text_parts_to_string(parts: Vec<TextPart>) -> String {
         let mut result =
             String::with_capacity(parts.iter().map(|p| p.as_str().len()).sum());
@@ -2040,7 +2040,8 @@ fn evaluate_word_parts(
         state: &mut ShellState,
         stdin: ShellPipeReader,
         stderr: ShellPipeWriter,
-    ) -> LocalBoxFuture<Result<WordPartsResult, EvaluateWordTextError>> {
+    ) -> LocalBoxFuture<'_, Result<WordPartsResult, EvaluateWordTextError>>
+    {
         // recursive async, so requires boxing
         async move {
             let mut result = WordPartsResult::new(Vec::new(), Vec::new());

crates/deno_task_shell/src/shell/execute.rs

@@ -43,6 +43,9 @@ windows-sys = { version = "0.59.0", features = ["Win32_Foundation", "Win32_Syste
 ctrlc = "3.4.5"
 libc = "0.2.170"
 
+[dev-dependencies]
+tempfile = "3.14.0"
+
 [package.metadata.release]
 # Dont publish the binary
 release = false

crates/shell/Cargo.toml

@@ -0,0 +1,18 @@
+[workspace]
+authors = ["The prefix-dev/shell team <[email protected]>"]
+channels = ["conda-forge"]
+name = "shell"
+platforms = ["win-64"]
+version = "0.3.0"
+preview = ["pixi-build"]
+
+[dependencies]
+rust = ">=1.90.0,<1.91"
+
+[package]
+name = "shell"
+version = "0.3.0"
+
+[package.build.backend]
+name = "pixi-build-rust"
+version = "==0.4.1"