Enhance golo golo command to support folders and specific module

--files parse folders to load golo files
--module is added to specify a Module name for the main function

this command is valid
$ golo golo --files samples/ --module hello.World
Hello World!
$

And
- shell completion updated with --module
- documentation for this enhancement
- some samples have a new module name (to avoid duplication in classpath)

Author: rlespinasse

.gitignore

@@ -8,3 +8,4 @@ dependency-reduced-pom.xml
 .benchmarks.h2.db
 benchmarks/*.json
 benchmarks/*.html
+doc/output/

doc/basics.asciidoc

@@ -75,12 +75,15 @@ follows:
 ----
 $ golo golo --files samples/helloworld.golo
 Hello world!
+$ golo golo --files samples/ --module hello.World
+Hello world!
 $
 ----
 
-`golo golo` takes several Golo source files as input. It expects the last
-one to have a `main` function to call. The Golo code is compiled on the
-fly and executed straight into a JVM.
+`golo golo` takes several Golo source files as input (folders accepted).
+It expects the last one to have a `main` function to call (or use
+`--module` to define the golo module with the `main` function).
+The Golo code is compiled on the fly and executed straight into a JVM.
 
 You may also pass arguments to the `main` function by appending `--args`
 on the command line invocation. Suppose that we have a module `EchoArgs`
@@ -158,7 +161,7 @@ Simple, isn't it?
 === Passing JVM-specific flags ===
 
 Both `golo` and `run` commands can be given JVM-specific flags using the `JAVA_OPTS` environment
-variable. 
+variable.
 
 As an example, the following runs `fibonacci.golo` and prints JIT compilation along the way:
 
@@ -176,7 +179,7 @@ $ JAVA_OPTS=-XX:+PrintCompilation golo golo --files samples/fibonacci.golo
 
 A bash script can be found in `share/shell-completion/` called `golo-bash-completion` that will provide autocomplete support for the `golo` and `vanilla-golo` CLI scripts. You may either `source` the script, or drop the script into your `bash_completion.d/` folder and restart your terminal.
 
-TIP: Not sure where your `bash_completion.d/` folder is? Try `/etc/bash_completion.d/` on Linux or `/usr/local/etc/bash_completion.d/` for Mac Homebrew users. 
+TIP: Not sure where your `bash_completion.d/` folder is? Try `/etc/bash_completion.d/` on Linux or `/usr/local/etc/bash_completion.d/` for Mac Homebrew users.
 
 === Zsh autocompletion ===
 
@@ -515,4 +518,3 @@ You can of course take advantage of the `array` collection literal, too:
 let a = array[1, 2, 3, 4]
 let b = array["a", "b"]
 ----
-

samples/dynamic-object-person.golo

@@ -1,30 +1,29 @@
 # Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module test
+module samples.DynamicObjectPerson
 
-local function mrbean = -> DynamicObject(): 
-  name("Mr Bean"): 
+local function mrbean = -> DynamicObject():
+  name("Mr Bean"):
   email("[email protected]"):
   define("toString", |this| -> this: name() + " <" + this: email() + ">")
 
-function main = |args| {  
+function main = |args| {
 
   let bean = mrbean()
   println(bean: toString())
 
   bean: email("[email protected]")
   println(bean: toString())
 }
-

samples/swing-actionlistener.golo

@@ -1,18 +1,18 @@
 # Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module test
+module samples.SwingActionListener
 
 import java.awt.event
 import javax.swing
@@ -41,4 +41,3 @@ function main = |args| {
   frame: pack()
   frame: setVisible(true)
 }
-

samples/swing-helloworld.golo

@@ -1,18 +1,18 @@
 # Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module test
+module samples.SwingHelloWorld
 
 import javax.swing
 import javax.swing.WindowConstants
@@ -29,4 +29,3 @@ function main = |args| {
   frame: pack()
   frame: setVisible(true)
 }
-

samples/templates-chat-webapp.golo

@@ -1,18 +1,18 @@
 # Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module samples.WebServer
+module samples.TemplatesChatWebapp
 
 import java.lang
 import java.io

share/shell-completion/golo-bash-completion

@@ -17,10 +17,10 @@
 _golo ()
 {
 	local cur prev special i
-	
+
 	COMPREPLY=()
 	_get_comp_words_by_ref cur prev
-	
+
 	# Find out if we have a special word and our previous flag.
 	for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do
 		if [[ ${COMP_WORDS[i]} == @(compile|run|golo|diagnose|doc|version|new) ]]; then
@@ -30,7 +30,7 @@ _golo ()
 			lastflag=${COMP_WORDS[i]}
 		fi
 	done
-	
+
 	# We know the special and that we're not trying to use a flag.
 	# We probably want to show files.
 	if [[ $cur != -* && ! -z ${special} ]]; then
@@ -41,13 +41,13 @@ _golo ()
 				;;
 		esac
 	fi
-	
+
 	# Our special wasn't defined. We need to start there.
 	if [ -z ${special} ]; then
 		COMPREPLY=( $( compgen -W 'version compile run golo new doc diagnose --help' -- "$cur" ) )
 		return 0
 	fi
-	
+
 	# Match against flags with specific options.
 	case "$prev" in
 		--format)
@@ -67,8 +67,8 @@ _golo ()
 			return 0
 			;;
 	esac
-	
-	# We know a special, but we're looking to learn the flags.	
+
+	# We know a special, but we're looking to learn the flags.
 	case "${special}" in
 		compile)
 			COMPREPLY=( $( compgen -W '--output' -- "$cur" ) )
@@ -80,7 +80,7 @@ _golo ()
 			COMPREPLY=( $( compgen -W '--module --classpath' -- "$cur" ) )
 			;;
 		golo)
-			COMPREPLY=( $( compgen -W '--files --args --classpath' -- "$cur" ) )
+			COMPREPLY=( $( compgen -W '--files --args --classpath --module' -- "$cur" ) )
 			;;
 		diagnose)
 			COMPREPLY=( $( compgen -W '--tool' -- "$cur" ) )

src/main/java/fr/insalyon/citi/golo/cli/Main.java

@@ -85,9 +85,12 @@ static class RunCommand {
   @Parameters(commandDescription = "Dynamically loads and runs from Golo source files")
   static class GoloGoloCommand {
 
-    @Parameter(names = "--files", variableArity = true, description = "Golo source files (the last one has a main function)", required = true)
+    @Parameter(names = "--files", variableArity = true, description = "Golo source files (the last one has a main function or use --module)", required = true)
     List<String> files = new LinkedList<>();
 
+    @Parameter(names = "--module", description = "The Golo module with a main function")
+    String module;
+
     @Parameter(names = "--args", variableArity = true, description = "Program arguments")
     List<String> arguments = new LinkedList<>();
 
@@ -431,22 +434,45 @@ private static void golo(GoloGoloCommand gologolo) throws Throwable {
     GoloClassLoader loader = new GoloClassLoader(primaryClassLoader);
     Class<?> lastClass = null;
     for (String goloFile : gologolo.files) {
-      File file = new File(goloFile);
-      if (!file.exists()) {
-        System.out.println("Error: " + file + " does not exist.");
-        return;
-      }
-      if (!file.isFile()) {
-        System.out.println("Error: " + file + " is not a file.");
-        return;
+      lastClass = loadGoloFile(goloFile, gologolo.module, loader);
+    }
+    if (lastClass == null && gologolo.module != null) {
+      System.out.println("The module " + gologolo.module + " does not exist in the classpath.");
+      return;
+    }
+    callRun(lastClass, gologolo.arguments.toArray(new String[gologolo.arguments.size()]));
+  }
+
+  private static Class<?> loadGoloFile(String goloFile, String module, GoloClassLoader loader) throws Throwable {
+    File file = new File(goloFile);
+    if (!file.exists()) {
+      System.out.println("Error: " + file.getAbsolutePath() + " does not exist.");
+      return null;
+    }
+    if (file.isDirectory()) {
+      File[] folderFiles = file.listFiles();
+      if (folderFiles != null) {
+        Class<?> lastClass = null;
+        for (File folderFile : folderFiles) {
+          Class<?> loadedClass = loadGoloFile(folderFile.getAbsolutePath(), module, loader);
+          if (module == null || (loadedClass != null && loadedClass.getCanonicalName().equals(module))) {
+            lastClass = loadedClass;
+          }
+        }
+        return lastClass;
       }
+    }
+    if (file.getName().endsWith(".golo")) {
       try (FileInputStream in = new FileInputStream(file)) {
-        lastClass = loader.load(file.getName(), in);
+        Class<?> loadedClass = loader.load(file.getName(), in);
+        if (module == null || loadedClass.getCanonicalName().equals(module)) {
+          return loadedClass;
+        }
       } catch (GoloCompilationException e) {
         handleCompilationException(e);
       }
     }
-    callRun(lastClass, gologolo.arguments.toArray(new String[gologolo.arguments.size()]));
+    return null;
   }
 
   private static void doc(DocCommand options) {