2021.9.371

terefang · Oct 3, 2021 · 7c8185a · 7c8185a
1 parent 7d2b135
commit 7c8185a
Show file tree

Hide file tree

Showing 22 changed files with 391 additions and 124 deletions.
diff --git a/build.sh b/build.sh
@@ -31,7 +31,7 @@ while test ! -z "$1" ; do
       ;;
     -install*)
       (cd $bDIR && mvn clean install $OPTS) || exit 1
-      (test -e ~/bin/template-cli.sh && cd $bDIR && cp template-cli/target/bin/template-cli*.sh.bin ~/bin/template-cli.sh)
+      (test -e ~/bin/template-cli.sh && cd $bDIR && cp template-cli/target/bin/template-cli*.bin ~/bin/template-cli.sh)
       ;;
     -deps)
       (cd $bDIR && mvn org.apache.maven.plugins:maven-dependency-plugin:tree) || exit 1

diff --git a/examples/script.py b/examples/script.py
diff --git a/examples/with_args.rb b/examples/with_args.rb
@@ -0,0 +1,8 @@
+$_log.info("test info log")
+
+
+$_log.info("#{$ARGV}")
+
+puts($_id)
+
+return true;
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.terefang.template</groupId>
     <artifactId>template</artifactId>
-    <version>2021.5.361</version>
+    <version>2021.9.371</version>
     <modules>
         <module>template-cli</module>
         <module>template-maven-plugin</module>
@@ -29,7 +29,8 @@
         <maven.version>3.6.3</maven.version>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyyMMdd'.'HHmm</maven.build.timestamp.format>
-        <version.jmelange>2021.7.147</version.jmelange>
+        <version.jmelange>2021.9.153</version.jmelange>
+        <version.slf4j>1.7.30</version.slf4j>
     </properties>
 
     <scm>

diff --git a/template-cli/pom.xml b/template-cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>template</artifactId>
         <groupId>com.github.terefang.template</groupId>
-        <version>2021.5.361</version>
+        <version>2021.9.371</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.30</version>
+            <version>${version.slf4j}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.sqlsheet</groupId>

diff --git a/template-cli/src/main/java/com/github/terefang/template_cli/TemplateCliMain.java b/template-cli/src/main/java/com/github/terefang/template_cli/TemplateCliMain.java
@@ -9,6 +9,12 @@
 import com.github.terefang.template_maven_plugin.groovy.*;
 import com.github.terefang.template_maven_plugin.jexl.*;
 import com.github.terefang.template_maven_plugin.jinjava.*;
+import com.github.terefang.template_maven_plugin.jruby.JRubyEspStandardMojo;
+import com.github.terefang.template_maven_plugin.jruby.JRubyEspTemplateMojo;
+import com.github.terefang.template_maven_plugin.jruby.JRubyStandardMojo;
+import com.github.terefang.template_maven_plugin.jruby.JRubyTemplateMojo;
+import com.github.terefang.template_maven_plugin.rhino.RhinoEspStandardMojo;
+import com.github.terefang.template_maven_plugin.rhino.RhinoEspTemplateMojo;
 import com.github.terefang.template_maven_plugin.rhino.RhinoStandardMojo;
 import com.github.terefang.template_maven_plugin.rhino.RhinoTemplateMojo;
 import com.github.terefang.template_maven_plugin.thymeleaf.*;
@@ -19,6 +25,7 @@
 import org.codehaus.plexus.util.StringUtils;
 import picocli.CommandLine;
 import java.io.File;
+import java.util.Collections;
 
 public class TemplateCliMain
 {
@@ -127,6 +134,19 @@ public static void main(String[] _args)
             }
         }
         else
+        if(_opts.getDoEngine().equals(TemplateCliOptions.TemplateEngineName.JRUBY))
+        {
+            if(_opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STANDARD)
+                    || _opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STD))
+            {
+                _smojo = new JRubyStandardMojo();
+            }
+            else
+            {
+                _tmojo = new JRubyTemplateMojo();
+            }
+        }
+        else
         if(_opts.getDoEngine().equals(TemplateCliOptions.TemplateEngineName.GSIMPLE))
         {
             if(_opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STANDARD)
@@ -153,7 +173,8 @@ public static void main(String[] _args)
             }
         }
         else
-        if(_opts.getDoEngine().equals(TemplateCliOptions.TemplateEngineName.ECMA))
+        if(_opts.getDoEngine().equals(TemplateCliOptions.TemplateEngineName.ECMA)
+                ||_opts.getDoEngine().equals(TemplateCliOptions.TemplateEngineName.RHINO))
         {
             if(_opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STANDARD)
                     || _opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STD))
@@ -166,6 +187,45 @@ public static void main(String[] _args)
             }
         }
         else
