skilleter-thingy 0.0.68__tar.gz → 0.0.69__tar.gz

{skilleter_thingy-0.0.68/skilleter_thingy.egg-info → skilleter_thingy-0.0.69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.68
+Version: 0.0.69
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.0.68 → skilleter_thingy-0.0.69}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.68"
+version = "0.0.69"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_thingy-0.0.68 → skilleter_thingy-0.0.69}/skilleter_thingy/readable.py

@@ -64,6 +64,14 @@ TF_IGNORE_LIST = [
 
 ################################################################################
 
+def error(msg):
+    """ Report an error and quit """
+
+    sys.stderr.write(f'{msg}\n')
+    sys.exit(1)
+
+################################################################################
+
 def parse_command_line():
     """ Parse, check and sanitise the command line arguments """
 
@@ -83,6 +91,7 @@ def parse_command_line():
     parser.add_argument('--replace', '-R', action='append', default=None, help='Additional regex replacements in the form "REGEX=REPLACEMENT"')
     parser.add_argument('--verbose', '-v', action='store_true', help='Output verbose status')
     parser.add_argument('--minimal', '-m', action='store_true', help='Remove unnecessary data from the file (e.g. Terraform progress updates (Refreshing..., Reading..., etc.))')
+    parser.add_argument('--non-minimal', '-M', action='store_true', help='Do not remove unnecessary data from the file (e.g. Terraform progress updates (Refreshing..., Reading..., etc.))')
     parser.add_argument('files', nargs='*', default=None, help='The files to convert (use stdin/stout if no input files are specified)')
 
     args = parser.parse_args()
@@ -96,23 +105,29 @@ def parse_command_line():
     # Can't do more than one transformation
 
     if args.light + args.dark + args.none + args.debug > 1:
-        print('ERROR: Only one colour conversion option can be specified')
-        sys.exit(1)
+        error('ERROR: Only one colour conversion option can be specified')
 
     if args.tidy and (args.light or args.dark or args.debug):
-        print('ERROR: The tidy and colour conversion options cannot be specified together')
-        sys.exit(1)
+        error('ERROR: The tidy and colour conversion options cannot be specified together')
+
+    if args.minimal and args.non_minimal:
+        error('ERROR: Cannot use minimal and non-minimal options together')
 
-    # Default to doing cleanup - removing colour codes, times & Terraform cleanup
+    # Default to doing cleanup - removing colour codes, times & Terraform & minimal cleanup
 
-    if not args.light and not args.dark and not args.tidy and not args.strip_blank and not args.terraform:
-        args.strip_blank = args.none = args.tidy = args.terraform = True
-        logging.info('No options specified - defaulting to stripping blanks, removing colour codes, tidying and cleaning Terraform data')
+    if not args.light and not args.dark and not args.tidy and not args.strip_blank and not args.terraform and not args.minimal and not args.non_minimal:
+        args.strip_blank = args.none = args.tidy = args.terraform = args.minimal = True
+        logging.info('No options specified - defaulting to stripping blanks, removing colour codes, tidying, cleaning Terraform data and removing unnecessary data')
 
     # Terraform option also removes ANSI, etc.
 
     if args.terraform:
-        args.strip_blank = args.tidy = args.none = True
+        args.strip_blank = args.tidy = args.none = args.minimal = True
+
+    # Non-minimal overrides minimal
+
+    if args.non_minimal:
+        args.minimal = False
 
     # Create the output directory, if required
 
@@ -317,7 +332,7 @@ def main():
     if args.files:
         try:
             for filename in args.files:
-                with open(filename, 'rt') as infile:
+                with open(filename, 'rt', encoding='utf8') as infile:
 
                     # Either write to stdout or to a temporary file
 

{skilleter_thingy-0.0.68 → skilleter_thingy-0.0.69/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.68
+Version: 0.0.69
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk