feat(core,cmds,tests): fix bindings, configuration, tests, update httpd

jmacro-commands/jmacro-commands-base/src/main/groovy/com/itquasar/multiverse/jmacro/commands/base/commands/ConfigurationCommand.groovy

@@ -88,6 +88,10 @@ class ConfigurationCommand extends AbstractCommand implements CallableCommand<Co
         throw new JMacroException("Property missing redirect is disabled in configuration")
     }
 
+    def methodMissing(String name, def args) {
+        scriptLogger.debug("Calling method '$name' missing on configuration")
+        return configuration.invokeMethod(name, args)
+    }
 
     @Override
     Iterator iterator() {

jmacro-commands/jmacro-commands-server/src/main/groovy/com/itquasar/multiverse/jmacro/commands/server/commands/httpd/Httpd.groovy

@@ -74,6 +74,17 @@ class Httpd implements AutoCloseable {
         this.stop()
     }
 
+    boolean isReady() {
+        return this.server.jettyServer().server().isStarted();
+    }
+
+    Httpd waitBeReady() {
+        while(!this.isReady()) {
+            Thread.sleep(25);
+        }
+        return this
+    }
+
     Httpd exit(String route = '/exit', String message = 'Bye') {
         exit(route, { ctx -> ctx.json([message: message]) })
     }

jmacro-commands/jmacro-commands-server/src/main/java/com/itquasar/multiverse/jmacro/commands/server/commands/HttpdCommand.java

@@ -77,8 +77,10 @@ public void close() {
     @Override
     public void onShutdown() {
         try {
-            getScriptLogger().warn("Closing all HTTPD instances as we are shutting down)");
-            this.close();
+            if (!this.servers.isEmpty()) {
+                getScriptLogger().warn("Closing all HTTPD instances as we are shutting down)");
+                this.close();
+            }
         } catch (Exception e) {
             getScriptLogger().error("Error closing HTTPD instances on shutdown", e);
         }

jmacro-core/src/main/java/com/itquasar/multiverse/jmacro/core/command/Command.java

@@ -62,8 +62,4 @@ default Object propertyMissing(String name) {
         return CommandUtils.propertyMissingOn(this.getBindings(), name);
     }
 
-    default Object methodMissing(String name, Object args) {
-        return CommandUtils.callMethodAliasOrOnBindings(this, name, args);
-    }
-
 }

jmacro-core/src/main/java/com/itquasar/multiverse/jmacro/core/command/CommandProvider.java

@@ -20,4 +20,8 @@ public interface CommandProvider<C extends AbstractCommand> {
      * @return Command new instance.
      */
     C getCommand(Core core, ScriptEngineAware scriptEngineAware);
+
+    default String getName() {
+        return Command.nameOf(this.getCommandType());
+    }
 }

jmacro-core/src/main/java/com/itquasar/multiverse/jmacro/core/engine/EngineImpl.java

@@ -205,10 +205,10 @@ public Map<String, ScriptEngineFactory> getEngines() {
 
         context.setWriter(new PrintWriter(System.out));
 
+        // FIXME where this is used??? tests break without this!!!
         var globalScope = context.getBindings(GLOBAL_SCOPE);
         if (globalScope == null) {
             context.setBindings(engine.createBindings(), ScriptContext.GLOBAL_SCOPE);
-            globalScope = context.getBindings(GLOBAL_SCOPE);
         }
 
         var engineScope = context.getBindings(ENGINE_SCOPE);
@@ -223,12 +223,12 @@ public Map<String, ScriptEngineFactory> getEngines() {
             "@" + scriptPath.substring(scriptPath.lastIndexOf('.') + 1);
         final var scriptLogger = LogManager.getLogger(loggerName);
 
-        globalScope.put("__MAIN__", normalExecution);
-        globalScope.put("id", id);
-        globalScope.put("uuid", UUID.randomUUID());
-        globalScope.put("logger", scriptLogger);
+        engineScope.put("__MAIN__", normalExecution);
+        engineScope.put("id", id);
+        engineScope.put("uuid", UUID.randomUUID());
+        engineScope.put("logger", scriptLogger);
 
-        ScriptEngineAware scriptEngineAware = ScriptEngineAware.of(globalScope, engine, scriptLogger);
+        ScriptEngineAware scriptEngineAware = ScriptEngineAware.of(engineScope, engine, scriptLogger);
 
         if (engine instanceof GroovyScriptEngineImpl) {
             engine.getContext().setAttribute("#jsr223.groovy.engine.keep.globals", "weak", ENGINE_SCOPE);

jmacro-tests/pom.xml

@@ -103,7 +103,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <!-- FIXME move def to BOM -->
             <groupId>com.athaydes</groupId>
             <artifactId>spock-reports</artifactId>
             <scope>test</scope>

jmacro-tests/src/test/groovy/com/itquasar/multiverse/jmacro/commands/CommandSpec.groovy

@@ -1,5 +1,6 @@
 package com.itquasar.multiverse.jmacro.commands
 
+
 import com.itquasar.multiverse.jmacro.core.command.CommandProvider
 import com.itquasar.multiverse.jmacro.core.configuration.Configuration
 import com.itquasar.multiverse.jmacro.core.engine.Core
@@ -10,13 +11,14 @@ import com.itquasar.multiverse.jmacro.core.script.Script
 import com.itquasar.multiverse.jmacro.core.script.ScriptResult
 import com.itquasar.multiverse.jmacro.core.util.SPILoader
 import groovy.util.logging.Log4j2
+import org.opentest4j.TestSkippedException
 import spock.lang.Specification
 import spock.lang.Unroll
 
 @Log4j2
 class CommandSpec extends Specification {
 
-    private static final String singleCommandTest = null
+    private static final String singleCommandTest = "configuration"
 
     Core core
 
@@ -35,7 +37,7 @@ class CommandSpec extends Specification {
     }
 
     @Unroll
-    void "Command [#provider.name] of type [#provider.commandType.simpleName]"(CommandProvider provider) {
+    void 'Command #provider.name of type #provider.commandType.simpleName'(CommandProvider provider) {
         when: "Script found"
         Script script = loadScript(provider.name)
         ScriptResult result = core.engine.execute(script, "foo=bar", "--foo", "bar=false")
@@ -57,21 +59,21 @@ class CommandSpec extends Specification {
 
         where: "Command providers loaded through Java SPI"
         provider << SPILoader.load(CommandProvider.class).toList().findAll {
-            (singleCommandTest != null && singleCommandTest == it.name)
-                ||
-                (singleCommandTest == null && ((it.name == 'tn3270' && System.getProperty('tn3270j.url') != null) || it.name != 'tn3270'))
+            (singleCommandTest != null && singleCommandTest == it.name) || (singleCommandTest == null && ((it.name == 'tn3270' && System.getProperty('tn3270j.url') != null) || it.name != 'tn3270'))
         }
     }
 
     static Script loadScript(String basename) {
         String filename = basename + ".groovy"
         URL location = CommandSpec.class.getResource("/tests/commands/" + filename)
         if (location == null) {
-            throw new IllegalArgumentException("Could not find $filename")
+            log.error("Could not find $filename")
+            throw new TestSkippedException("Command ${basename} (${filename}) have no test")
         }
         String source = location.text
         Metadata metadata = Metadata.extractMetadata(source)
         return new Script(metadata, 'command-spec', filename, location.toString(), source)
+
     }
 
     static class CommandTestRepository implements ScriptRepository {

jmacro-tests/src/test/resources/tests/commands/httpd.groovy

@@ -9,7 +9,7 @@ def server = httpd {
     it.get('/foo', ctx -> ctx.result(it.config.toString()))
 }
 
-pause 1
+server.waitBeReady()
 
 def req = request {
     it.GET "${server.url}foo"

jmacro-tests/src/test/resources/tests/commands/numberUtils.groovy

@@ -0,0 +1,9 @@
+/*
+START METADATA
+name: NUMBERUTILS
+infos:
+    expectedResult: 123.4
+END METADATA
+ */
+
+result(n("123.4"))

jmacro-tests/src/test/resources/tests/commands/request.groovy

@@ -10,7 +10,7 @@ def server = httpd {
     it.post('/foo', ctx -> ctx.result(ctx.header("Some-Header") + "#" + ctx.formParam("user") + ":" + ctx.formParam("senha")))
 }
 
-pause 1
+server.waitBeReady()
 
 def req = request {
     it.with {

jmacro-tests/src/test/resources/tests/commands/wrapping.groovy

@@ -0,0 +1,9 @@
+/*
+START METADATA
+name: WRAPPING
+infos:
+    expectedResult: "org.apache.logging.log4j.core.Logger"
+END METADATA
+ */
+
+result(logger.class.name)

pom.xml

@@ -10,7 +10,8 @@
     <version>0.1.0-SNAPSHOT</version>
 
     <name>JMacro</name>
-    <description>JMacro parent pom</description>
+    <!-- JScrorm ??? J SCRipt platfORM-->
+    <description>JMacro Script Platform</description>
 
     <pluginRepositories>
         <pluginRepository>