+        if(_opts.getDoEngine().equals(TemplateCliOptions.TemplateEngineName.RHINO_ESP))
+        {
+            if(_opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STANDARD)
+                    || _opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STD))
+            {
+                _smojo = new RhinoEspStandardMojo();
+            }
+            else
+            {
+                _tmojo = new RhinoEspTemplateMojo();
+            }
+        }
+        else
+        if(_opts.getDoEngine().equals(TemplateCliOptions.TemplateEngineName.JRUBY_ESP))
+        {
+            if(_opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STANDARD)
+                    || _opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STD))
+            {
+                _smojo = new JRubyEspStandardMojo();
+            }
+            else
+            {
+                _tmojo = new JRubyEspTemplateMojo();
+            }
+        }
+        else
+        if(_opts.getDoEngine().equals(TemplateCliOptions.TemplateEngineName.JEXL_ESP))
+        {
+            if(_opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STANDARD)
+                    || _opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STD))
+            {
+                _smojo = new JexlEspStandardMojo();
+            }
+            else
+            {
+                _tmojo = new JexlEspTemplateMojo();
+            }
+        }
+        else
         if(_opts.getDoEngine().equals(TemplateCliOptions.TemplateEngineName.THYMELEAF))
         {
             if(_opts.getDoMode().equals(TemplateCliOptions.TemplateEngineMode.STANDARD)
@@ -243,12 +303,15 @@ public static void executeScript(TemplateCliLogger _log, TemplateCliOptions _opt
         try
         {
             ScriptMojo _sm = new ScriptMojo();
+
             _sm.setLog(_log);
             _sm.setScriptFile(_opts.getResourcesDirectory());
             _sm.setDataFile(_opts.getAdditionalContext());
             _sm.setDataContextRoot(_opts.getAdditionalContextRoot());
             _sm.setOutputDirectory(_opts.getResourcesOutput());
             _sm.setAdditionalVariables(_opts.getAdditionalVariables());
+            _sm.setArguments(_opts.getArguments()!=null ? _opts.getArguments() : Collections.EMPTY_LIST);
+
             _sm.execute();
         }
         catch (MojoExecutionException _me)
@@ -363,10 +426,13 @@ public static void setSharedMojoParameters(AbstractTmpMojo _mojo, TemplateCliOpt
     {
         _mojo.setIncludePath(_opts.getIncludePath());
         _mojo.setOutputType(_opts.getOutputType().toString());
+
         _mojo.setAdditionalContext(_opts.getAdditionalContext());
         _mojo.setAdditionalContextRoot(_opts.getAdditionalContextRoot());
         _mojo.setAdditionalVariables(_opts.getAdditionalVariables());
 
+        _mojo.setArguments(_opts.getArguments()!=null ? _opts.getArguments() : Collections.EMPTY_LIST);
+
         if(StringUtils.isNotEmpty(_opts.getJdbcUrl()))
         {
             _mojo.setJdbcUrl(_opts.getJdbcUrl());

diff --git a/template-cli/src/main/java/com/github/terefang/template_cli/TemplateCliOptions.java b/template-cli/src/main/java/com/github/terefang/template_cli/TemplateCliOptions.java
@@ -9,7 +9,7 @@
 @Data
 public class TemplateCliOptions
 {
-    public static enum TemplateEngineName { THYMELEAF, JINJAVA, ECMA, JXLT, JEXL, GSIMPLE, GROOVY, FREEMARKER, TRIMOU, PREPROCESSOR, CONCAT, ToJSON, ToHSON, ToPDATA, SCRIPT}
+    public static enum TemplateEngineName { THYMELEAF, JINJAVA, ECMA, RHINO, JXLT, JEXL, GSIMPLE, GROOVY, JRUBY, JEXL_ESP, JRUBY_ESP, RHINO_ESP, FREEMARKER, TRIMOU, PREPROCESSOR, CONCAT, ToJSON, ToHSON, ToPDATA, SCRIPT}
 
     @CommandLine.Option(order = 10, names = {"-T", "--template-engine"}, paramLabel = "ENGINE", description = "name of the templating engine, ${COMPLETION-CANDIDATES}", required = true)
     public TemplateEngineName doEngine;
@@ -42,7 +42,7 @@ public static enum OutputType { TEXT, XML, HTML, JAVASCRIPT, SVG, PNG, PDF, XLS,
     @CommandLine.Option(order = 65, names = {"--jdbc-pass"}, paramLabel = "PASS", defaultValue = "", required = false)
     public String jdbcPassWord;
 
-    @CommandLine.Option(order = 65, names = {"--jdbc-driver"}, paramLabel = "PASS", defaultValue = "", required = false)
+    @CommandLine.Option(order = 65, names = {"--jdbc-driver"}, paramLabel = "DRIVER", defaultValue = "", required = false)
     public String jdbcDriver;
 
     /* shared Variables */
@@ -102,4 +102,7 @@ public static enum OutputType { TEXT, XML, HTML, JAVASCRIPT, SVG, PNG, PDF, XLS,
 
     @CommandLine.Option(order = 150, names = {"--inc-path", "--include-path"}, description = "include paths for groovy/luaj script (default: ${DEFAULT-VALUE})", required = false, defaultValue = ".")
     protected List<String> includePath;
+
+    @CommandLine.Unmatched
+    protected List<String> arguments;
 }
diff --git a/template-cli/src/test/java/TestScriptingWithArgs.java b/template-cli/src/test/java/TestScriptingWithArgs.java
@@ -0,0 +1,19 @@
+import com.github.terefang.template_cli.TemplateCliMain;
+
+public class TestScriptingWithArgs {
+    static String[] ARGS = {
+            "-T", "SCRIPT", "-M", "SCRIPT",
+            "-D", "examples/",
+            "-S", "examples/with_args.rb",
+            "--additional-context-file", "examples/data.pdx",
+            "--additional-variables", "_out_dir=examples",
+            "--",
+            "this",
+            "are",
+            "additional",
+            "args",
+    };
+    public static void main(String[] args) {
+        TemplateCliMain.main(ARGS);
+    }
+}