# HG changeset patch
# User fubar_too
# Date 1647854256 0
# Node ID c7696d7c2b7ebcb68ae4e9918408ac00be467257
# Parent  f9fb7c57cccb9b8f93d96efaaa966d1c6530e30d
Uploaded

diff -r f9fb7c57cccb -r c7696d7c2b7e toolfactory/ToolFactory.py
--- a/toolfactory/ToolFactory.py	Thu Jul 01 10:11:43 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,897 +0,0 @@
-# see https://github.com/fubar2/toolfactory
-#
-# copyright ross lazarus (ross stop lazarus at gmail stop com) May 2012
-#
-# all rights reserved
-# Licensed under the LGPL
-# suggestions for improvement and bug fixes welcome at
-# https://github.com/fubar2/toolfactory
-#
-# April 2021: Refactored into two tools - generate and test/install
-# as part of GTN tutorial development and biocontainer adoption
-# The tester runs planemo on a non-tested archive, creates the test outputs
-# and returns a new proper tool with test.
-
-
-
-import argparse
-import copy
-import fcntl
-import json
-import os
-import re
-import rpyc
-import shlex
-import shutil
-import subprocess
-import sys
-import tarfile
-import tempfile
-import time
-
-from bioblend import galaxy
-
-import galaxyxml.tool as gxt
-import galaxyxml.tool.parameters as gxtp
-
-import lxml.etree as ET
-
-import yaml
-
-myversion = "V2.3 April 2021"
-verbose = True
-debug = True
-toolFactoryURL = "https://github.com/fubar2/toolfactory"
-FAKEEXE = "~~~REMOVE~~~ME~~~"
-# need this until a PR/version bump to fix galaxyxml prepending the exe even
-# with override.
-
-
-def timenow():
-    """return current time as a string"""
-    return time.strftime("%d/%m/%Y %H:%M:%S", time.localtime(time.time()))
-
-
-cheetah_escape_table = {"$": "\\$", "#": "\\#"}
-
-
-def cheetah_escape(text):
-    """Produce entities within text."""
-    return "".join([cheetah_escape_table.get(c, c) for c in text])
-
-
-def parse_citations(citations_text):
-    """"""
-    citations = [c for c in citations_text.split("**ENTRY**") if c.strip()]
-    citation_tuples = []
-    for citation in citations:
-        if citation.startswith("doi"):
-            citation_tuples.append(("doi", citation[len("doi") :].strip()))
-        else:
-            citation_tuples.append(("bibtex", citation[len("bibtex") :].strip()))
-    return citation_tuples
-
-
-class Tool_Factory:
-    """Wrapper for an arbitrary script
-    uses galaxyxml
-
-    """
-
-    def __init__(self, args=None):  # noqa
-        """
-        prepare command line cl for running the tool here
-        and prepare elements needed for galaxyxml tool generation
-        """
-        self.ourcwd = os.getcwd()
-        self.collections = []
-        if len(args.collection) > 0:
-            try:
-                self.collections = [
-                    json.loads(x) for x in args.collection if len(x.strip()) > 1
-                ]
-            except Exception:
-                print(
-                    f"--collections parameter {str(args.collection)} is malformed - should be a dictionary"
-                )
-        try:
-            self.infiles = [
-                json.loads(x) for x in args.input_files if len(x.strip()) > 1
-            ]
-        except Exception:
-            print(
-                f"--input_files parameter {str(args.input_files)} is malformed - should be a dictionary"
-            )
-        try:
-            self.outfiles = [
-                json.loads(x) for x in args.output_files if len(x.strip()) > 1
-            ]
-        except Exception:
-            print(
-                f"--output_files parameter {args.output_files} is malformed - should be a dictionary"
-            )
-        assert (len(self.outfiles) + len(self.collections)) > 0, 'No outfiles or output collections specified. The Galaxy job runner will fail without an output of some sort'
-        try:
-            self.addpar = [
-                json.loads(x) for x in args.additional_parameters if len(x.strip()) > 1
-            ]
-        except Exception:
-            print(
-                f"--additional_parameters {args.additional_parameters} is malformed - should be a dictionary"
-            )
-        try:
-            self.selpar = [
-                json.loads(x) for x in args.selecttext_parameters if len(x.strip()) > 1
-            ]
-        except Exception:
-            print(
-                f"--selecttext_parameters {args.selecttext_parameters} is malformed - should be a dictionary"
-            )
-        self.args = args
-        self.cleanuppar()
-        self.lastxclredirect = None
-        self.xmlcl = []
-        self.is_positional = self.args.parampass == "positional"
-        if self.args.sysexe:
-            if " " in self.args.sysexe:
-                self.executeme = shlex.split(self.args.sysexe)
-            else:
-                self.executeme = [
-                    self.args.sysexe,
-                ]
-        else:
-            if self.args.packages:
-                self.executeme = [
-                    self.args.packages.split(",")[0].split(":")[0].strip(),
-                ]
-            else:
-                self.executeme = None
-        aXCL = self.xmlcl.append
-        assert args.parampass in [
-            "0",
-            "argparse",
-            "positional",
-        ], 'args.parampass must be "0","positional" or "argparse"'
-        self.tool_name = re.sub("[^a-zA-Z0-9_]+", "", args.tool_name)
-        self.tool_id = self.tool_name
-        self.newtool = gxt.Tool(
-            self.tool_name,
-            self.tool_id,
-            self.args.tool_version,
-            self.args.tool_desc,
-            FAKEEXE,
-        )
-        self.tooloutdir = "./tfout"
-        self.repdir = "./toolgen"
-        self.newtarpath = os.path.join(self.tooloutdir, "%s_not_tested.toolshed.gz" % self.tool_name)
-        self.testdir = os.path.join(self.tooloutdir, "test-data")
-        if not os.path.exists(self.tooloutdir):
-            os.mkdir(self.tooloutdir)
-        if not os.path.exists(self.testdir):
-            os.mkdir(self.testdir)
-        if not os.path.exists(self.repdir):
-            os.mkdir(self.repdir)
-        self.tinputs = gxtp.Inputs()
-        self.toutputs = gxtp.Outputs()
-        self.testparam = []
-        if self.args.script_path:
-            self.prepScript()
-        if self.args.command_override:
-            scos = open(self.args.command_override, "r").readlines()
-            self.command_override = [x.rstrip() for x in scos]
-        else:
-            self.command_override = None
-        if self.args.test_override:
-            stos = open(self.args.test_override, "r").readlines()
-            self.test_override = [x.rstrip() for x in stos]
-        else:
-            self.test_override = None
-        if self.args.script_path:
-            for ex in self.executeme:
-                aXCL(ex)
-            aXCL("$runme")
-        else:
-            for ex in self.executeme:
-                aXCL(ex)
-
-        if self.args.parampass == "0":
-            self.clsimple()
-        else:
-            if self.args.parampass == "positional":
-                self.prepclpos()
-                self.clpositional()
-            else:
-                self.prepargp()
-                self.clargparse()
-
-    def clsimple(self):
-        """no parameters or repeats - uses < and > for i/o"""
-        aXCL = self.xmlcl.append
-        if len(self.infiles) > 0:
-            aXCL("<")
-            aXCL("$%s" % self.infiles[0]["infilename"])
-        if len(self.outfiles) > 0:
-            aXCL(">")
-            aXCL("$%s" % self.outfiles[0]["name"])
-        if self.args.cl_user_suffix:  # DIY CL end
-            clp = shlex.split(self.args.cl_user_suffix)
-            for c in clp:
-                aXCL(c)
-
-    def prepargp(self):
-        xclsuffix = []
-        for i, p in enumerate(self.infiles):
-            nam = p["infilename"]
-            if p["origCL"].strip().upper() == "STDIN":
-                xappendme = [
-                    nam,
-                    nam,
-                    "< $%s" % nam,
-                ]
-            else:
-                rep = p["repeat"] == "1"
-                over = ""
-                if rep:
-                    over = f'#for $rep in $R_{nam}:\n--{nam} "$rep.{nam}"\n#end for'
-                xappendme = [p["CL"], "$%s" % p["CL"], over]
-            xclsuffix.append(xappendme)
-        for i, p in enumerate(self.outfiles):
-            if p["origCL"].strip().upper() == "STDOUT":
-                self.lastxclredirect = [">", "$%s" % p["name"]]
-            else:
-                xclsuffix.append([p["name"], "$%s" % p["name"], ""])
-        for p in self.addpar:
-            nam = p["name"]
-            rep = p["repeat"] == "1"
-            if rep:
-                over = f'#for $rep in $R_{nam}:\n--{nam} "$rep.{nam}"\n#end for'
-            else:
-                over = p["override"]
-            xclsuffix.append([p["CL"], '"$%s"' % nam, over])
-        for p in self.selpar:
-            xclsuffix.append([p["CL"], '"$%s"' % p["name"], p["override"]])
-        self.xclsuffix = xclsuffix
-
-    def prepclpos(self):
-        xclsuffix = []
-        for i, p in enumerate(self.infiles):
-            if p["origCL"].strip().upper() == "STDIN":
-                xappendme = [
-                    "999",
-                    p["infilename"],
-                    "< $%s" % p["infilename"],
-                ]
-            else:
-                xappendme = [p["CL"], "$%s" % p["infilename"], ""]
-            xclsuffix.append(xappendme)
-        for i, p in enumerate(self.outfiles):
-            if p["origCL"].strip().upper() == "STDOUT":
-                self.lastxclredirect = [">", "$%s" % p["name"]]
-            else:
-                xclsuffix.append([p["CL"], "$%s" % p["name"], ""])
-        for p in self.addpar:
-            nam = p["name"]
-            rep = p["repeat"] == "1"  # repeats make NO sense
-            if rep:
-                print(
-                    f"### warning. Repeats for {nam} ignored - not permitted in positional parameter command lines!"
-                )
-            over = p["override"]
-            xclsuffix.append([p["CL"], '"$%s"' % nam, over])
-        for p in self.selpar:
-            xclsuffix.append([p["CL"], '"$%s"' % p["name"], p["override"]])
-        xclsuffix.sort()
-        self.xclsuffix = xclsuffix
-
-    def prepScript(self):
-        rx = open(self.args.script_path, "r").readlines()
-        rx = [x.rstrip() for x in rx]
-        rxcheck = [x.strip() for x in rx if x.strip() > ""]
-        assert len(rxcheck) > 0, "Supplied script is empty. Cannot run"
-        self.script = "\n".join(rx)
-        fhandle, self.sfile = tempfile.mkstemp(
-            prefix=self.tool_name, suffix="_%s" % (self.executeme[0])
-        )
-        tscript = open(self.sfile, "w")
-        tscript.write(self.script)
-        tscript.close()
-        self.spacedScript = [f"    {x}" for x in rx if x.strip() > ""]
-        rx.insert(0, "#raw")
-        rx.append("#end raw")
-        self.escapedScript = rx
-        art = "%s.%s" % (self.tool_name, self.executeme[0])
-        artifact = open(art, "wb")
-        artifact.write(bytes(self.script, "utf8"))
-        artifact.close()
-
-    def cleanuppar(self):
-        """ positional parameters are complicated by their numeric ordinal"""
-        if self.args.parampass == "positional":
-            for i, p in enumerate(self.infiles):
-                assert (
-                    p["CL"].isdigit() or p["CL"].strip().upper() == "STDIN"
-                ), "Positional parameters must be ordinal integers - got %s for %s" % (
-                    p["CL"],
-                    p["label"],
-                )
-            for i, p in enumerate(self.outfiles):
-                assert (
-                    p["CL"].isdigit() or p["CL"].strip().upper() == "STDOUT"
-                ), "Positional parameters must be ordinal integers - got %s for %s" % (
-                    p["CL"],
-                    p["name"],
-                )
-            for i, p in enumerate(self.addpar):
-                assert p[
-                    "CL"
-                ].isdigit(), "Positional parameters must be ordinal integers - got %s for %s" % (
-                    p["CL"],
-                    p["name"],
-                )
-        for i, p in enumerate(self.infiles):
-            infp = copy.copy(p)
-            infp["origCL"] = infp["CL"]
-            if self.args.parampass in ["positional", "0"]:
-                infp["infilename"] = infp["label"].replace(" ", "_")
-            else:
-                infp["infilename"] = infp["CL"]
-            self.infiles[i] = infp
-        for i, p in enumerate(self.outfiles):
-            outfp = copy.copy(p)
-            outfp["origCL"] = outfp["CL"]  # keep copy
-            self.outfiles[i] = outfp
-        for i, p in enumerate(self.addpar):
-            addp = copy.copy(p)
-            addp["origCL"] = addp["CL"]
-            self.addpar[i] = addp
-
-    def clpositional(self):
-        # inputs in order then params
-        aXCL = self.xmlcl.append
-        for (k, v, koverride) in self.xclsuffix:
-            aXCL(v)
-        if self.lastxclredirect:
-            for cl in self.lastxclredirect:
-                aXCL(cl)
-        if self.args.cl_user_suffix:  # DIY CL end
-            clp = shlex.split(self.args.cl_user_suffix)
-            for c in clp:
-                aXCL(c)
-
-    def clargparse(self):
-        """argparse style"""
-        aXCL = self.xmlcl.append
-        # inputs then params in argparse named form
-
-        for (k, v, koverride) in self.xclsuffix:
-            if koverride > "":
-                k = koverride
-                aXCL(k)
-            else:
-                if len(k.strip()) == 1:
-                    k = "-%s" % k
-                else:
-                    k = "--%s" % k
-                aXCL(k)
-                aXCL(v)
-        if self.lastxclredirect:
-            for cl in self.lastxclredirect:
-                aXCL(cl)
-        if self.args.cl_user_suffix:  # DIY CL end
-            clp = shlex.split(self.args.cl_user_suffix)
-            for c in clp:
-                aXCL(c)
-
-    def getNdash(self, newname):
-        if self.is_positional:
-            ndash = 0
-        else:
-            ndash = 2
-            if len(newname) < 2:
-                ndash = 1
-        return ndash
-
-    def doXMLparam(self):  # noqa
-        """Add all needed elements to tool"""
-        for p in self.outfiles:
-            newname = p["name"]
-            newfmt = p["format"]
-            newcl = p["CL"]
-            test = p["test"]
-            oldcl = p["origCL"]
-            test = test.strip()
-            ndash = self.getNdash(newcl)
-            aparm = gxtp.OutputData(
-                name=newname, format=newfmt, num_dashes=ndash, label=newname
-            )
-            aparm.positional = self.is_positional
-            if self.is_positional:
-                if oldcl.upper() == "STDOUT":
-                    aparm.positional = 9999999
-                    aparm.command_line_override = "> $%s" % newname
-                else:
-                    aparm.positional = int(oldcl)
-                    aparm.command_line_override = "$%s" % newname
-            self.toutputs.append(aparm)
-            ld = None
-            if test.strip() > "":
-                if test.strip().startswith("diff"):
-                    c = "diff"
-                    ld = 0
-                    if test.split(":")[1].isdigit:
-                        ld = int(test.split(":")[1])
-                    tp = gxtp.TestOutput(
-                        name=newname,
-                        value="%s_sample" % newname,
-                        compare=c,
-                        lines_diff=ld,
-                    )
-                elif test.startswith("sim_size"):
-                    c = "sim_size"
-                    tn = test.split(":")[1].strip()
-                    if tn > "":
-                        if "." in tn:
-                            delta = None
-                            delta_frac = min(1.0, float(tn))
-                        else:
-                            delta = int(tn)
-                            delta_frac = None
-                    tp = gxtp.TestOutput(
-                        name=newname,
-                        value="%s_sample" % newname,
-                        compare=c,
-                        delta=delta,
-                        delta_frac=delta_frac,
-                    )
-                else:
-                    c = test
-                    tp = gxtp.TestOutput(
-                        name=newname,
-                        value="%s_sample" % newname,
-                        compare=c,
-                    )
-                self.testparam.append(tp)
-        for p in self.infiles:
-            newname = p["infilename"]
-            newfmt = p["format"]
-            ndash = self.getNdash(newname)
-            reps = p.get("repeat", "0") == "1"
-            if not len(p["label"]) > 0:
-                alab = p["CL"]
-            else:
-                alab = p["label"]
-            aninput = gxtp.DataParam(
-                newname,
-                optional=False,
-                label=alab,
-                help=p["help"],
-                format=newfmt,
-                multiple=False,
-                num_dashes=ndash,
-            )
-            aninput.positional = self.is_positional
-            if self.is_positional:
-                if p["origCL"].upper() == "STDIN":
-                    aninput.positional = 9999998
-                    aninput.command_line_override = "< $%s" % newname
-                else:
-                    aninput.positional = int(p["origCL"])
-                    aninput.command_line_override = "$%s" % newname
-            if reps:
-                repe = gxtp.Repeat(
-                    name=f"R_{newname}", title=f"Add as many {alab} as needed"
-                )
-                repe.append(aninput)
-                self.tinputs.append(repe)
-                tparm = gxtp.TestRepeat(name=f"R_{newname}")
-                tparm2 = gxtp.TestParam(newname, value="%s_sample" % newname)
-                tparm.append(tparm2)
-                self.testparam.append(tparm)
-            else:
-                self.tinputs.append(aninput)
-                tparm = gxtp.TestParam(newname, value="%s_sample" % newname)
-                self.testparam.append(tparm)
-        for p in self.addpar:
-            newname = p["name"]
-            newval = p["value"]
-            newlabel = p["label"]
-            newhelp = p["help"]
-            newtype = p["type"]
-            newcl = p["CL"]
-            oldcl = p["origCL"]
-            reps = p["repeat"] == "1"
-            if not len(newlabel) > 0:
-                newlabel = newname
-            ndash = self.getNdash(newname)
-            if newtype == "text":
-                aparm = gxtp.TextParam(
-                    newname,
-                    label=newlabel,
-                    help=newhelp,
-                    value=newval,
-                    num_dashes=ndash,
-                )
-            elif newtype == "integer":
-                aparm = gxtp.IntegerParam(
-                    newname,
-                    label=newlabel,
-                    help=newhelp,
-                    value=newval,
-                    num_dashes=ndash,
-                )
-            elif newtype == "float":
-                aparm = gxtp.FloatParam(
-                    newname,
-                    label=newlabel,
-                    help=newhelp,
-                    value=newval,
-                    num_dashes=ndash,
-                )
-            elif newtype == "boolean":
-                aparm = gxtp.BooleanParam(
-                    newname,
-                    label=newlabel,
-                    help=newhelp,
-                    value=newval,
-                    num_dashes=ndash,
-                )
-            else:
-                raise ValueError(
-                    'Unrecognised parameter type "%s" for\
-                 additional parameter %s in makeXML'
-                    % (newtype, newname)
-                )
-            aparm.positional = self.is_positional
-            if self.is_positional:
-                aparm.positional = int(oldcl)
-            if reps:
-                repe = gxtp.Repeat(
-                    name=f"R_{newname}", title=f"Add as many {newlabel} as needed"
-                )
-                repe.append(aparm)
-                self.tinputs.append(repe)
-                tparm = gxtp.TestRepeat(name=f"R_{newname}")
-                tparm2 = gxtp.TestParam(newname, value=newval)
-                tparm.append(tparm2)
-                self.testparam.append(tparm)
-            else:
-                self.tinputs.append(aparm)
-                tparm = gxtp.TestParam(newname, value=newval)
-                self.testparam.append(tparm)
-        for p in self.selpar:
-            newname = p["name"]
-            newval = p["value"]
-            newlabel = p["label"]
-            newhelp = p["help"]
-            newtype = p["type"]
-            newcl = p["CL"]
-            if not len(newlabel) > 0:
-                newlabel = newname
-            ndash = self.getNdash(newname)
-            if newtype == "selecttext":
-                newtext = p["texts"]
-                aparm = gxtp.SelectParam(
-                    newname,
-                    label=newlabel,
-                    help=newhelp,
-                    num_dashes=ndash,
-                )
-                for i in range(len(newval)):
-                    anopt = gxtp.SelectOption(
-                        value=newval[i],
-                        text=newtext[i],
-                    )
-                    aparm.append(anopt)
-                aparm.positional = self.is_positional
-                if self.is_positional:
-                    aparm.positional = int(newcl)
-                self.tinputs.append(aparm)
-                tparm = gxtp.TestParam(newname, value=newval)
-                self.testparam.append(tparm)
-            else:
-                raise ValueError(
-                    'Unrecognised parameter type "%s" for\
-                 selecttext parameter %s in makeXML'
-                    % (newtype, newname)
-                )
-        for p in self.collections:
-            newkind = p["kind"]
-            newname = p["name"]
-            newlabel = p["label"]
-            newdisc = p["discover"]
-            collect = gxtp.OutputCollection(newname, label=newlabel, type=newkind)
-            disc = gxtp.DiscoverDatasets(
-                pattern=newdisc, directory=f"{newname}", visible="false"
-            )
-            collect.append(disc)
-            self.toutputs.append(collect)
-            try:
-                tparm = gxtp.TestOutputCollection(newname)  # broken until PR merged.
-                self.testparam.append(tparm)
-            except Exception:
-                print(
-                    "#### WARNING: Galaxyxml version does not have the PR merged yet - tests for collections must be over-ridden until then!"
-                )
-
-    def doNoXMLparam(self):
-        """filter style package - stdin to stdout"""
-        if len(self.infiles) > 0:
-            alab = self.infiles[0]["label"]
-            if len(alab) == 0:
-                alab = self.infiles[0]["infilename"]
-            max1s = (
-                "Maximum one input if parampass is 0 but multiple input files supplied - %s"
-                % str(self.infiles)
-            )
-            assert len(self.infiles) == 1, max1s
-            newname = self.infiles[0]["infilename"]
-            aninput = gxtp.DataParam(
-                newname,
-                optional=False,
-                label=alab,
-                help=self.infiles[0]["help"],
-                format=self.infiles[0]["format"],
-                multiple=False,
-                num_dashes=0,
-            )
-            aninput.command_line_override = "< $%s" % newname
-            aninput.positional = True
-            self.tinputs.append(aninput)
-            tp = gxtp.TestParam(name=newname, value="%s_sample" % newname)
-            self.testparam.append(tp)
-        if len(self.outfiles) > 0:
-            newname = self.outfiles[0]["name"]
-            newfmt = self.outfiles[0]["format"]
-            anout = gxtp.OutputData(newname, format=newfmt, num_dashes=0)
-            anout.command_line_override = "> $%s" % newname
-            anout.positional = self.is_positional
-            self.toutputs.append(anout)
-            tp = gxtp.TestOutput(name=newname, value="%s_sample" % newname)
-            self.testparam.append(tp)
-
-    def makeXML(self):  # noqa
-        """
-        Create a Galaxy xml tool wrapper for the new script
-        Uses galaxyhtml
-        Hmmm. How to get the command line into correct order...
-        """
-        if self.command_override:
-            self.newtool.command_override = self.command_override  # config file
-        else:
-            self.newtool.command_override = self.xmlcl
-        cite = gxtp.Citations()
-        acite = gxtp.Citation(type="doi", value="10.1093/bioinformatics/bts573")
-        cite.append(acite)
-        self.newtool.citations = cite
-        safertext = ""
-        if self.args.help_text:
-            helptext = open(self.args.help_text, "r").readlines()
-            safertext = "\n".join([cheetah_escape(x) for x in helptext])
-        if len(safertext.strip()) == 0:
-            safertext = (
-                "Ask the tool author (%s) to rebuild with help text please\n"
-                % (self.args.user_email)
-            )
-        if self.args.script_path:
-            if len(safertext) > 0:
-                safertext = safertext + "\n\n------\n"  # transition allowed!
-            scr = [x for x in self.spacedScript if x.strip() > ""]
-            scr.insert(0, "\n\nScript::\n")
-            if len(scr) > 300:
-                scr = (
-                    scr[:100]
-                    + ["    >300 lines - stuff deleted", "    ......"]
-                    + scr[-100:]
-                )
-            scr.append("\n")
-            safertext = safertext + "\n".join(scr)
-        self.newtool.help = safertext
-        self.newtool.version_command = f'echo "{self.args.tool_version}"'
-        std = gxtp.Stdios()
-        std1 = gxtp.Stdio()
-        std.append(std1)
-        self.newtool.stdios = std
-        requirements = gxtp.Requirements()
-        if self.args.packages:
-            try:
-                for d in self.args.packages.split(","):
-                    ver = None
-                    packg = None
-                    d = d.replace("==", ":")
-                    d = d.replace("=", ":")
-                    if ":" in d:
-                        packg, ver = d.split(":")
-                        ver = ver.strip()
-                        packg = packg.strip()
-                    else:
-                        packg = d.strip()
-                        ver = None
-                    if ver == "":
-                        ver = None
-                    if packg:
-                        requirements.append(
-                            gxtp.Requirement("package", packg.strip(), ver)
-                        )
-            except Exception:
-                print(
-                    "### malformed packages string supplied - cannot parse =",
-                    self.args.packages,
-                )
-                sys.exit(2)
-        self.newtool.requirements = requirements
-        if self.args.parampass == "0":
-            self.doNoXMLparam()
-        else:
-            self.doXMLparam()
-        self.newtool.outputs = self.toutputs
-        self.newtool.inputs = self.tinputs
-        if self.args.script_path:
-            configfiles = gxtp.Configfiles()
-            configfiles.append(
-                gxtp.Configfile(name="runme", text="\n".join(self.escapedScript))
-            )
-            self.newtool.configfiles = configfiles
-        tests = gxtp.Tests()
-        test_a = gxtp.Test()
-        for tp in self.testparam:
-            test_a.append(tp)
-        tests.append(test_a)
-        self.newtool.tests = tests
-        self.newtool.add_comment(
-            "Created by %s at %s using the Galaxy Tool Factory."
-            % (self.args.user_email, timenow())
-        )
-        self.newtool.add_comment("Source in git at: %s" % (toolFactoryURL))
-        exml0 = self.newtool.export()
-        exml = exml0.replace(FAKEEXE, "")  # temporary work around until PR accepted
-        if (
-            self.test_override
-        ):  # cannot do this inside galaxyxml as it expects lxml objects for tests
-            part1 = exml.split("<tests>")[0]
-            part2 = exml.split("</tests>")[1]
-            fixed = "%s\n%s\n%s" % (part1, "\n".join(self.test_override), part2)
-            exml = fixed
-        with open("%s.xml" % self.tool_name, "w") as xf:
-            xf.write(exml)
-            xf.write("\n")
-        with open(self.args.untested_tool_out, 'w') as outf:
-            outf.write(exml)
-            outf.write('\n')
-        # galaxy history item
-
-    def writeShedyml(self):
-        """for planemo"""
-        yuser = self.args.user_email.split("@")[0]
-        yfname = os.path.join(self.tooloutdir, ".shed.yml")
-        yamlf = open(yfname, "w")
-        odict = {
-            "name": self.tool_name,
-            "owner": yuser,
-            "type": "unrestricted",
-            "description": self.args.tool_desc,
-            "synopsis": self.args.tool_desc,
-            "category": "TF Generated Tools",
-        }
-        yaml.dump(odict, yamlf, allow_unicode=True)
-        yamlf.close()
-
-    def makeTool(self):
-        """write xmls and input samples into place"""
-        if self.args.parampass == 0:
-            self.doNoXMLparam()
-        else:
-            self.makeXML()
-        if self.args.script_path:
-            stname = os.path.join(self.tooloutdir, self.sfile)
-            if not os.path.exists(stname):
-                shutil.copyfile(self.sfile, stname)
-        xreal = "%s.xml" % self.tool_name
-        xout = os.path.join(self.tooloutdir, xreal)
-        shutil.copyfile(xreal, xout)
-        for p in self.infiles:
-            pth = p["name"]
-            dest = os.path.join(self.testdir, "%s_sample" % p["infilename"])
-            shutil.copyfile(pth, dest)
-            dest = os.path.join(
-                self.repdir, "%s_sample.%s" % (p["infilename"], p["format"])
-            )
-            shutil.copyfile(pth, dest)
-
-    def makeToolTar(self, report_fail=False):
-        """move outputs into test-data and prepare the tarball"""
-        excludeme = "_planemo_test_report.html"
-
-        def exclude_function(tarinfo):
-            filename = tarinfo.name
-            return None if filename.endswith(excludeme) else tarinfo
-
-        for p in self.outfiles:
-            oname = p["name"]
-            tdest = os.path.join(self.testdir, "%s_sample" % oname)
-            src = os.path.join(self.testdir, oname)
-            if not os.path.isfile(tdest):
-                if os.path.isfile(src):
-                    shutil.copyfile(src, tdest)
-                    dest = os.path.join(self.repdir, "%s.sample.%s" % (oname,p['format']))
-                    shutil.copyfile(src, dest)
-                else:
-                    if report_fail:
-                        print(
-                            "###Tool may have failed - output file %s not found in testdir after planemo run %s."
-                            % (tdest, self.testdir)
-                        )
-        tf = tarfile.open(self.newtarpath, "w:gz")
-        tf.add(
-            name=self.tooloutdir,
-            arcname=self.tool_name,
-            filter=exclude_function,
-        )
-        shutil.copy(self.newtarpath, os.path.join(self.tooloutdir, f"{self.tool_name}_untested.toolshed.gz"))
-        tf.close()
-
-
-def main():
-    """
-    This is a Galaxy wrapper.
-    It expects to be called by a special purpose tool.xml
-
-    """
-    parser = argparse.ArgumentParser()
-    a = parser.add_argument
-    a("--script_path", default=None)
-    a("--history_test", default=None)
-    a("--cl_user_suffix", default=None)
-    a("--sysexe", default=None)
-    a("--packages", default=None)
-    a("--tool_name", default="newtool")
-    a("--tool_dir", default=None)
-    a("--input_files", default=[], action="append")
-    a("--output_files", default=[], action="append")
-    a("--user_email", default="Unknown")
-    a("--bad_user", default=None)
-    a("--help_text", default=None)
-    a("--tool_desc", default=None)
-    a("--tool_version", default="0.01")
-    a("--citations", default=None)
-    a("--command_override", default=None)
-    a("--test_override", default=None)
-    a("--additional_parameters", action="append", default=[])
-    a("--selecttext_parameters", action="append", default=[])
-    a("--edit_additional_parameters", action="store_true", default=False)
-    a("--parampass", default="positional")
-    a("--tfout", default="./tfout")
-    a("--galaxy_root", default="/galaxy-central")
-    a("--galaxy_venv", default="/galaxy_venv")
-    a("--collection", action="append", default=[])
-    a("--include_tests", default=False, action="store_true")
-    a("--install_flag", action = "store_false", default=True)
-    a("--admin_only", default=True, action="store_true")
-    a("--untested_tool_out", default=None)
-    a("--local_tools", default="tools")  # relative to $__root_dir__
-    a("--tool_conf_path", default="config/tool_conf.xml")  # relative to $__root_dir__
-    args = parser.parse_args()
-    if args.admin_only:
-        assert not args.bad_user, (
-            'UNAUTHORISED: %s is NOT authorized to use this tool until Galaxy \
-admin adds %s to "admin_users" in the galaxy.yml Galaxy configuration file'
-            % (args.bad_user, args.bad_user)
-        )
-    assert args.tool_name, "## This ToolFactory cannot build a tool without a tool name. Please supply one."
-    tf = Tool_Factory(args)
-    tf.writeShedyml()
-    tf.makeTool()
-    tf.makeToolTar()
-    if args.install_flag:  # always true except during toolfactory test - only works if the appliance rpyc server is running
-            try:
-                conn = rpyc.connect("planemo-server", port=9999, config={'sync_request_timeout':1200})
-            except ConnectionRefusedError:
-                print('### Remote rpyc server not available - cannot install new tool %s. This only works in the ToolFactory Appliance with the server running' % args.tool_name)
-                sys.exit(1)
-            res = conn.root.tool_updater(galaxy_root=args.galaxy_root,
-                tool_conf_path=args.tool_conf_path, new_tool_archive_path=os.path.abspath(tf.newtarpath),
-                new_tool_name=tf.tool_name, local_tool_dir=args.local_tools)
-            conn.close()
-            # code all moved to the server. No need for rsync other than there now.
-
-if __name__ == "__main__":
-    main()
diff -r f9fb7c57cccb -r c7696d7c2b7e toolfactory/ToolFactory.xml
--- a/toolfactory/ToolFactory.xml	Thu Jul 01 10:11:43 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,488 +0,0 @@
-<tool id="rgtf2" name="toolfactory" version="2.00" profile="16.04" >
-  <description>Scripts into tools v2.0</description>
-  <macros>
-      <xml name="singleText">
-            <param name="param_value" type="text" value="" label="Enter this parameter's default text value">
-          </param>
-      </xml>
-      <xml name="singleInt">
-            <param name="param_value" type="integer" value="" label="Enter this parameter's default integer value" >
-          </param>
-      </xml>
-      <xml name="singleFloat">
-            <param name="param_value" type="float" value="" label="Enter this parameter's default value">
-          </param>
-      </xml>
-     <xml name="singleBoolean">
-            <param name="param_value" type="boolean" value="" label="Enter this parameter's default value" />
-            <param name="truevalue" type="text" value="True" label="Command line value to emit when True" />
-            <param name="falsevalue" type="boolean" value="True" label="Command line value to emit when False" />
-      </xml>
-      <xml name="selectText">
-          <repeat name="selectTexts" title="Add each option to be presented in a text select box" min="2"
-             help="Each text added here will also have  a value to be emitted on the command line when the text is chosen">
-            <param name="select_text" type="text" value="" label="Enter the explanatory text the user will see for this choice" >
-          </param>
-          <param name="select_value" type="text" value="" label="Enter the value for the command line when the user selects this option">
-          </param>
-          </repeat>
-      </xml>
-     <xml name="tool_metadata">
-        <param name="tool_version" label="Tool Version - bump this to warn users trying to redo old analyses" type="text" value="0.01"
-            help="If you change your script and regenerate the 'same' tool, you should inform Galaxy (and users) by changing (bumping is traditional) this number"/>
-        <param name="tool_desc" label="Tool Synopsis" type="text" value=""
-            help="Supply a brief tool description for the Galaxy tool menu entry">
-            <sanitizer>
-                <valid initial="string.printable" />
-                <mapping initial="none"/>
-            </sanitizer>
-        </param>
-        <param name="install" label="Attempt to install in the host Galaxy"
-            help="This may/should fail unless running in a lax security environment (your own laptop perhaps) or the specialised ToolFactory Docker container"
-            type="hidden"  />
-         <param name="run_test" label="Finalise new archive with test outputs. Runs externally. Outputs will appear in history when ready"
-            help="Archives must be run and updated using planemo to populate all the test outputs. May take a long time depending on dependencies"
-            type="hidden" checked="False" truevalue="1"  falsevalue="" />
-         <param name="help_text" label="Tool form documentation and help text for users" type="text" area="true"
-            value="**What it Does**"
-             help="Supply user documentation to appear on the new tool form as reStructured text - http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html" >
-                <sanitizer>
-                    <valid initial="string.printable" />
-                    <mapping initial="none"/>
-                </sanitizer>
-        </param>
-        <repeat name="citations" title="Citation">
-                <conditional name="citation_type">
-                    <param name="type" type="select" display="radio" label="Citation Type">
-                        <option value="doi">DOI</option>
-                        <option value="bibtex">BibTeX</option>
-                    </param>
-                    <when value="doi">
-                        <param name="doi" label="DOI" type="text" value=""
-                        help="Supply a DOI (e.g. doi: 10.1111/j.1740-9713.2007.00258.x) to be cited when this tool is used in published research." />
-                    </when>
-                    <when value="bibtex">
-                        <param name="bibtex" label="BibTex" type="text" area="true"
-                            help="Supply a BibTex entry that should be cited when this tool is used in published research." value="" >
-                            <sanitizer>
-                                <valid initial="string.printable" />
-                                <mapping initial="none"/>
-                            </sanitizer>
-                        </param>
-                    </when>
-                </conditional>
-        </repeat>
-     </xml>
-     <xml name="io">
-     <section name="io" title="Input and output files" expanded="true">
-        <repeat name="history_inputs" title="Inputs" min="0"
-             help="Input data files to pass on the command line to the executable. USE SMALL SAMPLES for the new tool's test. Prompts will form a history item selector as input for users of this new tool">
-            <param name="input_files" type="data" format="data" label="Select an input file from your history" multiple="false"
-               help=""/>
-            <param name="input_formats" type="select" multiple="true" label="Select the datatype(s) that your tool/script accepts as input"
-              help="If your datatype is not listed here, it has to be added in galaxy's datatypes_conf.xml" value="tabular">
-               <options from_parameter="tool.app.datatypes_registry.upload_file_formats">
-                <column name="value" index="0"/>
-               </options>
-            </param>
-            <param name="input_label" type="text" value="" label="This will become the user prompt for the form so please make it informative" >
-                <sanitizer invalid_char="_">
-                <valid initial="string.printable" >
-                </valid>
-              </sanitizer>
-            </param>
-            <param name="input_help" type="text" value="" label="This will become help text on the form." >
-            </param>
-            <param name="input_CL" type="text" label="Positional: ordinal integer. Argparse: argument name. STDIN if the executable/script expects it"
-              help="If you will pass positional parameters, enter the integer ordinal for this parameter. If Argparse style, '--' will be prepended or '-' if single character" value="">
-            </param>
-            <param name="input_repeat" type="boolean" checked="False" truevalue="1"  falsevalue="0" label="Allow user to repeat this input as many times as wanted - script/executable must parse these."/>
-        </repeat>
-        <repeat name="history_outputs" min="0" title="Outputs"
-             help="New history items output by the executable to appear in the user history after the tool runs. The name will become a history item for users of the new tool you are making containing one of it's outputs">
-            <param name="history_name" type="text" label="Output Name" optional="false"
-              help="Name used for this output in history. No spaces! Argparse will also use this name as --[name]">
-              <sanitizer invalid_char="_">
-                <valid initial="string.ascii_letters,string.digits" >
-                   <add value="_" />
-                </valid>
-              </sanitizer>
-            </param>
-            <param name="history_format" type="select" multiple="false" label="Select the datatype for this output"
-              help="If your datatype is not listed here, it has to be added in galaxy's datatypes_conf.xml" value="tabular">
-               <options from_parameter="tool.app.datatypes_registry.upload_file_formats">
-                <column name="value" index="0"/>
-               </options>
-            </param>
-            <param name="history_CL" type="text"  label="Position"
-              help="Positional: ordinal integer or 'STDOUT' if '>' required. Otherwise ignored if argparse because name is used. If positional parameters, enter the integer ordinal expected for this parameter. If argparse, ignore unless STDOUT needed" value=""/>
-            <param name="history_test" type="text"  label="Test output comparison setting"
-              help="Pass/fail criterion for this output compared to stored test output. Available options are diff:[#lines] and sim_size:[delta (integer bytes) or delta_frac (float)"
-                value="diff:0"/>
-        </repeat>
-        <repeat name="collection_outputs" title="Output Collections" min="0"
-             help="New history collections to appear in the user history after the tool runs. Hides outputs not needed for downstream tools such as images and intermediate reports." >
-            <param name="name" type="text" label="Name"
-              help="for new collection with all outputs not individually passed to history outputs. No spaces! Script MUST create and fill a directory with the same name and the tool test MUST be overwritten - see the plotter example for hints">
-              <sanitizer invalid_char=" ">
-                <valid initial="string.ascii_letters,string.digits" >
-                   <add value="_" />
-                </valid>
-              </sanitizer>
-            </param>
-            <param name="kind" type="select" multiple="false" label="Select the kind of collection for this output"
-              help="">
-                <option value="list" selected="true">List</option>
-                <option value="paired">Paired</option>
-                <option value="list:paired">List of paired</option>
-            </param>
-            <param name="label" type="text"  label="Label for this collection" help="" value=""/>
-            <param name="discover" type="text"  label="Discover datasets expression" help="__name_and_ext__ should catch all filenames with extensions" value="__name_and_ext__"/>
-        </repeat>
-
-        </section>
-     </xml>
-     <xml name="additparam">
-     <section name="addparam" title="Executable or script settings passed on the command line other than I/O files" expanded="true">
-        <param name="edit_params" type="hidden" />
-        <repeat name="additional_parameters" title="User supplied parameters" min="0"
-             help="Settings for the user to adjust. Passed to the executable on the command line. See examples below to see how these can be parsed by scripts in various languages">
-          <param name="param_name" type="text" value="" label="Choose the name for this parameter - MUST not be blank!">
-              <sanitizer invalid_char=" ">
-                <valid initial="string.ascii_letters,string.digits" >
-                   <add value="_" />
-                </valid>
-              </sanitizer>
-          </param>
-          <conditional name="ap_type">
-          <param name="param_type" type="select" label="Select the type for this parameter">
-            <option value="text" selected="true">Text string</option>
-            <option value="integer">Integer</option>
-            <option value="float">Float</option>
-            <option value="boolean">Boolean</option>
-            <option value="selecttext">Select text string</option>
-          </param>
-          <when value = "text">
-              <expand macro="singleText" />
-          </when>
-          <when value = "integer">
-              <expand macro="singleInt" />
-          </when>
-          <when value = "float">
-              <expand macro="singleFloat" />
-          </when>
-          <when value = "boolean">
-              <expand macro="singleBoolean" />
-          </when>
-          <when value = "selecttext">
-              <expand macro="selectText" />
-          </when>
-          </conditional>
-          <param name="param_label" type="text" value="" label="Enter this parameter's label for the form">
-          </param>
-          <param name="param_help" type="text" value="" label="Help for this parameter">
-          </param>
-          <param name="param_CL" type="text" label="Positional ordinal | argparse argument name"
-              help="Using positional parameters, enter the integer ordinal for this parameter on the command line. Using Argparse style, '--' will be prepended on the CL" value="" />
-          <param name="param_CLprefixed" type="text" label="Override the generated default argparse name prefix if not empty - eg ----foo if needed"
-              help="Some targets like Planemo expect an unadorned action like 'test' before --galaxy_root." value="" />
-          <param name="param_repeat" type="boolean" checked="False" truevalue="1"  falsevalue="0" label="Allow user to repeat this as many times as needed." />
-        </repeat>
-        </section>
-     </xml>
-  </macros>
-
-<requirements>
-     <requirement type="package" version="0.4.14">galaxyxml</requirement>
-     <requirement type="package" version="0.15.0">bioblend</requirement>
-     <requirement type="package" version="5.0.1">rpyc</requirement>
-</requirements>
-
-<command detect_errors="exit_code"><![CDATA[
-#import os
-#set dev_env = os.environ.get('GALAXY_DEVELOPMENT_ENVIRONMENT', '0') == '1'
-#if not $dev_env and ( $__user_email__ not in $__admin_users__ ):
-python3 $__tool_directory__/ToolFactory.py --bad_user $__user_email__
- #else:
-python3 $__tool_directory__/ToolFactory.py
-    #if len(str($cl_suffix)) > 0:
---cl_user_suffix "$cl_suffix"
-    #end if
-    #if $cover.commover == "yes":
-       #if len(str($cover.command_override)) > 10:
---command_override "$commandoverride"
-       #end if
-       #if len(str($cover.test_override)) > 10:
---test_override "$testoverride"
-       #end if
-    #end if
-    #if $deps.packages > "":
-        --packages "$deps.packages"
-    #end if
-   #if $deps.usescript.choosescript == "yes":
---script_path "$runme"
---sysexe "$deps.usescript.scriptrunner"
-    #end if
---tool_name "$tool_name"  --user_email "$__user_email__" --citations "$citeme"  --parampass "$io_param.ppass.parampass"
---tool_desc "$tool_desc"
---tool_version "$tool_version"
---help_text "$helpme"
-   #if $io_param.ppass.parampass != '0':
-     #for $apar in $io_param.ppass.addparam.additional_parameters:
-        #if $apar.ap_type.param_type=="selecttext":
---selecttext_parameters '{"name":"$apar.param_name", "label":"$apar.param_label", "help":"$apar.param_help",
-"type":"$apar.ap_type.param_type","CL":"$apar.param_CL","override":"$apar.param_CLprefixed","value": [
-         #for $i,$st in enumerate($apar.ap_type.selectTexts):
-           "$st.select_value"
-           #if ($i < (len($apar.ap_type.selectTexts)-1)):
-           ,
-           #end if
-         #end for
-         ], "texts": [
-         #for $i,$st in enumerate($apar.ap_type.selectTexts):
-         "$st.select_text"
-          #if ($i < (len($apar.ap_type.selectTexts)-1)):
-           ,
-           #end if
-
-         #end for
-         ]
-         }'
-       #else:
---additional_parameters '{"name": "$apar.param_name", "value": "$apar.ap_type.param_value", "label": "$apar.param_label", "help": "$apar.param_help",
-"type": "$apar.ap_type.param_type","CL": "$apar.param_CL","override": "$apar.param_CLprefixed", "repeat": "$apar.param_repeat"}'
-       #end if
-     #end for
-   #end if
-     #for $intab in $io_param.ppass.io.history_inputs:
---input_files '{"name": "$intab.input_files", "CL": "$intab.input_CL", "format": "$intab.input_formats", "label": "$intab.input_label", "help": "$intab.input_help", "repeat": "$intab.input_repeat"}'
-     #end for
-     #for $otab in $io_param.ppass.io.history_outputs:
---output_files '{"name": "$otab.history_name", "format": "$otab.history_format", "CL": "$otab.history_CL", "test": "$otab.history_test"}'
-     #end for
-     #for $collect in $io_param.ppass.io.collection_outputs:
---collection '{"name": "$collect.name", "kind": "$collect.kind", "discover": "$collect.discover", "label": "$collect.label"}'
-     #end for
---untested_tool_out "$generated_xml"
-#if $install == "0":
---install_flag
-#end if
---galaxy_root "$__root_dir__"
---tool_dir "$__tool_directory__"
---admin_only
-
- #end if
-]]></command>
- <configfiles>
-  <configfile name="runme">
-$deps.usescript.dynScript
- </configfile>
- <configfile name="commandoverride">
-#if $cover.commover == "yes" and len(str($cover.command_override).strip()) > 1:
-$cover.command_override
-#end if
- </configfile>
- <configfile name="testoverride">
-#if $cover.commover == "yes" and len(str($cover.test_override).strip()) > 1:
-$cover.test_override
-#end if
- </configfile>
- <configfile name="helpme">
-${help_text}
- </configfile>
- <configfile name="citeme">
-
-#for $citation in $citations:
-    #if $citation.citation_type.type == "bibtex":
-        **ENTRY**bibtex
-        ${citation.citation_type.bibtex}
-    #else
-        **ENTRY**doi
-        ${citation.citation_type.doi}
-    #end if
-#end for
-
- </configfile>
-  </configfiles>
-  <inputs>
-   <param name="tool_name" type="text" value="my_tool"   label="New tool ID and title for outputs"
-         help="Toolshed repository name. Choose thoughtfully to avoid namespace clashes with other tool writers. Lower case, digits and underscores only">
-        <sanitizer invalid_char=" ">
-            <valid initial="string.ascii_lowercase,string.digits">
-                <add value="_"/>
-            </valid>
-        </sanitizer>
-    </param>
-
-    <section name="deps" title="Dependencies, optional script and script interpreter" expanded="true">
-
-    <param name="packages" type="text" value="" label="Conda dependencies as package name[:version, name:version...]. These will always be available when this tool executes"
-     help="Use =[ver] or :[ver] for specific version - 'bwa=0.17.0'. Default is latest. Will be used every time the tool is (re)run. Only Conda is currently supported"  />
-
-    <conditional name="usescript">
-        <param name="choosescript" type="select" display="radio" label="Supply a script for a dependency (e.g. python/R/bash) or a system executable such as Bash"
-        help = "For script interpreters like Python or bash, parameters and i/o specified below must match script's expectations - if you pass parameters, the script must deal with them">
-            <option value="no">No script required for this tool - just pass parameters on the command line to the first dependency listed above</option>
-            <option value="yes" selected="true">Yes, a script is ready to be pasted below</option>
-        </param>
-        <when value="no">
-            <param name="dynScript" type="hidden"  value="" />
-            <param name="scriptrunner" type="hidden"  value="" />
-        </when>
-        <when value="yes">
-            <param name="scriptrunner" type="text" value=""   label="Interpreter for the script - eg bash or python. Can be one of the dependencies named above or a system executable"
-              help="Scripts are interpreted by the executable named here. For conda r-base, 'Rscript --vanilla' or for conda planemo, 'planemo test' for example">
-            </param>
-            <param name="dynScript" type="text" area="True" value="" label="Script for executable above to interpret. It can be one of the Conda dependency names "
-             help="Script must handle all i/o and parameters as specified below using the parameters and passing method chosen below">
-              <sanitizer>
-                 <valid initial="string.printable"/>
-                 <mapping initial="none"/>
-              </sanitizer>
-             </param>
-        </when>
-    </conditional>
-    </section>
-    <section name="io_param" title="Data file input, output and settings forming the executable or script command line" expanded="true">
-    <conditional name="ppass">
-        <param name="parampass"  type="select" display="radio" label="Command line parameter passing method to use">
-            <option value="argparse" selected="true">Argparse: passed in the form of --clname value</option>
-            <option value="positional">Positional: Passed in the order of positional ordinals ...foo.bam bar.idx zot.xls</option>
-            <option value="0">Tool reads selected input file from STDIN and writes STDOUT with no parameters</option>
-        </param>
-        <when value="argparse">
-            <expand macro="io" />
-            <expand macro="additparam" />
-        </when>
-        <when value="positional">
-            <expand macro="io" />
-            <expand macro="additparam" />
-        </when>
-        <when value="0">
-            <expand macro="io" />
-        </when>
-    </conditional>
-    </section>
-    <param name="cl_suffix" type="text" value="" label="Suffix for generated command line. Useful for bash post processing. Use override below to replace completely"
-            help="';' separated bash commands can be used here for post processing - added at end of autogenerated command line">
-            <sanitizer>
-                 <valid initial="string.printable" />
-                 <mapping initial="none"/>
-            </sanitizer>
-    </param>
-    <conditional name="cover">
-        <param name="commover" type="select" display="radio" label="Add Human wrought code to override the generated XML command and/or test section - DIY"
-        help = "For arbitrary and artfull command lines. All i/o and parameters must be passed. Choose No unless needed. Not for the faint of heart">
-            <option value="no" selected="true">No. Use automatically generated command/test XML </option>
-            <option value="yes">Yes. XML needed to override autogenerated command and/or test segments will be pasted below</option>
-        </param>
-        <when value="no">
-            <param name="command_override" type="hidden"  value="" />
-            <param name="test_override" type="hidden"  value="" />
-        </when>
-        <when value="yes">
-            <param name="command_override" type="text" area="True" value="" label="Optional. Human wrought command element override XML/template - e.g. for bwa"
-             help="For arbitrary and artfull command lines. All i/o and parameters must be passed. Leave blank unless needed. Not for the faint of heart">
-              <sanitizer>
-                 <valid initial="string.printable"/>
-                 <mapping initial="none"/>
-              </sanitizer>
-             </param>
-            <param name="test_override" type="text" area="True" value="" label="Optional. Human wrought test element override XML/template - e.g. for bwa"
-             help="For arbitrary and artfull scripts. Leave blank unless needed. Not for the faint of heart">
-              <sanitizer>
-                 <valid initial="string.printable" />
-                 <mapping initial="none"/>
-              </sanitizer>
-            </param>
-        </when>
-    </conditional>
-    <expand macro="tool_metadata" />
-  </inputs>
-  <outputs>
-      <data name="generated_xml" format="xml" label = "${tool_name} generated XML"/>
-  </outputs>
-<tests>
-<test>
-    <param name="user_email" value="admin@galaxy.org"/>
-    <param name="input_files" value="input1_sample" />
-    <param name="input_CL" value="1" />
-    <param name="input_formats" value="txt" />
-    <param name="input_label" value="input" />
-    <param name="input_help" value="help" />
-    <param name="tool_name" value="pyrevpos" />
-    <param name="parampass" value="positional" />
-    <param name="tool_version" value="0.01" />
-    <param name="tool_desc" value="positional reverse" />
-    <param name="help_text" value="help text goes here" />
-    <param name="packages" value="python"/>
-    <param name="history_name" value="output2" />
-    <param name="history_format" value="txt" />
-    <param name="history_CL" value="2" />
-    <param name="dynScript" value="import sys; inp = sys.argv[1]; outp = sys.argv[2]; inlist = open(inp,'r').readlines(); o = open(outp,'w'); rs = [''.join(list(reversed(x.rstrip()))) for x in inlist]; o.write('\n'.join(rs)); o.close()"/>
-    <param name="choosescript" value="yes" />
-    <param name="script_path" value="$runme"/>
-    <param name="install" value="0"/>
-    <output name="generated_xml" value="generated_xml_sample" compare="diff" lines_diff="5"/>
-</test>
-</tests>
-<help>
-
-**Details and attribution**
-(see GTF_)
-
-**Local Admins ONLY**
-Only users whose IDs found in the local admin_user configuration setting in universe_wsgi.ini can run this tool.
-
-**If you find a bug**
-Please raise an issue, or even better, submit a pull request fixing it, on the github repository GTF_
-
-**What it does**
-This tool optionally generates normal workflow compatible first class Galaxy tools
-
-Generated tools can run existing binary packages that become requirements, existing scripts, or new scripts pasted into this tool form.
-Pasted scripts are written so they are part of the new tool and cannot be adjusted by the downstream user.
-Binary packages are managed by the dependency subsystem - conda usually, so anything in bioconda or conda_forge is available for example.
-
-Any number of parameters can be built into the new tool form for passing in to the script or executable at runtime.
-These can be editable by the downstream user or baked in.
-
-A new tarball compatible with any Galaxy toolshed is created in your history, however, it does not have the test prepared.
-There is a separate tool you can run to update the archive after testing with Planemo
-
-If the configuration in job_conf.xml allows tools to write to [galaxy_root]/tools, the new tool will be installed so you can view and test it locally.
-
-.. class:: warningmark
-
-**Note to system administrators**
-This tool offers *NO* built in protection against malicious scripts. It should only be installed on private/personnal Galaxy instances.
-Admin_users will have the power to do anything they want as the Galaxy user if you install this tool.
-
-.. class:: warningmark
-
-**Use on public servers**  is STRONGLY discouraged - allowing potentially malicious users to install and run any code they like is asking for trouble.
-
-The tools generated by this tool will run just as securely as any other normal installed Galaxy tool but like any other new tools, should always be checked carefully before installation.
-We recommend that you follow the good code hygiene practices associated with safe toolshed practices.
-
-
-Paper_
-
-*Licensing*
-
-Copyright Ross Lazarus (ross period lazarus at gmail period com) May 2012
-All rights reserved.
-Licensed under the LGPL_
-
-.. _LGPL: http://www.gnu.org/copyleft/lesser.html
-.. _GTF:  https://github.com/fubar2/toolfactory
-.. _Paper: https://academic.oup.com/bioinformatics/article/28/23/3139/192853
-
-
-</help>
-<citations>
-    <citation type="doi">10.1093/bioinformatics/bts573</citation>
-</citations>
-</tool>
-
-
diff -r f9fb7c57cccb -r c7696d7c2b7e toolfactory/toolfactory.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolfactory/toolfactory.py	Mon Mar 21 09:17:36 2022 +0000
@@ -0,0 +1,1092 @@
+# see https://github.com/fubar2/toolfactory
+#
+# copyright ross lazarus (ross stop lazarus at gmail stop com) May 2012
+#
+# all rights reserved
+# Licensed under the LGPL
+# suggestions for improvement and bug fixes welcome at
+# https://github.com/fubar2/toolfactory
+#
+# march 2022: Refactored into two tools - generate and test/install
+# as part of GTN tutorial development and biocontainer adoption
+# The tester runs planemo on a non-tested archive, creates the test outputs
+# and returns a new proper tool with test.
+
+
+
+import argparse
+import copy
+import fcntl
+import json
+import os
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+import tempfile
+import time
+
+from bioblend import galaxy
+
+import galaxyxml.tool as gxt
+import galaxyxml.tool.parameters as gxtp
+
+import lxml.etree as ET
+
+import yaml
+
+myversion = "V2.4 March 2022"
+verbose = True
+debug = True
+toolFactoryURL = "https://github.com/fubar2/toolfactory"
+FAKEEXE = "~~~REMOVE~~~ME~~~"
+# need this until a PR/version bump to fix galaxyxml prepending the exe even
+# with override.
+
+
+def timenow():
+    """return current time as a string"""
+    return time.strftime("%d/%m/%Y %H:%M:%S", time.localtime(time.time()))
+
+
+cheetah_escape_table = {"$": "\\$", "#": "\\#"}
+
+
+def cheetah_escape(text):
+    """Produce entities within text."""
+    return "".join([cheetah_escape_table.get(c, c) for c in text])
+
+
+def parse_citations(citations_text):
+    """"""
+    citations = [c for c in citations_text.split("**ENTRY**") if c.strip()]
+    citation_tuples = []
+    for citation in citations:
+        if citation.startswith("doi"):
+            citation_tuples.append(("doi", citation[len("doi") :].strip()))
+        else:
+            citation_tuples.append(("bibtex", citation[len("bibtex") :].strip()))
+    return citation_tuples
+
+
+class Tool_Factory:
+    """Wrapper for an arbitrary script
+    uses galaxyxml
+
+    """
+
+    def __init__(self, args=None):  # noqa
+        """
+        prepare command line cl for running the tool here
+        and prepare elements needed for galaxyxml tool generation
+        """
+        self.ourcwd = os.getcwd()
+        self.collections = []
+        if len(args.collection) > 0:
+            try:
+                self.collections = [
+                    json.loads(x) for x in args.collection if len(x.strip()) > 1
+                ]
+            except Exception:
+                print(
+                    f"--collections parameter {str(args.collection)} is malformed - should be a dictionary"
+                )
+        try:
+            self.infiles = [
+                json.loads(x) for x in args.input_files if len(x.strip()) > 1
+            ]
+        except Exception:
+            print(
+                f"--input_files parameter {str(args.input_files)} is malformed - should be a dictionary"
+            )
+        try:
+            self.outfiles = [
+                json.loads(x) for x in args.output_files if len(x.strip()) > 1
+            ]
+        except Exception:
+            print(
+                f"--output_files parameter {args.output_files} is malformed - should be a dictionary"
+            )
+        assert (len(self.outfiles) + len(self.collections)) > 0, 'No outfiles or output collections specified. The Galaxy job runner will fail without an output of some sort'
+        try:
+            self.addpar = [
+                json.loads(x) for x in args.additional_parameters if len(x.strip()) > 1
+            ]
+        except Exception:
+            print(
+                f"--additional_parameters {args.additional_parameters} is malformed - should be a dictionary"
+            )
+        try:
+            self.selpar = [
+                json.loads(x) for x in args.selecttext_parameters if len(x.strip()) > 1
+            ]
+        except Exception:
+            print(
+                f"--selecttext_parameters {args.selecttext_parameters} is malformed - should be a dictionary"
+            )
+        self.args = args
+        self.cleanuppar()
+        self.lastxclredirect = None
+        self.xmlcl = []
+        self.is_positional = self.args.parampass == "positional"
+        if self.args.sysexe:
+            if " " in self.args.sysexe:
+                self.executeme = shlex.split(self.args.sysexe)
+            else:
+                self.executeme = [
+                    self.args.sysexe,
+                ]
+        else:
+            if self.args.packages:
+                self.executeme = [
+                    self.args.packages.split(",")[0].split(":")[0].strip(),
+                ]
+            else:
+                self.executeme = None
+        aXCL = self.xmlcl.append
+        assert args.parampass in [
+            "0",
+            "argparse",
+            "positional",
+        ], 'args.parampass must be "0","positional" or "argparse"'
+        self.tool_name = re.sub("[^a-zA-Z0-9_]+", "", args.tool_name)
+        self.tool_id = self.tool_name
+        self.newtool = gxt.Tool(
+            self.tool_name,
+            self.tool_id,
+            self.args.tool_version,
+            self.args.tool_desc,
+            FAKEEXE,
+        )
+        self.tooloutdir = "./tfout"
+        self.repdir = "./toolgen"
+        self.newtarpath = os.path.join(self.tooloutdir, "%s_not_tested.toolshed.gz" % self.tool_name)
+        self.testdir = os.path.join(self.tooloutdir, "test-data")
+        if not os.path.exists(self.tooloutdir):
+            os.mkdir(self.tooloutdir)
+        if not os.path.exists(self.testdir):
+            os.mkdir(self.testdir)
+        if not os.path.exists(self.repdir):
+            os.mkdir(self.repdir)
+        self.tinputs = gxtp.Inputs()
+        self.toutputs = gxtp.Outputs()
+        self.testparam = []
+        if self.args.script_path:
+            self.prepScript()
+        if self.args.command_override:
+            scos = open(self.args.command_override, "r").readlines()
+            self.command_override = [x.rstrip() for x in scos]
+        else:
+            self.command_override = None
+        if self.args.test_override:
+            stos = open(self.args.test_override, "r").readlines()
+            self.test_override = [x.rstrip() for x in stos]
+        else:
+            self.test_override = None
+        if self.args.script_path:
+            for ex in self.executeme:
+                aXCL(ex)
+            aXCL("$runme")
+        else:
+            for ex in self.executeme:
+                aXCL(ex)
+
+        if self.args.parampass == "0":
+            self.clsimple()
+        else:
+            if self.args.parampass == "positional":
+                self.prepclpos()
+                self.clpositional()
+            else:
+                self.prepargp()
+                self.clargparse()
+
+    def clsimple(self):
+        """no parameters or repeats - uses < and > for i/o"""
+        aXCL = self.xmlcl.append
+        if len(self.infiles) > 0:
+            aXCL("<")
+            aXCL("$%s" % self.infiles[0]["infilename"])
+        if len(self.outfiles) > 0:
+            aXCL(">")
+            aXCL("$%s" % self.outfiles[0]["name"])
+        if self.args.cl_user_suffix:  # DIY CL end
+            clp = shlex.split(self.args.cl_user_suffix)
+            for c in clp:
+                aXCL(c)
+
+    def prepargp(self):
+        xclsuffix = []
+        for i, p in enumerate(self.infiles):
+            nam = p["infilename"]
+            if p["origCL"].strip().upper() == "STDIN":
+                xappendme = [
+                    nam,
+                    nam,
+                    "< $%s" % nam,
+                ]
+            else:
+                rep = p["repeat"] == "1"
+                over = ""
+                if rep:
+                    over = f'#for $rep in $R_{nam}:\n--{nam} "$rep.{nam}"\n#end for'
+                xappendme = [p["CL"], "$%s" % p["CL"], over]
+            xclsuffix.append(xappendme)
+        for i, p in enumerate(self.outfiles):
+            if p["origCL"].strip().upper() == "STDOUT":
+                self.lastxclredirect = [">", "$%s" % p["name"]]
+            else:
+                xclsuffix.append([p["name"], "$%s" % p["name"], ""])
+        for p in self.addpar:
+            nam = p["name"]
+            rep = p["repeat"] == "1"
+            if rep:
+                over = f'#for $rep in $R_{nam}:\n--{nam} "$rep.{nam}"\n#end for'
+            else:
+                over = p["override"]
+            xclsuffix.append([p["CL"], '"$%s"' % nam, over])
+        for p in self.selpar:
+            xclsuffix.append([p["CL"], '"$%s"' % p["name"], p["override"]])
+        self.xclsuffix = xclsuffix
+
+    def prepclpos(self):
+        xclsuffix = []
+        for i, p in enumerate(self.infiles):
+            if p["origCL"].strip().upper() == "STDIN":
+                xappendme = [
+                    "999",
+                    p["infilename"],
+                    "< $%s" % p["infilename"],
+                ]
+            else:
+                xappendme = [p["CL"], "$%s" % p["infilename"], ""]
+            xclsuffix.append(xappendme)
+        for i, p in enumerate(self.outfiles):
+            if p["origCL"].strip().upper() == "STDOUT":
+                self.lastxclredirect = [">", "$%s" % p["name"]]
+            else:
+                xclsuffix.append([p["CL"], "$%s" % p["name"], ""])
+        for p in self.addpar:
+            nam = p["name"]
+            rep = p["repeat"] == "1"  # repeats make NO sense
+            if rep:
+                print(
+                    f"### warning. Repeats for {nam} ignored - not permitted in positional parameter command lines!"
+                )
+            over = p["override"]
+            xclsuffix.append([p["CL"], '"$%s"' % nam, over])
+        for p in self.selpar:
+            xclsuffix.append([p["CL"], '"$%s"' % p["name"], p["override"]])
+        xclsuffix.sort()
+        self.xclsuffix = xclsuffix
+
+    def prepScript(self):
+        rx = open(self.args.script_path, "r").readlines()
+        rx = [x.rstrip() for x in rx]
+        rxcheck = [x.strip() for x in rx if x.strip() > ""]
+        assert len(rxcheck) > 0, "Supplied script is empty. Cannot run"
+        self.script = "\n".join(rx)
+        fhandle, self.sfile = tempfile.mkstemp(
+            prefix=self.tool_name, suffix="_%s" % (self.executeme[0])
+        )
+        tscript = open(self.sfile, "w")
+        tscript.write(self.script)
+        tscript.close()
+        self.spacedScript = [f"    {x}" for x in rx if x.strip() > ""]
+        rx.insert(0, "#raw")
+        rx.append("#end raw")
+        self.escapedScript = rx
+        art = "%s.%s" % (self.tool_name, self.executeme[0])
+        artifact = open(art, "wb")
+        artifact.write(bytes(self.script, "utf8"))
+        artifact.close()
+
+    def cleanuppar(self):
+        """ positional parameters are complicated by their numeric ordinal"""
+        if self.args.parampass == "positional":
+            for i, p in enumerate(self.infiles):
+                assert (
+                    p["CL"].isdigit() or p["CL"].strip().upper() == "STDIN"
+                ), "Positional parameters must be ordinal integers - got %s for %s" % (
+                    p["CL"],
+                    p["label"],
+                )
+            for i, p in enumerate(self.outfiles):
+                assert (
+                    p["CL"].isdigit() or p["CL"].strip().upper() == "STDOUT"
+                ), "Positional parameters must be ordinal integers - got %s for %s" % (
+                    p["CL"],
+                    p["name"],
+                )
+            for i, p in enumerate(self.addpar):
+                assert p[
+                    "CL"
+                ].isdigit(), "Positional parameters must be ordinal integers - got %s for %s" % (
+                    p["CL"],
+                    p["name"],
+                )
+        for i, p in enumerate(self.infiles):
+            infp = copy.copy(p)
+            infp["origCL"] = infp["CL"]
+            if self.args.parampass in ["positional", "0"]:
+                infp["infilename"] = infp["label"].replace(" ", "_")
+            else:
+                infp["infilename"] = infp["CL"]
+            self.infiles[i] = infp
+        for i, p in enumerate(self.outfiles):
+            outfp = copy.copy(p)
+            outfp["origCL"] = outfp["CL"]  # keep copy
+            self.outfiles[i] = outfp
+        for i, p in enumerate(self.addpar):
+            addp = copy.copy(p)
+            addp["origCL"] = addp["CL"]
+            self.addpar[i] = addp
+
+    def clpositional(self):
+        # inputs in order then params
+        aXCL = self.xmlcl.append
+        for (k, v, koverride) in self.xclsuffix:
+            aXCL(v)
+        if self.lastxclredirect:
+            for cl in self.lastxclredirect:
+                aXCL(cl)
+        if self.args.cl_user_suffix:  # DIY CL end
+            clp = shlex.split(self.args.cl_user_suffix)
+            for c in clp:
+                aXCL(c)
+
+    def clargparse(self):
+        """argparse style"""
+        aXCL = self.xmlcl.append
+        # inputs then params in argparse named form
+
+        for (k, v, koverride) in self.xclsuffix:
+            if koverride > "":
+                k = koverride
+                aXCL(k)
+            else:
+                if len(k.strip()) == 1:
+                    k = "-%s" % k
+                else:
+                    k = "--%s" % k
+                aXCL(k)
+                aXCL(v)
+        if self.lastxclredirect:
+            for cl in self.lastxclredirect:
+                aXCL(cl)
+        if self.args.cl_user_suffix:  # DIY CL end
+            clp = shlex.split(self.args.cl_user_suffix)
+            for c in clp:
+                aXCL(c)
+
+    def getNdash(self, newname):
+        if self.is_positional:
+            ndash = 0
+        else:
+            ndash = 2
+            if len(newname) < 2:
+                ndash = 1
+        return ndash
+
+    def doXMLparam(self):  # noqa
+        """Add all needed elements to tool"""
+        for p in self.outfiles:
+            newname = p["name"]
+            newfmt = p["format"]
+            newcl = p["CL"]
+            test = p["test"]
+            oldcl = p["origCL"]
+            test = test.strip()
+            ndash = self.getNdash(newcl)
+            aparm = gxtp.OutputData(
+                name=newname, format=newfmt, num_dashes=ndash, label=newname
+            )
+            aparm.positional = self.is_positional
+            if self.is_positional:
+                if oldcl.upper() == "STDOUT":
+                    aparm.positional = 9999999
+                    aparm.command_line_override = "> $%s" % newname
+                else:
+                    aparm.positional = int(oldcl)
+                    aparm.command_line_override = "$%s" % newname
+            self.toutputs.append(aparm)
+            ld = None
+            if test.strip() > "":
+                if test.strip().startswith("diff"):
+                    c = "diff"
+                    ld = 0
+                    if test.split(":")[1].isdigit:
+                        ld = int(test.split(":")[1])
+                    tp = gxtp.TestOutput(
+                        name=newname,
+                        value="%s_sample" % newname,
+                        compare=c,
+                        lines_diff=ld,
+                    )
+                elif test.startswith("sim_size"):
+                    c = "sim_size"
+                    tn = test.split(":")[1].strip()
+                    if tn > "":
+                        if "." in tn:
+                            delta = None
+                            delta_frac = min(1.0, float(tn))
+                        else:
+                            delta = int(tn)
+                            delta_frac = None
+                    tp = gxtp.TestOutput(
+                        name=newname,
+                        value="%s_sample" % newname,
+                        compare=c,
+                        delta=delta,
+                        delta_frac=delta_frac,
+                    )
+                else:
+                    c = test
+                    tp = gxtp.TestOutput(
+                        name=newname,
+                        value="%s_sample" % newname,
+                        compare=c,
+                    )
+                self.testparam.append(tp)
+        for p in self.infiles:
+            newname = p["infilename"]
+            newfmt = p["format"]
+            ndash = self.getNdash(newname)
+            reps = p.get("repeat", "0") == "1"
+            if not len(p["label"]) > 0:
+                alab = p["CL"]
+            else:
+                alab = p["label"]
+            aninput = gxtp.DataParam(
+                newname,
+                optional=False,
+                label=alab,
+                help=p["help"],
+                format=newfmt,
+                multiple=False,
+                num_dashes=ndash,
+            )
+            aninput.positional = self.is_positional
+            if self.is_positional:
+                if p["origCL"].upper() == "STDIN":
+                    aninput.positional = 9999998
+                    aninput.command_line_override = "< $%s" % newname
+                else:
+                    aninput.positional = int(p["origCL"])
+                    aninput.command_line_override = "$%s" % newname
+            if reps:
+                repe = gxtp.Repeat(
+                    name=f"R_{newname}", title=f"Add as many {alab} as needed"
+                )
+                repe.append(aninput)
+                self.tinputs.append(repe)
+                tparm = gxtp.TestRepeat(name=f"R_{newname}")
+                tparm2 = gxtp.TestParam(newname, value="%s_sample" % newname)
+                tparm.append(tparm2)
+                self.testparam.append(tparm)
+            else:
+                self.tinputs.append(aninput)
+                tparm = gxtp.TestParam(newname, value="%s_sample" % newname)
+                self.testparam.append(tparm)
+        for p in self.addpar:
+            newname = p["name"]
+            newval = p["value"]
+            newlabel = p["label"]
+            newhelp = p["help"]
+            newtype = p["type"]
+            newcl = p["CL"]
+            oldcl = p["origCL"]
+            reps = p["repeat"] == "1"
+            if not len(newlabel) > 0:
+                newlabel = newname
+            ndash = self.getNdash(newname)
+            if newtype == "text":
+                aparm = gxtp.TextParam(
+                    newname,
+                    label=newlabel,
+                    help=newhelp,
+                    value=newval,
+                    num_dashes=ndash,
+                )
+            elif newtype == "integer":
+                aparm = gxtp.IntegerParam(
+                    newname,
+                    label=newlabel,
+                    help=newhelp,
+                    value=newval,
+                    num_dashes=ndash,
+                )
+            elif newtype == "float":
+                aparm = gxtp.FloatParam(
+                    newname,
+                    label=newlabel,
+                    help=newhelp,
+                    value=newval,
+                    num_dashes=ndash,
+                )
+            elif newtype == "boolean":
+                aparm = gxtp.BooleanParam(
+                    newname,
+                    label=newlabel,
+                    help=newhelp,
+                    value=newval,
+                    num_dashes=ndash,
+                )
+            else:
+                raise ValueError(
+                    'Unrecognised parameter type "%s" for\
+                 additional parameter %s in makeXML'
+                    % (newtype, newname)
+                )
+            aparm.positional = self.is_positional
+            if self.is_positional:
+                aparm.positional = int(oldcl)
+            if reps:
+                repe = gxtp.Repeat(
+                    name=f"R_{newname}", title=f"Add as many {newlabel} as needed"
+                )
+                repe.append(aparm)
+                self.tinputs.append(repe)
+                tparm = gxtp.TestRepeat(name=f"R_{newname}")
+                tparm2 = gxtp.TestParam(newname, value=newval)
+                tparm.append(tparm2)
+                self.testparam.append(tparm)
+            else:
+                self.tinputs.append(aparm)
+                tparm = gxtp.TestParam(newname, value=newval)
+                self.testparam.append(tparm)
+        for p in self.selpar:
+            newname = p["name"]
+            newval = p["value"]
+            newlabel = p["label"]
+            newhelp = p["help"]
+            newtype = p["type"]
+            newcl = p["CL"]
+            if not len(newlabel) > 0:
+                newlabel = newname
+            ndash = self.getNdash(newname)
+            if newtype == "selecttext":
+                newtext = p["texts"]
+                aparm = gxtp.SelectParam(
+                    newname,
+                    label=newlabel,
+                    help=newhelp,
+                    num_dashes=ndash,
+                )
+                for i in range(len(newval)):
+                    anopt = gxtp.SelectOption(
+                        value=newval[i],
+                        text=newtext[i],
+                    )
+                    aparm.append(anopt)
+                aparm.positional = self.is_positional
+                if self.is_positional:
+                    aparm.positional = int(newcl)
+                self.tinputs.append(aparm)
+                tparm = gxtp.TestParam(newname, value=newval)
+                self.testparam.append(tparm)
+            else:
+                raise ValueError(
+                    'Unrecognised parameter type "%s" for\
+                 selecttext parameter %s in makeXML'
+                    % (newtype, newname)
+                )
+        for p in self.collections:
+            newkind = p["kind"]
+            newname = p["name"]
+            newlabel = p["label"]
+            newdisc = p["discover"]
+            collect = gxtp.OutputCollection(newname, label=newlabel, type=newkind)
+            disc = gxtp.DiscoverDatasets(
+                pattern=newdisc, directory=f"{newname}", visible="false"
+            )
+            collect.append(disc)
+            self.toutputs.append(collect)
+            try:
+                tparm = gxtp.TestOutputCollection(newname)  # broken until PR merged.
+                self.testparam.append(tparm)
+            except Exception:
+                print(
+                    "#### WARNING: Galaxyxml version does not have the PR merged yet - tests for collections must be over-ridden until then!"
+                )
+
+    def doNoXMLparam(self):
+        """filter style package - stdin to stdout"""
+        if len(self.infiles) > 0:
+            alab = self.infiles[0]["label"]
+            if len(alab) == 0:
+                alab = self.infiles[0]["infilename"]
+            max1s = (
+                "Maximum one input if parampass is 0 but multiple input files supplied - %s"
+                % str(self.infiles)
+            )
+            assert len(self.infiles) == 1, max1s
+            newname = self.infiles[0]["infilename"]
+            aninput = gxtp.DataParam(
+                newname,
+                optional=False,
+                label=alab,
+                help=self.infiles[0]["help"],
+                format=self.infiles[0]["format"],
+                multiple=False,
+                num_dashes=0,
+            )
+            aninput.command_line_override = "< $%s" % newname
+            aninput.positional = True
+            self.tinputs.append(aninput)
+            tp = gxtp.TestParam(name=newname, value="%s_sample" % newname)
+            self.testparam.append(tp)
+        if len(self.outfiles) > 0:
+            newname = self.outfiles[0]["name"]
+            newfmt = self.outfiles[0]["format"]
+            anout = gxtp.OutputData(newname, format=newfmt, num_dashes=0)
+            anout.command_line_override = "> $%s" % newname
+            anout.positional = self.is_positional
+            self.toutputs.append(anout)
+            tp = gxtp.TestOutput(name=newname, value="%s_sample" % newname)
+            self.testparam.append(tp)
+
+    def makeXML(self):  # noqa
+        """
+        Create a Galaxy xml tool wrapper for the new script
+        Uses galaxyhtml
+        Hmmm. How to get the command line into correct order...
+        """
+        if self.command_override:
+            self.newtool.command_override = self.command_override  # config file
+        else:
+            self.newtool.command_override = self.xmlcl
+        cite = gxtp.Citations()
+        acite = gxtp.Citation(type="doi", value="10.1093/bioinformatics/bts573")
+        cite.append(acite)
+        self.newtool.citations = cite
+        safertext = ""
+        if self.args.help_text:
+            helptext = open(self.args.help_text, "r").readlines()
+            safertext = "\n".join([cheetah_escape(x) for x in helptext])
+        if len(safertext.strip()) == 0:
+            safertext = (
+                "Ask the tool author (%s) to rebuild with help text please\n"
+                % (self.args.user_email)
+            )
+        if self.args.script_path:
+            if len(safertext) > 0:
+                safertext = safertext + "\n\n------\n"  # transition allowed!
+            scr = [x for x in self.spacedScript if x.strip() > ""]
+            scr.insert(0, "\n\nScript::\n")
+            if len(scr) > 300:
+                scr = (
+                    scr[:100]
+                    + ["    >300 lines - stuff deleted", "    ......"]
+                    + scr[-100:]
+                )
+            scr.append("\n")
+            safertext = safertext + "\n".join(scr)
+        self.newtool.help = safertext
+        self.newtool.version_command = f'echo "{self.args.tool_version}"'
+        std = gxtp.Stdios()
+        std1 = gxtp.Stdio()
+        std.append(std1)
+        self.newtool.stdios = std
+        requirements = gxtp.Requirements()
+        if self.args.packages:
+            try:
+                for d in self.args.packages.split(","):
+                    ver = None
+                    packg = None
+                    d = d.replace("==", ":")
+                    d = d.replace("=", ":")
+                    if ":" in d:
+                        packg, ver = d.split(":")
+                        ver = ver.strip()
+                        packg = packg.strip()
+                    else:
+                        packg = d.strip()
+                        ver = None
+                    if ver == "":
+                        ver = None
+                    if packg:
+                        requirements.append(
+                            gxtp.Requirement("package", packg.strip(), ver)
+                        )
+            except Exception:
+                print(
+                    "### malformed packages string supplied - cannot parse =",
+                    self.args.packages,
+                )
+                sys.exit(2)
+        self.newtool.requirements = requirements
+        if self.args.parampass == "0":
+            self.doNoXMLparam()
+        else:
+            self.doXMLparam()
+        self.newtool.outputs = self.toutputs
+        self.newtool.inputs = self.tinputs
+        if self.args.script_path:
+            configfiles = gxtp.Configfiles()
+            configfiles.append(
+                gxtp.Configfile(name="runme", text="\n".join(self.escapedScript))
+            )
+            self.newtool.configfiles = configfiles
+        tests = gxtp.Tests()
+        test_a = gxtp.Test()
+        for tp in self.testparam:
+            test_a.append(tp)
+        tests.append(test_a)
+        self.newtool.tests = tests
+        self.newtool.add_comment(
+            "Created by %s at %s using the Galaxy Tool Factory."
+            % (self.args.user_email, timenow())
+        )
+        self.newtool.add_comment("Source in git at: %s" % (toolFactoryURL))
+        exml0 = self.newtool.export()
+        exml = exml0.replace(FAKEEXE, "")  # temporary work around until PR accepted
+        if (
+            self.test_override
+        ):  # cannot do this inside galaxyxml as it expects lxml objects for tests
+            part1 = exml.split("<tests>")[0]
+            part2 = exml.split("</tests>")[1]
+            fixed = "%s\n%s\n%s" % (part1, "\n".join(self.test_override), part2)
+            exml = fixed
+        with open("%s.xml" % self.tool_name, "w") as xf:
+            xf.write(exml)
+            xf.write("\n")
+        with open(self.args.untested_tool_out, 'w') as outf:
+            outf.write(exml)
+            outf.write('\n')
+        # galaxy history item
+
+    def writeShedyml(self):
+        """for planemo"""
+        yuser = self.args.user_email.split("@")[0]
+        yfname = os.path.join(self.tooloutdir, ".shed.yml")
+        yamlf = open(yfname, "w")
+        odict = {
+            "name": self.tool_name,
+            "owner": yuser,
+            "type": "unrestricted",
+            "description": self.args.tool_desc,
+            "synopsis": self.args.tool_desc,
+            "category": "TF Generated Tools",
+        }
+        yaml.dump(odict, yamlf, allow_unicode=True)
+        yamlf.close()
+
+    def makeTool(self):
+        """write xmls and input samples into place"""
+        if self.args.parampass == 0:
+            self.doNoXMLparam()
+        else:
+            self.makeXML()
+        if self.args.script_path:
+            stname = os.path.join(self.tooloutdir, self.sfile)
+            if not os.path.exists(stname):
+                shutil.copyfile(self.sfile, stname)
+        xreal = "%s.xml" % self.tool_name
+        xout = os.path.join(self.tooloutdir, xreal)
+        shutil.copyfile(xreal, xout)
+        for p in self.infiles:
+            pth = p["name"]
+            dest = os.path.join(self.testdir, "%s_sample" % p["infilename"])
+            shutil.copyfile(pth, dest)
+            dest = os.path.join(
+                self.repdir, "%s_sample.%s" % (p["infilename"], p["format"])
+            )
+            shutil.copyfile(pth, dest)
+
+    def makeToolTar(self, report_fail=False):
+        """move outputs into test-data and prepare the tarball"""
+        excludeme = "_planemo_test_report.html"
+
+        def exclude_function(tarinfo):
+            filename = tarinfo.name
+            return None if filename.endswith(excludeme) else tarinfo
+
+        for p in self.outfiles:
+            oname = p["name"]
+            tdest = os.path.join(self.testdir, "%s_sample" % oname)
+            src = os.path.join(self.testdir, oname)
+            if not os.path.isfile(tdest):
+                if os.path.isfile(src):
+                    shutil.copyfile(src, tdest)
+                    dest = os.path.join(self.repdir, "%s.sample.%s" % (oname,p['format']))
+                    shutil.copyfile(src, dest)
+                else:
+                    if report_fail:
+                        print(
+                            "###Tool may have failed - output file %s not found in testdir after planemo run %s."
+                            % (tdest, self.testdir)
+                        )
+        tf = tarfile.open(self.newtarpath, "w:gz")
+        tf.add(
+            name=self.tooloutdir,
+            arcname=self.tool_name,
+            filter=exclude_function,
+        )
+        shutil.copy(self.newtarpath, os.path.join(self.tooloutdir, f"{self.tool_name}_untested.toolshed.gz"))
+        tf.close()
+
+    def shedLoad(self):
+        """
+        use bioblend to create new repository
+        or update existing
+
+        """
+        if os.path.exists(self.tlog):
+            sto = open(self.tlog, "a")
+        else:
+            sto = open(self.tlog, "w")
+
+        ts = toolshed.ToolShedInstance(
+            url=self.args.toolshed_url,
+            key=self.args.toolshed_api_key,
+            verify=False,
+        )
+        repos = ts.repositories.get_repositories()
+        rnames = [x.get("name", "?") for x in repos]
+        rids = [x.get("id", "?") for x in repos]
+        tfcat = "ToolFactory generated tools"
+        if self.tool_name not in rnames:
+            tscat = ts.categories.get_categories()
+            cnames = [x.get("name", "?").strip() for x in tscat]
+            cids = [x.get("id", "?") for x in tscat]
+            catID = None
+            if tfcat.strip() in cnames:
+                ci = cnames.index(tfcat)
+                catID = cids[ci]
+            res = ts.repositories.create_repository(
+                name=self.args.tool_name,
+                synopsis="Synopsis:%s" % self.args.tool_desc,
+                description=self.args.tool_desc,
+                type="unrestricted",
+                remote_repository_url=self.args.toolshed_url,
+                homepage_url=None,
+                category_ids=catID,
+            )
+            tid = res.get("id", None)
+            sto.write(f"#create_repository {self.args.tool_name} tid={tid} res={res}\n")
+        else:
+            i = rnames.index(self.tool_name)
+            tid = rids[i]
+        try:
+            res = ts.repositories.update_repository(
+                id=tid, tar_ball_path=self.newtarpath, commit_message=None
+            )
+            sto.write(f"#update res id {id} ={res}\n")
+        except ConnectionError:
+            sto.write(
+                "####### Is the toolshed running and the API key correct? Bioblend shed upload failed\n"
+            )
+        sto.close()
+
+    def eph_galaxy_load(self):
+        """
+        use ephemeris to load the new tool from the local toolshed after planemo uploads it
+        """
+        if os.path.exists(self.tlog):
+            tout = open(self.tlog, "a")
+        else:
+            tout = open(self.tlog, "w")
+        cll = [
+            "shed-tools",
+            "install",
+            "-g",
+            self.args.galaxy_url,
+            "--latest",
+            "-a",
+            self.args.galaxy_api_key,
+            "--name",
+            self.tool_name,
+            "--owner",
+            "fubar",
+            "--toolshed",
+            self.args.toolshed_url,
+            "--section_label",
+            "ToolFactory",
+        ]
+        tout.write("running\n%s\n" % " ".join(cll))
+        subp = subprocess.run(
+            cll,
+            env=self.ourenv,
+            cwd=self.ourcwd,
+            shell=False,
+            stderr=tout,
+            stdout=tout,
+        )
+        tout.write(
+            "installed %s - got retcode %d\n" % (self.tool_name, subp.returncode)
+        )
+        tout.close()
+        return subp.returncode
+
+    def planemo_biodocker_test(self):
+        """planemo currently leaks dependencies if used in the same container and gets unhappy after a
+        first successful run. https://github.com/galaxyproject/planemo/issues/1078#issuecomment-731476930
+
+        Docker biocontainer has planemo with caches filled to save repeated downloads
+
+
+        """
+
+        def prun(container, tout, cl, user="biodocker"):
+            rlog = container.exec_run(cl, user=user)
+            slogl = str(rlog).split("\\n")
+            slog = "\n".join(slogl)
+            tout.write(f"## got rlog {slog} from {cl}\n")
+
+        if os.path.exists(self.tlog):
+            tout = open(self.tlog, "a")
+        else:
+            tout = open(self.tlog, "w")
+        planemoimage = "quay.io/fubar2/planemo-biocontainer"
+        xreal = "%s.xml" % self.tool_name
+        repname = f"{self.tool_name}_planemo_test_report.html"
+        ptestrep_path = os.path.join(self.repdir, repname)
+        client = docker.from_env()
+        tvol = client.volumes.create()
+        tvolname = tvol.name
+        destdir = "/toolfactory/ptest"
+        imrep = os.path.join(destdir, repname)
+        # need to keep the container running so keep it open with sleep
+        # will stop and destroy it when we are done
+        container = client.containers.run(
+            planemoimage,
+            "sleep 120m",
+            detach=True,
+            user="biodocker",
+            volumes={f"{tvolname}": {"bind": "/toolfactory", "mode": "rw"}},
+        )
+        cl = f"mkdir -p {destdir}"
+        prun(container, tout, cl, user="root")
+        # that's how hard it is to get root on a biodocker container :(
+        cl = f"rm -rf {destdir}/*"
+        prun(container, tout, cl, user="root")
+        ptestpath = os.path.join(destdir, "tfout", xreal)
+        self.copy_to_container(self.tooloutdir, destdir, container)
+        cl = "chown -R biodocker /toolfactory"
+        prun(container, tout, cl, user="root")
+        _ = container.exec_run(f"ls -la {destdir}")
+        ptestcl = f"planemo test  --test_output {imrep}  --update_test_data  --no_cleanup --test_data {destdir}/tfout/test-data --galaxy_root /home/biodocker/galaxy-central {ptestpath}"
+        try:
+            _ = container.exec_run(ptestcl)
+            # fails because test outputs missing but updates the test-data directory
+        except Exception:
+            e = sys.exc_info()[0]
+            tout.write(f"#### error: {e} from {ptestcl}\n")
+        cl = f"planemo test  --test_output {imrep} --no_cleanup --test_data {destdir}/tfout/test-data --galaxy_root /home/biodocker/galaxy-central {ptestpath}"
+        try:
+            prun(container, tout, cl)
+        except Exception:
+            e = sys.exc_info()[0]
+            tout.write(f"#### error: {e} from {ptestcl}\n")
+        testouts = tempfile.mkdtemp(suffix=None, prefix="tftemp", dir=".")
+        self.copy_from_container(destdir, testouts, container)
+        src = os.path.join(testouts, "ptest")
+        if os.path.isdir(src):
+            shutil.copytree(src, ".", dirs_exist_ok=True)
+            src = repname
+            if os.path.isfile(repname):
+                shutil.copyfile(src, ptestrep_path)
+        else:
+            tout.write(f"No output from run to shutil.copytree in {src}\n")
+        tout.close()
+        container.stop()
+        container.remove()
+        tvol.remove()
+        shutil.rmtree(testouts)  # leave for debugging
+
+    def planemo_test_once(self):
+        """planemo is a requirement so is available for testing but needs a
+        different call if in the biocontainer - see above
+        and for generating test outputs if command or test overrides are
+        supplied test outputs are sent to repdir for display
+        """
+        xreal = "%s.xml" % self.tool_name
+        tool_test_path = os.path.join(
+            self.repdir, f"{self.tool_name}_planemo_test_report.html"
+        )
+        if os.path.exists(self.tlog):
+            tout = open(self.tlog, "a")
+        else:
+            tout = open(self.tlog, "w")
+        cll = [
+            "planemo",
+            "test",
+            "--conda_auto_init",
+            "--test_data",
+            os.path.abspath(self.testdir),
+            "--test_output",
+            os.path.abspath(tool_test_path),
+            "--galaxy_root",
+            self.args.galaxy_root,
+            "--update_test_data",
+            os.path.abspath(xreal),
+        ]
+        p = subprocess.run(
+            cll,
+            shell=False,
+            cwd=self.tooloutdir,
+            stderr=tout,
+            stdout=tout,
+        )
+        tout.close()
+        return p.returncode
+
+
+def main():
+    """
+    This is a Galaxy wrapper.
+    It expects to be called by a special purpose tool.xml
+
+    """
+    parser = argparse.ArgumentParser()
+    a = parser.add_argument
+    a("--script_path", default=None)
+    a("--history_test", default=None)
+    a("--cl_user_suffix", default=None)
+    a("--sysexe", default=None)
+    a("--packages", default=None)
+    a("--tool_name", default="newtool")
+    a("--tool_dir", default=None)
+    a("--input_files", default=[], action="append")
+    a("--output_files", default=[], action="append")
+    a("--user_email", default="Unknown")
+    a("--bad_user", default=None)
+    a("--help_text", default=None)
+    a("--tool_desc", default=None)
+    a("--tool_version", default="0.01")
+    a("--citations", default=None)
+    a("--command_override", default=None)
+    a("--test_override", default=None)
+    a("--additional_parameters", action="append", default=[])
+    a("--selecttext_parameters", action="append", default=[])
+    a("--edit_additional_parameters", action="store_true", default=False)
+    a("--parampass", default="positional")
+    a("--tfout", default="./tfout")
+    a("--galaxy_root", default="/galaxy-central")
+    a("--galaxy_venv", default="/galaxy_venv")
+    a("--collection", action="append", default=[])
+    a("--include_tests", default=False, action="store_true")
+    a("--install_flag", action = "store_true", default=False)
+    a("--admin_only", default=True, action="store_true")
+    a("--untested_tool_out", default=None)
+    a("--local_tools", default="tools")  # relative to $__root_dir__
+    a("--tool_conf_path", default="config/tool_conf.xml")  # relative to $__root_dir__
+    args = parser.parse_args()
+    if args.admin_only:
+        assert not args.bad_user, (
+            'UNAUTHORISED: %s is NOT authorized to use this tool until Galaxy \
+admin adds %s to "admin_users" in the galaxy.yml Galaxy configuration file'
+            % (args.bad_user, args.bad_user)
+        )
+    assert args.tool_name, "## This ToolFactory cannot build a tool without a tool name. Please supply one."
+    tf = Tool_Factory(args)
+    tf.writeShedyml()
+    tf.makeTool()
+    tf.makeToolTar()
+
+
+if __name__ == "__main__":
+    main()
diff -r f9fb7c57cccb -r c7696d7c2b7e toolfactory/toolfactory.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolfactory/toolfactory.xml	Mon Mar 21 09:17:36 2022 +0000
@@ -0,0 +1,485 @@
+<tool id="rgtf2" name="toolfactory" version="2.00" profile="16.04" >
+  <description>Scripts into tools v2.0</description>
+  <macros>
+      <xml name="singleText">
+            <param name="param_value" type="text" value="" label="Enter this parameter's default text value">
+          </param>
+      </xml>
+      <xml name="singleInt">
+            <param name="param_value" type="integer" value="" label="Enter this parameter's default integer value" >
+          </param>
+      </xml>
+      <xml name="singleFloat">
+            <param name="param_value" type="float" value="" label="Enter this parameter's default value">
+          </param>
+      </xml>
+     <xml name="singleBoolean">
+            <param name="param_value" type="boolean" value="" label="Enter this parameter's default value" />
+            <param name="truevalue" type="text" value="True" label="Command line value to emit when True" />
+            <param name="falsevalue" type="boolean" value="True" label="Command line value to emit when False" />
+      </xml>
+      <xml name="selectText">
+          <repeat name="selectTexts" title="Add each option to be presented in a text select box" min="2" default="2"
+             help="Each text added here will also have  a value to be emitted on the command line when the text is chosen">
+            <param name="select_text" type="text" value="" label="Enter the explanatory text the user will see for this choice" >
+          </param>
+          <param name="select_value" type="text" value="" label="Enter the value for the command line when the user selects this option">
+          </param>
+          </repeat>
+      </xml>
+     <xml name="tool_metadata">
+        <param name="tool_version" label="Tool Version - bump this to warn users trying to redo old analyses" type="text" value="0.01"
+            help="If you change your script and regenerate the 'same' tool, you should inform Galaxy (and users) by changing (bumping is traditional) this number"/>
+        <param name="tool_desc" label="Tool Synopsis" type="text" value=""
+            help="Supply a brief tool description for the Galaxy tool menu entry" />
+        <param name="install" label="Attempt to install in the host Galaxy"
+            help="This may/should fail unless running in a lax security environment (your own laptop perhaps) or the specialised ToolFactory Docker container"
+            type="hidden" checked="True" truevalue="1"  falsevalue="" />
+         <param name="run_test" label="Finalise new archive with test outputs. Runs externally. Outputs will appear in history when ready"
+            help="Archives must be run and updated using planemo to populate all the test outputs. May take a long time depending on dependencies"
+            type="boolean" checked="False" truevalue="1"  falsevalue="" />
+         <param name="help_text" label="Tool form documentation and help text for users" type="text" area="true"
+            value="**What it Does**"
+             help="Supply user documentation to appear on the new tool form as reStructured text - http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html" >
+                <sanitizer>
+                    <valid initial="string.printable" />
+                    <mapping initial="none"/>
+                </sanitizer>
+        </param>
+        <repeat name="citations" title="Citation">
+                <conditional name="citation_type">
+                    <param name="type" type="select" display="radio" label="Citation Type">
+                        <option value="doi">DOI</option>
+                        <option value="bibtex">BibTeX</option>
+                    </param>
+                    <when value="doi">
+                        <param name="doi" label="DOI" type="text" value=""
+                        help="Supply a DOI (e.g. doi: 10.1111/j.1740-9713.2007.00258.x) to be cited when this tool is used in published research." />
+                    </when>
+                    <when value="bibtex">
+                        <param name="bibtex" label="BibTex" type="text" area="true"
+                            help="Supply a BibTex entry that should be cited when this tool is used in published research." value="" >
+                            <sanitizer>
+                                <valid initial="string.printable" />
+                                <mapping initial="none"/>
+                            </sanitizer>
+                        </param>
+                    </when>
+                </conditional>
+        </repeat>
+     </xml>
+     <xml name="io">
+     <section name="io" title="Input and output files" expanded="true">
+        <repeat name="history_inputs" title="Inputs" min="0"
+             help="Input data files to pass on the command line to the executable. USE SMALL SAMPLES for the new tool's test. Prompts will form a history item selector as input for users of this new tool">
+            <param name="input_files" type="data" format="data" label="Select an input file from your history" multiple="false"
+               help=""/>
+            <param name="input_formats" type="select" multiple="true" label="Select the datatype(s) that your tool/script accepts as input"
+              help="If your datatype is not listed here, it has to be added in galaxy's datatypes_conf.xml" value="tabular">
+               <options from_parameter="tool.app.datatypes_registry.upload_file_formats">
+                <column name="value" index="0"/>
+               </options>
+            </param>
+            <param name="input_label" type="text" value="" label="This will become the user prompt for the form so please make it informative" >
+            </param>
+            <param name="input_help" type="text" value="" label="This will become help text on the form." >
+            </param>
+            <param name="input_CL" type="text" label="Positional: ordinal integer. Argparse: argument name. STDIN if the executable/script expects it"
+              help="If you will pass positional parameters, enter the integer ordinal for this parameter. If Argparse style, '--' will be prepended or '-' if single character" value="">
+            </param>
+            <param name="input_repeat" type="boolean" checked="False" truevalue="1"  falsevalue="0" label="Allow user to repeat this input as many times as wanted - script/executable must parse these."/>
+        </repeat>
+        <repeat name="history_outputs" min="0" title="Outputs"
+             help="New history items output by the executable to appear in the user history after the tool runs. The name will become a history item for users of the new tool you are making containing one of it's outputs">
+            <param name="history_name" type="text" label="Output Name" optional="false"
+              help="Name used for this output in history. No spaces! Argparse will also use this name as --[name]">
+              <sanitizer invalid_char=" ">
+                <valid initial="string.ascii_letters,string.digits" >
+                   <add value="_" />
+                </valid>
+              </sanitizer>
+            </param>
+            <param name="history_format" type="select" multiple="false" label="Select the datatype for this output"
+              help="If your datatype is not listed here, it has to be added in galaxy's datatypes_conf.xml" value="tabular">
+               <options from_parameter="tool.app.datatypes_registry.upload_file_formats">
+                <column name="value" index="0"/>
+               </options>
+            </param>
+            <param name="history_CL" type="text"  label="Position"
+              help="Positional: ordinal integer or 'STDOUT' if '>' required. Otherwise ignored if argparse because name is used. If positional parameters, enter the integer ordinal expected for this parameter. If argparse, ignore unless STDOUT needed" value=""/>
+            <param name="history_test" type="text"  label="Output test criteria"
+              help="Pass/fail decision criterion for this output compared to test generation. Available options are diff:[lines], sim_size:[delta (integer) or delta_frac (float)" value="diff:0"/>
+        </repeat>
+        <repeat name="collection_outputs" title="Output Collections" min="0"
+             help="New history collections to appear in the user history after the tool runs. Hides outputs not needed for downstream tools such as images and intermediate reports." default="0">
+            <param name="name" type="text" label="Name"
+              help="for new collection with all outputs not individually passed to history outputs. No spaces! Script MUST create and fill a directory with the same name and the tool test MUST be overwritten - see the plotter example for hints">
+              <sanitizer invalid_char="_">
+                <valid initial="string.ascii_letters,string.digits" >
+                   <add value="_" />
+                </valid>
+              </sanitizer>
+            </param>
+            <param name="kind" type="select" multiple="false" label="Select the kind of collection for this output"
+              help="">
+                <option value="list" selected="true">List</option>
+                <option value="paired">Paired</option>
+                <option value="list:paired">List of paired</option>
+            </param>
+            <param name="label" type="text"  label="Label for this collection" help="" value=""/>
+            <param name="discover" type="text"  label="Discover datasets expression" help="__name_and_ext__ should catch all filenames with extensions" value="__name_and_ext__"/>
+        </repeat>
+
+        </section>
+     </xml>
+     <xml name="additparam">
+     <section name="addparam" title="Arguments" help="Executable or script settings passed on the command line other than I/O files" expanded="true">
+        <param name="edit_params" type="select" display="radio" label="Make these settings on the generated tool form user editable?"
+             help="If no, users will NOT be able to alter any additional parameters. If yes, these will appear on the tool form as text fields with no validation or sanitizing">
+            <option value="yes" selected="true">Yes, allow user to edit all additional parameters on the generated tool form</option>
+            <option value="no">No - use the fixed values for all additional parameters - no user editing</option>
+        </param>
+        <repeat name="additional_parameters" title="Command Line Paramters" min="0"
+             help="Command line settings for the user to pass to the executable. See examples below to see how these can be parsed by scripts in the various languages">
+          <param name="param_name" type="text" value="" label="Choose the name for this parameter - MUST not be blank!">
+            <sanitizer invalid_char="">
+              <valid initial="string.ascii_letters,string.digits"/>
+              <mapping initial="none"/>
+            </sanitizer>
+          </param>
+          <conditional name="ap_type">
+          <param name="param_type" type="select" label="Select the type for this parameter">
+            <option value="text" selected="true">Text string</option>
+            <option value="integer">Integer</option>
+            <option value="float">Float</option>
+            <option value="boolean">Boolean</option>
+            <option value="selecttext">Select text string</option>
+          </param>
+          <when value = "text">
+              <expand macro="singleText" />
+          </when>
+          <when value = "integer">
+              <expand macro="singleInt" />
+          </when>
+          <when value = "float">
+              <expand macro="singleFloat" />
+          </when>
+          <when value = "boolean">
+              <expand macro="singleBoolean" />
+          </when>
+          <when value = "selecttext">
+              <expand macro="selectText" />
+          </when>
+          </conditional>
+          <param name="param_label" type="text" value="" label="Enter this parameter's label for the form">
+          </param>
+          <param name="param_help" type="text" value="" label="Help for this parameter">
+          </param>
+          <param name="param_CL" type="text" label="Positional ordinal | argparse argument name"
+              help="Using positional parameters, enter the integer ordinal for this parameter on the command line. Using Argparse style, '--' will be prepended on the CL" value="" />
+          <param name="param_CLprefixed" type="text" label="Override the generated default argparse name prefix if not empty - eg ----foo if needed"
+              help="Some targets like Planemo expect an unadorned action like 'test' before --galaxy_root." value="" />
+          <param name="param_repeat" type="boolean" checked="False" truevalue="1"  falsevalue="0" label="Allow user to repeat this as many times as needed." />
+        </repeat>
+        </section>
+     </xml>
+  </macros>
+
+<requirements>
+     <requirement type="package" version="0.4.14">galaxyxml</requirement>
+     <requirement type="package" version="0.16.0">bioblend</requirement>
+</requirements>
+
+<command detect_errors="exit_code"><![CDATA[
+#import os
+#set dev_env = os.environ.get('GALAXY_DEVELOPMENT_ENVIRONMENT', '0') == '1'
+#if not $dev_env and ( $__user_email__ not in $__admin_users__ ):
+python3 $__tool_directory__/rgToolFactory2.py --bad_user $__user_email__
+ #else:
+python3 $__tool_directory__/ToolFactory.py
+    #if len(str($cl_suffix)) > 0:
+--cl_user_suffix "$cl_suffix"
+    #end if
+    #if $cover.commover == "yes":
+       #if len(str($cover.command_override)) > 10:
+--command_override "$commandoverride"
+       #end if
+       #if len(str($cover.test_override)) > 10:
+--test_override "$testoverride"
+       #end if
+    #end if
+    #if $deps.packages > "":
+        --packages "$deps.packages"
+    #end if
+   #if $deps.usescript.choosescript == "yes":
+--script_path "$runme"
+--sysexe "$deps.usescript.scriptrunner"
+    #end if
+--tool_name "$tool_name"  --user_email "$__user_email__" --citations "$citeme"  --parampass "$io_param.ppass.parampass"
+--tool_desc "$tool_desc"
+--tool_version "$tool_version"
+--help_text "$helpme"
+   #if $io_param.ppass.parampass != '0':
+     #if str($io_param.ppass.addparam.edit_params) == "yes":
+--edit_additional_parameters
+     #end if
+     #for $apar in $io_param.ppass.addparam.additional_parameters:
+        #if $apar.ap_type.param_type=="selecttext":
+--selecttext_parameters '{"name":"$apar.param_name", "label":"$apar.param_label", "help":"$apar.param_help",
+"type":"$apar.ap_type.param_type","CL":"$apar.param_CL","override":"$apar.param_CLprefixed","value": [
+         #for $i,$st in enumerate($apar.ap_type.selectTexts):
+           "$st.select_value"
+           #if ($i < (len($apar.ap_type.selectTexts)-1)):
+           ,
+           #end if
+         #end for
+         ], "texts": [
+         #for $i,$st in enumerate($apar.ap_type.selectTexts):
+         "$st.select_text"
+          #if ($i < (len($apar.ap_type.selectTexts)-1)):
+           ,
+           #end if
+
+         #end for
+         ]
+         }'
+       #else:
+--additional_parameters '{"name": "$apar.param_name", "value": "$apar.ap_type.param_value", "label": "$apar.param_label", "help": "$apar.param_help",
+"type": "$apar.ap_type.param_type","CL": "$apar.param_CL","override": "$apar.param_CLprefixed", "repeat": "$apar.param_repeat"}'
+       #end if
+     #end for
+   #end if
+     #for $intab in $io_param.ppass.io.history_inputs:
+--input_files '{"name": "$intab.input_files", "CL": "$intab.input_CL", "format": "$intab.input_formats", "label": "$intab.input_label", "help": "$intab.input_help", "repeat": "$intab.input_repeat"}'
+     #end for
+     #for $otab in $io_param.ppass.io.history_outputs:
+--output_files '{"name": "$otab.history_name", "format": "$otab.history_format", "CL": "$otab.history_CL", "test": "$otab.history_test"}'
+     #end for
+     #for $collect in $io_param.ppass.io.collection_outputs:
+--collection '{"name": "$collect.name", "kind": "$collect.kind", "discover": "$collect.discover", "label": "$collect.label"}'
+     #end for
+--untested_tool_out "$untested_tool"
+#if $run_test == "1":
+--run_test
+#end if
+--galaxy_root "$__root_dir__"
+--tool_dir "$__tool_directory__"
+ #end if
+]]></command>
+ <configfiles>
+  <configfile name="runme">
+$deps.usescript.dynScript
+ </configfile>
+ <configfile name="commandoverride">
+#if $cover.commover == "yes" and len(str($cover.command_override).strip()) > 1:
+$cover.command_override
+#end if
+ </configfile>
+ <configfile name="testoverride">
+#if $cover.commover == "yes" and len(str($cover.test_override).strip()) > 1:
+$cover.test_override
+#end if
+ </configfile>
+ <configfile name="helpme">
+${help_text}
+ </configfile>
+ <configfile name="citeme">
+
+#for $citation in $citations:
+    #if $citation.citation_type.type == "bibtex":
+        **ENTRY**bibtex
+        ${citation.citation_type.bibtex}
+    #else
+        **ENTRY**doi
+        ${citation.citation_type.doi}
+    #end if
+#end for
+
+ </configfile>
+  </configfiles>
+  <inputs>
+   <param name="tool_name" type="text" value="my_tool"   label="New tool ID and title for outputs"
+         help="Toolshed repository name. Choose thoughtfully to avoid namespace clashes with other tool writers. Lower case, digits and underscores only">
+        <sanitizer invalid_char="">
+            <valid initial="string.ascii_lowercase,string.digits">
+                <add value="_"/>
+            </valid>
+        </sanitizer>
+    </param>
+
+    <section name="deps" title="Dependencies, optional script and script interpreter" expanded="true">
+
+    <param name="packages" type="text" value="" label="Conda dependencies as package name[:version, name:version...]. These will always be available when this tool executes"
+     help="Use =[ver] or :[ver] for specific version - 'bwa=0.17.0'. Default is latest. Will be used every time the tool is (re)run. Only Conda is currently supported"  />
+
+    <conditional name="usescript">
+        <param name="choosescript" type="select" display="radio" label="Supply a script for a dependency (e.g. python/R/bash) or a system executable such as Bash"
+        help = "For script interpreters like Python or bash, parameters and i/o specified below must match script's expectations - if you pass parameters, the script must deal with them">
+            <option value="no">No script required for this tool - just pass parameters on the command line to the first dependency listed above</option>
+            <option value="yes" selected="true">Yes, a script is ready to be pasted below</option>
+        </param>
+        <when value="no">
+            <param name="dynScript" type="hidden"  value="" />
+            <param name="scriptrunner" type="hidden"  value="" />
+        </when>
+        <when value="yes">
+            <param name="scriptrunner" type="text" value=""   label="Interpreter for the script - eg bash or python. Can be one of the dependencies named above or a system executable"
+              help="Scripts are interpreted by the executable named here. For conda r-base, 'Rscript --vanilla' or for conda planemo, 'planemo test' for example">
+            </param>
+            <param name="dynScript" type="text" area="True" value="" label="Script for executable above to interpret. It can be one of the Conda dependency names "
+             help="Script must handle all i/o and parameters as specified below using the parameters and passing method chosen below">
+              <sanitizer>
+                 <valid initial="string.printable"/>
+                 <mapping initial="none"/>
+              </sanitizer>
+             </param>
+        </when>
+    </conditional>
+    </section>
+    <section name="io_param" title="Data file input, output and settings forming the executable or script command line" expanded="true">
+    <conditional name="ppass">
+        <param name="parampass"  type="select" display="radio" label="Command line parameter passing method to use">
+            <option value="argparse" selected="true">Argparse: passed in the form of --clname value</option>
+            <option value="positional">Positional: Passed in the order of positional ordinals ...foo.bam bar.idx zot.xls</option>
+            <option value="0">Tool reads selected input file from STDIN and writes STDOUT with no parameters</option>
+        </param>
+        <when value="argparse">
+            <expand macro="io" />
+            <expand macro="additparam" />
+        </when>
+        <when value="positional">
+            <expand macro="io" />
+            <expand macro="additparam" />
+        </when>
+        <when value="0">
+             <expand macro="io"/>
+        </when>
+    </conditional>
+    </section>
+    <param name="cl_suffix" type="text" value="" label="Suffix for generated command line. Useful for bash post processing. Use override below to replace completely"
+            help="';' separated bash commands can be used here for post processing - added at end of autogenerated command line">
+            <sanitizer>
+                 <valid initial="string.printable" />
+                 <mapping initial="none"/>
+            </sanitizer>
+    </param>
+    <conditional name="cover">
+        <param name="commover" type="select" display="radio" label="Add Human wrought code to override the generated XML command and/or test section - DIY"
+        help = "For arbitrary and artfull command lines. All i/o and parameters must be passed. Choose No unless needed. Not for the faint of heart">
+            <option value="no" selected="true">No. Use automatically generated command/test XML </option>
+            <option value="yes">Yes. XML needed to override autogenerated command and/or test segments will be pasted below</option>
+        </param>
+        <when value="no">
+            <param name="command_override" type="hidden"  value="" />
+            <param name="test_override" type="hidden"  value="" />
+        </when>
+        <when value="yes">
+            <param name="command_override" type="text" area="True" value="" label="Optional. Human wrought command element override XML/template - e.g. for bwa"
+             help="For arbitrary and artfull command lines. All i/o and parameters must be passed. Leave blank unless needed. Not for the faint of heart">
+              <sanitizer>
+                 <valid initial="string.printable"/>
+                 <mapping initial="none"/>
+              </sanitizer>
+             </param>
+            <param name="test_override" type="text" area="True" value="" label="Optional. Human wrought test element override XML/template - e.g. for bwa"
+             help="For arbitrary and artfull scripts. Leave blank unless needed. Not for the faint of heart">
+              <sanitizer>
+                 <valid initial="string.printable" />
+                 <mapping initial="none"/>
+              </sanitizer>
+            </param>
+        </when>
+    </conditional>
+    <expand macro="tool_metadata" />
+  </inputs>
+  <outputs>
+     <collection name="toolgen" type="list" label="${tool_name} generated components">
+      <discover_datasets pattern="__name_and_ext__" directory="toolgen" visible="false"/>
+    </collection>
+      <data name="untested_tool" format="toolshed.gz" label = "${tool_name} untested archive"/>
+  </outputs>
+<tests>
+<test>
+    <param name="user_email" value="admin@galaxy.org"/>
+    <param name="input_files" value="input1_sample" />
+    <param name="input_CL" value="1" />
+    <param name="input_formats" value="txt" />
+    <param name="input_label" value="input" />
+    <param name="input_help" value="help" />
+    <param name="tool_name" value="pyrevpos" />
+    <param name="parampass" value="positional" />
+    <param name="tool_version" value="0.01" />
+    <param name="tool_desc" value="positional reverse" />
+    <param name="help_text" value="help text goes here" />
+    <param name="packages" value="python"/>
+    <param name="history_name" value="output2" />
+    <param name="history_format" value="txt" />
+    <param name="history_CL" value="2" />
+    <param name="dynScript" value="import sys; inp = sys.argv[1]; outp = sys.argv[2]; inlist = open(inp,'r').readlines(); o = open(outp,'w'); rs = [''.join(list(reversed(x.rstrip()))) for x in inlist]; o.write('\n'.join(rs)); o.close()"/>
+    <param name="choosescript" value="yes" />
+    <param name="script_path" value="$runme"/>
+    <output_collection name="toolgen" type="list">
+     <element file="pyrevpos_not_tested.toolshed_sample" name="pyrevpos_not_tested_toolshed" ext="gz" compare="sim_size" delta_frac="0.1"/>
+    </output_collection>
+</test>
+</tests>
+<help>
+
+**Details and attribution**
+(see GTF_)
+
+**Local Admins ONLY**
+Only users whose IDs found in the local admin_user configuration setting in universe_wsgi.ini can run this tool.
+
+**If you find a bug**
+Please raise an issue, or even better, submit a pull request fixing it, on the github repository GTF_
+
+**What it does**
+This tool optionally generates normal workflow compatible first class Galaxy tools
+
+Generated tools can run existing binary packages that become requirements, existing scripts, or new scripts pasted into this tool form.
+Pasted scripts are written so they are part of the new tool and cannot be adjusted by the downstream user.
+Binary packages are managed by the dependency subsystem - conda usually, so anything in bioconda or conda_forge is available for example.
+
+Any number of parameters can be built into the new tool form for passing in to the script or executable at runtime.
+These can be editable by the downstream user or baked in.
+
+A new tarball compatible with any Galaxy toolshed is created in your history, however, it does not have the test prepared.
+There is a separate tool you can run to update the archive after testing with Planemo
+
+If the configuration in job_conf.xml allows tools to write to [galaxy_root]/tools, the new tool will be installed so you can view and test it locally.
+
+.. class:: warningmark
+
+**Note to system administrators**
+This tool offers *NO* built in protection against malicious scripts. It should only be installed on private/personnal Galaxy instances.
+Admin_users will have the power to do anything they want as the Galaxy user if you install this tool.
+
+.. class:: warningmark
+
+**Use on public servers**  is STRONGLY discouraged for obvious reasons
+
+The tools generated by this tool will run just as securely as any other normal installed Galaxy tool but like any other new tools, should always be checked carefully before installation.
+We recommend that you follow the good code hygiene practices associated with safe toolshed practices.
+
+
+Paper_
+
+*Licensing*
+
+Copyright Ross Lazarus (ross period lazarus at gmail period com) May 2012
+All rights reserved.
+Licensed under the LGPL_
+
+.. _LGPL: http://www.gnu.org/copyleft/lesser.html
+.. _GTF:  https://github.com/fubar2/toolfactory
+.. _Paper: https://academic.oup.com/bioinformatics/article/28/23/3139/192853
+
+
+</help>
+<citations>
+    <citation type="doi">10.1093/bioinformatics/bts573</citation>
+</citations>
+</tool>
+
+