Merge pull request #65 from Anaconda-Platform/move-cli

Move cli to an internal package for clarity

anaconda_project/cli.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# ----------------------------------------------------------------------------
+# Copyright © 2016, Continuum Analytics, Inc. All rights reserved.
+#
+# The full license is in the file LICENSE.txt, distributed with this software.
+# ----------------------------------------------------------------------------
+"""The ``main`` function chooses and runs a subcommand."""
+from __future__ import absolute_import, print_function
+
+# the point of this file is to make the internal main() into a public
+# entry point.
+from anaconda_project.internal.cli.main import main  # noqa: F401

anaconda_project/commands/activate.py → anaconda_project/internal/cli/activate.py

@@ -14,8 +14,8 @@
 except ImportError:  # pragma: no cover (py2 only)
     from pipes import quote
 
-from anaconda_project.commands.prepare_with_mode import prepare_with_ui_mode_printing_errors
-from anaconda_project.commands.project_load import load_project
+from anaconda_project.internal.cli.prepare_with_mode import prepare_with_ui_mode_printing_errors
+from anaconda_project.internal.cli.project_load import load_project
 
 
 def activate(dirname, ui_mode, conda_environment, command_name):

anaconda_project/commands/archive.py → anaconda_project/internal/cli/archive.py

@@ -7,8 +7,8 @@
 """The ``archive`` command makes an archive of the project."""
 from __future__ import absolute_import, print_function
 
-from anaconda_project.commands.project_load import load_project
-from anaconda_project.commands import console_utils
+from anaconda_project.internal.cli.project_load import load_project
+from anaconda_project.internal.cli import console_utils
 import anaconda_project.project_ops as project_ops
 
 

anaconda_project/commands/bug_handler.py → anaconda_project/internal/cli/bug_handler.py

@@ -9,7 +9,7 @@
 
 import sys
 
-import anaconda_project.commands.console_utils as console_utils
+import anaconda_project.internal.cli.console_utils as console_utils
 from anaconda_project.internal.slugify import slugify
 
 

anaconda_project/commands/clean.py → anaconda_project/internal/cli/clean.py

@@ -7,10 +7,10 @@
 """The ``clean`` command removes generated state."""
 from __future__ import absolute_import, print_function
 
-from anaconda_project.commands.project_load import load_project
+from anaconda_project.internal.cli.project_load import load_project
 from anaconda_project.prepare import prepare_without_interaction
 from anaconda_project.provide import PROVIDE_MODE_CHECK
-from anaconda_project.commands import console_utils
+from anaconda_project.internal.cli import console_utils
 import anaconda_project.project_ops as project_ops
 
 

anaconda_project/commands/command_commands.py → anaconda_project/internal/cli/command_commands.py

@@ -11,9 +11,9 @@
 import platform
 import sys
 
-from anaconda_project.commands.project_load import load_project
+from anaconda_project.internal.cli.project_load import load_project
 from anaconda_project import project_ops
-from anaconda_project.commands import console_utils
+from anaconda_project.internal.cli import console_utils
 
 
 def _ask_command(command):

anaconda_project/commands/download_commands.py → anaconda_project/internal/cli/download_commands.py

@@ -9,9 +9,9 @@
 
 import sys
 
-from anaconda_project.commands.project_load import load_project
+from anaconda_project.internal.cli.project_load import load_project
 from anaconda_project import project_ops
-from anaconda_project.commands import console_utils
+from anaconda_project.internal.cli import console_utils
 from anaconda_project.prepare import prepare_without_interaction
 from anaconda_project.provide import PROVIDE_MODE_CHECK
 

anaconda_project/commands/environment_commands.py → anaconda_project/internal/cli/environment_commands.py

@@ -9,9 +9,9 @@
 
 import sys
 
-from anaconda_project.commands.project_load import load_project
+from anaconda_project.internal.cli.project_load import load_project
 from anaconda_project import project_ops
-from anaconda_project.commands import console_utils
+from anaconda_project.internal.cli import console_utils
 
 
 def _handle_status(status, success_message=None):

anaconda_project/commands/init.py → anaconda_project/internal/cli/init.py

@@ -10,7 +10,7 @@
 import os
 
 from anaconda_project import project_ops
-from anaconda_project.commands.console_utils import (print_project_problems, console_ask_yes_or_no)
+from anaconda_project.internal.cli.console_utils import (print_project_problems, console_ask_yes_or_no)
 
 
 def init_command(project_dir, assume_yes):

anaconda_project/commands/main.py → anaconda_project/internal/cli/main.py

@@ -12,28 +12,28 @@
 import sys
 from argparse import ArgumentParser, REMAINDER
 
