Fix #26 --version command and fork information in help output

tkruse · tkruse · commit e3760e92c6e0 · 2019-02-24T16:34:30.000+09:00
diff --git a/cpplint.py b/cpplint.py
@@ -59,6 +59,8 @@
 # if empty, use defaults
 _valid_extensions = set([])
 
+__VERSION__ = '1.4.4'
+
 try:
   xrange          # Python 2
 except NameError:
@@ -76,8 +78,12 @@
                    [--exclude=path]
                    [--extensions=hpp,cpp,...]
                    [--quiet]
+                   [--version]
         <file> [file] ...
 
+  Style checker for C/C++ source files.
+  This is a fork of the Google style checker with minor extensions.
+
   The style guidelines this tries to follow are those in
     https://google.github.io/styleguide/cppguide.html
 
@@ -6393,6 +6399,11 @@ def PrintUsage(message):
   else:
     sys.exit(0)
 
+def PrintVersion():
+  print('Cpplint fork (https://github.com/cpplint/cpplint)')
+  print('cpplint ' + __VERSION__)
+  print('Python ' + sys.version)
+  sys.exit(0)
 
 def PrintCategories():
   """Prints a list of all the error-categories used by error messages.
@@ -6416,6 +6427,8 @@ def ParseArguments(args):
   """
   try:
     (opts, filenames) = getopt.getopt(args, '', ['help', 'output=', 'verbose=',
+                                                 'v=',
+                                                 'version',
                                                  'counting=',
                                                  'filter=',
                                                  'root=',
@@ -6439,14 +6452,16 @@ def ParseArguments(args):
   for (opt, val) in opts:
     if opt == '--help':
       PrintUsage(None)
+    if opt == '--version':
+      PrintVersion()
     elif opt == '--output':
       if val not in ('emacs', 'vs7', 'eclipse', 'junit'):
         PrintUsage('The only allowed output formats are emacs, vs7, eclipse '
                    'and junit.')
       output_format = val
     elif opt == '--quiet':
       quiet = True
-    elif opt == '--verbose':
+    elif opt == '--verbose' or opt == '--v':
       verbosity = int(val)
     elif opt == '--filter':
       filters = val
diff --git a/cpplint_unittest.py b/cpplint_unittest.py
@@ -3974,6 +3974,7 @@ def testParseArguments(self):
       self.assertRaises(SystemExit, cpplint.ParseArguments, [])
       self.assertRaises(SystemExit, cpplint.ParseArguments, ['--badopt'])
       self.assertRaises(SystemExit, cpplint.ParseArguments, ['--help'])
+      self.assertRaises(SystemExit, cpplint.ParseArguments, ['--version'])
       self.assertRaises(SystemExit, cpplint.ParseArguments, ['--v=0'])
       self.assertRaises(SystemExit, cpplint.ParseArguments, ['--filter='])
       # This is illegal because all filters must start with + or -
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 from subprocess import check_call
 from multiprocessing import cpu_count
 from distutils.spawn import find_executable
-
+import cpplint as cpplint
 
 class Test(TestCommand):
     def run_tests(self):
@@ -56,7 +56,7 @@ def run(self):
 
 
 setup(name='cpplint',
-      version='1.4.3',
+      version=cpplint.__VERSION__,
       py_modules=['cpplint'],
       # generate platform specific start script
       entry_points={
