Add pre-process command

Signed-off-by: Matthew Ballance <[email protected]>

.env

@@ -0,0 +1,2 @@
+PYTHONPATH=./src
+

.gitignore

@@ -83,7 +83,7 @@ celerybeat-schedule
 *.sage.py
 
 # dotenv
-.env
+# .env
 
 # virtualenv
 .venv

.vscode/c_cpp_properties.json

@@ -0,0 +1,35 @@
+{
+    "configurations": [
+        {
+            "name": "Default",
+            "includePath": [
+                "${default}",
+                "packages/libvsc/src/include"
+            ],
+            "defines": [
+                "${default}"
+            ],
+            "macFrameworkPath": [
+                "${default}"
+            ],
+            "forcedInclude": [
+                "${default}",
+                "additional/paths"
+            ],
+            "compileCommands": "${default}",
+            "browse": {
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": "${default}",
+                "path": [
+                    "${default}"
+                ]
+            },
+            "intelliSenseMode": "${default}",
+            "cStandard": "${default}",
+            "cppStandard": "${default}",
+            "compilerPath": "${default}",
+            "C_Cpp.enhancedColorization": "Enabled"
+        }
+    ],
+    "version": 4
+}

.vscode/settings.json

@@ -0,0 +1,17 @@
+{
+    "python.defaultInterpreterPath": "${workspaceFolder}/packages/python/bin/python3",
+    "python.testing.unittestArgs": [
+        "-v",
+        "-s",
+        "./ve/unit",
+        "-p",
+        "test_**.py"
+    ],
+    "python.envFile": "${workspaceFolder}/.env",
+    "python.testing.pytestEnabled": false,
+    "python.testing.unittestEnabled": true,
+
+    "search.useIgnoreFiles": true,
+    "search.useGlobalIgnoreFiles": true
+}
+

ivpm.yaml

@@ -6,10 +6,14 @@ package:
         - name: jinja2
           type: python
           src: pypi
+        - name: pyyaml
+          src: pypi
     dev-deps:
         - name: jinja2
           type: python
           src: pypi
+        - name: pyyaml
+          src: pypi
         - name: Sphinx
           src: pypi
         - name: sphinx-rtd-theme

setup.py

@@ -27,7 +27,8 @@
     'setuptools_scm',
   ],
   install_requires=[
-    'jinja2>=2.10'
+    'jinja2>=2.10',
+    'pyyaml'
   ],
 )
 

src/vte/__main__.py

@@ -6,8 +6,12 @@
 import jinja2
 import os
 import stat
+import sys
 from stat import *
 from . import template_rgy
+from .cmds.generate import CmdGenerate
+from .cmds.preprocess import CmdPreprocess
+from .cmds.list import CmdList
 
 def substitute(vars, str):
     i=0
@@ -32,217 +36,61 @@ def substitute(vars, str):
 
     return str
 
-def list_templates(args, rgy):
-    template_ids = sorted(rgy.template_map.keys())
-
-    max_len = 0
-    for id in template_ids:
-      if len(id) > max_len:
-        max_len = len(id)
-
-    fmt_str = "%-" + str(max_len) + "s - %s"
-    for id in template_ids:
-      print(fmt_str % (id, rgy.template_map[id].desc))
-
-#********************************************************************
-#* generate()
-#* 
-#********************************************************************
-def generate(args, parameters, rgy):
-    if args.template not in rgy.template_map.keys():
-        print("Error: template does not exist")
-        return
-
-    template = rgy.template_map[args.template]
-
-    env = jinja2.Environment(loader=template)
-
-#    jinja2.Environment.globals['name'] = "foo";
-    global_vars = {
-        "name" : args.name
-    }
-
-    # First, check all template parameters
-    # and set the default or take user value
-    for param_k in template.parameters.keys():
-        param = template.parameters[param_k]
-
-        if param_k in parameters.keys():
-            global_vars[param_k] = parameters[param_k]
-        elif param.has_default == True:
-            global_vars[param_k] = param.default
-        else:
-            print("Error: parameter \"" + param_k + "\" is not specified")
-            return
-
-    for param_k in parameters.keys():
-        if param_k not in template.parameters.keys():
-            print("Warning: user-specified parameter \"" + param_k + "\" has no effect")
-
-    # If 'force' is not set, check for files that might be overwritten
-    existing_files = False
-
-    if args.force == False:
-        for tmpl in env.list_templates():
-            tmpl_e = env.get_template(tmpl)
-
-            filename = substitute(global_vars, tmpl_e.name)
-            file_dir = os.path.dirname(filename)
-            try:
-                filename_u = tmpl_e.module.filename
-
-                if filename_u.find("/") != -1:
-                    # User has specified a relative path, so we assume 
-                    # this is relative to the output directory
-                    filename = filename_u
-                else:
-                    # Just a simple filename, so we assume it is relative
-                    # to the template file
-                    filename = file_dir + "/" + filename_u
-            except:
-                pass
-
-            filename = substitute(global_vars, filename)
-
-            if os.path.exists(filename):
-                print("Error: output file \"" + filename + "\" already exists")
-                existing_files = True
-
-    if existing_files == True:
-        exit(1)
-
-    for tmpl in env.list_templates():
-        tmpl_e = env.get_template(tmpl)
-
-        filename = substitute(global_vars, tmpl_e.name)
-        file_dir = os.path.dirname(filename)
-        try:
-            filename = tmpl_e.module.filename;
-
-            filename_u = tmpl_e.module.filename
-
-            if filename_u.find("/") != -1 or file_dir == "":
-                # User has specified a relative path, so we assume 
-                # this is relative to the output directory
-                filename = filename_u
-            else:
-                # Just a simple filename, so we assume it is relative
-                # to the template file
-                filename = file_dir + "/" + filename_u
-        except:
-            pass
-
-        filename = substitute(global_vars, filename)
-
-        print("Note: processing template " + tmpl_e.name)        
-        result = tmpl_e.render(global_vars)
-#        print("Result: " + result)
-
-        dir = os.path.dirname(filename)
-
-        if dir != "":
-            if os.path.isdir(dir) == False:
-                os.makedirs(dir)
-
-        fh = open(filename, "w");
-        fh.write(result)
-        fh.close()
-
-        chmod = ""
-        try:
-            chmod = tmpl_e.module.chmod
-        except:
-            pass
-
-        chmod = chmod.strip()
-
-        if chmod != "":
-            mode = os.stat(filename).st_mode
-
-            i=0
-            is_add = True
-            while i < len(chmod):
-                if chmod[i] == "+":
-                    is_add = True
-                elif chmod[i] == "-":
-                    is_add = False
-                elif chmod[i] == "x":
-                    if is_add:
-                        mode = mode | stat.S_IEXEC
-                    else:
-                        mode = mode & ~stat.S_IEXEC
-                elif chmod[i] == "r":
-                    if is_add:
-                        mode = mode | stat.S_IREAD
-                    else:
-                        mode = mode & ~stat.S_IREAD
-                elif chmod[i] == "w":
-                    if is_add:
-                        mode = mode | stat.S_IWRITE
-                    else:
-                        mode = mode & ~stat.S_IWRITE
-                else:
-                    print("Error: unknown chmod character \"" + chmod[i] + "\" in chmod string \"" + chmod + "\"")
-
-                i=i+1
-            os.chmod(filename, mode)
-
-
-def main():
+def get_parser():
     parser = argparse.ArgumentParser(prog="vte")
     subparser = parser.add_subparsers(dest="subcmd")
