Merge pull request #33 from amplify-education/drop_docopt

Drop docopt

Author: aoskotsky-amplify

bin/hcl2tojson

@@ -10,40 +10,47 @@ Options:
     PATH        The path to convert
     OUT_PATH    The path to write files to
 """
+import argparse
 import json
-import sys
 import os
-
-from docopt import docopt
+import sys
 
 from hcl2 import load
 from hcl2.parser import hcl2
 from hcl2.version import __version__
 from lark import UnexpectedToken
 
 if __name__ == '__main__':
-    arguments = docopt(__doc__, version=__version__)
-    skip = arguments["-s"]
-    in_path = arguments["PATH"]
-    out_path = arguments["OUT_PATH"]
-    if os.path.isfile(in_path):
-        with open(in_path, 'r') as in_file:
-            out_file = sys.stdout if out_path is None else open(out_path, 'w')
-            print(in_path, file=sys.stderr, flush=True)
+    parser = argparse.ArgumentParser(description='This script recursively converts hcl2 files to json')
+    parser.add_argument('-s', dest='skip', action='store_true', help='Skip un-parsable files')
+    parser.add_argument('PATH', help='The file or directory to convert')
+    parser.add_argument(
+        'OUT_PATH',
+        nargs='?',
+        help='The path where to write files to. Optional when parsing a single file. '
+             'Output is printed to stdout if OUT_PATH is blank'
+    )
+    parser.add_argument('--version', action='version', version=__version__)
+
+    args = parser.parse_args()
+    if os.path.isfile(args.PATH):
+        with open(args.PATH, 'r') as in_file:
+            out_file = sys.stdout if args.OUT_PATH is None else open(args.OUT_PATH, 'w')
+            print(args.PATH, file=sys.stderr, flush=True)
             json.dump(hcl2.parse(in_file.read()), out_file)
-            if out_path is None:
+            if args.OUT_PATH is None:
                 out_file.write('\n')
                 out_file.close()
-    elif os.path.isdir(in_path):
+    elif os.path.isdir(args.PATH):
         processed_files = set()
-        if out_path is None:
+        if args.OUT_PATH is None:
             raise RuntimeError("Positional OUT_PATH parameter shouldn't be empty")
-        if not os.path.exists(out_path):
-            os.mkdir(out_path)
-        for current_dir, dirs, files in os.walk(in_path):
-            dir_prefix = os.path.commonpath([in_path, current_dir])
+        if not os.path.exists(args.OUT_PATH):
+            os.mkdir(args.OUT_PATH)
+        for current_dir, dirs, files in os.walk(args.PATH):
+            dir_prefix = os.path.commonpath([args.PATH, current_dir])
             relative_current_dir = os.path.relpath(current_dir, dir_prefix)
-            current_out_path = os.path.normpath(os.path.join(out_path, relative_current_dir))
+            current_out_path = os.path.normpath(os.path.join(args.OUT_PATH, relative_current_dir))
             if not os.path.exists(current_out_path):
                 os.mkdir(current_out_path)
             for file_name in files:
@@ -63,10 +70,10 @@ if __name__ == '__main__':
                     try:
                         parsed_data = load(in_file)
                     except UnexpectedToken:
-                        if skip:
+                        if args.skip:
                             continue
                         raise
                     with open(out_file_path, 'w') as out_file:
                         json.dump(parsed_data, out_file)
     else:
-        raise RuntimeError('Invalid Path %s', in_path)
+        raise RuntimeError('Invalid Path %s', args.PATH)

bin/terraform_test

@@ -9,21 +9,24 @@ Options:
     PATH    The directory to check. Defaults to the TERRAFORM_CONFIG environment variable
 
 """
+import argparse
 import os
 
-from docopt import docopt
-
 from hcl2 import load
-from hcl2.parser import hcl2
 from hcl2.version import __version__
 
 if __name__ == '__main__':
-    arguments = docopt(__doc__, version=__version__)
-    target_dir = arguments["PATH"] if arguments["PATH"] else os.environ['TERRAFORM_CONFIG']
-    for current_dir, dirs, files in os.walk(target_dir):
+    parser = argparse.ArgumentParser(description='This script recursively converts hcl2 files to json')
+    parser.add_argument('PATH', nargs='?', default=None, help='The path to convert')
+    parser.add_argument('--version', action='version', version=__version__)
+
+    args = parser.parse_args()
+
+    target_dir = args.PATH if args.PATH else os.environ['TERRAFORM_CONFIG']
+    for curr_dir, dirs, files in os.walk(target_dir):
         for file_name in files:
-            if ".terraform" not in current_dir and (file_name.endswith(".tf") or file_name.endswith('tfvars')):
-                file_path = os.path.join(current_dir, file_name)
+            if ".terraform" not in curr_dir and (file_name.endswith(".tf") or file_name.endswith('tfvars')):
+                file_path = os.path.join(curr_dir, file_name)
 
                 with open(file_path, 'r') as file:
                     print(file_path)

hcl2/version.py

@@ -1,4 +1,4 @@
 """Place of record for the package version"""
 
-__version__ = "0.2.6"
+__version__ = "0.3.0"
 __git_hash__ = "GIT_HASH"

package-lock.json

@@ -1,4 +1,3 @@
 # Place dependencies in this file, following the distutils format:
 # http://docs.python.org/2/distutils/setupscript.html#relationships-between-distributions-and-packages
-docopt==0.6.2
 lark-parser>=0.7.8,<0.8.0