Refactor most of cmd_shed_upload logic into planemo.shed.

Trying to trim down the command files - I think the analogy to thin controllers is good. Also want to reuse the logic related converting the pattern shed_upload.tar.gz to shed_upload_<repo_name>.tar.gz when .shed.yml map to multiple repositories.

Author: jmchilton

planemo/commands/cmd_shed_upload.py

@@ -7,9 +7,6 @@
 from planemo.cli import pass_context
 from planemo import options
 from planemo import shed
-from planemo.io import error
-from planemo.io import info
-from planemo.io import shell
 
 
 tar_path = click.Path(
@@ -57,47 +54,7 @@ def cli(ctx, path, **kwds):
     """Handle possible recursion through paths for uploading files to a toolshed
     """
     def upload(realized_repository):
-        return __handle_upload(ctx, realized_repository, **kwds)
+        return shed.upload_repository(ctx, realized_repository, **kwds)
 
     exit_code = shed.for_each_repository(upload, path, **kwds)
     sys.exit(exit_code)
-
-
-def __handle_upload(ctx, realized_repository, **kwds):
-    """Upload a tool directory as a tarball to a tool shed.
-    """
-    path = realized_repository.path
-    tar_path = kwds.get("tar", None)
-    if not tar_path:
-        tar_path = shed.build_tarball(path, **kwds)
-    if kwds["tar_only"]:
-        suffix = ""
-        if realized_repository.multiple:
-            name = realized_repository.config["name"]
-            suffix = "_%s" % name.replace("-", "_")
-        shell("cp %s shed_upload%s.tar.gz" % (tar_path, suffix))
-        return 0
-    tsi = shed.tool_shed_client(ctx, **kwds)
-    update_kwds = {}
-    message = kwds.get("message", None)
-    if message:
-        update_kwds["commit_message"] = message
-
-    # TODO: this needs to use realized repository
-    repo_id = realized_repository.find_repository_id(ctx, tsi)
-    if repo_id is None and kwds["force_repository_creation"]:
-        repo_id = realized_repository.create(ctx, tsi)
-    # failing to create the repo, give up
-    if repo_id is None:
-        return -1
-    # TODO: support updating repo information if it changes in the config file
-
-    try:
-        tsi.repositories.update_repository(repo_id, tar_path, **update_kwds)
-    except Exception as e:
-        message = shed.api_exception_to_message(e)
-        error("Could not update %s" % realized_repository.name)
-        error(message)
-        return -1
-    info("Repository %s updated successfully." % realized_repository.name)
-    return 0

planemo/shed/__init__.py

@@ -16,6 +16,8 @@
 
 from planemo.io import (
     error,
+    shell,
+    info,
     can_write_to_path,
 )
 from planemo import glob
@@ -140,6 +142,45 @@ def shed_init(ctx, path, **kwds):
     return 0
 
 
+def upload_repository(ctx, realized_repository, **kwds):
+    """Upload a tool directory as a tarball to a tool shed.
+    """
+    path = realized_repository.path
+    tar_path = kwds.get("tar", None)
+    if not tar_path:
+        tar_path = build_tarball(path, **kwds)
+    if kwds["tar_only"]:
+        suffix = ""
+        if realized_repository.multiple:
+            name = realized_repository.config["name"]
+            suffix = "_%s" % name.replace("-", "_")
+        shell("cp %s shed_upload%s.tar.gz" % (tar_path, suffix))
+        return 0
+    tsi = tool_shed_client(ctx, **kwds)
+    update_kwds = {}
+    message = kwds.get("message", None)
+    if message:
+        update_kwds["commit_message"] = message
+
+    # TODO: this needs to use realized repository
+    repo_id = realized_repository.find_repository_id(ctx, tsi)
+    if repo_id is None and kwds["force_repository_creation"]:
+        repo_id = realized_repository.create(ctx, tsi)
+    # failing to create the repo, give up
+    if repo_id is None:
+        return -1
+    # TODO: support updating repo information if it changes in the config file
+    try:
+        tsi.repositories.update_repository(repo_id, tar_path, **update_kwds)
+    except Exception as e:
+        message = api_exception_to_message(e)
+        error("Could not update %s" % realized_repository.name)
+        error(message)
+        return -1
+    info("Repository %s updated successfully." % realized_repository.name)
+    return 0
+
+
 def shed_repo_config(path, name=None):
     shed_yaml_path = os.path.join(path, SHED_CONFIG_NAME)
     config = {}