Extend shed_lint to check for required files based on type...

Packages need a tool_dependencies.xml and suites need repository_dependencies.xml.

Since the shed realization process filters out invalid types I feel like this closes #156 (@peterjc - is this enough?).

Author: jmchilton

planemo/shed/__init__.py

@@ -921,6 +921,26 @@ def __init__(self, realized_path, real_path, config, multiple, missing):
         self.multiple = multiple
         self.missing = missing
 
+    @property
+    def repository_type(self):
+        return shed_repo_type(self.config, self.name)
+
+    @property
+    def is_package(self):
+        return self.repository_type == REPO_TYPE_TOOL_DEP
+
+    @property
+    def is_suite(self):
+        return self.repository_type == REPO_TYPE_SUITE
+
+    @property
+    def repo_dependencies_path(self):
+        return os.path.join(self.path, REPO_DEPENDENCIES_CONFIG_NAME)
+
+    @property
+    def tool_dependencies_path(self):
+        return os.path.join(self.path, TOOL_DEPENDENCIES_CONFIG_NAME)
+
     def git_rev(self, ctx):
         return git.rev_if_git(ctx, self.real_path)
 

planemo/shed_lint.py

@@ -47,7 +47,11 @@ def lint_repository(ctx, realized_repository, **kwds):
         lint_expansion,
         realized_repository,
     )
-
+    lint_ctx.lint(
+        "lint_expected_files",
+        lint_expected_files,
+        realized_repository,
+    )
     lint_ctx.lint(
         "lint_tool_dependencies_xsd",
         lint_tool_dependencies_xsd,
@@ -161,6 +165,18 @@ def lint_tool_dependencies_actions(path, lint_ctx):
         return
 
 
+def lint_expected_files(realized_repository, lint_ctx):
+    if realized_repository.is_package:
+        if not os.path.exists(realized_repository.tool_dependencies_path):
+            lint_ctx.warn("Package repository does not contain a "
+                          "tool_dependencies.xml file.")
+
+    if realized_repository.is_suite:
+        if not os.path.exists(realized_repository.repo_dependencies_path):
+            lint_ctx.warn("Suite repository does not contain a "
+                          "repository_dependencies.xml file.")
+
+
 def lint_repository_dependencies(path, lint_ctx):
     repo_dependencies = os.path.join(path, "repository_dependencies.xml")
     if not os.path.exists(repo_dependencies):

tests/data/repos/bad_missing_repo_deps/.shed.yml

@@ -0,0 +1,3 @@
+name: suite_1
+owner: iuc
+description: suite_1 description

tests/data/repos/bad_missing_repo_deps/README.rst

@@ -0,0 +1,2 @@
+Test Suite 1
+============

tests/data/repos/bad_missing_tool_deps/.shed.yml

@@ -0,0 +1,3 @@
+name: package_1
+owner: iuc
+description: package_1 description

tests/data/repos/bad_missing_tool_deps/README.rst

@@ -0,0 +1,3 @@
+Test Package 1
+===============
+

tests/test_shed_lint.py

@@ -26,6 +26,10 @@ def test_invalid_repos(self):
             self._check_exit_code(["shed_lint"], exit_code=-1)
         with self._isolate_repo("bad_missing_include"):
             self._check_exit_code(["shed_lint"], exit_code=-1)
+        with self._isolate_repo("bad_missing_tool_deps"):
+            self._check_exit_code(["shed_lint"], exit_code=-1)
+        with self._isolate_repo("bad_missing_repo_deps"):
+            self._check_exit_code(["shed_lint"], exit_code=-1)
         with self._isolate_repo("bad_invalid_yaml"):
             self._check_exit_code(["shed_lint"], exit_code=254)