Modernising dodgy to be a bit more python3 now that python2 is proper…

…ly dead (tomorrow) and cleaning up some old fixes and added two PRs

.gitignore

@@ -33,3 +33,7 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+
+# localdev helpers
+env.txt
+.env

.travis.yml

@@ -1,10 +1,10 @@
 language: python
 python:
-  - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
 install:
   - "pip install nose coverage coveralls"
   - "pip install --editable ."

dodgy/__pkginfo__.py

@@ -1,4 +1,4 @@
-VERSION = (0, 1, 10)
+VERSION = (0, 2, 0)
 
 
 def get_version():

dodgy/run.py

@@ -62,18 +62,18 @@ def run_checks(directory, ignore_paths=None):
     return warnings
 
 
-def run(ignore_paths=None):
+def run(ignore_paths=None, zero_exit=False):
     warnings = run_checks(os.getcwd(), ignore_paths=ignore_paths)
 
-    if warnings:
-        output = json.dumps({"warnings": warnings}, indent=2)
-        sys.stdout.write(output + "\n")
-        return 1
+    output = json.dumps({"warnings": warnings}, indent=2)
+    sys.stdout.write(output + "\n")
 
-    return 0
+    if zero_exit:
+        sys.exit(0)
+    sys.exit(1 if warnings else 0)
 
-
-def main(argv=sys.argv):
+def main(argv=None):
+    argv = argv or sys.argv
     desc = (
         'A very basic tool to run against your codebase to search for "dodgy" looking values. '
         "It is a series of simple regular expressions designed to detect things such as "
@@ -90,10 +90,17 @@ def main(argv=sys.argv):
         metavar="IGNORE_PATH",
         help="Paths to ignore",
     )
-    args, _ = parser.parse_known_args(argv)
+    parser.add_argument(
+        "--zero-exit",
+        "-0",
+        dest="zero_exit",
+        help="Dodgy will exit with a code of 1 if problems are found. This flag ensures that it always returns with 0 unless an exception is raised.",
+        action="store_true",
+    )
 
-    run(ignore_paths=args.ignore)
+    args, _ = parser.parse_known_args(argv)
 
+    run(ignore_paths=args.ignore, zero_exit=args.zero_exit)
 
 if __name__ == "__main__":
     main()

setup.py

@@ -12,16 +12,18 @@
 _install_requires = []
 
 _classifiers = (
-    'Development Status :: 2 - Pre-Alpha',
+    'Development Status :: 7 - Inactive',
     'Environment :: Console',
     'Intended Audience :: Developers',
     'License :: OSI Approved :: MIT License',
     'Operating System :: Unix',
     'Topic :: Software Development :: Quality Assurance',
-    'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
 )
 
 setup(
@@ -31,7 +33,11 @@
     author_email='[email protected]',
     description=_short_description,
     install_requires=_install_requires,
-    scripts=['bin/dodgy'],
+    entry_points={
+        'console_scripts': [
+            'dodgy = dodgy.run:main',
+        ],
+    },
     version=__pkginfo__.get_version(),
     packages=_packages,
     license='MIT',