Address PR feedback: remove run command, rename scripts to actions, change ${path} to ${deps}

Co-authored-by: quintesse <778793+quintesse@users.noreply.github.com>

Author: Copilot

src/main/java/org/codejive/jpm/Main.java

@@ -48,8 +48,7 @@
             Main.Search.class,
             Main.Install.class,
             Main.PrintPath.class,
-            Main.Do.class,
-            Main.Run.class
+            Main.Do.class
         })
 public class Main {
 
@@ -318,26 +317,26 @@ public Integer call() throws Exception {
     @Command(
             name = "do",
             description =
-                    "Executes a script command defined in the app.yml file. Scripts can use variable substitution for classpath.\n\n"
+                    "Executes an action command defined in the app.yml file. Actions can use variable substitution for classpath.\n\n"
                             + "Example:\n  jpm do build\n  jpm do test\n")
     static class Do implements Callable<Integer> {
         @Mixin CopyMixin copyMixin;
 
         @Parameters(
-                paramLabel = "scriptName",
-                description = "Name of the script to execute as defined in app.yml",
+                paramLabel = "actionName",
+                description = "Name of the action to execute as defined in app.yml",
                 arity = "1")
-        private String scriptName;
+        private String actionName;
 
         @Override
         public Integer call() throws Exception {
             AppInfo appInfo = AppInfo.read();
-            String command = appInfo.getScript(scriptName);
+            String command = appInfo.getAction(actionName);
 
             if (command == null) {
-                System.err.println("Script '" + scriptName + "' not found in app.yml");
-                if (!appInfo.getScriptNames().isEmpty()) {
-                    System.err.println("Available scripts: " + String.join(", ", appInfo.getScriptNames()));
+                System.err.println("Action '" + actionName + "' not found in app.yml");
+                if (!appInfo.getActionNames().isEmpty()) {
+                    System.err.println("Available actions: " + String.join(", ", appInfo.getActionNames()));
                 }
                 return 1;
             }
@@ -359,43 +358,7 @@ public Integer call() throws Exception {
         }
     }
 
-    @Command(
-            name = "run",
-            description =
-                    "Alias for 'jpm do run'. Executes the 'run' script defined in the app.yml file.\n\n"
-                            + "Example:\n  jpm run\n")
-    static class Run implements Callable<Integer> {
-        @Mixin CopyMixin copyMixin;
-
-        @Override
-        public Integer call() throws Exception {
-            AppInfo appInfo = AppInfo.read();
-            String command = appInfo.getScript("run");
-            
-            if (command == null) {
-                System.err.println("Script 'run' not found in app.yml");
-                if (!appInfo.getScriptNames().isEmpty()) {
-                    System.err.println("Available scripts: " + String.join(", ", appInfo.getScriptNames()));
-                }
-                return 1;
-            }
-
-            // Get the classpath for variable substitution using app.yml dependencies
-            List<Path> classpath = Collections.emptyList();
-            try {
-                classpath = Jpm.builder()
-                        .directory(copyMixin.directory)
-                        .noLinks(copyMixin.noLinks)
-                        .build()
-                        .path(new String[0]); // Empty array means use dependencies from app.yml
-            } catch (Exception e) {
-                // If we can't get the classpath, continue with empty list
-                System.err.println("Warning: Could not resolve classpath: " + e.getMessage());
-            }
 
-            return ScriptUtils.executeScript(command, classpath);
-        }
-    }
 
     static class CopyMixin {
         @Option(
@@ -462,8 +425,8 @@ public static void main(String... args) {
         // Handle common aliases
         if (args.length > 0) {
             String firstArg = args[0];
-            if ("compile".equals(firstArg) || "test".equals(firstArg)) {
-                // Convert "jpm compile" to "jpm do compile" and "jpm test" to "jpm do test"
+            if ("compile".equals(firstArg) || "test".equals(firstArg) || "run".equals(firstArg)) {
+                // Convert "jpm compile", "jpm test", "jpm run" to "jpm do <command>"
                 String[] newArgs = new String[args.length + 1];
                 newArgs[0] = "do";
                 System.arraycopy(args, 0, newArgs, 1, args.length);

src/main/java/org/codejive/jpm/json/AppInfo.java

@@ -18,7 +18,7 @@
 public class AppInfo {
     private Map<String, Object> yaml = new TreeMap<>();
     public Map<String, String> dependencies = new TreeMap<>();
-    public Map<String, String> scripts = new TreeMap<>();
+    public Map<String, String> actions = new TreeMap<>();
 
     /** The official name of the app.yml file. */
     public static final String APP_INFO_FILE = "app.yml";
@@ -35,22 +35,22 @@ public String[] getDependencyGAVs() {
     }
 
     /**
-     * Returns the script command for the given script name.
+     * Returns the action command for the given action name.
      *
-     * @param scriptName The name of the script
-     * @return The script command or null if not found
+     * @param actionName The name of the action
+     * @return The action command or null if not found
      */
-    public String getScript(String scriptName) {
-        return scripts.get(scriptName);
+    public String getAction(String actionName) {
+        return actions.get(actionName);
     }
 
     /**
-     * Returns all available script names.
+     * Returns all available action names.
      *
-     * @return A set of script names
+     * @return A set of action names
      */
-    public java.util.Set<String> getScriptNames() {
-        return scripts.keySet();
+    public java.util.Set<String> getActionNames() {
+        return actions.keySet();
     }
 
     /**
@@ -78,12 +78,12 @@ public static AppInfo read() throws IOException {
                 appInfo.dependencies.put(entry.getKey(), entry.getValue().toString());
             }
         }
-        // Parse scripts section
-        if (appInfo.yaml.containsKey("scripts")
-                && appInfo.yaml.get("scripts") instanceof Map) {
-            Map<String, Object> scripts = (Map<String, Object>) appInfo.yaml.get("scripts");
-            for (Map.Entry<String, Object> entry : scripts.entrySet()) {
-                appInfo.scripts.put(entry.getKey(), entry.getValue().toString());
+        // Parse actions section
+        if (appInfo.yaml.containsKey("actions")
+                && appInfo.yaml.get("actions") instanceof Map) {
+            Map<String, Object> actions = (Map<String, Object>) appInfo.yaml.get("actions");
+            for (Map.Entry<String, Object> entry : actions.entrySet()) {
+                appInfo.actions.put(entry.getKey(), entry.getValue().toString());
             }
         }
         return appInfo;
@@ -104,7 +104,7 @@ public static void write(AppInfo appInfo) throws IOException {
             Yaml yaml = new Yaml(dopts);
             // WARNING awful code ahead
             appInfo.yaml.put("dependencies", (Map<String, Object>) (Map) appInfo.dependencies);
-            appInfo.yaml.put("scripts", (Map<String, Object>) (Map) appInfo.scripts);
+            appInfo.yaml.put("actions", (Map<String, Object>) (Map) appInfo.actions);
             yaml.dump(appInfo.yaml, out);
         }
     }

src/main/java/org/codejive/jpm/util/ScriptUtils.java

@@ -14,7 +14,7 @@ public class ScriptUtils {
      * Executes a script command with variable substitution and path conversion.
      *
      * @param command The command to execute
-     * @param classpath The classpath to use for ${path} substitution
+     * @param classpath The classpath to use for ${deps} substitution
      * @return The exit code of the executed command
      * @throws IOException if an error occurred during execution
      * @throws InterruptedException if the execution was interrupted
@@ -37,21 +37,21 @@ public static int executeScript(String command, List<Path> classpath)
      * Processes a command by performing variable substitution and path conversion.
      *
      * @param command The raw command
-     * @param classpath The classpath to use for ${path} substitution
+     * @param classpath The classpath to use for ${deps} substitution
      * @return The processed command
      */
     private static String processCommand(String command, List<Path> classpath) {
         String result = command;
 
-        // Substitute ${path} with the classpath
-        if (result.contains("${path}")) {
+        // Substitute ${deps} with the classpath
+        if (result.contains("${deps}")) {
             String classpathStr = "";
             if (classpath != null && !classpath.isEmpty()) {
                 classpathStr = classpath.stream()
                         .map(Path::toString)
                         .collect(Collectors.joining(File.pathSeparator));
             }
-            result = result.replace("${path}", classpathStr);
+            result = result.replace("${deps}", classpathStr);
         }
 
         // Convert Unix-style paths to Windows if needed