-from anaconda_project.commands.prepare_with_mode import (UI_MODE_TEXT_ASK_QUESTIONS,
-                                                         UI_MODE_TEXT_DEVELOPMENT_DEFAULTS_OR_ASK, _all_ui_modes)
+from anaconda_project.internal.cli.prepare_with_mode import (UI_MODE_TEXT_ASK_QUESTIONS,
+                                                             UI_MODE_TEXT_DEVELOPMENT_DEFAULTS_OR_ASK, _all_ui_modes)
 from anaconda_project.version import version
 from anaconda_project.verbose import push_verbose_logger, pop_verbose_logger
 from anaconda_project.project import ALL_COMMAND_TYPES
 from anaconda_project.plugins.registry import PluginRegistry
 from anaconda_project.plugins.requirements.download import _hash_algorithms
 import anaconda_project
-from anaconda_project.commands.bug_handler import handle_bugs
-import anaconda_project.commands.init as init
-import anaconda_project.commands.run as run
-import anaconda_project.commands.prepare as prepare
-import anaconda_project.commands.clean as clean
-import anaconda_project.commands.archive as archive
-import anaconda_project.commands.unarchive as unarchive
-import anaconda_project.commands.upload as upload
-import anaconda_project.commands.activate as activate
-import anaconda_project.commands.variable_commands as variable_commands
-import anaconda_project.commands.download_commands as download_commands
-import anaconda_project.commands.service_commands as service_commands
-import anaconda_project.commands.environment_commands as environment_commands
-import anaconda_project.commands.command_commands as command_commands
+from anaconda_project.internal.cli.bug_handler import handle_bugs
+import anaconda_project.internal.cli.init as init
+import anaconda_project.internal.cli.run as run
+import anaconda_project.internal.cli.prepare as prepare
+import anaconda_project.internal.cli.clean as clean
+import anaconda_project.internal.cli.archive as archive
+import anaconda_project.internal.cli.unarchive as unarchive
+import anaconda_project.internal.cli.upload as upload
+import anaconda_project.internal.cli.activate as activate
+import anaconda_project.internal.cli.variable_commands as variable_commands
+import anaconda_project.internal.cli.download_commands as download_commands
+import anaconda_project.internal.cli.service_commands as service_commands
+import anaconda_project.internal.cli.environment_commands as environment_commands
+import anaconda_project.internal.cli.command_commands as command_commands
 
 
 def _parse_args_and_run_subcommand(argv):

anaconda_project/commands/prepare.py → anaconda_project/internal/cli/prepare.py

@@ -7,8 +7,8 @@
 """The ``prepare`` command configures a project to run, asking the user questions if necessary."""
 from __future__ import absolute_import, print_function
 
-from anaconda_project.commands.prepare_with_mode import prepare_with_ui_mode_printing_errors
-from anaconda_project.commands.project_load import load_project
+from anaconda_project.internal.cli.prepare_with_mode import prepare_with_ui_mode_printing_errors
+from anaconda_project.internal.cli.project_load import load_project
 
 
 def prepare_command(project_dir, ui_mode, conda_environment, command_name):

anaconda_project/commands/prepare_with_mode.py → anaconda_project/internal/cli/prepare_with_mode.py

@@ -14,7 +14,7 @@
 
 from anaconda_project.provide import (PROVIDE_MODE_PRODUCTION, PROVIDE_MODE_DEVELOPMENT, PROVIDE_MODE_CHECK)
 
-import anaconda_project.commands.console_utils as console_utils
+import anaconda_project.internal.cli.console_utils as console_utils
 
 # these UI_MODE_ strings are used as values for command line options, so they are user-visible
 

anaconda_project/commands/project_load.py → anaconda_project/internal/cli/project_load.py

@@ -9,7 +9,7 @@
 
 from anaconda_project.project import Project
 
-import anaconda_project.commands.console_utils as console_utils
+import anaconda_project.internal.cli.console_utils as console_utils
 
 
 def load_project(dirname):

anaconda_project/commands/run.py → anaconda_project/internal/cli/run.py

@@ -9,8 +9,8 @@
 
 import sys
 
-from anaconda_project.commands.prepare_with_mode import prepare_with_ui_mode_printing_errors
-from anaconda_project.commands.project_load import load_project
+from anaconda_project.internal.cli.prepare_with_mode import prepare_with_ui_mode_printing_errors
+from anaconda_project.internal.cli.project_load import load_project
 from anaconda_project.project_commands import ProjectCommand
 
 

anaconda_project/commands/service_commands.py → anaconda_project/internal/cli/service_commands.py

@@ -7,9 +7,9 @@
 """Commands related to the downloads section."""
 from __future__ import absolute_import, print_function
 
