Added new option -m --multi to remove multiple whitespaces

Fixes #40

Author: dietmarw

setup.py

@@ -24,7 +24,7 @@
 META = {
     'name': 'ttws',
     'url': 'https://github.com/simulatino/trimtrailingwhitespaces',
-    'version': '0.8.4',
+    'version': '0.8.5',
     'description': 'Script to remove trailing whitespaces from textfiles and more.',
     'classifiers': CLASSIFIERS,
     'license': 'UNLICENSE',

ttws/__init__.py

@@ -24,6 +24,7 @@
 import os
 import textwrap
 import io
+import re
 
 from pyparsing import (White, Keyword, nestedExpr, lineEnd, Suppress,
                        ZeroOrMore, Optional, ParseException, FollowedBy,
@@ -82,15 +83,17 @@ def detecttype(filepath):
             return "unknown"
 
 
-def trimWhitespace(filepath, eol):
+def trimWhitespace(filepath, multiOpt, eol):
     """Trim trailing white spaces from a given filepath."""
     try:
-        with io.open(filepath, "r", encoding='utf-8-sig') as source:
-            lines = [line.rstrip() for line in source]
-            while len(lines) > 1 and not lines[-1]:
-                lines.pop(-1)
-        with io.open(filepath, "w", newline="") as target:
-            target.write(eol.join(lines) + eol)
+        with open(filepath, "r", encoding='utf-8-sig') as f:
+            lines = f.readlines()
+        with open(filepath, "w", newline=eol) as f:
+            for line in lines:
+                if multiOpt and not line.lstrip().startswith('//'):
+                    line = re.sub(r'(?<=\S)[\s]+', ' ', line)
+                f.write(line.rstrip() + eol)
+
     except (UnicodeDecodeError, TypeError) as err:
         print("\nOops! Failing to process file: %s\n"
               "Are you sure it is of pure ASCII or UTF8 encoding?\n"

ttws/cli.py

@@ -17,8 +17,7 @@ def main(args=None):
 
     # Look for optional arguments:
     try:
-        opts, dirnames = getopt.getopt(args, "hvsbc", ["help", "version", "strip", "blanks", "clean",
-                                                       "eol="])
+        opts, dirnames = getopt.getopt(args, "hvsbcm", ["help", "version", "strip", "blanks", "clean", "multi", "eol="])
     # If unknown option is given trigger the display message:
     except getopt.GetoptError:
         unknownOption(args)
@@ -30,6 +29,7 @@ def main(args=None):
 
     # If help option is given display help otherwise display warning:
     cleanOpt = False
+    multiOpt = False
     stripOpt = False
     eol = os.linesep
     for opt, arg in opts:
@@ -41,6 +41,8 @@ def main(args=None):
             sys.exit(0)
         elif opt in ("-c", "--clean"):
             cleanOpt = True
+        elif opt in ("-m", "--multi"):
+            multiOpt = True
         elif opt in ("-b", "--blanks"):
             os.system('for fn in `find -name "*.mo"`; do cat -s $fn >$fn.1; mv $fn.1 $fn; done')
             sys.exit(0)
@@ -73,15 +75,15 @@ def main(args=None):
                     filetype = detecttype(filepath)
                     if filetype is "mo" and cleanOpt is True:
                         print("trimming and cleaning %s" % filepath)
-                        trimWhitespace(filepath, eol)
+                        trimWhitespace(filepath, multiOpt, eol)
                         cleanAnnotation(filepath, eol)
                     elif filetype is "mo" and stripOpt is True:
                         print("trimming and stripping %s" % filepath)
-                        trimWhitespace(filepath, eol)
+                        trimWhitespace(filepath, multiOpt, eol)
                         stripDocString(filepath, eol)
                     elif filetype is "mo" or filetype is "text":
                         print("trimming %s" % filepath)
-                        trimWhitespace(filepath, eol)
+                        trimWhitespace(filepath, multiOpt, eol)
                     else:
                         print("skipping file of type %s: %s" % (filetype, filepath))
 
@@ -134,6 +136,12 @@ def usage(script_name):
                 Only use this if your code is under version control
                 and in combination with a careful code-diff review.
 
+            -m, --multi
+                Replaces multiple inline whitespaces by one whitespace.
+                It ignores commented lines starting with '//'
+                CAREFUL: It will damage whitespace sensitive documentation
+                         like verbatim code snippets!
+
             -b, --blanks
                 suppress repeated empty output lines from *.mo files
                 (This option should not be run in combination with others.)