Merge pull request #121 from natefoo/lint-name

Support passing a name through to the lint context so that error messages can be more useful

Author: bgruening

galaxy/tools/lint.py

@@ -12,15 +12,15 @@
 LEVEL_ERROR = "error"
 
 
-def lint_tool_source(tool_source, level=LEVEL_ALL, fail_level=LEVEL_WARN, extra_modules=[], skip_types=[]):
-    lint_context = LintContext(level=level, skip_types=skip_types)
+def lint_tool_source(tool_source, level=LEVEL_ALL, fail_level=LEVEL_WARN, extra_modules=[], skip_types=[], name=None):
+    lint_context = LintContext(level=level, skip_types=skip_types, object_name=name)
     lint_tool_source_with(lint_context, tool_source, extra_modules)
 
     return not lint_context.failed(fail_level)
 
 
-def lint_xml(tool_xml, level=LEVEL_ALL, fail_level=LEVEL_WARN, extra_modules=[], skip_types=[]):
-    lint_context = LintContext(level=level, skip_types=skip_types)
+def lint_xml(tool_xml, level=LEVEL_ALL, fail_level=LEVEL_WARN, extra_modules=[], skip_types=[], name=None):
+    lint_context = LintContext(level=level, skip_types=skip_types, object_name=name)
     lint_xml_with(lint_context, tool_xml, extra_modules)
 
     return not lint_context.failed(fail_level)
@@ -63,9 +63,10 @@ def lint_xml_with(lint_context, tool_xml, extra_modules=[]):
 # be moved to galaxy.util.lint.
 class LintContext(object):
 
-    def __init__(self, level, skip_types=[]):
+    def __init__(self, level, skip_types=[], object_name=None):
         self.skip_types = skip_types
         self.level = level
+        self.object_name = object_name
         self.found_errors = False
         self.found_warns = False