dotfiles
bugabingas dorkfiles
owned by bugabinga
chore: harden java mise shell
8e94747bf029ee8d730bbe20daa0a998f58d4d39
Oliver Jan Krylow <oliver@bugabinga.net> ·
unsigned
Browse filesCompare with HEAD
Changed files (3)
1 -Subproject commit 902e78f5dc75dc19294d2edde54504c971c54ee9
1 +Subproject commit 66a87ef7d12bdfe7c5b4e1eb92c21753ad1d0c45
scripts/dotfiles_integration_test.java
Modified 69 69 var miseTools
= run(root,
"mise",
"ls",
"--current").toLowerCase(
Locale.
ROOT);
70 70 if (miseTools.contains(
"nushell")) fail(
"root-mise-nushell-tool");
71 71 System.out.println(run(root,
"java",
"-version").lines().findFirst().orElse(
"java"));
73 74 run(root,
"mise",
"run",
"hook");
74 75 if (
!Files.isExecutable(root.resolve(
".git/hooks/pre-commit"))) fail(
"hook-executable");
95 96 System.out.println(
"RESULT:ok");
99 + static void miseShellSmoke() throws
Exception {
100 + var smoke
= "mise-shell-smoke";
102 + mkdir(\
"%1$s/tree\"); 103 + write(\
"%1$s/a.txt\", \"alpha\"); 104 + IO.println(read(\
"%1$s/a.txt\")); 105 + IO.println(out(\
"java\", \"-version\").contains(\"openjdk\")); 106 + rm(\
"%1$s/a.txt\"); 107 + write(\
"%1$s/tree/b.txt\", \"beta\"); 108 + rmTree(\
"%1$s/tree\"); 110 + """.formatted(smoke); 111 + var out
= run(root,
"java",
"scripts/mise_shell.java", snippet);
112 + if (
!out.contains(
"alpha")
|| !out.contains(
"true")) fail(
"mise-shell-helpers");
113 + if (
!runExpectFail(root,
Map.of(),
"java",
"scripts/mise_shell.java",
"bad();").contains(
"cannot find symbol")) fail(
"mise-shell-errors");
98 117 static
List<
String> allHosts() throws
IOException {
99 118 var hosts
= new ArrayList<
String>();
100 119 try (
var s
= Files.list(root)) {
scripts/mise_shell.java
Modified 4 +final int USAGE_EXIT = 64;
5 +final int FAILURE_EXIT = 1;
6 +final String LOCAL_ENGINE = "local";
10 14 if (args.length
!= 1)
12 16 System.err.println(
"expected one mise task snippet arg, got " + args.length);
17 + System.exit(
USAGE_EXIT);
17 - try (
var jshell
= JShell.builder().executionEngine(
"local").out(
System.out).err(
System.err).build())
20 + try (
var jshell
= JShell.builder().executionEngine(
LOCAL_ENGINE).out(
System.out).err(
System.err).build())
19 - failed
|= !evalAll(jshell, startup(),
true);
21 - failed
|= !evalAll(jshell, args[
0],
false);
22 + if (
!evalAll(jshell, startup(),
true)
|| !evalAll(jshell, args[
0],
false))
23 + System.exit(
FAILURE_EXIT);
39 39 boolean evalAll(
JShell jshell,
String input,
boolean startup)
43 - while (
!rest.isBlank())
41 + for (
var rest
= input;
!rest.isBlank(); )
45 43 var info
= jshell.sourceCodeAnalysis().analyzeCompletion(rest);
46 44 if (
!info.completeness().isComplete())
48 - System.err.println((startup
? "startup: " : "")
+ "incomplete snippet: " + info.completeness());
46 + System.err.println(prefix(startup)
+ "incomplete snippet: " + info.completeness());
51 49 if (
!evalOne(jshell, info.source(), startup))
56 51 rest
= info.remaining();
78 73 System.err.println(message
== null ? event.exception().toString()
: message);
81 - var status
= event.status();
82 - if (status
== Snippet.
Status.
REJECTED || status
== Snippet.
Status.
RECOVERABLE_NOT_DEFINED)
76 + if (rejected(event.status()))
84 - jshell.diagnostics(event.snippet()).forEach(d
-> System.err.println((startup
? "startup: " : "")
+ d.getMessage(
Locale.
ROOT)));
78 + jshell.diagnostics(event.snippet()).forEach(d
-> System.err.println(prefix(startup)
+ d.getMessage(
Locale.
ROOT)));
85 +boolean rejected(
Snippet.
Status status)
87 + return status
== Snippet.
Status.
REJECTED || status
== Snippet.
Status.
RECOVERABLE_NOT_DEFINED;
90 +String prefix(
boolean startup)
92 + return startup
? "startup: " : "";
107 + return String.join(
"\n",
104 124 import java.io.
*;
107 127 import java.
util.
*;
108 128 import java.
util.
regex.
*;
109 129 import java.
util.
stream.
*;
133 +String stateHelpers()
111 136 Path CWD = Path.of(
"").toAbsolutePath().normalize();
112 137 Map<
String,
String>
ENV = new HashMap<>(
System.getenv());
141 +String resultHelpers()
152 182 List<
String> lines() {
return out.lines().toList(); }
187 +String pathHelpers()
196 231 throw new IllegalArgumentException(
"not a directory: " + next);
223 263 ENV.put(name, value);
268 +String processHelpers()
298 343 return result(cmd).code();
348 +String fileHelpers()
340 390 Files.createDirectories(path(dir));
395 +String deleteHelpers()
412 467 Files.deleteIfExists(x);
473 +String globHelpers()
497 +String whichHelpers()