add more app commands

Author: jomifred

README.md

@@ -69,6 +69,50 @@ Type the command `jason`:
 
 the `<TAB>` key is your new 'mouse' to explore the system.
 
+### Create Applications
+
+New Jason applications can be created with:
+
+```
+jason app create app1 --console
+cd app1
+jason app1.mas2j
+```
+
+The first command creates a Jason application identified by `app1` with two agents and a shared environment. The third command executes the application. The output:
+
+```
+[bob] hello world.
+[alice] hello world.
+```
+
+You can add more agents in the project with:
+
+```
+jason app add-agent karlos
+```
+To run agent karlos, there are two options: stop MAS and run it again; or add karlos in the running MAS:
+
+```
+jason agent start --source="src/agt/karlos.asl" --mas-name="app1" jomi
+```
+
+You can add Gradle scripts for the application with:
+
+```
+jason app add-gradle
+```
+
+More details of the commands with:
+
+```
+jason app
+```
+
+
+Then use your preferred IDE to edit the sources of the application in  the `src` folder.
+
+
 ### Scripts
 
 Create a script file, for instance, a file called `hello.jcli` with content:

build.gradle

@@ -6,7 +6,7 @@ defaultTasks 'build'
 
 apply plugin: 'java'
 
-version '1.0.0-SNAPSHOT'
+version '3.2-SNAPSHOT' // use the jason version
 group   'org.jason'
 
 java {
@@ -42,6 +42,7 @@ dependencies {
     implementation 'org.jline:jline:3.22.0'
     implementation 'org.fusesource.jansi:jansi:2.4.0'
 
+    implementation 'org.gradle:gradle-tooling-api:7.6'
     //testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
@@ -65,6 +66,10 @@ task run (type: JavaExec, dependsOn: 'build') {
     classpath sourceSets.main.runtimeClasspath
 }
 
+clean {
+    delete 'bin'
+    delete 'build'
+}
 
 task uberJar(type: Jar, dependsOn: 'classes') {
     description 'creates a single runnable jar file with all dependencies'
@@ -80,6 +85,13 @@ task uberJar(type: Jar, dependsOn: 'classes') {
     destinationDirectory = file('build/bin')
     from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
+
+    doLast {
+        copy {
+            from 'src/main/resources/scripts'
+            into 'build/bin'
+        }
+    }
 }
 
 task createBin (dependsOn: 'uberJar') {

docs/commands.md

@@ -84,4 +84,15 @@ jason agent start bob { +!g <- .print(ok). }
 
 Type `jason agent stop --help` for details of `stop` command ...
 
+## Application level
 
+```
+Usage: jason app (create | compile | add-agent | add-gradle )
+commands to handle applications
+
+Commands:
+  create      creates the files of a new application
+  compile     compiles the java classes of an application
+  add-agent   adds a new agent into the application
+  add-gradle  adds a Gradle script for the application
+```

src/main/java/jason/cli/JasonCommands.java

@@ -56,7 +56,7 @@ public void setReader(LineReader reader) {
 
 class VersionProvider implements IVersionProvider {
     public String[] getVersion() {
-        return new String[] { "Jason " + Config.get().getJasonVersion() };
+        return new String[] { "Jason CLI " + Config.get().getJasonVersion() };
     }
 }
 

src/main/java/jason/cli/app/AddAgent.java

@@ -0,0 +1,74 @@
+package jason.cli.app;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+import java.io.*;
+
+
+@Command(
+    name = "add-agent",
+    description = "adds a new agent into the application"
+)
+public class AddAgent extends Common implements Runnable {
+
+    @CommandLine.Parameters(paramLabel = "<agent name>", defaultValue = "",
+            arity = "1")
+    String agName;
+
+
+    @CommandLine.ParentCommand
+    protected Application parent;
+
+    @Override
+    public void run() {
+        if (agName.isEmpty()) {
+            parent.parent.errorMsg("the name of the agent should be informed, e.g., 'app add-agent karlos'.");
+            return;
+        }
+
+        try {
+            var file = getProjectFile("");
+            if (file == null) {
+                parent.parent.errorMsg("can not find a .mas2j file in the current directory!");
+                return;
+            }
+
+            var agFile = new File("src/agt/"+agName+".asl");
+            if (agFile.exists()) {
+                parent.parent.errorMsg("a file '"+agFile+"' exists already, chose another name for the agent.");
+                return;
+            }
+
+            Create.copyFile("", "agent", agName, agFile, true);
+            addAgInProject(file, agName);
+            parent.parent.println("agent "+agName+" ("+agFile+") was included in "+file);
+        } catch(Exception e) {
+            parent.parent.errorMsg("error adding agent:\n" + e);
+        }
+    }
+
+    private void addAgInProject(File file, String agName) {
+        // read and change
+        var text = new StringBuilder();
+        try (var in  = new BufferedReader(new FileReader(file) )) {
+            String l = in.readLine();
+            while (l != null) {
+                if (l.contains("agents:"))
+                    l = l.replace("agents: ", "agents: "+agName+";\n            ");
+                text.append(l+"\n");
+                l = in.readLine();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        // write
+        try (var out = new BufferedWriter(new FileWriter(file))) {
+            out.append(text.toString());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
+

src/main/java/jason/cli/app/Application.java

@@ -1,15 +1,14 @@
 package jason.cli.app;
 
 import jason.cli.JasonCommands;
-import jason.cli.agent.*;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 
 @Command(
     name = "app",
-    description = "commands to handle aplications",
-    subcommands = { Compile.class },
-    synopsisSubcommandLabel = "(create | compile | add-agent | set-env | add-gradle )"
+    description = "commands to handle applications",
+    subcommands = { Create.class, Compile.class, AddAgent.class, Gradle.class },
+    synopsisSubcommandLabel = "(create | compile | add-agent | add-gradle )"
 )
 public class Application {
 

src/main/java/jason/cli/app/Common.java

@@ -0,0 +1,31 @@
+package jason.cli.app;
+
+import jason.util.CreateNewProject;
+
+import java.io.File;
+
+
+public class Common {
+    protected File getProjectFile(String masName) {
+        if (!masName.endsWith(".mas2j"))
+            masName += ".temp.mas2j";
+
+        var f = new File(masName);
+        if (f.exists())
+            return f;
+
+        // find a .mas2j file in current directory
+        for (var nf: new File(".").listFiles()) {
+            if (nf.getName().endsWith(".mas2j"))
+                return nf;
+        }
+
+        return null;
+    }
+    protected File createTempProjectFile(String masName) {
+        var f = new File( ".temp.mas2j");
+        CreateNewProject.copyFile("temp", "project", f, true);
+        return f;
+    }
+}
+

src/main/java/jason/cli/app/Compile.java

@@ -1,25 +1,20 @@
 package jason.cli.app;
 
-import jason.asSemantics.Intention;
-import jason.cli.agent.Agent;
-import jason.cli.mas.RunningMASs;
 import jason.mas2j.MAS2JProject;
 import jason.mas2j.parser.mas2j;
 import jason.util.Config;
-import jason.util.CreateNewProject;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 
 import java.io.File;
 import java.io.FileReader;
-import java.rmi.RemoteException;
 
 
 @Command(
     name = "compile",
     description = "compiles the java classes of an application"
 )
-public class Compile implements Runnable {
+public class Compile extends Common implements Runnable {
 
     @CommandLine.Parameters(paramLabel = "<MAS name>", defaultValue = "",
             arity = "0..1")
@@ -59,31 +54,12 @@ public void run() {
             launcher.writeScripts(false, false);
             launcher.setTask("compile");
             launcher.run();
-        } catch(Exception e) {
-            System.err.println("parsing errors found... \n" + e);
-        }
-    }
 
-    private File getProjectFile(String masName) {
-        var f = new File(masName+".mas2j");
-        if (f.exists())
-            return f;
-
-        // find a .mas2j file in current directory
-        for (var nf: new File(".").listFiles()) {
-            if (nf.getName().endsWith(".mas2j"))
-                return nf;
+            if (file.getName().equals(".temp.mas2j"))
+                file.delete();
+        } catch(Exception e) {
+            parent.parent.errorMsg("error compiling:\n" + e);
         }
-
-        return null;
-    }
-
-    private File createTempProjectFile(String masName) {
-        var f = new File( ".temp.mas2j");
-        CreateNewProject.copyFile("temp", "project", f, true);
-        return f;
     }
-
-
 }