changed dependency-related command-line interface

Author: mbdevpl

.travis.yml

@@ -81,7 +81,7 @@ install:
   - pip install -U pip
   - pip install -U -r dev_requirements.txt
   # Java
-  - python -m open_fortran_parser --dev-deps
+  - python -m open_fortran_parser --deps
   - export CLASSPATH="${CLASSPATH}:$(pwd)/lib/*"
   - ant -Dpython=python
   - export CLASSPATH="${CLASSPATH}:$(pwd)/dist/*"

README.rst

@@ -455,7 +455,7 @@ Get dependencies, either manually, or using the provided script:
 .. code:: bash
 
     pip3 install -U -r requirements.txt
-    python3 -m open_fortran_parser --dev-deps
+    python3 -m open_fortran_parser --deps
     export CLASSPATH="${CLASSPATH}:$(pwd)/lib/*"
 
 Build:
@@ -580,7 +580,7 @@ You can make sure that dependencies are configured correctly by running:
 
 .. code:: bash
 
-    python3 -m open_fortran_parser --deps
+    python3 -m open_fortran_parser --check-deps
 
 If the depenencies changed since you first ran the wrapper from the source tree, you can cleanup
 outdated dependencies by executing:
@@ -597,7 +597,7 @@ as script
 
     $ python3 -m open_fortran_parser -h
     usage: open_fortran_parser [-h] [--version] [-v VERBOSITY]
-                               [--get-dependencies]
+                               [--check-dependencies]
                                [input] [output]
 
     Python wrapper around XML generator for Open Fortran Parser
@@ -612,8 +612,9 @@ as script
       --version             show program's version number and exit
       -v VERBOSITY, --verbosity VERBOSITY
                             level of verbosity, from 0 to 100 (default: 100)
-      --get-dependencies, --deps
-                            download dependencies and exit (default: False)
+      --check-dependencies, --check-deps
+                            check if all required dependencies are present and
+                            exit (default: False)
 
     Copyright 2017-2019 by the contributors, Apache License 2.0,
     https://github.com/mbdevpl/open-fortran-parser-xml

appveyor.yml

@@ -88,7 +88,7 @@ install:
   - python -m pip install -U pip
   - python -m pip install -U -r dev_requirements.txt
   # Java
-  - python -m open_fortran_parser --dev-deps
+  - python -m open_fortran_parser --deps
   - set CLASSPATH=%cd%\\lib\\*;%CLASSPATH%
   - ant -Dpython=python
   - set CLASSPATH=%cd%\\dist\\*;%CLASSPATH%

open_fortran_parser/config.py

@@ -6,9 +6,11 @@
 
 from ._version import VERSION
 
-DEV_DEPENDENCIES_PATH = pathlib.Path(os.getcwd(), 'lib')
+DEPENDENCIES_PATH = pathlib.Path(__file__).resolve().parent
+
+DEV_DEPENDENCIES_PATH = DEPENDENCIES_PATH.parent.joinpath('lib')
 
-DEV_DEPENDENCIES = {
+COMMON_DEPENDENCIES = {
     'ANTLR 3.5.2': (
         urllib.parse.urlparse(
             'https://github.com/mbdevpl/open-fortran-parser/releases/download/v0.8.5-1/'),
@@ -22,9 +24,9 @@
             'https://github.com/mbdevpl/open-fortran-parser-xml/releases/download/v0.1.0/'),
         pathlib.Path('commons-cli-1.4.jar'))}
 
-DEPENDENCIES_PATH = pathlib.Path(__file__).resolve().parent
+DEV_DEPENDENCIES = COMMON_DEPENDENCIES.copy()
 
-DEPENDENCIES = DEV_DEPENDENCIES.copy()
+DEPENDENCIES = COMMON_DEPENDENCIES.copy()
 
 DEPENDENCIES.update({
     'Open Fortran Parser XML {}'.format(VERSION): (

open_fortran_parser/main.py

@@ -38,22 +38,22 @@ def main(args=None, namespace=None):
         '-v', '--verbosity', type=int, default=100, help='''level of verbosity, from 0 to 100''')
     parser.add_argument(
         '--get-dependencies', '--deps', action='store_true',
-        help='''download dependencies and exit''')
+        help=argparse.SUPPRESS)  # download dependencies for development and exit
     parser.add_argument(
-        '--get-development-dependencies', '--dev-deps', action='store_true',
-        help=argparse.SUPPRESS)
+        '--check-dependencies', '--check-deps', action='store_true',
+        help='''check if all required dependencies are present and exit''')
     parser.add_argument(
         '--cleanup-dependencies', '--cleanup-deps', action='store_true',
-        help=argparse.SUPPRESS)
+        help=argparse.SUPPRESS)  # delete outdated development dependencies and exit
 
     args = parser.parse_args(args, namespace)
 
-    if args.get_development_dependencies:
+    if args.get_dependencies:
         ensure_dependencies(DEV_DEPENDENCIES, DEV_DEPENDENCIES_PATH)
         return
 
-    if args.get_dependencies:
-        ensure_dependencies(DEPENDENCIES, DEPENDENCIES_PATH)
+    if args.check_dependencies:
+        ensure_dependencies(DEPENDENCIES, DEPENDENCIES_PATH, download=False)
         return
 
     if args.cleanup_dependencies:

test/test_script.py

@@ -38,15 +38,17 @@ def test_help(self):
         self.assertIn('usage', text)
         self.assertIn('open_fortran_parser', text)
 
-    @unittest.skipUnless(os.environ.get('TEST_DEPENDENCIES'), 'skipping dependency test')
-    def test_deps_flag(self):
+    def test_check_deps_flag(self):
         sio = io.StringIO()
         with contextlib.redirect_stderr(sio):
-            run_module('open_fortran_parser', '--deps')
+            run_module('open_fortran_parser', '--check-deps')
         self.assertGreater(len(sio.getvalue()), 0)
         self.assertGreater(len(os.listdir(str(DEPENDENCIES_PATH))), 0)
 
-        run_module('open_fortran_parser', '--dev-deps')
+    @unittest.skipUnless(os.environ.get('TEST_DEPENDENCIES'), 'skipping dependency test')
+    def test_development_flags(self):
+        run_module('open_fortran_parser', '--deps')
+        run_module('open_fortran_parser', '--cleanup-deps')
         self.assertGreater(len(os.listdir(str(DEV_DEPENDENCIES_PATH))), 0)
 
     def test_verbosity_flag(self):