+    subparser.required = True
+
     generate_cmd = subparser.add_parser("generate",
         help="generate source files")
-
     generate_cmd.add_argument("-force", 
         action="store_true",
         help="force overwrite of existing files")    
     generate_cmd.add_argument("template", help="ID of template")
     generate_cmd.add_argument("name", help="Name to use in the template")
-    generate_cmd.add_argument("parameters", 
-             metavar="KEY=VALUE", 
-             nargs="*",
-             help="Specify other template variables")
+    # generate_cmd.add_argument("parameters", 
+    #          metavar="KEY=VALUE", 
+    #          nargs="*",
+    #          help="Specify other template variables")
+    generate_cmd.set_defaults(func=CmdGenerate())
+
+    preprocess_cmd = subparser.add_parser("preprocess",
+        help="Pre-process a file")
+    preprocess_cmd.add_argument("-o", "--output", help="Specify output")
+    preprocess_cmd.add_argument("file", help="Input file")
+    preprocess_cmd.set_defaults(func=CmdPreprocess())
 
     list_cmd = subparser.add_parser("list",
         help="list available templates")
-
-    args = parser.parse_args()
+    list_cmd.set_defaults(func=CmdList())
 
+    return parser
+
+def main():
+    parser = get_parser()
+
+    parameters = {}
+
+    # Filter out parameters first
+    parse_args = []
+    for arg in sys.argv:
+        if arg.startswith("-D"):
+            key_val = arg[2:]
+            eq = key_val.find('=')
+            if eq != -1:
+                parameters[key_val[0:eq]] = key_val[eq+1:]
+            else:
+                parameters[key_val] = ""
+        else:
+            parse_args.append(arg)
+
+    args = parser.parse_args(args=parse_args[1:])
+    args.parameters = parameters
 
-    template_path = []
-
     # TODO: query extension points
 
-    # Bring in the template path elements from 
-    if os.getenv("VTE_TEMPLATE_PATH") != None:
-        for elem in os.getenv("VTE_TEMPLATE_PATH").split(":"):
-            template_path.append(elem)
-
-    rgy = template_rgy.TemplateRgy(template_path)
-
-    if args.subcmd == "generate":
-        if args.name.find("=") != -1:
-            print("Error: name contains '='")
-            exit(1)
-
-        # Check that parameters are properly-specified 
-        parameters = {}
-        for param in args.parameters:
-            idx = param.find("=")
-            if idx == -1:
-                print("Error: parameter specification \"" + param + "\" doesn't contain '='");
-                exit(1)
-            parameters[param[:idx]] = param[idx+1:]
+    args.func(args)
 
-        generate(args, parameters, rgy)
-    elif args.subcmd == "list":
-        list_templates(args, rgy)
-    else:
-        print("Error: no subcommand specified")
-        parser.print_help()
-        exit(1);
-
 
 if __name__ == "__main__":
     main()