Compare commits

..

9 Commits
v1.1.0 ... main

Author SHA1 Message Date
e177b26348
refactor: remove unused imports in main.rs
All checks were successful
Release / Release (push) Successful in 34s
2024-08-28 13:19:38 +02:00
2dbc4d6a28
feat: add shell_completion dependency and import
All checks were successful
Release / Release (push) Successful in 34s
2024-08-28 13:10:26 +02:00
0a5d3e11e4
feat: add current directory display in main loop
All checks were successful
Release / Release (push) Successful in 34s
2024-08-28 13:01:08 +02:00
5961309bab
style(main): remove unused result warnings in main.rs
All checks were successful
Release / Release (push) Successful in 33s
2024-08-28 12:36:07 +02:00
797f401cf3
feat: implement command piping in shell program
All checks were successful
Release / Release (push) Successful in 37s
2024-08-28 12:31:16 +02:00
3ed8234852
feat: add support for 'cd' command in REPL loop 2024-08-28 12:17:44 +02:00
f73c10d6eb Merge pull request 'chore: Configure Renovate' (#1) from renovate/configure into main
All checks were successful
Release / Release (push) Successful in 33s
Reviewed-on: #1
2024-08-28 06:23:36 +00:00
1d50cd25d5 chore(deps): add renovate.json
All checks were successful
Release / Release (push) Successful in 35s
2024-08-28 06:00:40 +00:00
65f97a673b
refactor(main): improve command input handling loop
All checks were successful
Release / Release (push) Successful in 39s
2024-08-28 07:59:11 +02:00
4 changed files with 86 additions and 8 deletions

9
Cargo.lock generated

@ -5,3 +5,12 @@ version = 3
[[package]] [[package]]
name = "jshell" name = "jshell"
version = "0.1.0" version = "0.1.0"
dependencies = [
"shell_completion",
]
[[package]]
name = "shell_completion"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73937c192504363290613e241705a02dff92ae7c03f544e2a69bbef24cc1042c"

@ -4,3 +4,4 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
shell_completion = "0.0.2"

6
renovate.json Normal file

@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"local>Renovate/renovate-config"
]
}

@ -1,13 +1,75 @@
use std::{io::stdin, process::Command}; use std::{env, io::{stdin, stdout, Write}, path::Path, process::{Child, Command, Stdio}};
fn main(){ fn main(){
loop {
println!("");
println!("{}", env::current_dir().unwrap().to_str().unwrap());
print!("> ");
let _ = stdout().flush();
let mut input = String::new(); let mut input = String::new();
stdin().read_line(&mut input).unwrap(); stdin().read_line(&mut input).unwrap();
// read_line leaves a trailing newline, which trim removes // must be peekable so we know when we are on the last command
let command = input.trim(); let mut commands = input.trim().split(" | ").peekable();
let mut previous_command = None;
Command::new(command) while let Some(command) = commands.next() {
.spawn()
.unwrap(); let mut parts = command.trim().split_whitespace();
let command = parts.next().unwrap();
let args = parts;
match command {
"cd" => {
let new_dir = args.peekable().peek()
.map_or("/", |x| *x);
let root = Path::new(new_dir);
if let Err(e) = env::set_current_dir(&root) {
eprintln!("{}", e);
}
previous_command = None;
},
"exit" => return,
command => {
let stdin = previous_command
.map_or(
Stdio::inherit(),
|output: Child| Stdio::from(output.stdout.unwrap())
);
let stdout = if commands.peek().is_some() {
// there is another command piped behind this one
// prepare to send output to the next command
Stdio::piped()
} else {
// there are no more commands piped behind this one
// send output to shell stdout
Stdio::inherit()
};
let output = Command::new(command)
.args(args)
.stdin(stdin)
.stdout(stdout)
.spawn();
match output {
Ok(output) => { previous_command = Some(output); },
Err(e) => {
previous_command = None;
eprintln!("{}", e);
},
};
}
}
}
if let Some(mut final_command) = previous_command {
// block until the final command has finished
let _ = final_command.wait();
}
}
} }