skilleter-thingy 0.0.68__py3-none-any.whl → 0.0.69__py3-none-any.whl

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.dist-info → skilleter_thingy-0.0.69.dist-info}/METADATA

@@ -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.dist-info → skilleter_thingy-0.0.69.dist-info}/RECORD

@@ -28,7 +28,7 @@ skilleter_thingy/moviemover.py,sha256=j_Xb9_jFdgpFBAXcF4tEqbnKH_FonlnUU39LiCK980
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=5gSjlINUxf3ZQl3NG0o7CsWwODvTbokIMIafLFvn8Hc,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
-skilleter_thingy/readable.py,sha256=0rwqS2kAJfw_uyl7h9d0ucqHYqrI61sM_7cZz_SFktY,14738
+skilleter_thingy/readable.py,sha256=HR68vsm5xki6UF_p_1c6Dqsy9Yi7kW4RI-Z7qsLKor8,15414
 skilleter_thingy/remdir.py,sha256=SkN9xEc1ckFGRP4zS2LUbx7Ihw697YMV0ybr_-afiyE,4653
 skilleter_thingy/rmdupe.py,sha256=tcX3w8XvliGwBMdSt9BUu07kuDtQEc0IiU8sCxmgzHA,17117
 skilleter_thingy/rpylint.py,sha256=TzZ5GvWrqgTKYKZwadTvzdbX-DJ8ll4WfVJqtN6IzO0,2635
@@ -60,9 +60,9 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
 skilleter_thingy/thingy/tidy.py,sha256=71DCyj0VJrj52RmjQyj1eOiQJIfy5EIPHuThOrS6ZTA,5876
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.0.68.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.68.dist-info/METADATA,sha256=Jz03ABA0JmvYxJ7GiKQJ4J3pYwtxzz1F5qQi_DTiIiU,5313
-skilleter_thingy-0.0.68.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-skilleter_thingy-0.0.68.dist-info/entry_points.txt,sha256=LxYRrQHkCGK-zjLXHqRdsUSUOoBbh7e8YUN1IVs5vIs,2072
-skilleter_thingy-0.0.68.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.68.dist-info/RECORD,,
+skilleter_thingy-0.0.69.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.69.dist-info/METADATA,sha256=bkdkX-7xamc-FoQaF6jy_Oko0Xc5qSEOCaIE-6FDT3c,5313
+skilleter_thingy-0.0.69.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+skilleter_thingy-0.0.69.dist-info/entry_points.txt,sha256=LxYRrQHkCGK-zjLXHqRdsUSUOoBbh7e8YUN1IVs5vIs,2072
+skilleter_thingy-0.0.69.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.69.dist-info/RECORD,,