Merge pull request #94 from cat-bro/fix-dry-run-tool-version

Fix dry run tool version

tests/fixtures/mapping-rules.yml

@@ -33,6 +33,11 @@ tools:
             - highmem
       - if: input_size >= 20
         fail: Too much data, shouldn't run
+  toolshed.g2.bx.psu.edu/repos/iuc/bwameth/bwameth/.*:
+    rules:
+      - if: helpers.tool_version_gte(tool, '42')
+        env:
+          bwameth_is_great: yes
 users:
   [email protected]:
     env:

tests/test_shell.py

@@ -289,3 +289,14 @@ def test_dry_run_user_email(self):
             tpv_config)
         self.assertTrue("name: TEST_JOB_SLOTS_USER" in output,
                         f"Expected 'name: TEST_JOB_SLOTS_USER' in destination\n{output}")
+
+    def test_dry_run_tool_with_version(self):
+        job_config = os.path.join(os.path.dirname(__file__), 'fixtures/job_conf_dry_run.yml')
+        tpv_config = os.path.join(os.path.dirname(__file__), 'fixtures/mapping-rules.yml')
+        output = self.call_shell_command(
+            "tpv", "dry-run", "--job-conf", job_config, "--input-size", "6", "--user", "[email protected]",
+            "--tool", "toolshed.g2.bx.psu.edu/repos/iuc/bwameth/bwameth/42",
+            tpv_config)
+        self.assertTrue("bwameth_is_great" in output,
+                        f"Expected 'bwameth_is_great' in destination\n{output}")
+

tpv/commands/dryrunner.py

@@ -29,7 +29,10 @@ def from_params(job_conf, user=None, tool=None, tpv_confs=None, input_size=None)
             user = None
 
         if tool:
-            tool = mock_galaxy.Tool(tool)
+            tool = mock_galaxy.Tool(
+                tool,
+                version=tool.split('/')[-1] if '/' in tool else None
+            )
         else:
             tool = None