Merge pull request #378 from JrGoodle/refactor

Various refactoring
JrGoodle · Nov 7, 2017 · 88fe78f · 88fe78f
2 parents 80badd1 + d942c8d
commit 88fe78f
Show file tree

Hide file tree

Showing 32 changed files with 207 additions and 284 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -1,8 +1,6 @@
 version: "2"
 
 engines:
-  markdownlint:
-    enabled: true
   pep8:
     enabled: true
   shellcheck:
@@ -12,7 +10,6 @@ ratings:
   paths:
   - "**.py"
   - "**.sh"
-  - "**.md"
 
 checks:
   argument-count:

diff --git a/README.md b/README.md
@@ -1,7 +1,8 @@
 # `clowder`
 [![Build Status](https://travis-ci.org/JrGoodle/clowder.svg)](https://travis-ci.org/JrGoodle/clowder)
 [![Coverage Status](https://coveralls.io/repos/github/JrGoodle/clowder/badge.svg?branch=master)](https://coveralls.io/github/JrGoodle/clowder?branch=master)
-[![Issue Count](https://codeclimate.com/github/JrGoodle/clowder/badges/issue_count.svg)](https://codeclimate.com/github/JrGoodle/clowder)
+[![Maintainability](https://api.codeclimate.com/v1/badges/56c92799de08f9ef9258/maintainability)](https://codeclimate.com/github/JrGoodle/clowder/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/56c92799de08f9ef9258/test_coverage)](https://codeclimate.com/github/JrGoodle/clowder/test_coverage)
 [![PyPI version](https://badge.fury.io/py/clowder-repo.svg)](https://badge.fury.io/py/clowder-repo)
 [![Python version](https://img.shields.io/pypi/pyversions/clowder-repo.svg)](https://pypi.python.org/pypi/clowder-repo)
 [![License](https://img.shields.io/pypi/l/clowder-repo.svg)](https://pypi.python.org/pypi/clowder-repo)

diff --git a/clowder/clowder/cli/branch_controller.py b/clowder/clowder/cli/branch_controller.py
@@ -7,16 +7,16 @@
 
 from cement.ext.ext_argparse import ArgparseController, expose
 
-from clowder.cli.globals import CLOWDER_CONTROLLER
-from clowder.cli.util import (
+from clowder.clowder_controller import CLOWDER_CONTROLLER
+from clowder.clowder_repo import print_clowder_repo_status
+from clowder.util.decorators import valid_clowder_yaml_required
+from clowder.util.clowder_utils import (
     filter_groups,
     filter_projects_on_project_names,
     options_help_message,
     run_group_command,
     run_project_command
 )
-from clowder.clowder_repo import print_clowder_repo_status
-from clowder.util.decorators import valid_clowder_yaml_required
 
 
 class BranchController(ArgparseController):

diff --git a/clowder/clowder/cli/checkout_controller.py b/clowder/clowder/cli/checkout_controller.py
@@ -7,16 +7,16 @@
 
 from cement.ext.ext_argparse import ArgparseController, expose
 
-from clowder.cli.globals import CLOWDER_CONTROLLER
-from clowder.cli.util import (
+from clowder.clowder_controller import CLOWDER_CONTROLLER
+from clowder.clowder_repo import print_clowder_repo_status
+from clowder.util.decorators import valid_clowder_yaml_required
+from clowder.util.clowder_utils import (
     filter_groups,
     filter_projects_on_project_names,
     options_help_message,
     run_group_command,
     run_project_command
 )
-from clowder.clowder_repo import print_clowder_repo_status
-from clowder.util.decorators import valid_clowder_yaml_required
 
 
 class CheckoutController(ArgparseController):

diff --git a/clowder/clowder/cli/clean_controller.py b/clowder/clowder/cli/clean_controller.py
@@ -7,16 +7,16 @@
 
 from cement.ext.ext_argparse import ArgparseController, expose
 
-from clowder.cli.globals import CLOWDER_CONTROLLER
-from clowder.cli.util import (
+from clowder.clowder_controller import CLOWDER_CONTROLLER
+from clowder.clowder_repo import print_clowder_repo_status
+from clowder.util.decorators import valid_clowder_yaml_required
+from clowder.util.clowder_utils import (
     filter_groups,
     filter_projects_on_project_names,
     options_help_message,
     run_group_command,
     run_project_command
 )
-from clowder.clowder_repo import print_clowder_repo_status
-from clowder.util.decorators import valid_clowder_yaml_required
 
 
 class CleanController(ArgparseController):

diff --git a/clowder/clowder/cli/diff_controller.py b/clowder/clowder/cli/diff_controller.py
@@ -7,16 +7,16 @@
 
 from cement.ext.ext_argparse import ArgparseController, expose
 
-from clowder.cli.globals import CLOWDER_CONTROLLER
-from clowder.cli.util import (
+from clowder.clowder_controller import CLOWDER_CONTROLLER
+from clowder.clowder_repo import print_clowder_repo_status
+from clowder.util.decorators import valid_clowder_yaml_required
+from clowder.util.clowder_utils import (
     filter_groups,
     filter_projects_on_project_names,
     options_help_message,
     run_group_command,
     run_project_command
 )
-from clowder.clowder_repo import print_clowder_repo_status
-from clowder.util.decorators import valid_clowder_yaml_required
 
 
 class DiffController(ArgparseController):

diff --git a/clowder/clowder/cli/forall_controller.py b/clowder/clowder/cli/forall_controller.py
@@ -7,11 +7,11 @@
 
 from cement.ext.ext_argparse import ArgparseController, expose
 
-from clowder.cli.globals import CLOWDER_CONTROLLER
-from clowder.cli.parallel import forall
-from clowder.cli.util import options_help_message
+from clowder.cli.parallel_commands import forall
+from clowder.clowder_controller import CLOWDER_CONTROLLER
 from clowder.clowder_repo import print_clowder_repo_status
 from clowder.util.decorators import valid_clowder_yaml_required
+from clowder.util.clowder_utils import options_help_message
 
 
 class ForallController(ArgparseController):

diff --git a/clowder/clowder/cli/globals.py b/clowder/clowder/cli/globals.py
diff --git a/clowder/clowder/cli/herd_controller.py b/clowder/clowder/cli/herd_controller.py
@@ -7,15 +7,15 @@
 
 from cement.ext.ext_argparse import ArgparseController, expose
 
-from clowder.cli.globals import CLOWDER_CONTROLLER
-from clowder.cli.parallel import (
+from clowder.cli.parallel_commands import (
     herd,
     herd_parallel
 )
-from clowder.cli.util import options_help_message
+from clowder.clowder_controller import CLOWDER_CONTROLLER
 from clowder.clowder_repo import print_clowder_repo_status_fetch
-from clowder.util.decorators import valid_clowder_yaml_required
 from clowder.util.connectivity import network_connection_required
+from clowder.util.decorators import valid_clowder_yaml_required
+from clowder.util.clowder_utils import options_help_message
 
 
 class HerdController(ArgparseController):
@@ -73,7 +73,9 @@ def _herd(self):
         kwargs = {'group_names': self.app.pargs.groups, 'project_names': self.app.pargs.projects,
                   'skip': self.app.pargs.skip, 'branch': branch, 'tag': tag,
                   'depth': depth, 'rebase': self.app.pargs.rebase, 'protocol': protocol}
+
         if self.app.pargs.parallel:
             herd_parallel(CLOWDER_CONTROLLER, **kwargs)
             return
+
         herd(CLOWDER_CONTROLLER, **kwargs)
diff --git a/clowder/clowder/cli/link_controller.py b/clowder/clowder/cli/link_controller.py
@@ -7,15 +7,15 @@
 
 from cement.ext.ext_argparse import ArgparseController, expose
 
-from clowder.cli.util import (
-    get_saved_version_names,
-    options_help_message
-)
 from clowder.clowder_repo import (
     CLOWDER_REPO,
     print_clowder_repo_status
 )
 from clowder.util.decorators import clowder_required
+from clowder.util.clowder_utils import (
+    get_saved_version_names,
+    options_help_message
+)
 
 
 class LinkController(ArgparseController):

diff --git a/clowder/clowder/cli/parallel.py → clowder/clowder/cli/parallel_commands.py b/clowder/clowder/cli/parallel.py → clowder/clowder/cli/parallel_commands.py
@@ -16,7 +16,8 @@
 from termcolor import cprint
 
 import clowder.util.formatting as fmt
-from clowder.cli.util import (
+from clowder.util.progress import Progress
+from clowder.util.clowder_utils import (
     filter_groups,
     filter_projects_on_group_names,
     filter_projects_on_project_names,
@@ -27,7 +28,6 @@
     validate_groups,
     validate_projects
 )
-from clowder.util.progress import Progress
 
 
 def herd_project(project, branch, tag, depth, rebase, protocol):
@@ -225,22 +225,16 @@ def herd_parallel(clowder, group_names, **kwargs):
         validate_groups(groups)
         projects = filter_projects_on_group_names(clowder.groups, group_names)
         print_parallel_groups_output(groups, skip)
-        for project in projects:
-            if project.name in skip:
-                continue
-            result = __clowder_pool__.apply_async(herd_project, args=(project, branch, tag, depth, rebase, protocol),
-                                                  callback=async_callback)
-            __clowder_results__.append(result)
-        pool_handler(len(projects))
-        return
+    else:
+        projects = filter_projects_on_project_names(clowder.groups, project_names)
+        validate_projects(projects)
+        print_parallel_projects_output(projects, skip)
 
-    projects = filter_projects_on_project_names(clowder.groups, project_names)
-    validate_projects(projects)
-    print_parallel_projects_output(projects, skip)
     for project in projects:
         if project.name in skip:
             continue
-        result = __clowder_pool__.apply_async(herd_project, args=(project, branch, tag, depth, rebase, protocol),
+        result = __clowder_pool__.apply_async(herd_project,
+                                              args=(project, branch, tag, depth, rebase, protocol),
                                               callback=async_callback)
         __clowder_results__.append(result)
     pool_handler(len(projects))
@@ -325,6 +319,7 @@ def _forall_parallel(commands, skip, ignore_errors, projects):
 
     for cmd in commands:
         print('\n' + fmt.command(cmd))
+
     for project in projects:
         if project.name in skip:
             continue
@@ -363,17 +358,11 @@ def _reset_parallel(clowder, group_names, **kwargs):
         validate_groups(groups)
         projects = filter_projects_on_group_names(clowder.groups, group_names)
         print_parallel_groups_output(groups, skip)
-        for project in projects:
-            if project.name in skip:
-                continue
-            result = __clowder_pool__.apply_async(reset_project, args=(project, timestamp), callback=async_callback)
-            __clowder_results__.append(result)
-        pool_handler(len(projects))
-        return
+    else:
+        projects = filter_projects_on_project_names(clowder.groups, project_names)
+        validate_projects(projects)
+        print_parallel_projects_output(projects, skip)
 
-    projects = filter_projects_on_project_names(clowder.groups, project_names)
-    validate_projects(projects)
-    print_parallel_projects_output(projects, skip)
     for project in projects:
         if project.name in skip:
             continue

diff --git a/clowder/clowder/cli/prune_controller.py b/clowder/clowder/cli/prune_controller.py
@@ -12,8 +12,11 @@
 from cement.ext.ext_argparse import ArgparseController, expose
 from termcolor import cprint
 
-from clowder.cli.globals import CLOWDER_CONTROLLER
-from clowder.cli.util import (
+from clowder.clowder_controller import CLOWDER_CONTROLLER
+from clowder.clowder_repo import print_clowder_repo_status
+from clowder.util.connectivity import network_connection_required
+from clowder.util.decorators import valid_clowder_yaml_required
+from clowder.util.clowder_utils import (
     existing_branch_groups,
     existing_branch_projects,
     filter_groups,
@@ -24,9 +27,6 @@
     validate_groups,
     validate_projects
 )
-from clowder.clowder_repo import print_clowder_repo_status
-from clowder.util.decorators import valid_clowder_yaml_required
-from clowder.util.connectivity import network_connection_required
 
 
 class PruneController(ArgparseController):

diff --git a/clowder/clowder/cli/reset_controller.py b/clowder/clowder/cli/reset_controller.py
@@ -7,12 +7,12 @@
 
 from cement.ext.ext_argparse import ArgparseController, expose
 
-from clowder.cli.globals import CLOWDER_CONTROLLER
-from clowder.cli.parallel import reset
-from clowder.cli.util import options_help_message
+from clowder.cli.parallel_commands import reset
+from clowder.clowder_controller import CLOWDER_CONTROLLER
 from clowder.clowder_repo import print_clowder_repo_status_fetch
-from clowder.util.decorators import valid_clowder_yaml_required
 from clowder.util.connectivity import network_connection_required
+from clowder.util.decorators import valid_clowder_yaml_required
+from clowder.util.clowder_utils import options_help_message
 
 
 class ResetController(ArgparseController):

diff --git a/clowder/clowder/cli/save_controller.py b/clowder/clowder/cli/save_controller.py
@@ -14,13 +14,13 @@
 
 import clowder.util.formatting as fmt
 from clowder import ROOT_DIR
-from clowder.cli.globals import CLOWDER_CONTROLLER
-from clowder.cli.util import (
+from clowder.clowder_controller import CLOWDER_CONTROLLER
+from clowder.clowder_repo import CLOWDER_REPO
+from clowder.util.decorators import valid_clowder_yaml_required
+from clowder.util.clowder_utils import (
     validate_groups,
     validate_projects_exist
 )
-from clowder.clowder_repo import CLOWDER_REPO
-from clowder.util.decorators import valid_clowder_yaml_required
 from clowder.yaml.saving import save_yaml