-from anaconda_project.commands.project_load import load_project
+from anaconda_project.internal.cli.project_load import load_project
 from anaconda_project import project_ops
-from anaconda_project.commands import console_utils
+from anaconda_project.internal.cli import console_utils
 from anaconda_project.prepare import prepare_without_interaction
 from anaconda_project.provide import PROVIDE_MODE_CHECK
 

anaconda_project/commands/test/test_activate.py → anaconda_project/internal/cli/test/test_activate.py

@@ -13,9 +13,9 @@
 
 import platform
 
-from anaconda_project.commands.main import _parse_args_and_run_subcommand
-from anaconda_project.commands.activate import activate, main
-from anaconda_project.commands.prepare_with_mode import UI_MODE_TEXT_ASSUME_YES_DEVELOPMENT
+from anaconda_project.internal.cli.main import _parse_args_and_run_subcommand
+from anaconda_project.internal.cli.activate import activate, main
+from anaconda_project.internal.cli.prepare_with_mode import UI_MODE_TEXT_ASSUME_YES_DEVELOPMENT
 from anaconda_project.internal.test.tmpfile_utils import with_directory_contents_completing_project_file
 from anaconda_project.project_file import DEFAULT_PROJECT_FILENAME
 from anaconda_project.local_state_file import DEFAULT_LOCAL_STATE_FILENAME

anaconda_project/commands/test/test_bug_handler.py → anaconda_project/internal/cli/test/test_bug_handler.py

@@ -10,7 +10,7 @@
 import os
 import pytest
 
-from anaconda_project.commands.bug_handler import handle_bugs
+from anaconda_project.internal.cli.bug_handler import handle_bugs
 
 
 def test_no_bug_happens(capsys):
@@ -31,7 +31,7 @@ def test_bug_handling(capsys, monkeypatch):
     def mock_is_interactive():
         return True
 
-    monkeypatch.setattr('anaconda_project.commands.console_utils.stdin_is_interactive', mock_is_interactive)
+    monkeypatch.setattr('anaconda_project.internal.cli.console_utils.stdin_is_interactive', mock_is_interactive)
 
     def buggy_main():
         raise AssertionError("It did not work")
@@ -77,7 +77,7 @@ def test_bug_handling_not_interactive(capsys, monkeypatch):
     def mock_is_interactive():
         return False
 
-    monkeypatch.setattr('anaconda_project.commands.console_utils.stdin_is_interactive', mock_is_interactive)
+    monkeypatch.setattr('anaconda_project.internal.cli.console_utils.stdin_is_interactive', mock_is_interactive)
 
     def buggy_main():
         raise AssertionError("It did not work")

anaconda_project/commands/test/test_bundle.py → anaconda_project/internal/cli/test/test_bundle.py

@@ -9,7 +9,7 @@
 import os
 import zipfile
 
-from anaconda_project.commands.main import _parse_args_and_run_subcommand
+from anaconda_project.internal.cli.main import _parse_args_and_run_subcommand
 from anaconda_project.internal.test.tmpfile_utils import (with_directory_contents,
                                                           with_directory_contents_completing_project_file)
 from anaconda_project.project_file import DEFAULT_PROJECT_FILENAME

anaconda_project/commands/test/test_clean.py → anaconda_project/internal/cli/test/test_clean.py

@@ -6,7 +6,7 @@
 # ----------------------------------------------------------------------------
 from __future__ import absolute_import, print_function
 
-from anaconda_project.commands.main import _parse_args_and_run_subcommand
+from anaconda_project.internal.cli.main import _parse_args_and_run_subcommand
 from anaconda_project.internal.test.tmpfile_utils import with_directory_contents_completing_project_file
 from anaconda_project.project_file import DEFAULT_PROJECT_FILENAME
 

anaconda_project/commands/test/test_command_commands.py → anaconda_project/internal/cli/test/test_command_commands.py

@@ -8,8 +8,8 @@
 
 import pytest
 
-from anaconda_project.commands.command_commands import main
-from anaconda_project.commands.main import _parse_args_and_run_subcommand
+from anaconda_project.internal.cli.command_commands import main
+from anaconda_project.internal.cli.main import _parse_args_and_run_subcommand
 from anaconda_project.internal.test.tmpfile_utils import with_directory_contents_completing_project_file
 from anaconda_project.project_file import DEFAULT_PROJECT_FILENAME
 from anaconda_project.project import Project
@@ -30,12 +30,12 @@ def check_ask_type(dirname):
         def mock_is_interactive():
             return True
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils.stdin_is_interactive', mock_is_interactive)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils.stdin_is_interactive', mock_is_interactive)
 
         def mock_console_input(prompt):
             return "b"
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils.console_input', mock_console_input)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils.console_input', mock_console_input)
 
         args = Args(None, 'test', 'file.py', directory=dirname)
         res = main(args)
