Make command_line.py more testing friendly and add download tests

Author: jyapayne

command_line.py

@@ -105,9 +105,6 @@ def get_settings(self):
 
         contents = codecs.open(config_file, encoding='utf-8').read()
 
-        contents = contents.replace('{DEFAULT_DOWNLOAD_PATH}',
-                                    config.DEFAULT_DOWNLOAD_PATH)
-
         config_io = StringIO(contents)
         config_obj = ConfigObj(config_io, unrepr=True).dict()
 
@@ -362,7 +359,8 @@ def download_file_with_error_handling(self):
         in the GUI.
         """
         setting = self.files_to_download.pop()
-        location = self.get_setting('download_dir').value
+        location = (self.get_setting('download_dir').value or
+                    config.download_path())
         version = self.selected_version()
         path = setting.url.format(version, version)
 
@@ -583,7 +581,8 @@ def selected_version(self):
     def extract_files(self):
         """Extract nw.js files to the specific version path"""
         self.extract_error = None
-        location = self.get_setting('download_dir').value
+        location = (self.get_setting('download_dir').value or
+                    config.download_path())
 
         sdk_build_setting = self.get_setting('sdk_build')
         sdk_build = sdk_build_setting.value
@@ -1387,7 +1386,8 @@ def download_file(self, path, setting):
         """Download a file from the path and setting"""
         self.logger.info('Downloading file {}.'.format(path))
 
-        location = self.get_setting('download_dir').value
+        location = (self.get_setting('download_dir').value or
+                    config.download_path())
 
         sdk_build_setting = self.get_setting('sdk_build')
         sdk_build = sdk_build_setting.value
@@ -1496,7 +1496,7 @@ def error(self, message):
         sys.stderr.write('error: {}\n'.format(message))
         sys.exit(2)
 
-def get_arguments(command_base):
+def get_arguments(command_base, args=None):
     """Retrieves arguments from the command line"""
 
     parser = ArgParser(description=('Command line interface '
@@ -1535,6 +1535,9 @@ def get_arguments(command_base):
                         help=('Choose at least one system '
                               'to export to.'))
 
+    if args:
+        return parse.parse_args(args)
+
     return parser.parse_args()
 
 def generate_setting_args(command_base, parser):
@@ -1678,12 +1681,12 @@ def initialize_setting_values(args, command_base):
             if setting is not None:
                 setting.value = val
 
-def main():
+def main(args=None):
     """Main setup and argument parsing"""
     command_base = CommandBase()
     command_base.init()
 
-    args = get_arguments(command_base)
+    args = get_arguments(command_base, args)
 
     setup_logging(args, command_base)
     setup_directories(args, command_base)

config.py

@@ -19,6 +19,7 @@
 MAX_RECENT = 10
 
 DEBUG = False
+TESTING = False
 
 SSL_CONTEXT = ssl._create_unverified_context()
 
@@ -66,7 +67,6 @@ def is_installed():
 W2E_VER_FILE = 'files/version.txt'
 
 TEMP_DIR = utils.get_temp_dir()
-DEFAULT_DOWNLOAD_PATH = utils.get_data_path('files/downloads')
 
 ERROR_LOG_FILE = 'files/error.log'
 VER_FILE = 'files/nw-versions.txt'
@@ -91,6 +91,7 @@ def is_installed():
 ## Logger setup ----------------------------------------------
 
 LOG_FILENAME = utils.get_data_file_path(ERROR_LOG_FILE)
+
 if __name__ != '__main__':
     logging.basicConfig(
         filename=LOG_FILENAME,
@@ -104,15 +105,18 @@ def is_installed():
 ## Custom except hook to log all errors ----------------------
 
 def my_excepthook(type_, value, tback):
-    output_err = ''.join([x for x in traceback.format_exception(type_, value, tback)])
+    output_err = ''.join([x for x in traceback.format_exception(type_, value,
+                                                                tback)])
     logger.error('{}'.format(output_err))
     sys.__excepthook__(type_, value, tback)
 
 sys.excepthook = my_excepthook
 
-
-# Ensure that the default download path exists
-try:
-    os.makedirs(DEFAULT_DOWNLOAD_PATH)
-except:
-    pass
+def download_path(path=None):
+    # Ensure that the default download path exists
+    path = path or utils.get_data_path('files/downloads')
+    try:
+        os.makedirs(path)
+    except:
+        pass
+    return path

main.py

@@ -27,10 +27,11 @@
 import logging
 import platform
 
+import config
+
 import utils
 from utils import log, open_folder_in_explorer
 
-import config
 from config import get_file
 from config import __version__ as __gui_version__
 
@@ -730,7 +731,7 @@ def download_file(self, path, setting):
         sdk_build_setting = self.get_setting('sdk_build')
         sdk_build = sdk_build_setting.value
 
-        location = self.get_setting('download_dir').value
+        location = self.get_setting('download_dir').value or config.download_path()
 
         if sdk_build:
             # Switch the download URL if an sdk build is selected

tests/test_command_line.py

@@ -1,15 +1,23 @@
-from command_line import CommandBase
-import utils
+import os
 import config
+import utils
 import pytest
 
+from command_line import CommandBase
+
 api = pytest.mark.skipif(
     not pytest.config.getoption("--runapi"),
     reason="need --runapi option to run"
 )
 
 @pytest.fixture(scope='module')
 def command_base():
+    config.TESTING = True
+    dpath = utils.get_data_path('')
+
+    if os.path.exists(dpath):
+        utils.rmtree(dpath)
+
     base = CommandBase()
     base._project_name = 'Test'
     return base
@@ -71,7 +79,6 @@ def test_get_default_nwjs_branch(command_base):
     assert match != None
 
 def test_get_versions(command_base):
-    import os
     path = utils.get_data_file_path(config.VER_FILE)
 
     if os.path.exists(path):
@@ -83,4 +90,16 @@ def test_get_versions(command_base):
         data = ver_file.read()
         assert len(data) > 0
 
+def test_download_nwjs(command_base):
+    command_base.get_setting('nw_version').value = '0.19.0'
+    command_base.get_setting('windows-x64').value = True
+    command_base.init()
+    command_base.get_files_to_download()
+
+    command_base.download_file_with_error_handling()
+
+    base, _ = os.path.split(__file__)
 
+    assert os.path.exists(utils.path_join(base, 'test_data', 'files',
+                                          'downloads',
+                                          'nwjs-v0.19.0-win-x64.zip'))

util_classes.py

@@ -429,7 +429,7 @@ def save_file_path(self, version, location=None, sdk_build=False):
         if location:
             self.save_path = location
         else:
-            self.save_path = self.save_path or config.DEFAULT_DOWNLOAD_PATH
+            self.save_path = location or config.download_path()
 
 
         self.get_file_information_from_url()

utils.py

@@ -17,6 +17,7 @@
 import validators
 import traceback
 import logging
+import config
 
 from PySide import QtCore
 
@@ -136,9 +137,13 @@ def path_join(base, *rest):
     return rpath
 
 def get_data_path(dir_path):
+
     parts = dir_path.split('/')
-    dirs = AppDirs('Web2Executable', 'Web2Executable')
-    data_path = path_join(dirs.user_data_dir, *parts)
+    if config.TESTING:
+        data_path = path_join(config.CWD, 'tests', 'test_data', *parts)
+    else:
+        dirs = AppDirs('Web2Executable', 'Web2Executable')
+        data_path = path_join(dirs.user_data_dir, *parts)
 
     if is_windows():
         data_path = data_path.replace('\\', '/')