@@ -56,7 +56,7 @@ def check(dirname):
         def mock_is_interactive():
             return False
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils.stdin_is_interactive', mock_is_interactive)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils.stdin_is_interactive', mock_is_interactive)
 
         args = Args(None, 'test', 'file.py', directory=dirname)
         res = main(args)
@@ -74,12 +74,12 @@ def check_ask_type(dirname):
         def mock_is_interactive():
             return True
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils.stdin_is_interactive', mock_is_interactive)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils.stdin_is_interactive', mock_is_interactive)
 
         def mock_input(prompt):
             raise KeyboardInterrupt('^C')
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils._input', mock_input)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils._input', mock_input)
 
         args = Args(None, 'test', 'file.py', directory=dirname)
         with pytest.raises(SystemExit) as excinfo:
@@ -98,12 +98,12 @@ def check(dirname):
         def mock_is_interactive():
             return True
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils.stdin_is_interactive', mock_is_interactive)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils.stdin_is_interactive', mock_is_interactive)
 
         def mock_console_input(prompt):
             return "c"
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils.console_input', mock_console_input)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils.console_input', mock_console_input)
 
         def mock_system():
             return "Linux"
@@ -129,12 +129,12 @@ def check(dirname):
         def mock_is_interactive():
             return True
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils.stdin_is_interactive', mock_is_interactive)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils.stdin_is_interactive', mock_is_interactive)
 
         def mock_console_input(prompt):
             return "c"
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils.console_input', mock_console_input)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils.console_input', mock_console_input)
 
         def mock_system():
             return "Windows"
@@ -160,7 +160,7 @@ def check_ask_type(dirname):
         def mock_is_interactive():
             return True
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils.stdin_is_interactive', mock_is_interactive)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils.stdin_is_interactive', mock_is_interactive)
 
         calls = []
 
@@ -169,7 +169,7 @@ def mock_console_input(prompt):
             calls.append(True)
             return res
 
-        monkeypatch.setattr('anaconda_project.commands.console_utils.console_input', mock_console_input)
+        monkeypatch.setattr('anaconda_project.internal.cli.console_utils.console_input', mock_console_input)
 
         args = Args(None, 'test', 'file.py', directory=dirname)
         res = main(args)

anaconda_project/commands/test/test_console_utils.py → anaconda_project/internal/cli/test/test_console_utils.py

@@ -8,7 +8,7 @@
 
 import sys
 
-import anaconda_project.commands.console_utils as console_utils
+import anaconda_project.internal.cli.console_utils as console_utils
 
 
 def test_stdin_is_interactive(monkeypatch):
@@ -32,7 +32,7 @@ def mock_input(prompt):
         else:
             return item
 
-    monkeypatch.setattr('anaconda_project.commands.console_utils._input', mock_input)
+    monkeypatch.setattr('anaconda_project.internal.cli.console_utils._input', mock_input)
 
 
 def _monkeypatch_getpass(monkeypatch, answer):
@@ -59,7 +59,7 @@ def mock_isatty_true():
         return True
 
     # python 2 can throw a "readonly" error if you try to patch sys.stdin.isatty itself
-    monkeypatch.setattr('anaconda_project.commands.console_utils.stdin_is_interactive', mock_isatty_true)
+    monkeypatch.setattr('anaconda_project.internal.cli.console_utils.stdin_is_interactive', mock_isatty_true)
 
     for answer in ("y", "Y", "yes", "Yes", "YES", "yoyo"):
         _monkeypatch_input(monkeypatch, answer)
@@ -113,7 +113,7 @@ def mock_isatty_true():
         return True
 
     # python 2 can throw a "readonly" error if you try to patch sys.stdin.isatty itself
-    monkeypatch.setattr('anaconda_project.commands.console_utils.stdin_is_interactive', mock_isatty_true)
+    monkeypatch.setattr('anaconda_project.internal.cli.console_utils.stdin_is_interactive', mock_isatty_true)
 
     _monkeypatch_getpass(monkeypatch, "s3kr3t")
 

anaconda_project/commands/test/test_download_commands.py → anaconda_project/internal/cli/test/test_download_commands.py

@@ -8,7 +8,7 @@
 
 import os
 
-from anaconda_project.commands.main import _parse_args_and_run_subcommand
+from anaconda_project.internal.cli.main import _parse_args_and_run_subcommand
 from anaconda_project.internal.test.tmpfile_utils import with_directory_contents_completing_project_file
 from anaconda_project.project import Project
 from anaconda_project.project_file import DEFAULT_PROJECT_FILENAME