changeset 50:807b8d103f18 draft default tip

Uploaded
author fubar
date Wed, 09 Jun 2021 02:28:01 +0000
parents 36d46b20095a
children
files toolfactory/LICENSE toolfactory/README.md toolfactory/ToolFactory.py toolfactory/ToolFactory.xml toolfactory/ToolFactoryDemosApril30.ga toolfactory/rgToolFactory2.py toolfactory/rgToolFactory2.xml toolfactory/test-data/generated_xml_sample toolfactory/test-data/input1_sample toolfactory/test-data/pyrevpos_not_tested.toolshed_sample toolfactory/test-data/test1_log.txt
diffstat 11 files changed, 3360 insertions(+), 2786 deletions(-) [+]
line wrap: on
line diff
--- a/toolfactory/LICENSE	Sun Apr 18 02:14:13 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,504 +0,0 @@
-GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-(This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.)
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    {description}
-    Copyright (C) {year} {fullname}
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-    USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random
-  Hacker.
-
-  {signature of Ty Coon}, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
--- a/toolfactory/README.md	Sun Apr 18 02:14:13 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,380 +0,0 @@
-## Breaking news! Docker container at https://github.com/fubar2/toolfactory-galaxy-docker recommended as at December 2020
-
-### New demonstration of planemo tool_factory command ![Planemo ToolFactory demonstration](images/lintplanemo-2021-01-08_18.02.45.mkv?raw=false "Demonstration inside Planemo")
-
-## This is the original ToolFactory suitable for non-docker situations. Please use the docker container if you can because it's integrated with a Toolshed...
-
-# WARNING
-
-Install this tool to a throw-away private Galaxy or Docker container ONLY!
-
-Please NEVER on a public or production instance where a hostile user may
-be able to gain access if they can acquire an administrative account login.
-
-It only runs for server administrators - the ToolFactory tool will refuse to execute for an ordinary user since
-it can install new tools to the Galaxy server it executes on! This is not something you should allow other than
-on a throw away instance that is protected from potentially hostile users.
-
-## Short Story
-
-Galaxy is easily extended to new applications by adding a new tool. Each new scientific computational package added as
-a tool to Galaxy requires an XML document describing how the application interacts with Galaxy.
-This is sometimes termed "wrapping" the package because the instructions tell Galaxy how to run the package
-as a new Galaxy tool. Any tool that has been wrapped is readily available to all the users through a consistent
-and easy to use interface once installed in the local Galaxy server.
-
-Most Galaxy tool wrappers have been manually prepared by skilled programmers, many using Planemo because it
-automates much of the boilerplate and makes the process much easier.
-The ToolFactory (TF) now uses Planemo under the hood for testing, but hides the command
-line complexities. The user will still need appropriate skills in terms of describing the interface between
-Galaxy and the new application, but will be helped by a Galaxy tool form to collect all the needed
-settings, together with automated testing and uploading to a toolshed with optional local installation.
-
-
-## ToolFactory generated tools are ordinary Galaxy tools
-
-A TF generated tool that passes the Planemo test is ready to publish in any Galaxy Toolshed and ready to install in any running Galaxy instance.
-They are fully workflow compatible and work exactly like any hand-written tool. The user can select input files of the specified type(s) from their
-history and edit each of the specified parameters. The tool form will show all the labels and help text supplied when the tool was built. When the tool
-is executed, the dependent binary or script will be passed all the i/o files and parameters as specified, and will write outputs to the specified new
-history datasets - just like any other Galaxy tool.
-
-## Models for tool command line construction
-
-The key to turning any software package into a Galaxy tool is the automated construction of a suitable command line.
-
-The TF can build a new tool that will allow the tool user to select input files from their history, set any parameters and when run will send the
-new output files to the history as specified when the tool builder completed the form and built the new tool.
-
-That tool can contain instructions to run any Conda dependency or a system executable like bash. Whether a bash script you have written or
-a Conda package like bwa, the executable will expect to find settings for input, output and parameters on a command line.
-
-These are often passed as "--name value" (argparse style) or in a fixed order (positional style).
-
-The ToolFactory allows either, or for "filter" applications that process input from STDIN and write processed output to STDOUT.
-
-The simplest tool model wraps a simple script or Conda dependency package requiring only input and output files, with no user supplied settings illustrated by
-the Tacrev demonstration tool found in the Galaxy running in the ToolFactory docker container. It passes a user selected input file from the current history on STDIN
-to a bash script. The bash script runs the unix tac utility (reverse cat) piped to the unix rev (reverse lines in a text file) utility. It's a one liner:
-
-`tac | rev`
-
-The tool building form allows zero or more Conda package name(s) and version(s) and an optional script to be executed by either a system
-executable like ``bash`` or the first of any named Conda dependency package/version. Tacrev uses a tiny bash script shown above and uses the system
-bash. Conda bash can be specified if it is important to use the same version consistently for the tool.
-
-On the tool form, the repeat section allowing zero or more input files was set to be a text file to be selected by the tool user and
-in the repeat section allowing one or more outputs, a new output file with special value `STDOUT` as the positional parameter, causes the TF to
-generate a command to capture STDOUT and send it to the new history file containing the reversed input text.
-
-By reversed, we mean really, truly reversed.
-
-That simple model can be made much more complicated, and can pass inputs and outputs as named or positional parameters,
-to allow more complicated scripts or dependent binaries that require:
-
-1. Any number of input data files selected by the user from existing history data
-2. Any number of output data files written to the user's history
-3. Any number of user supplied parameters. These can be passed as command line arguments to the script or the dependency package. Either
-positional or named (argparse) style command line parameter passing can be used.
-
-More complex models can be seen in the Sedtest, Pyrevpos and Pyrevargparse tools illustrating positional and argparse parameter passing.
-
-The most complex demonstration is the Planemo advanced tool tutorial BWA tool. There is one version using a command-override to implement
-exactly the same command structure in the Planemo tutorial. A second version uses a bash script and positional parameters to achieve the same
-result. Some tool builders may find the bash version more familiar and cleaner but the choice is yours.
-
-## Overview
-
-![IHello example ToolFactory tool form](files/hello_toolfactory_form.png?raw=true "Part of the Hello world example ToolFactory tool form")
-
-
-Steps in building a new Galaxy tool are all conducted through Galaxy running in the docker container:
-
-1. Login to the Galaxy running in the container at http://localhost:8080 using an admin account. They are specified in config/galaxy.yml and
-    in the documentation at
-    and the ToolFactory will error out and refuse to run for non-administrative tool builders as a minimal protection from opportunistic hostile use.
-
-2. Start the TF and fill in the form, providing sample inputs and parameter values to suit the Conda package being wrapped.
-
-3. Execute the tool to create a new XML tool wrapper using the sample inputs and parameter settings for the inbuilt tool test. Planemo runs twice.
-    firstly to generate the test outputs and then to perform a proper test. The completed toolshed archive is written to the history
-    together with the planemo test report. Optionally the new tool archive can be uploaded
-    to the toolshed running in the same container (http://localhost:9009) and then installed inside the Galaxy in the container for further testing.
-
-4. If the test fails, rerun the failed history job and correct errors on the tool form before rerunning until everything works correctly.
-
-![How it works](files/TFasIDE.png?raw=true "Overview of the ToolFactory as an Integrated Development Environment")
-
-## Planning and building new Galaxy tool wrappers.
-
-It is best to have all the required planning done to wrap any new script or binary before firing up the TF.
-Conda is the only current dependency manager supported. Before starting, at the very least, the tool builder will need
-to know the required software package name in Conda and the version to use, how the command line for
-the package must be constructed, and there must be sample inputs in the working history for each of the required data inputs
-for the package, together with values for every parameter to suit these sample inputs. These are required on the TF form
-for preparing the inbuilt tool test. That test is run using Planemo, as part of the tool generation process.
-
-A new tool is specified by filling in the usual Galaxy tool form.
-
-The form starts with a new tool name. Most tools will need dependency packages and versions
-for the executable. Only Conda is currently supported.
-
-If a script is needed, it can be pasted into a text box and the interpreter named. Available system executables
-can be used such as bash, or an interpreter such as python, perl or R can be nominated as conda dependencies
-to ensure reproducible analyses.
-
-The tool form will be generated from the input data and the tool builder supplied parameters. The command line for the
-executable is built using positional or argparse (named e.g. --input_file /foo/baz) style
-parameters and is completely dependent on the executable. These can include:
-
-1. Any number of input data sets needed by the executable. Each appears to the tool user on the run form and is included
-on the command line for the executable. The tool builder must supply a small representative sample for each one as
-an input for the automated tool test.
-
-2. Any number of output data sets generated by the package can be added to the command line and will appear in
-the user's history at the end of the job
-
-3. Any number of text or numeric parameters. Each will appear to the tool user on the run form and are included
-on the command line to the executable. The tool builder must supply a suitable representative value for each one as
-the value to be used for the automated tool test.
-
-Once the form is completed, executing the TF will build a new XML tool wrapper
-including a functional test based on the sample settings and data.
-
-If the Planemo test passes, the tool can be optionally uploaded to the local Galaxy used in the image for more testing.
-
-A local toolshed runs inside the container to allow an automated installation, although any toolshed and any accessible
-Galaxy can be specified for this process by editing the default URL and API keys to provide appropriate credentials.
-
-## Generated Tool Dependency management
-
-Conda is used for all dependency management although tools that use system utilities like sed, bash or awk
-may be available on job execution nodes. Sed and friends are available as Conda (conda-forge) dependencies if necessary.
-Versioned Conda dependencies are always baked-in to the tool and will be used for reproducible calculation.
-
-## Requirements
-
-These are all managed automagically. The TF relies on galaxyxml to generate tool xml and uses ephemeris and
-bioblend to load tools to the toolshed and to Galaxy. Planemo is used for testing and runs in a biocontainer currently at
-https://quay.io/fubar2/planemo-biocontainer
-
-## Caveats
-
-This docker image requires privileged mode so exposes potential security risks if hostile tool builders gain access.
-Please, do not run it in any situation where that is a problem - never, ever on a public facing Galaxy server.
-On a laptop or workstation should be fine in a non-hostile environment.
-
-
-## Example generated XML
-
-For the bwa-mem example, a supplied bash script is included as a configfile and so has escaped characters.
-```
-<tool name="bwatest" id="bwatest" version="0.01">
-  <!--Cite: Creating re-usable tools from scripts doi:10.1093/bioinformatics/bts573-->
-  <!--Source in git at: https://github.com/fubar2/toolfactory-->
-  <!--Created by admin@galaxy.org at 30/11/2020 07:12:10 using the Galaxy Tool Factory.-->
-  <description>Planemo advanced tool building sample bwa mem mapper as a ToolFactory demo</description>
-  <requirements>
-    <requirement version="0.7.15" type="package">bwa</requirement>
-    <requirement version="1.3" type="package">samtools</requirement>
-  </requirements>
-  <configfiles>
-    <configfile name="runme"><![CDATA[
-REFFILE=\$1
-FASTQ=\$2
-BAMOUT=\$3
-rm -f "refalias"
-ln -s "\$REFFILE" "refalias"
-bwa index -a is "refalias"
-bwa mem -t "2"  -v 1 "refalias" "\$FASTQ"  > tempsam
-samtools view -Sb tempsam > temporary_bam_file.bam
-samtools sort -o "\$BAMOUT" temporary_bam_file.bam
-
-]]></configfile>
-  </configfiles>
-  <version_command/>
-  <command><![CDATA[bash
-$runme
-$input1
-$input2
-$bam_output]]></command>
-  <inputs>
-    <param optional="false" label="Reference sequence for bwa to map the fastq reads against" help="" format="fasta" multiple="false" type="data" name="input1" argument="input1"/>
-    <param optional="false" label="Reads as fastqsanger to align to the reference sequence" help="" format="fastqsanger" multiple="false" type="data" name="input2" argument="input2"/>
-  </inputs>
-  <outputs>
-    <data name="bam_output" format="bam" label="bam_output" hidden="false"/>
-  </outputs>
-  <tests>
-    <test>
-      <output name="bam_output" value="bam_output_sample" compare="sim_size" format="bam" delta_frac="0.1"/>
-      <param name="input1" value="input1_sample"/>
-      <param name="input2" value="input2_sample"/>
-    </test>
-  </tests>
-  <help><![CDATA[
-
-**What it Does**
-
-Planemo advanced tool building sample bwa mem mapper
-
-Reimagined as a bash script for a ToolFactory demonstration
-
-
-------
-
-Script::
-
-    REFFILE=$1
-    FASTQ=$2
-    BAMOUT=$3
-    rm -f "refalias"
-    ln -s "$REFFILE" "refalias"
-    bwa index -a is "refalias"
-    bwa mem -t "2"  -v 1 "refalias" "$FASTQ"  > tempsam
-    samtools view -Sb tempsam > temporary_bam_file.bam
-    samtools sort -o "$BAMOUT" temporary_bam_file.bam
-
-]]></help>
-</tool>
-
-```
-
-
-
-## More Explanation
-
-The TF is an unusual Galaxy tool, designed to allow a skilled user to make new Galaxy tools.
-It appears in Galaxy just like any other tool but outputs include new Galaxy tools generated
-using instructions provided by the user and the results of Planemo lint and tool testing using
-small sample inputs provided by the TF user. The small samples become tests built in to the new tool.
-
-It offers a familiar Galaxy form driven way to define how the user of the new tool will
-choose input data from their history, and what parameters the new tool user will be able to adjust.
-The TF user must know, or be able to read, enough about the tool to be able to define the details of
-the new Galaxy interface and the ToolFactory offers little guidance on that other than some examples.
-
-Tools always depend on other things. Most tools in Galaxy depend on third party
-scientific packages, so TF tools usually have one or more dependencies. These can be
-scientific packages such as BWA or scripting languages such as Python and are
-managed by Conda. If the new tool relies on a system utility such as bash or awk
-where the importance of version control on reproducibility is low, these can be used without
-Conda management - but remember the potential risks of unmanaged dependencies on computational
-reproducibility.
-
-The TF user can optionally supply a working script where scripting is
-required and the chosen dependency is a scripting language such as Python or a system
-scripting executable such as bash. Whatever the language, the script must correctly parse the command line
-arguments it receives at tool execution, as they are defined by the TF user. The
-text of that script is "baked in" to the new tool and will be executed each time
-the new tool is run. It is highly recommended that scripts and their command lines be developed
-and tested until proven to work before the TF is invoked. Galaxy as a software development
-environment is actually possible, but not recommended being somewhat clumsy and inefficient.
-
-Tools nearly always take one or more data sets from the user's history as input. TF tools
-allow the TF user to define what Galaxy datatypes the tool end user will be able to choose and what
-names or positions will be used to pass them on a command line to the package or script.
-
-Tools often have various parameter settings. The TF allows the TF user to define how each
-parameter will appear on the tool form to the end user, and what names or positions will be
-used to pass them on the command line to the package. At present, parameters are limited to
-simple text and number fields. Pull requests for other kinds of parameters that galaxyxml
-can handle are welcomed.
-
-Best practice Galaxy tools have one or more automated tests. These should use small sample data sets and
-specific parameter settings so when the tool is tested, the outputs can be compared with their expected
-values. The TF will automatically create a test for the new tool. It will use the sample data sets
-chosen by the TF user when they built the new tool.
-
-The TF works by exposing *unrestricted* and therefore extremely dangerous scripting
-to all designated administrators of the host Galaxy server, allowing them to
-run scripts in R, python, sh and perl. For this reason, a Docker container is
-available to help manage the associated risks.
-
-## Scripting uses
-
-To use a scripting language to create a new tool, you must first prepared and properly test a script. Use small sample
-data sets for testing. When the script is working correctly, upload the small sample datasets
-into a new history, start configuring a new ToolFactory tool, and paste the script into the script text box on the TF form.
-
-### Outputs
-
-The TF will generate the new tool described on the TF form, and test it
-using planemo. Optionally if a local toolshed is running, it can be used to
-install the new tool back into the generating Galaxy.
-
-A toolshed is built in to the Docker container and configured
-so a tool can be tested, sent to that toolshed, then installed in the Galaxy
-where the TF is running using the default toolshed and Galaxy URL and API keys.
-
-Once it's in a ToolShed, it can be installed into any local Galaxy server
-from the server administrative interface.
-
-Once the new tool is installed, local users can run it - each time, the
-package and/or script that was supplied when it was built will be executed with the input chosen
-from the user's history, together with user supplied parameters. In other words, the tools you generate with the
-TF run just like any other Galaxy tool.
-
-TF generated tools work as normal workflow components.
-
-
-## Limitations
-
-The TF is flexible enough to generate wrappers for many common scientific packages
-but the inbuilt automation will not cope with all possible situations. Users can
-supply overrides for two tool XML segments - tests and command and the BWA
-example in the supplied samples workflow illustrates their use. It does not deal with
-repeated elements or conditional parameters such as allowing a user to choose to see "simple"
-or "advanced" parameters (yet) and there will be plenty of packages it just
-won't cover - but it's a quick and efficient tool for the other 90% of cases. Perfect for
-that bash one liner you need to get that workflow functioning correctly for this
-afternoon's demonstration!
-
-## Installation
-
-The Docker container https://github.com/fubar2/toolfactory-galaxy-docker/blob/main/README.md
-is the best way to use the TF because it is preconfigured
-to automate new tool testing and has a built in local toolshed where each new tool
-is uploaded. If you grab the docker container, it should just work after a restart and you
-can run a workflow to generate all the sample tools. Running the samples and rerunning the ToolFactory
-jobs that generated them allows you to add fields and experiment to see how things work.
-
-It can be installed like any other tool from the Toolshed, but you will need to make some
-configuration changes (TODO write a configuration). You can install it most conveniently using the
-administrative "Search and browse tool sheds" link. Find the Galaxy Main
-toolshed at https://toolshed.g2.bx.psu.edu/ and search for the toolfactory
-repository in the Tool Maker section. Open it and review the code and select the option to install it.
-
-If not already there please add:
-
-```
-<datatype extension="tgz" type="galaxy.datatypes.binary:Binary" mimetype="multipart/x-gzip" subclass="True" />
-```
-
-to your local config/data_types_conf.xml.
-
-
-## Restricted execution
-
-The tool factory tool itself will ONLY run for admin users -
-people with IDs in config/galaxy.yml "admin_users".
-
-*ONLY admin_users can run this tool*
-
-That doesn't mean it's safe to install on a shared or exposed instance - please don't.
-
-## Generated tool Security
-
-Once you install a generated tool, it's just
-another tool - assuming the script is safe. They just run normally and their
-user cannot do anything unusually insecure but please, practice safe toolshed.
-Read the code before you install any tool. Especially this one - it is really scary.
-
-## Attribution
-
-Creating re-usable tools from scripts: The Galaxy Tool Factory
-Ross Lazarus; Antony Kaspi; Mark Ziemann; The Galaxy Team
-Bioinformatics 2012; doi: 10.1093/bioinformatics/bts573
-
-http://bioinformatics.oxfordjournals.org/cgi/reprint/bts573?ijkey=lczQh1sWrMwdYWJ&keytype=ref
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolfactory/ToolFactory.py	Wed Jun 09 02:28:01 2021 +0000
@@ -0,0 +1,897 @@
+# 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 = self.args.sysexe.split(" ")
+            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=None)
+    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=False, 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, "## Tool Factory expects a tool name - eg --tool_name=DESeq"
+    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()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolfactory/ToolFactory.xml	Wed Jun 09 02:28:01 2021 +0000
@@ -0,0 +1,487 @@
+<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" >
+            </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="Arguments" help="Executable or script settings passed on the command line other than I/O files" expanded="true">
+        <param name="edit_params" type="hidden" 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="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>
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolfactory/ToolFactoryDemosApril30.ga	Wed Jun 09 02:28:01 2021 +0000
@@ -0,0 +1,965 @@
+{
+    "a_galaxy_workflow": "true",
+    "annotation": "",
+    "format-version": "0.1",
+    "name": "ToolFactory - make, test and install demonstration tools",
+    "steps": {
+        "0": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 0,
+            "input_connections": {},
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": -152.39999389648438,
+                "height": 102.60000610351562,
+                "left": 252.5,
+                "right": 452.5,
+                "top": -255,
+                "width": 200,
+                "x": 252.5,
+                "y": -255
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"__workflow_invocation_uuid__\": \"dbb99db2a98811ebbc9e0242ac1b0004\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_prefix\": \"\", \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"bash\", \"dynScript\": \"echo \\\"Hello $1\\\"\"}}, \"help_text\": \"**What it Does**\", \"install\": \"false\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"Hello_output\", \"history_format\": \"txt\", \"history_CL\": \"STDOUT\", \"history_test\": \"diff:0\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": [{\"__index__\": 0, \"param_name\": \"say_hello_to\", \"ap_type\": {\"param_type\": \"text\", \"__current_case__\": 0, \"param_value\": \"\"}, \"param_label\": \"Say hello to\", \"param_help\": \"\", \"param_CL\": \"1\", \"param_CLprefixed\": \"\", \"param_repeat\": \"false\"}]}}}, \"make\": {\"makeMode\": {\"__current_case__\": 1, \"citations\": [], \"galaxy_apikey\": \"fakekey\", \"galaxy_url\": \"http://localhost:8080\", \"help_text\": \"**What it Does**\\nToolFactory demonstration - hello world in Galaxy\", \"make_Tool\": \"gentest\", \"tool_desc\": \"Says hello\", \"tool_version\": \"0.01\", \"toolshed_apikey\": \"fakekey\", \"toolshed_url\": \"http://localhost:9009\"}}, \"run_test\": \"true\", \"tool_desc\": \"\", \"tool_name\": \"hello_toolshed\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "f07cf7c8-4a96-4c4f-bd7b-d43c30642369",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "5e1e49e0-ed56-4c7a-95fe-2f66aa4d7165"
+                }
+            ]
+        },
+        "1": {
+            "annotation": "",
+            "content_id": null,
+            "errors": null,
+            "id": 1,
+            "input_connections": {},
+            "inputs": [
+                {
+                    "description": "",
+                    "name": "bwa-mem-fastq1.fq"
+                }
+            ],
+            "label": "bwa-mem-fastq1.fq",
+            "name": "Input dataset",
+            "outputs": [],
+            "position": {
+                "bottom": 353.1999969482422,
+                "height": 82.19999694824219,
+                "left": 252.5,
+                "right": 452.5,
+                "top": 271,
+                "width": 200,
+                "x": 252.5,
+                "y": 271
+            },
+            "tool_id": null,
+            "tool_state": "{\"optional\": false}",
+            "tool_version": null,
+            "type": "data_input",
+            "uuid": "e1c43d57-ee0e-42ea-aed7-d86c595d06e7",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "output",
+                    "uuid": "ecd799ad-b7be-4b58-87ea-050884620d99"
+                }
+            ]
+        },
+        "2": {
+            "annotation": "",
+            "content_id": null,
+            "errors": null,
+            "id": 2,
+            "input_connections": {},
+            "inputs": [
+                {
+                    "description": "",
+                    "name": "bwa-mem-mt-genome.fa"
+                }
+            ],
+            "label": "bwa-mem-mt-genome.fa",
+            "name": "Input dataset",
+            "outputs": [],
+            "position": {
+                "bottom": 473.1999969482422,
+                "height": 82.19999694824219,
+                "left": 252.5,
+                "right": 452.5,
+                "top": 391,
+                "width": 200,
+                "x": 252.5,
+                "y": 391
+            },
+            "tool_id": null,
+            "tool_state": "{\"optional\": false}",
+            "tool_version": null,
+            "type": "data_input",
+            "uuid": "98ae8bb5-cd5c-4330-b0cc-4d2252b0eee1",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "output",
+                    "uuid": "c0b94cf6-886f-4260-9e63-a2e57435a628"
+                }
+            ]
+        },
+        "3": {
+            "annotation": "",
+            "content_id": null,
+            "errors": null,
+            "id": 3,
+            "input_connections": {},
+            "inputs": [
+                {
+                    "description": "",
+                    "name": "hello_toolshed_toolshed.gz"
+                }
+            ],
+            "label": "hello_toolshed_toolshed.gz",
+            "name": "Input dataset",
+            "outputs": [],
+            "position": {
+                "bottom": -333.8000030517578,
+                "height": 82.19999694824219,
+                "left": 252.5,
+                "right": 452.5,
+                "top": -416,
+                "width": 200,
+                "x": 252.5,
+                "y": -416
+            },
+            "tool_id": null,
+            "tool_state": "{\"optional\": false}",
+            "tool_version": null,
+            "type": "data_input",
+            "uuid": "f65affe8-b8b2-4e54-9e1a-57f038e31d04",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "output",
+                    "uuid": "68da073d-aa54-470c-aab5-a429846870eb"
+                }
+            ]
+        },
+        "4": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 4,
+            "input_connections": {},
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": -313.3999938964844,
+                "height": 102.60000610351562,
+                "left": 530.5,
+                "right": 730.5,
+                "top": -416,
+                "width": 200,
+                "x": 530.5,
+                "y": -416
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"swi-prolog\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"swipl -q -g main -s \", \"dynScript\": \"parent(pam,bob).\\nparent(tom,bob).\\nparent(tom,liz).\\nparent(bob,ann).\\nparent(bob,pat).\\nparent(pat,jim).\\n\\nmain :-\\n    parent(X,jim),\\n    format('~a is the parent of jim~n', [X]),\\n    halt.\"}}, \"help_text\": \"**What it Does**\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"prolog_out\", \"history_format\": \"txt\", \"history_CL\": \"STDOUT\", \"history_test\": \"diff:0\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": []}}}, \"run_test\": \"true\", \"tool_desc\": \"\", \"tool_name\": \"prolog_demo\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "b912fc6c-2ac9-4b29-8b29-abb960e75468",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "4d4d0421-9ae5-4b3a-8c81-ccfbe02cbada"
+                }
+            ]
+        },
+        "5": {
+            "annotation": "",
+            "content_id": null,
+            "errors": null,
+            "id": 5,
+            "input_connections": {},
+            "inputs": [
+                {
+                    "description": "",
+                    "name": "phiX.fasta"
+                }
+            ],
+            "label": "phiX.fasta",
+            "name": "Input dataset",
+            "outputs": [],
+            "position": {
+                "bottom": -176.1999969482422,
+                "height": 61.80000305175781,
+                "left": 808.5,
+                "right": 1008.5,
+                "top": -238,
+                "width": 200,
+                "x": 808.5,
+                "y": -238
+            },
+            "tool_id": null,
+            "tool_state": "{\"optional\": false}",
+            "tool_version": null,
+            "type": "data_input",
+            "uuid": "0e9d6723-9165-413d-95e0-cb7cad549c86",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "output",
+                    "uuid": "cd0767ab-f0f3-47c1-8eb0-ac40700c3a5e"
+                }
+            ]
+        },
+        "6": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 6,
+            "input_connections": {},
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": -313.3999938964844,
+                "height": 102.60000610351562,
+                "left": 808.5,
+                "right": 1008.5,
+                "top": -416,
+                "width": 200,
+                "x": 808.5,
+                "y": -416
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"bash\", \"dynScript\": \"echo \\\"Hello $1\\\"\"}}, \"help_text\": \"**What it Does**\\nPrototype bash script with a text input and a new history output.\\nRemarkably useful as a starting point - add a new bash script and add the appropriate parameters to make a new tool.\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"Hello_output\", \"history_format\": \"txt\", \"history_CL\": \"STDOUT\", \"history_test\": \"diff:0\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": [{\"__index__\": 0, \"param_name\": \"say_hello_to\", \"ap_type\": {\"param_type\": \"text\", \"__current_case__\": 0, \"param_value\": \"Hello from the ToolFactory!\"}, \"param_label\": \"Say hello to\", \"param_help\": \"\", \"param_CL\": \"1\", \"param_CLprefixed\": \"\", \"param_repeat\": \"false\"}]}}}, \"run_test\": \"true\", \"tool_desc\": \"ToolFactory demonstration using a bash script.\", \"tool_name\": \"hello_toolshed\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "877a5d8c-e46f-48b0-9c54-5bbf302c8719",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "56928b22-2cb6-4b3a-ab79-987d3cdbbba2"
+                }
+            ]
+        },
+        "7": {
+            "annotation": "",
+            "content_id": null,
+            "errors": null,
+            "id": 7,
+            "input_connections": {},
+            "inputs": [
+                {
+                    "description": "",
+                    "name": "rgToolFactory2.py"
+                }
+            ],
+            "label": "rgToolFactory2.py",
+            "name": "Input dataset",
+            "outputs": [],
+            "position": {
+                "bottom": 562.1999969482422,
+                "height": 82.19999694824219,
+                "left": 818.5,
+                "right": 1018.5,
+                "top": 480,
+                "width": 200,
+                "x": 818.5,
+                "y": 480
+            },
+            "tool_id": null,
+            "tool_state": "{\"optional\": false}",
+            "tool_version": null,
+            "type": "data_input",
+            "uuid": "60049d1f-78bd-4a84-bad4-23263ea7d023",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "output",
+                    "uuid": "3d75794b-a995-4f36-b622-71fd91edd084"
+                }
+            ]
+        },
+        "8": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 8,
+            "input_connections": {},
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": -313.3999938964844,
+                "height": 102.60000610351562,
+                "left": 1086.5,
+                "right": 1286.5,
+                "top": -416,
+                "width": 200,
+                "x": 1086.5,
+                "y": -416
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"bash\", \"dynScript\": \"echo \\\"You chose $1\\\"\"}}, \"help_text\": \"**What it Does**\\nDemonstrates select parameters generated by ToolFactory forms\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"select_out\", \"history_format\": \"txt\", \"history_CL\": \"STDOUT\", \"history_test\": \"diff:0\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": [{\"__index__\": 0, \"param_name\": \"choose\", \"ap_type\": {\"param_type\": \"selecttext\", \"__current_case__\": 4, \"selectTexts\": [{\"__index__\": 0, \"select_text\": \"one\", \"select_value\": \"won\"}, {\"__index__\": 1, \"select_text\": \"two\", \"select_value\": \"too\"}, {\"__index__\": 2, \"select_text\": \"three\", \"select_value\": \"free\"}]}, \"param_label\": \"Choose\", \"param_help\": \"\", \"param_CL\": \"1\", \"param_CLprefixed\": \"\", \"param_repeat\": \"false\"}]}}}, \"run_test\": \"true\", \"tool_desc\": \"ToolFactory select demonstration\", \"tool_name\": \"select_test\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "f9c9d681-b626-426c-b8fb-19503ea4571e",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "3de506bf-9ad1-4d1f-be29-e42ae6f37a34"
+                }
+            ]
+        },
+        "9": {
+            "annotation": "",
+            "content_id": null,
+            "errors": null,
+            "id": 9,
+            "input_connections": {},
+            "inputs": [
+                {
+                    "description": "",
+                    "name": "hello_lisp.txt"
+                }
+            ],
+            "label": "hello_lisp.txt",
+            "name": "Input dataset",
+            "outputs": [],
+            "position": {
+                "bottom": -4.1999969482421875,
+                "height": 61.80000305175781,
+                "left": 1364.5,
+                "right": 1564.5,
+                "top": -66,
+                "width": 200,
+                "x": 1364.5,
+                "y": -66
+            },
+            "tool_id": null,
+            "tool_state": "{\"optional\": false}",
+            "tool_version": null,
+            "type": "data_input",
+            "uuid": "4883c5d1-15ec-4595-8488-9c5ce453d632",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "output",
+                    "uuid": "9af42c99-a5bf-4835-8408-767d7273ceb0"
+                }
+            ]
+        },
+        "10": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 10,
+            "input_connections": {},
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": -313.3999938964844,
+                "height": 102.60000610351562,
+                "left": 1364.5,
+                "right": 1564.5,
+                "top": -416,
+                "width": 200,
+                "x": 1364.5,
+                "y": -416
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"r-base\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"Rscript\", \"dynScript\": \"# demo\\nargs = commandArgs(trailingOnly=TRUE)\\nif (length(args)==0) {\\n   n_plots = 3 \\n} else {\\n   n_plots = as.integer(args[1]) }\\ndir.create('plots')\\nfor (i in 1:n_plots) {\\n    foo = runif(100)\\n    bar = rnorm(100)\\n    bar = foo + 0.05*bar\\n    pdf(paste('plots/yet',i,\\\"anotherplot.pdf\\\",sep='_'))\\n    plot(foo,bar,main=paste(\\\"Foo by Bar plot #\\\",i),col=\\\"maroon\\\", pch=3,cex=0.6)\\n    dev.off()\\n    foo = data.frame(a=runif(100),b=runif(100),c=runif(100),d=runif(100),e=runif(100),f=runif(100))\\n    bar = as.matrix(foo)\\n    pdf(paste('plots/yet',i,\\\"anotherheatmap.pdf\\\",sep='_'))\\n    heatmap(bar,main='Random Heatmap')\\n    dev.off()\\n}\\n\"}}, \"help_text\": \"**What it Does**\\nToolFactory demonstration of a collection to hide lots of outputs from a tool in a single history item to avoid clutter.\\nAs many random plots as you want.\\nViewable inside the resulting history collection\\nScript is responsible for writing all the appropriate outputs into a directory called the same name as the collection as shown here.\\nVery handy for things not useful downstream but useful for the user to review and study.\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [], \"history_outputs\": [], \"collection_outputs\": [{\"__index__\": 0, \"name\": \"plots\", \"kind\": \"list\", \"label\": \"Plots\", \"discover\": \"__name_and_ext__\"}]}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": [{\"__index__\": 0, \"param_name\": \"nplot\", \"ap_type\": {\"param_type\": \"text\", \"__current_case__\": 0, \"param_value\": \"3\"}, \"param_label\": \"Number of random plots pairs to draw\", \"param_help\": \"\", \"param_CL\": \"1\", \"param_CLprefixed\": \"\", \"param_repeat\": \"false\"}]}}}, \"run_test\": \"true\", \"tool_desc\": \"Collection demonstration\", \"tool_name\": \"plotter\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "d00bd283-f69e-4537-9ccc-a5fa753e9f53",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "4d769d8b-370c-444e-9245-2b2fa719ca99"
+                }
+            ]
+        },
+        "11": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 11,
+            "input_connections": {},
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": -293,
+                "height": 123,
+                "left": 1642.5,
+                "right": 1842.5,
+                "top": -416,
+                "width": 200,
+                "x": 1642.5,
+                "y": -416
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"bash\", \"dynScript\": \"# pathetic attempt at a malicious script in Galaxy\\n# it fails because the job execution environment gives write access to few places\\necho \\\"ls -la\\\"\\nls -la\\ncd /\\necho \\\"ls -la after changing to /\\\"\\nls -la\\ntouch \\\"foo_was.here\\\"\\necho \\\"ls -la in root after touch foo_was.here - foo_was_not.here more like it\\\"\\nls -la\\n\"}}, \"help_text\": \"**What it Does**\\nShows what you can't do with a bash script\\nCheck the tool stderr - it isn't captured but should be. Send code.\\nResults vary - in a biocontainer, you are root so can do anything.\\nIn a normal Galaxy, not so much.\\nThis is a very interesting way to see what a tool can do on your machine.\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"evil_script_output\", \"history_format\": \"txt\", \"history_CL\": \"STDOUT\", \"history_test\": \"sim_size:0.05\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": []}}}, \"run_test\": \"true\", \"tool_desc\": \"Tries some naughty things\", \"tool_name\": \"evil_script_that_fails\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "4c24a895-4cf6-43ec-8517-769974115809",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "d19ecbb5-e61e-46f1-a37b-2b54e0eaba1b"
+                }
+            ]
+        },
+        "12": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 12,
+            "input_connections": {
+                "io_param|ppass|io|history_inputs_0|input_files": {
+                    "id": 0,
+                    "output_name": "new_tool"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": -96.60000610351562,
+                "height": 154.39999389648438,
+                "left": 530.5,
+                "right": 730.5,
+                "top": -251,
+                "width": 200,
+                "x": 530.5,
+                "y": -251
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"planemo=0.74.1\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"bash\", \"dynScript\": \"cp $1 foo.tar \\ntar -xvf foo.tar\\nTOOLNAME=`find . -name \\\"*.xml\\\"`\\necho \\\"$$$$$TOOLNAME = $TOOLNAME\\\" > $2\\nplanemo lint $TOOLNAME >> $2\"}}, \"help_text\": \"**What it Does**\\nToolFactory demonstration script using bash to run planemo lint from a history tarball\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [{\"__index__\": 0, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"tgz\", \"toolshed.gz\"], \"input_label\": \"Toolshed archive to be linted\", \"input_help\": \"\", \"input_CL\": \"1\", \"input_repeat\": \"false\"}], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"lint_output\", \"history_format\": \"txt\", \"history_CL\": \"2\", \"history_test\": \"diff:5\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": []}}}, \"run_test\": \"true\", \"tool_desc\": \"Runs Planemo lint on any toolshed.gz file\", \"tool_name\": \"planemo_lint\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "170f36c8-8681-477e-ba9d-8e6c8965f735",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "0e7fba79-fda8-44e7-912c-324f79d2caf2"
+                }
+            ]
+        },
+        "13": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 13,
+            "input_connections": {
+                "io_param|ppass|io|history_inputs_0|input_files": {
+                    "id": 2,
+                    "output_name": "output"
+                },
+                "io_param|ppass|io|history_inputs_1|input_files": {
+                    "id": 1,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": 485.6000061035156,
+                "height": 225.60000610351562,
+                "left": 540.5,
+                "right": 740.5,
+                "top": 260,
+                "width": 200,
+                "x": 540.5,
+                "y": 260
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"yes\", \"__current_case__\": 1, \"command_override\": \"## Build reference\\n#set $reference_fasta_filename = \\\"localref.fa\\\"\\nln -s \\\"${ref_file}\\\" \\\"${reference_fasta_filename}\\\" ;\\nbwa index -a is \\\"${reference_fasta_filename}\\\" ;\\nbwa mem -t \\\"\\\\${GALAXY_SLOTS:-4}\\\" -v 1 \\\"${reference_fasta_filename}\\\" \\\"${fastq_input1}\\\"  | samtools view -Sb - > temporary_bam_file.bam ;\\nsamtools sort -o \\\"${bwa_test_commover_bam_output}\\\" temporary_bam_file.bam\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"bwa=0.7.15, samtools=1.3\", \"usescript\": {\"choosescript\": \"no\", \"__current_case__\": 0, \"dynScript\": \"\", \"scriptrunner\": \"\"}}, \"help_text\": \"**What it Does**\\nTrivial example from a Planemo documentation example\\nIt can be useful. It is sort of bash with substitutions from the tool form.\\nIf you need it, it's here.\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"argparse\", \"__current_case__\": 0, \"io\": {\"history_inputs\": [{\"__index__\": 0, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"fasta\"], \"input_label\": \"Reference sequence to align reads\", \"input_help\": \"\", \"input_CL\": \"ref_file\", \"input_repeat\": \"false\"}, {\"__index__\": 1, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"fastqsanger\"], \"input_label\": \"Fastqsanger file containing reads to be mapped against reference\", \"input_help\": \"\", \"input_CL\": \"fastq_input1\", \"input_repeat\": \"false\"}], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"bwa_test_commover_bam_output\", \"history_format\": \"bam\", \"history_CL\": \"\", \"history_test\": \"sim_size:0.1\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": []}}}, \"run_test\": \"true\", \"tool_desc\": \"Command over-ride demonstration\", \"tool_name\": \"bwa_test_command_override\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "43535a6f-1066-4b85-b347-f310858995a7",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "a48f2e86-7017-47b8-8c2b-e81b25cf9590"
+                }
+            ]
+        },
+        "14": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 14,
+            "input_connections": {
+                "io_param|ppass|io|history_inputs_0|input_files": {
+                    "id": 2,
+                    "output_name": "output"
+                },
+                "io_param|ppass|io|history_inputs_1|input_files": {
+                    "id": 1,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": 749.6000061035156,
+                "height": 225.60000610351562,
+                "left": 540.5,
+                "right": 740.5,
+                "top": 524,
+                "width": 200,
+                "x": 540.5,
+                "y": 524
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"bwa=0.7.15, samtools=1.3\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"bash\", \"dynScript\": \"REFFILE=$1\\nFASTQ=$2\\nBAMOUT=$3\\nrm -f \\\"refalias\\\"\\nln -s \\\"$REFFILE\\\" \\\"refalias\\\"\\nbwa index -a is \\\"refalias\\\"\\nbwa mem -t \\\"2\\\"  -v 1 \\\"refalias\\\" \\\"$FASTQ\\\"  > tempsam\\nsamtools view -Sb tempsam > temporary_bam_file.bam\\nsamtools sort -o \\\"$BAMOUT\\\" temporary_bam_file.bam\\n\"}}, \"help_text\": \"**What it Does**\\nSame thing as the command over-ride version but using a bash script and passing parameters.\\nProbably more familiar to many non-Galaxy developers.\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [{\"__index__\": 0, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"fasta\"], \"input_label\": \"Reference sequence to map reads against\", \"input_help\": \"\", \"input_CL\": \"1\", \"input_repeat\": \"false\"}, {\"__index__\": 1, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"fastq\"], \"input_label\": \"Reads to map\", \"input_help\": \"\", \"input_CL\": \"2\", \"input_repeat\": \"false\"}], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"bwa_test_bash_output\", \"history_format\": \"bam\", \"history_CL\": \"3\", \"history_test\": \"sim_size:0.1\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": []}}}, \"run_test\": \"true\", \"tool_desc\": \"Bash script equivalent of the bwa command over-ride.\", \"tool_name\": \"bwa_test_toolfactory_positional_bash\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "dc44d183-23e3-45cc-978a-336280ec70a6",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "c7943d13-c9c1-41ec-a055-a7cb1af39b6e"
+                }
+            ]
+        },
+        "15": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 15,
+            "input_connections": {
+                "io_param|ppass|io|history_inputs_0|input_files": {
+                    "id": 5,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": 91.39999389648438,
+                "height": 154.39999389648438,
+                "left": 1086.5,
+                "right": 1286.5,
+                "top": -63,
+                "width": 200,
+                "x": 1086.5,
+                "y": -63
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"perl\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"perl\", \"dynScript\": \"#!/usr/bin/perl -w\\n\\n# usage : perl toolExample.pl <FASTA file> <output file>\\n\\nopen (IN, \\\"<$ARGV[0]\\\");\\nopen (OUT, \\\">$ARGV[1]\\\");\\nwhile (<IN>) {\\n    chop;\\n    if (m/^>/) {\\n        s/^>//;\\n        if ($. > 1) {\\n            print OUT sprintf(\\\"%.3f\\\", $gc/$length) . \\\"\\\\n\\\";\\n        }\\n        $gc = 0;\\n        $length = 0;\\n    } else {\\n        ++$gc while m/[gc]/ig;\\n        $length += length $_;\\n    }\\n}\\nprint OUT sprintf(\\\"%.3f\\\", $gc/$length) . \\\"\\\\n\\\";\\nclose( IN );\\nclose( OUT );\"}}, \"help_text\": \"**What it Does**\\nPerl is also possible.\\nIt is also hard to maintain but we are a welcoming community so have it your way if you must.\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [{\"__index__\": 0, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"fasta\"], \"input_label\": \"Input fasta for GC estimate\", \"input_help\": \"\", \"input_CL\": \"1\", \"input_repeat\": \"false\"}], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"perl_gc_output\", \"history_format\": \"txt\", \"history_CL\": \"2\", \"history_test\": \"diff:0\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": []}}}, \"run_test\": \"true\", \"tool_desc\": \"Perl script demonstration\", \"tool_name\": \"perl_gc_counter\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "5b481ff7-6f1c-4184-8927-9cfdee297c26",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "a3c89cac-ec48-4f1d-83f3-39d9a565b899"
+                }
+            ]
+        },
+        "16": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 16,
+            "input_connections": {
+                "io_param|ppass|io|history_inputs_0|input_files": {
+                    "id": 5,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": -100.60000610351562,
+                "height": 154.39999389648438,
+                "left": 1086.5,
+                "right": 1286.5,
+                "top": -255,
+                "width": 200,
+                "x": 1086.5,
+                "y": -255
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"sed\", \"usescript\": {\"choosescript\": \"no\", \"__current_case__\": 0, \"dynScript\": \"\", \"scriptrunner\": \"\"}}, \"help_text\": \"**What it Does**\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [{\"__index__\": 0, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"txt\"], \"input_label\": \"Input text to be edited\", \"input_help\": \"\", \"input_CL\": \"2\", \"input_repeat\": \"false\"}], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"sedtest_edited_output\", \"history_format\": \"txt\", \"history_CL\": \"STDOUT\", \"history_test\": \"diff:0\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": [{\"__index__\": 0, \"param_name\": \"sedstring\", \"ap_type\": {\"param_type\": \"text\", \"__current_case__\": 0, \"param_value\": \"s/A/Abjork!/g\"}, \"param_label\": \"sed edit string - subsitute some text for some other text globally\", \"param_help\": \"\", \"param_CL\": \"1\", \"param_CLprefixed\": \"\", \"param_repeat\": \"false\"}]}}}, \"run_test\": \"false\", \"tool_desc\": \"\", \"tool_name\": \"sedtest_toolshed\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "b468577d-7026-45bd-b36f-2e4e4e8110df",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "7fd24cc1-bf68-4c55-b2b1-9f4383d0f211"
+                }
+            ]
+        },
+        "17": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 17,
+            "input_connections": {
+                "io_param|ppass|io|history_inputs_0|input_files": {
+                    "id": 7,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": 434.8000030517578,
+                "height": 174.8000030517578,
+                "left": 1096.5,
+                "right": 1296.5,
+                "top": 260,
+                "width": 200,
+                "x": 1096.5,
+                "y": 260
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"python\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"python\", \"dynScript\": \"# reverse order of text by row\\nimport argparse\\nparser = argparse.ArgumentParser()\\na = parser.add_argument\\na('--infile',default='')\\na('--pyrevargparse_outfile',default=None)\\nargs = parser.parse_args()\\ninp = args.infile\\noutp = args.pyrevargparse_outfile\\ni = open(inp,'r').readlines()\\no = open(outp,'w')\\nfor row in i:\\n  rs = row.rstrip()\\n  rs = list(rs)\\n  rs.reverse()\\n  o.write(''.join(rs))\\n  o.write('\\\\n')\\no.close()\"}}, \"help_text\": \"**What it Does**\\nDemonstrates argparse - script must correctly parse the names given on the form for this to work.\\nArgparse argument names your script should expect are constructed according to the parameter type - please read the tool form carefully.\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"argparse\", \"__current_case__\": 0, \"io\": {\"history_inputs\": [{\"__index__\": 0, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"txt\"], \"input_label\": \"input file to be reversed\", \"input_help\": \"\", \"input_CL\": \"infile\", \"input_repeat\": \"false\"}], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"pyrevargparse_outfile\", \"history_format\": \"txt\", \"history_CL\": \"pyrevargparse_outfile\", \"history_test\": \"diff:0\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": []}}}, \"run_test\": \"true\", \"tool_desc\": \"ToolFactory demonstration python script with argparse parameters\", \"tool_name\": \"pyrev_argparse_test\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "d86af8cb-0ed5-4581-9fce-87210c09230e",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "10516bab-d1aa-4554-99c2-0ed6694dbdb6"
+                }
+            ]
+        },
+        "18": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 18,
+            "input_connections": {
+                "io_param|ppass|io|history_inputs_0|input_files": {
+                    "id": 7,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": 627.3999938964844,
+                "height": 154.39999389648438,
+                "left": 1096.5,
+                "right": 1296.5,
+                "top": 473,
+                "width": 200,
+                "x": 1096.5,
+                "y": 473
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"python\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"python\", \"dynScript\": \"## reverse order of text by row\\n## ToolFactory demonstration\\n## positional parameters\\nimport sys\\ninp = sys.argv[1]\\noutp = sys.argv[2]\\ni = open(inp,'r').readlines()\\no = open(outp,'w')\\nfor row in i:\\n  rs = row.rstrip()\\n  rs = list(rs)\\n  rs.reverse()\\n  o.write(''.join(rs))\\n  o.write('\\\\n')\\no.close()\"}}, \"help_text\": \"**What it Does**\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [{\"__index__\": 0, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"txt\"], \"input_label\": \"Input text file to be reversed\", \"input_help\": \"\", \"input_CL\": \"1\", \"input_repeat\": \"false\"}], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"pyrev_positionalparse_output\", \"history_format\": \"txt\", \"history_CL\": \"2\", \"history_test\": \"diff:0\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": []}}}, \"run_test\": \"true\", \"tool_desc\": \"\", \"tool_name\": \"pyrev_pos_test\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "5550dfd1-91ad-4c43-a852-0028da606c57",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "2b413dbd-a019-4265-9d67-936519084f32"
+                }
+            ]
+        },
+        "19": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 19,
+            "input_connections": {
+                "io_param|ppass|io|history_inputs_0|input_files": {
+                    "id": 7,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": 819.3999938964844,
+                "height": 154.39999389648438,
+                "left": 1096.5,
+                "right": 1296.5,
+                "top": 665,
+                "width": 200,
+                "x": 1096.5,
+                "y": 665
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"bash\", \"dynScript\": \"tac | rev\"}}, \"help_text\": \"**What it Does**\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"0\", \"__current_case__\": 2, \"io\": {\"history_inputs\": [{\"__index__\": 0, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"txt\"], \"input_label\": \"Input text file to be reversed\", \"input_help\": \"\", \"input_CL\": \"STDIN\", \"input_repeat\": \"false\"}], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"tacrev_reversed_output\", \"history_format\": \"txt\", \"history_CL\": \"STDOUT\", \"history_test\": \"diff:0\"}], \"collection_outputs\": []}}}, \"run_test\": \"true\", \"tool_desc\": \"\", \"tool_name\": \"tacrev\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "e8b1cf36-b3d9-47a4-8c84-37e92f1722bf",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "8edeb5fa-6c11-4508-9876-8e267ef78618"
+                }
+            ]
+        },
+        "20": {
+            "annotation": "",
+            "content_id": "lisp_demo",
+            "errors": null,
+            "id": 20,
+            "input_connections": {
+                "SBCL_Lisp_script_to_execute": {
+                    "id": 9,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "lisp_demo",
+            "outputs": [
+                {
+                    "name": "lisp_out",
+                    "type": "txt"
+                }
+            ],
+            "position": {
+                "bottom": 30.199996948242188,
+                "height": 93.19999694824219,
+                "left": 1642.5,
+                "right": 1842.5,
+                "top": -63,
+                "width": 200,
+                "x": 1642.5,
+                "y": -63
+            },
+            "post_job_actions": {},
+            "tool_id": "lisp_demo",
+            "tool_state": "{\"SBCL_Lisp_script_to_execute\": {\"__class__\": \"ConnectedValue\"}, \"__input_ext\": \"txt\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "0.01",
+            "type": "tool",
+            "uuid": "ced975df-0054-4642-b831-665f6f88d73d",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "lisp_out",
+                    "uuid": "c0bc1652-93ae-481f-8ad2-47d45b5b4326"
+                }
+            ]
+        },
+        "21": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 21,
+            "input_connections": {
+                "io_param|ppass|io|history_inputs_0|input_files": {
+                    "id": 9,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": 222.39999389648438,
+                "height": 154.39999389648438,
+                "left": 1642.5,
+                "right": 1842.5,
+                "top": 68,
+                "width": 200,
+                "x": 1642.5,
+                "y": 68
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"sbcl\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"bash\", \"dynScript\": \"sbcl --script $1\"}}, \"help_text\": \"**What it Does**\\nSays hello world using a trivial lisp script.\\nIt will actually try to run any text file you like from your history but likely fail unless they happen to be valid lisp according to the interpreter dependency.\\nThese demonstrations show what is possible, not what is sensible.\\nPlease don't expose this anywhere.\", \"install\": \"true\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [{\"__index__\": 0, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"txt\"], \"input_label\": \"SBCL Lisp script to execute\", \"input_help\": \"Provide a script in lisp to be interpreted by SBCL\", \"input_CL\": \"1\", \"input_repeat\": \"false\"}], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"lisp_out\", \"history_format\": \"txt\", \"history_CL\": \"STDOUT\", \"history_test\": \"diff:0\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": []}}}, \"run_test\": \"true\", \"tool_desc\": \"ToolFactory demonstration using Lisp for the nostalgic.\", \"tool_name\": \"lisp_demo\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "0241fb8d-f8c7-43c2-953c-95a45d4af735",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "789a7cc9-bea5-45d2-ae2e-7026265fc835"
+                }
+            ]
+        },
+        "22": {
+            "annotation": "",
+            "content_id": "rgtf2",
+            "errors": null,
+            "id": 22,
+            "input_connections": {
+                "io_param|ppass|io|history_inputs_0|input_files": {
+                    "id": 9,
+                    "output_name": "output"
+                }
+            },
+            "inputs": [],
+            "label": null,
+            "name": "toolfactory",
+            "outputs": [
+                {
+                    "name": "new_tool",
+                    "type": "toolshed.gz"
+                }
+            ],
+            "position": {
+                "bottom": -100.60000610351562,
+                "height": 154.39999389648438,
+                "left": 1642.5,
+                "right": 1842.5,
+                "top": -255,
+                "width": 200,
+                "x": 1642.5,
+                "y": -255
+            },
+            "post_job_actions": {},
+            "tool_id": "rgtf2",
+            "tool_state": "{\"__input_ext\": \"input\", \"__workflow_invocation_uuid__\": \"dbb99db2a98811ebbc9e0242ac1b0004\", \"chromInfo\": \"/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"citations\": [], \"cl_prefix\": \"\", \"cl_suffix\": \"\", \"cover\": {\"commover\": \"no\", \"__current_case__\": 0, \"command_override\": \"\", \"test_override\": \"\"}, \"deps\": {\"packages\": \"planemo\", \"usescript\": {\"choosescript\": \"yes\", \"__current_case__\": 1, \"scriptrunner\": \"bash\", \"dynScript\": \"cp $1 foo.tar.gz\\ntar -xvf foo.tar.gz\\nTOOLNAME=`find . -name \\\"*.xml\\\"`\\necho \\\"TOOLNAME = $TOOLNAME\\\"\\nplanemo test  --test_output $2 $TOOLNAME\"}}, \"help_text\": \"**What it Does**\", \"install\": \"false\", \"io_param\": {\"ppass\": {\"parampass\": \"positional\", \"__current_case__\": 1, \"io\": {\"history_inputs\": [{\"__index__\": 0, \"input_files\": {\"__class__\": \"ConnectedValue\"}, \"input_formats\": [\"tgz\"], \"input_label\": \"ToolFactory toolshed archive from the history to test\", \"input_help\": \"\", \"input_CL\": \"1\", \"input_repeat\": \"false\"}], \"history_outputs\": [{\"__index__\": 0, \"history_name\": \"planemo_test_output\", \"history_format\": \"txt\", \"history_CL\": \"2\", \"history_test\": \"sim_size:0.05\"}], \"collection_outputs\": []}, \"addparam\": {\"edit_params\": \"yes\", \"additional_parameters\": []}}}, \"make\": {\"makeMode\": {\"__current_case__\": 1, \"citations\": [], \"galaxy_apikey\": \"\", \"galaxy_url\": \"\", \"help_text\": \"**What it Does**\\n\\nRuns planemo test on a ToolFactory or other toolshed archive\", \"make_Tool\": \"gentest\", \"tool_desc\": \"Tests a ToolFactory tool\", \"tool_version\": \"0.01\", \"toolshed_apikey\": \"\", \"toolshed_url\": \"\"}}, \"run_test\": \"true\", \"tool_desc\": \"\", \"tool_name\": \"planemo_test\", \"tool_version\": \"0.01\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
+            "tool_version": "2.00",
+            "type": "tool",
+            "uuid": "2d826252-a3fc-4e99-8791-2908926cda10",
+            "workflow_outputs": [
+                {
+                    "label": null,
+                    "output_name": "new_tool",
+                    "uuid": "659cabcf-e7db-4b61-8e3c-097a1d25c336"
+                }
+            ]
+        }
+    },
+    "tags": [],
+    "uuid": "308d4b95-f04f-49b0-8674-f0ddf0587850",
+    "version": 1
+}
--- a/toolfactory/rgToolFactory2.py	Sun Apr 18 02:14:13 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1149 +0,0 @@
-# replace with shebang for biocontainer
-# 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
-#
-# July 2020: BCC was fun and I feel like rip van winkle after 5 years.
-# Decided to
-# 1. Fix the toolfactory so it works - done for simplest case
-# 2. Fix planemo so the toolfactory function works
-# 3. Rewrite bits using galaxyxml functions where that makes sense - done
-
-import argparse
-import copy
-import json
-import logging
-import os
-import re
-import shlex
-import shutil
-import subprocess
-import sys
-import tarfile
-import tempfile
-import time
-
-from bioblend import ConnectionError
-from bioblend import toolshed
-
-import galaxyxml.tool as gxt
-import galaxyxml.tool.parameters as gxtp
-
-import lxml
-
-import yaml
-
-myversion = "V2.2 February 2021"
-verbose = True
-debug = True
-toolFactoryURL = "https://github.com/fubar2/toolfactory"
-foo = len(lxml.__version__)
-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 ScriptRunner:
-    """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"
-            )
-        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.lastclredirect = None
-        self.lastxclredirect = None
-        self.cl = []
-        self.xmlcl = []
-        self.is_positional = self.args.parampass == "positional"
-        if self.args.sysexe:
-            if ' ' in self.args.sysexe:
-                self.executeme = self.args.sysexe.split(' ')
-            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
-        aCL = self.cl.append
-        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.newtarpath = "%s_toolshed.gz" % self.tool_name
-        self.tooloutdir = "./tfout"
-        self.repdir = "./TF_run_report_tempdir"
-        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:
-                aCL(ex)
-                aXCL(ex)
-            aCL(self.sfile)
-            aXCL("$runme")
-        else:
-            for ex in self.executeme:
-                aCL(ex)
-                aXCL(ex)
-
-        self.elog = os.path.join(self.repdir, "%s_error_log.txt" % self.tool_name)
-        self.tlog = os.path.join(self.repdir, "%s_runner_log.txt" % self.tool_name)
-        if self.args.parampass == "0":
-            self.clsimple()
-        else:
-            if self.args.parampass == "positional":
-                self.prepclpos()
-                self.clpositional()
-            else:
-                self.prepargp()
-                self.clargparse()
-        if self.args.cl_suffix:  # DIY CL end
-            clp = shlex.split(self.args.cl_suffix)
-            for c in clp:
-                aCL(c)
-                aXCL(c)
-
-    def clsimple(self):
-        """no parameters or repeats - uses < and > for i/o"""
-        aCL = self.cl.append
-        aXCL = self.xmlcl.append
-        if len(self.infiles) > 0:
-            aCL("<")
-            aCL(self.infiles[0]["infilename"])
-            aXCL("<")
-            aXCL("$%s" % self.infiles[0]["infilename"])
-        if len(self.outfiles) > 0:
-            aCL(">")
-            aCL(self.outfiles[0]["name"])
-            aXCL(">")
-            aXCL("$%s" % self.outfiles[0]["name"])
-
-    def prepargp(self):
-        clsuffix = []
-        xclsuffix = []
-        for i, p in enumerate(self.infiles):
-            nam = p["infilename"]
-            if p["origCL"].strip().upper() == "STDIN":
-                appendme = [
-                    nam,
-                    nam,
-                    "< %s" % nam,
-                ]
-                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'
-                appendme = [p["CL"], p["CL"], ""]
-                xappendme = [p["CL"], "$%s" % p["CL"], over]
-            clsuffix.append(appendme)
-            xclsuffix.append(xappendme)
-        for i, p in enumerate(self.outfiles):
-            if p["origCL"].strip().upper() == "STDOUT":
-                self.lastclredirect = [">", p["name"]]
-                self.lastxclredirect = [">", "$%s" % p["name"]]
-            else:
-                clsuffix.append([p["name"], p["name"], ""])
-                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"]
-            clsuffix.append([p["CL"], nam, over])
-            xclsuffix.append([p["CL"], nam, over])
-        for p in self.selpar:
-            clsuffix.append([p["CL"], p["name"], p["override"]])
-            xclsuffix.append([p["CL"], '"$%s"' % p["name"], p["override"]])
-        self.xclsuffix = xclsuffix
-        self.clsuffix = clsuffix
-
-    def prepclpos(self):
-        clsuffix = []
-        xclsuffix = []
-        for i, p in enumerate(self.infiles):
-            if p["origCL"].strip().upper() == "STDIN":
-                appendme = [
-                    "999",
-                    p["infilename"],
-                    "< $%s" % p["infilename"],
-                ]
-                xappendme = [
-                    "999",
-                    p["infilename"],
-                    "< $%s" % p["infilename"],
-                ]
-            else:
-                appendme = [p["CL"], p["infilename"], ""]
-                xappendme = [p["CL"], "$%s" % p["infilename"], ""]
-            clsuffix.append(appendme)
-            xclsuffix.append(xappendme)
-        for i, p in enumerate(self.outfiles):
-            if p["origCL"].strip().upper() == "STDOUT":
-                self.lastclredirect = [">", p["name"]]
-                self.lastxclredirect = [">", "$%s" % p["name"]]
-            else:
-                clsuffix.append([p["CL"], p["name"], ""])
-                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"]
-            clsuffix.append([p["CL"], nam, over])
-            xclsuffix.append([p["CL"], '"$%s"' % nam, over])
-        for p in self.selpar:
-            clsuffix.append([p["CL"], p["name"], p["override"]])
-            xclsuffix.append([p["CL"], '"$%s"' % p["name"], p["override"]])
-        clsuffix.sort()
-        xclsuffix.sort()
-        self.xclsuffix = xclsuffix
-        self.clsuffix = clsuffix
-
-    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.escapedScript = [cheetah_escape(x) for x in rx]
-        self.spacedScript = [f"    {x}" for x in rx if x.strip() > ""]
-        art = "%s.%s" % (self.tool_name, self.executeme[0])
-        artifact = open(art, "wb")
-        artifact.write(bytes("\n".join(self.escapedScript), "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):
-            p["origCL"] = p["CL"]  # keep copy
-            self.outfiles[i] = p
-        for i, p in enumerate(self.addpar):
-            p["origCL"] = p["CL"]
-            self.addpar[i] = p
-
-    def clpositional(self):
-        # inputs in order then params
-        aCL = self.cl.append
-        for (k, v, koverride) in self.clsuffix:
-            if " " in v:
-                aCL("%s" % v)
-            else:
-                aCL(v)
-        aXCL = self.xmlcl.append
-        for (k, v, koverride) in self.xclsuffix:
-            aXCL(v)
-        if self.lastxclredirect:
-            aXCL(self.lastxclredirect[0])
-            aXCL(self.lastxclredirect[1])
-
-    def clargparse(self):
-        """argparse style"""
-        aCL = self.cl.append
-        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)
-        for (k, v, koverride) in self.clsuffix:
-            if koverride > "":
-                k = koverride
-            elif len(k.strip()) == 1:
-                k = "-%s" % k
-            else:
-                k = "--%s" % k
-            aCL(k)
-            aCL(v)
-        if self.lastxclredirect:
-            aXCL(self.lastxclredirect[0])
-            aXCL(self.lastxclredirect[1])
-
-    def getNdash(self, newname):
-        if self.is_positional:
-            ndash = 0
-        else:
-            ndash = 2
-            if len(newname) < 2:
-                ndash = 1
-        return ndash
-
-    def doXMLparam(self):
-        """Add all needed elements to tool"""  # noqa
-        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.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:
-            for d in self.args.packages.split(","):
-                ver = ""
-                d = d.replace("==", ":")
-                d = d.replace("=", ":")
-                if ":" in d:
-                    packg, ver = d.split(":")
-                else:
-                    packg = d
-                requirements.append(
-                    gxtp.Requirement("package", packg.strip(), ver.strip())
-                )
-        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
-        # exml = exml.replace('range="1:"', 'range="1000:"')
-        xf = open("%s.xml" % self.tool_name, "w")
-        xf.write(exml)
-        xf.write("\n")
-        xf.close()
-        # ready for the tarball
-
-    def run(self):
-        """
-        generate test outputs by running a command line
-        won't work if command or test override in play - planemo is the
-        easiest way to generate test outputs for that case so is
-        automagically selected
-        """
-        scl = " ".join(self.cl)
-        err = None
-        if self.args.parampass != "0":
-            if os.path.exists(self.elog):
-                ste = open(self.elog, "a")
-            else:
-                ste = open(self.elog, "w")
-            if self.lastclredirect:
-                sto = open(self.lastclredirect[1], "wb")  # is name of an output file
-            else:
-                if os.path.exists(self.tlog):
-                    sto = open(self.tlog, "a")
-                else:
-                    sto = open(self.tlog, "w")
-                sto.write(
-                    "## Executing Toolfactory generated command line = %s\n" % scl
-                )
-            sto.flush()
-            subp = subprocess.run(
-                self.cl, shell=False, stdout=sto, stderr=ste
-            )
-            sto.close()
-            ste.close()
-            retval = subp.returncode
-        else:  # work around special case - stdin and write to stdout
-            if len(self.infiles) > 0:
-                sti = open(self.infiles[0]["name"], "rb")
-            else:
-                sti = sys.stdin
-            if len(self.outfiles) > 0:
-                sto = open(self.outfiles[0]["name"], "wb")
-            else:
-                sto = sys.stdout
-            subp = subprocess.run(
-                self.cl, shell=False, stdout=sto, stdin=sti
-            )
-            sto.write("## Executing Toolfactory generated command line = %s\n" % scl)
-            retval = subp.returncode
-            sto.close()
-            sti.close()
-        if os.path.isfile(self.tlog) and os.stat(self.tlog).st_size == 0:
-            os.unlink(self.tlog)
-        if os.path.isfile(self.elog) and os.stat(self.elog).st_size == 0:
-            os.unlink(self.elog)
-        if retval != 0 and err:  # problem
-            sys.stderr.write(err)
-        logging.debug("run done")
-        return retval
-
-    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,
-            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 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" % p["infilename"])
-            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
-
-        if os.path.exists(self.tlog):
-            tout = open(self.tlog, "a")
-        else:
-            tout = open(self.tlog, "w")
-        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" % (oname))
-                    shutil.copyfile(src, dest)
-                else:
-                    if report_fail:
-                        tout.write(
-                            "###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,
-        )
-        tf.close()
-        shutil.copyfile(self.newtarpath, self.args.new_tool)
-
-    def moveRunOutputs(self):
-        """need to move planemo or run outputs into toolfactory collection"""
-        with os.scandir(self.tooloutdir) as outs:
-            for entry in outs:
-                if not entry.is_file():
-                    continue
-                if "." in entry.name:
-                    _, ext = os.path.splitext(entry.name)
-                    if ext in [".tgz", ".json"]:
-                        continue
-                    if ext in [".yml", ".xml", ".yaml"]:
-                        newname = f"{entry.name.replace('.','_')}.txt"
-                    else:
-                        newname = entry.name
-                else:
-                    newname = f"{entry.name}.txt"
-                dest = os.path.join(self.repdir, newname)
-                src = os.path.join(self.tooloutdir, entry.name)
-                shutil.copyfile(src, dest)
-        if self.args.include_tests:
-            with os.scandir(self.testdir) as outs:
-                for entry in outs:
-                    if (not entry.is_file()) or entry.name.endswith(
-                        "_planemo_test_report.html"
-                    ):
-                        continue
-                    if "." in entry.name:
-                        _, ext = os.path.splitext(entry.name)
-                        if ext in [".tgz", ".json"]:
-                            continue
-                        if ext in [".yml", ".xml", ".yaml"]:
-                            newname = f"{entry.name.replace('.','_')}.txt"
-                        else:
-                            newname = entry.name
-                    else:
-                        newname = f"{entry.name}.txt"
-                    dest = os.path.join(self.repdir, newname)
-                    src = os.path.join(self.testdir, entry.name)
-                    shutil.copyfile(src, dest)
-
-    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",
-            "--galaxy_python_version",
-            self.args.python_version,
-            "--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_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("--make_Tool", default="runonly")
-    a("--help_text", default=None)
-    a("--tool_desc", default=None)
-    a("--tool_version", default=None)
-    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("--new_tool", default="new_tool")
-    a("--galaxy_url", default="http://localhost:8080")
-    a("--toolshed_url", default="http://localhost:9009")
-    # make sure this is identical to tool_sheds_conf.xml
-    # localhost != 127.0.0.1 so validation fails
-    a("--toolshed_api_key", default="fakekey")
-    a("--galaxy_api_key", default="fakekey")
-    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("--python_version", default="3.9")
-    args = parser.parse_args()
-    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, "## Tool Factory expects a tool name - eg --tool_name=DESeq"
-    assert (
-        args.sysexe or args.packages
-    ), "## Tool Factory wrapper expects an interpreter \
-or an executable package in --sysexe or --packages"
-    r = ScriptRunner(args)
-    r.writeShedyml()
-    r.makeTool()
-    if args.make_Tool == "generate":
-        r.run()
-        r.moveRunOutputs()
-        r.makeToolTar()
-    else:
-        r.planemo_test_once()
-        r.moveRunOutputs()
-        r.makeToolTar(report_fail=True)
-        if args.make_Tool == "gentestinstall":
-            r.shedLoad()
-            r.eph_galaxy_load()
-
-
-if __name__ == "__main__":
-    main()
--- a/toolfactory/rgToolFactory2.xml	Sun Apr 18 02:14:13 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,612 +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" 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="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="zero or more input data files to pass on the command line to the executable."
-             help="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" title="one or more new history items output by the executable to appear in the user history after the tool runs"
-             help="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="Name for this output to appear in new history" optional="false"
-              help="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="Positional: ordinal integer. Use STDOUT if '>' required. Otherwise ignored if argparse because name is used"
-              help="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 pass decision criterion for this output compared to test generation"
-              help="Available options are diff:[lines], sim_size:[delta (integer) or delta_frac (float)" value="diff:0"/>
-        </repeat>
-        <repeat name="collection_outputs" title="zero or more new history collections to appear in the user history after the tool runs"
-             help="Hides outputs not needed for downstream tools such as images and intermediate reports." default="0">
-            <param name="name" type="text" label="Name for new collection with all outputs not individually passed to history outputs"
-              help="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="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="zero or more command line settings for the user to pass to the executable"
-             help="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.74.3">planemo</requirement>
-   <container type="docker">quay.io/biocontainers/mulled-v2-0a86ccf22d71945a175383bcea5edd6b51c25ed0:55f1b8132a10ad91f0016ba9f4c692627ca2d25b-0</container>
-</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__/rgToolFactory2.py
-    #if len(str($cl_suffix)) > 0:
---cl_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
---packages "$deps.packages"
-   #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"
-
-   #if str($make.makeMode.make_Tool)!="runonly":
---make_Tool "$make.makeMode.make_Tool"
---tool_desc "$make.makeMode.tool_desc"
---tool_version "$make.makeMode.tool_version"
---help_text "$helpme"
---new_tool "$new_tool"
---toolshed_api_key "$make.makeMode.toolshed_apikey"
---galaxy_api_key "$make.makeMode.galaxy_apikey"
---toolshed_url "$make.makeMode.toolshed_url"
---galaxy_url "$make.makeMode.galaxy_url"
-   #end if
-   #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
---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">
-    #if $make.makeMode.make_Tool != "runonly":
-${make.makeMode.help_text}
-    #else
-$tool_name help goes here
-    #end if
- </configfile>
- <configfile name="citeme">
-#if $make.makeMode.make_Tool != "runonly":
-    #for $citation in $make.makeMode.citations:
-        #if $citation.citation_type.type == "bibtex":
-            **ENTRY**bibtex
-            ${citation.citation_type.bibtex}
-        #else
-            **ENTRY**doi
-            ${citation.citation_type.doi}
-        #end if
-    #end for
-#end if
- </configfile>
-  </configfiles>
-  <inputs>
-   <param name="tool_name" type="text" value="tool1"   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>
-     <section name="make" title="Generate, toolshed and local Galaxy installation options" expanded="true">
-    <conditional name="makeMode">
-        <param name="make_Tool" type="select" display="radio" label="Choose the steps you want to run. The TF Docker container is recommended for local installation"
-          help="Installation in this Galaxy is optional" >
-        <option value="generate" >Run to generate tests only. Should fail if dependencies needed.</option>
-        <option value="gentest" selected="true">Test with planemo after generating.</option>
-        <option value="gentestinstall">Install in this Galaxy after generation and testing. Must have local ToolShed as in the TF Docker container</option>
-        </param>
-       <when value="generate">
-           <param name="galaxy_apikey" value="" type="hidden"  ></param>
-           <param name="toolshed_apikey" value="" type="hidden"  ></param>
-           <param name="galaxy_url" value="" type="hidden"  ></param>
-           <param name="toolshed_url" value="" type="hidden"  ></param>
-            <expand macro="tool_metadata" />
-        </when>
-       <when value="gentest">
-           <param name="galaxy_apikey" value="" type="hidden"  ></param>
-           <param name="toolshed_apikey" value="" type="hidden"  ></param>
-           <param name="galaxy_url" value="" type="hidden"  ></param>
-           <param name="toolshed_url" value="" type="hidden"  ></param>
-            <expand macro="tool_metadata" />
-        </when>
-       <when value="gentestinstall">
-            <param name="galaxy_url" type="text" value="http://localhost:8080" label="URL for the Galaxy server where the new tool should be installed"
-             help="Default is localhost">
-              <sanitizer>
-                 <valid initial="string.printable" />
-                 <mapping initial="none"/>
-              </sanitizer>
-            </param>
-          <param name="galaxy_apikey" type="text" value="fakekey" label="API key for the Galaxy to install the new tool"
-             help="Cut and paste from the admin user properties screen">
-              <sanitizer>
-                 <valid initial="string.ascii_letters,string.digits" />
-                 <mapping initial="none"/>
-              </sanitizer>
-            </param>
-           <param name="toolshed_url" type="text" value="http://localhost:9009" label="URL for the Toolshed where the new tool should be installed"
-             help="Default value is localhost:9009">
-              <sanitizer>
-                 <valid initial="string.printable" />
-                 <mapping initial="none"/>
-              </sanitizer>
-            </param>
-           <param name="toolshed_apikey" type="text" value="fakekey" label="API key for the local toolshed to use when installing the tool"
-             help="Cut and paste from the admin user properties screen">
-              <sanitizer>
-                 <valid initial="string.ascii_letters,string.digits" />
-                 <mapping initial="none"/>
-              </sanitizer>
-            </param>
-            <expand macro="tool_metadata" />
-        </when>
-    </conditional>
-    </section>
-  </inputs>
-  <outputs>
-
-    <data format="toolshed.gz" name="new_tool" label="${tool_name}_toolshed.gz" >
-        <filter>makeMode['make_Tool'] != "runonly"</filter>
-    </data>
-
-  <collection name="TF_run_report" type="list" label="${tool_name} outputs">
-      <discover_datasets pattern="__name_and_ext__" directory="TF_run_report_tempdir" />
-  </collection>
-  </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="make_Tool" value="gentest" />
-    <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 name="new_tool" file="toolfactory_pyrevpos_tgz_sample" compare="sim_size" delta="6000" />
-</test>
-</tests>
-<help>
-
-.. class:: warningmark
-
-**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.
-
-When you run this tool, your executable or script and supplied parameter values will be run to produce a canonical
-set of outputs - these are used to construct a test for the new tool.
-
-If tool generation is required, a new tarball compatible with any Galaxy toolshed is created.
-It can be unpacked in your galaxy/tools directory and manually added to tool_conf.xml, or
-installed into any toolshed from where it can be installed into your Galaxy.
-
-
-.. 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.
-
-Here's a sample python script that can be cut and pasted into the tool form, suitable for positional parameter passing:
-
-::
-
-    # reverse order of text by row
-    import sys
-    inp = sys.argv[1]
-    outp = sys.argv[2]
-    i = open(inp,'r').readlines()
-    o = open(outp,'w')
-    for row in i:
-      rs = row.rstrip()
-      rs = list(rs)
-      rs.reverse()
-      o.write(''.join(rs))
-      o.write('\n')
-    o.close()
-
-With argparse style parameters:
-
-::
-
-    # reverse order of text by row
-    import argparse
-    parser = argparse.ArgumentParser()
-    a = parser.add_argument
-    a('--infile',default='')
-    a('--outfile',default=None)
-    args = parser.parse_args()
-    inp = args.infile
-    outp = args.outfile
-    i = open(inp,'r').readlines()
-    o = open(outp,'w')
-    for row in i:
-      rs = row.rstrip()
-      rs = list(rs)
-      rs.reverse()
-      o.write(''.join(rs))
-      o.write('\n')
-    o.close()
-
-R script to draw some plots - use a collection.
-
-::
-
-
-     \# note this script takes NO input because it generates random data
-    dir.create('plots')
-    for (i in 1:10) {
-        foo = runif(100)
-        bar = rnorm(100)
-        bar = foo + 0.05*bar
-        pdf(paste('plots/yet',i,"anotherplot.pdf",sep='_'))
-        plot(foo,bar,main=paste("Foo by Bar plot \#",i),col="maroon", pch=3,cex=0.6)
-        dev.off()
-        foo = data.frame(a=runif(100),b=runif(100),c=runif(100),d=runif(100),e=runif(100),f=runif(100))
-        bar = as.matrix(foo)
-        pdf(paste('plots/yet',i,"anotherheatmap.pdf",sep='_'))
-        heatmap(bar,main='Random Heatmap')
-        dev.off()
-    }
-
-
-
-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>
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolfactory/test-data/generated_xml_sample	Wed Jun 09 02:28:01 2021 +0000
@@ -0,0 +1,53 @@
+<tool name="pyrevpos" id="pyrevpos" version="0.01">
+  <!--Source in git at: https://github.com/fubar2/toolfactory-->
+  <!--Created by test@bx.psu.edu at 11/05/2021 18:27:13 using the Galaxy Tool Factory.-->
+  <description>positional reverse</description>
+  <requirements>
+    <requirement type="package">python</requirement>
+  </requirements>
+  <stdio>
+    <exit_code range="1:" level="fatal"/>
+  </stdio>
+  <version_command><![CDATA[echo "0.01"]]></version_command>
+  <command><![CDATA[python
+$runme
+$input
+$output2]]></command>
+  <configfiles>
+    <configfile name="runme"><![CDATA[#raw
+
+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()
+
+#end raw]]></configfile>
+  </configfiles>
+  <inputs>
+    <param name="input" type="data" optional="false" label="input" help="help" format="txt" multiple="false"/>
+  </inputs>
+  <outputs>
+    <data name="output2" format="txt" label="output2" hidden="false"/>
+  </outputs>
+  <tests>
+    <test>
+      <output name="output2" value="output2_sample" compare="diff" lines_diff="0"/>
+      <param name="input" value="input_sample"/>
+    </test>
+  </tests>
+  <help><![CDATA[
+
+help text goes here
+
+ 
+
+------
+
+
+Script::
+
+    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()
+
+]]></help>
+  <citations>
+    <citation type="doi">10.1093/bioinformatics/bts573</citation>
+  </citations>
+</tool>
+
--- a/toolfactory/test-data/input1_sample	Sun Apr 18 02:14:13 2021 +0000
+++ b/toolfactory/test-data/input1_sample	Wed Jun 09 02:28:01 2021 +0000
@@ -1,166 +1,982 @@
-*WARNING before you start*
+# 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 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
 
- Install this tool on a private Galaxy ONLY
- Please NEVER on a public or production instance
- 
-Updated august 2014 by John Chilton adding citation support
+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()))
+
 
-Updated august 8 2014 to fix bugs reported by Marius van den Beek
+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
 
-Please cite the resource at
-http://bioinformatics.oxfordjournals.org/cgi/reprint/bts573?ijkey=lczQh1sWrMwdYWJ&keytype=ref
-if you use this tool in your published work.
+class Locker:
+    """
+    multiple instances of the TF may try to update tool_conf.xml so use a simple lockfile
+    to prevent overwriting mix ups.
+    """
+    def __enter__ (self):
+        lockfile = "/tmp/.toolfactory_lockfile.lck"
+        if not os.path.exists(lockfile):
+            try:
+                os.utime(lockfile, None)
+            except OSError:
+                open(lockfile, 'a').close()
+        self.fp = open(lockfile)
+        fcntl.flock(self.fp.fileno(), fcntl.LOCK_EX)
 
-**Short Story**
+    def __exit__ (self, _type, value, tb):
+        fcntl.flock(self.fp.fileno(), fcntl.LOCK_UN)
+        self.fp.close()
+
+
+class Tool_Conf_Updater:
+
+    """# update config/tool_conf.xml with a new tool unpacked in /tools
+    # requires highly insecure docker settings - like write to tool_conf.xml and to tools !
+    # if in a container possibly not so courageous.
+    # Fine on your own laptop but security red flag for most production instances
+    Note potential race condition for tool_conf.xml update - uses a file lock.
+    """
 
-This is an unusual Galaxy tool capable of generating new Galaxy tools.
-It works by exposing *unrestricted* and therefore extremely dangerous scripting
-to all designated administrators of the host Galaxy server, allowing them to
-run scripts in R, python, sh and perl over multiple selected input data sets,
-writing a single new data set as output.
+    def __init__(
+        self, args, tool_conf_path, new_tool_archive_path, new_tool_name, local_tool_dir, run_test
+    ):
+        self.args = args
+        self.tool_conf_path = os.path.join(args.galaxy_root, tool_conf_path)
+        self.tool_dir = os.path.join(args.galaxy_root, local_tool_dir,'TFtools')
+        self.out_section = "ToolFactory Generated Tools"
+        tff = tarfile.open(new_tool_archive_path, "r:*")
+        flist = tff.getnames()
+        ourdir = os.path.commonpath(flist)  # eg pyrevpos
+        self.tool_id = ourdir  # they are the same for TF tools
+        ourxml = [x for x in flist if x.lower().endswith(".xml")]
+        tff.extractall()
+        tff.close()
+        self.run_rsync(ourdir, self.tool_dir)
+        with Locker():
+            self.update_toolconf(ourdir, ourxml)
 
-*You have a working r/python/perl/bash script or any executable with positional or argparse style parameters*
+    def run_rsync(self, srcf, dstf):
+        src = os.path.abspath(srcf)
+        dst = os.path.abspath(dstf)
+        if os.path.isdir(src):
+            cll = ["rsync", "-r", src, dst]
+        else:
+            cll = ["rsync", src, dst]
+        subprocess.run(
+            cll,
+            capture_output=False,
+            encoding="utf8",
+            shell=False,
+        )
 
-It can be turned into an ordinary Galaxy tool in minutes, using a Galaxy tool.
+    def update_toolconf(self, ourdir, ourxml):  # path is relative to tools
+        localconf = "./local_tool_conf.xml"
+        self.run_rsync(self.tool_conf_path, localconf)
+        tree = ET.parse(localconf)
+        root = tree.getroot()
+        hasTF = False
+        TFsection = None
+        for e in root.findall("section"):
+            if e.attrib["name"] == self.out_section:
+                hasTF = True
+                TFsection = e
+        if not hasTF:
+            TFsection = ET.Element("section", {"id":self.out_section, "name":self.out_section})
+            root.insert(0, TFsection)  # at the top!
+        our_tools = TFsection.findall("tool")
+        conf_tools = [x.attrib["file"] for x in our_tools]
+        for xml in ourxml:  # may be > 1
+            if xml not in conf_tools:  # new
+                ET.SubElement(TFsection, "tool", {"file": os.path.join('TFtools', xml)})
+        newconf = f"{self.tool_id}_conf"
+        tree.write(newconf, pretty_print=True)
+        self.run_rsync(newconf, self.tool_conf_path)
+
+
 
 
-**Automated generation of new Galaxy tools for installation into any Galaxy**
+class Tool_Factory:
+    """Wrapper for an arbitrary script
+    uses galaxyxml
+
+    """
 
-A test is generated using small sample test data inputs and parameter settings you supply.
-Once the test case outputs have been produced, they can be used to build a
-new Galaxy tool. The supplied script or executable is baked as a requirement
-into a new, ordinary Galaxy tool, fully workflow compatible out of the box.
-Generated tools are installed via a tool shed by an administrator
-and work exactly like all other Galaxy tools for your users.
+    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"
+            )
+        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 = self.args.sysexe.split(" ")
+            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)
 
-**More Detail**
+        if self.args.parampass == "0":
+            self.clsimple()
+        else:
+            if self.args.parampass == "positional":
+                self.prepclpos()
+                self.clpositional()
+            else:
+                self.prepargp()
+                self.clargparse()
 
-To use the ToolFactory, you should have prepared a script to paste into a
-text box, or have a package in mind and a small test input example ready to select from your history
-to test your new script.
-
-```planemo test rgToolFactory2.xml --galaxy_root ~/galaxy --test_data ~/galaxy/tools/tool_makers/toolfactory/test-data``` works for me
+    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)
 
-There is an example in each scripting language on the Tool Factory form. You
-can just cut and paste these to try it out - remember to select the right
-interpreter please. You'll also need to create a small test data set using
-the Galaxy history add new data tool.
+    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
 
-If the script fails somehow, use the "redo" button on the tool output in
-your history to recreate the form complete with broken script. Fix the bug
-and execute again. Rinse, wash, repeat.
+    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()
 
-Once the script runs sucessfully, a new Galaxy tool that runs your script
-can be generated. Select the "generate" option and supply some help text and
-names. The new tool will be generated in the form of a new Galaxy datatype
-*toolshed.gz* - as the name suggests, it's an archive ready to upload to a
-Galaxy ToolShed as a new tool repository.
+    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
 
-Once it's in a ToolShed, it can be installed into any local Galaxy server
-from the server administrative interface.
+    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
 
-Once the new tool is installed, local users can run it - each time, the script
-that was supplied when it was built will be executed with the input chosen
-from the user's history. In other words, the tools you generate with the
-ToolFactory run just like any other Galaxy tool,but run your script every time.
-
-Tool factory tools are perfect for workflow components. One input, one output,
-no variables.
-
-*To fully and safely exploit the awesome power* of this tool,
-Galaxy and the ToolShed, you should be a developer installing this
-tool on a private/personal/scratch local instance where you are an
-admin_user. Then, if you break it, you get to keep all the pieces see
-https://bitbucket.org/fubar/galaxytoolfactory/wiki/Home
+    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.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!"
+                )
 
-**Installation**
-This is a Galaxy tool. You can install it most conveniently using the
-administrative "Search and browse tool sheds" link. Find the Galaxy Main
-toolshed at https://toolshed.g2.bx.psu.edu/ and search for the toolfactory
-repository. Open it and review the code and select the option to install it.
+    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)
 
-If you can't get the tool that way, the xml and py files here need to be
-copied into a new tools
-subdirectory such as tools/toolfactory Your tool_conf.xml needs a new entry
-pointing to the xml
-file - something like::
+    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
+        # exml = exml.replace('range="1:"', 'range="1000:"')
+        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')
+        # ready for the tarball
 
-  <section name="Tool building tools" id="toolbuilders">
-    <tool file="toolfactory/rgToolFactory.xml"/>
-  </section>
+    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()
 
-If not already there,
-please add:
-<datatype extension="toolshed.gz" type="galaxy.datatypes.binary:Binary"
-mimetype="multipart/x-gzip" subclass="True" />
-to your local data_types_conf.xml.
+    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)
+        #xout = os.path.join(self.repdir, 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()
 
 
-**Restricted execution**
-
-The tool factory tool itself will then be usable ONLY by admin users -
-people with IDs in admin_users in universe_wsgi.ini **Yes, that's right. ONLY
-admin_users can run this tool** Think about it for a moment. If allowed to
-run any arbitrary script on your Galaxy server, the only thing that would
-impede a miscreant bent on destroying all your Galaxy data would probably
-be lack of appropriate technical skills.
-
-**What it does** 
-
-This is a tool factory for simple scripts in python, R and
-perl currently. Functional tests are automatically generated. How cool is that.
-
-LIMITED to simple scripts that read one input from the history. Optionally can
-write one new history dataset, and optionally collect any number of outputs
-into links on an autogenerated HTML index page for the user to navigate -
-useful if the script writes images and output files - pdf outputs are shown
-as thumbnails and R's bloated pdf's are shrunk with ghostscript so that and
-imagemagik need to be available.
-
-Generated tools can be edited and enhanced like any Galaxy tool, so start
-small and build up since a generated script gets you a serious leg up to a
-more complex one.
-
-**What you do**
-
-You paste and run your script, you fix the syntax errors and
-eventually it runs. You can use the redo button and edit the script before
-trying to rerun it as you debug - it works pretty well.
+def main():
+    """
+    This is a Galaxy wrapper.
+    It expects to be called by a special purpose tool.xml
 
-Once the script works on some test data, you can generate a toolshed compatible
-gzip file containing your script ready to run as an ordinary Galaxy tool in
-a repository on your local toolshed. That means safe and largely automated
-installation in any production Galaxy configured to use your toolshed.
-
-**Generated tool Security**
-
-Once you install a generated tool, it's just
-another tool - assuming the script is safe. They just run normally and their
-user cannot do anything unusually insecure but please, practice safe toolshed.
-Read the code before you install any tool. Especially this one - it is really scary.
-
-**Send Code**
-
-Patches and suggestions welcome as bitbucket issues please?
-
-**Attribution**
+    """
+    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=None)
+    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", default="1")
+    a("--admin_only", default=False, 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, "## Tool Factory expects a tool name - eg --tool_name=DESeq"
+    r = Tool_Factory(args)
+    r.writeShedyml()
+    r.makeTool()
+    r.makeToolTar()
+    if args.install == "1":
+        TCU = Tool_Conf_Updater(
+            args=args,
+            local_tool_dir=args.local_tools,
+            new_tool_archive_path=r.newtarpath,
+            tool_conf_path=args.tool_conf_path,
+            new_tool_name=r.tool_name,
+            run_test = args.run_test
+        )
 
-Creating re-usable tools from scripts: The Galaxy Tool Factory
-Ross Lazarus; Antony Kaspi; Mark Ziemann; The Galaxy Team
-Bioinformatics 2012; doi: 10.1093/bioinformatics/bts573
-
-http://bioinformatics.oxfordjournals.org/cgi/reprint/bts573?ijkey=lczQh1sWrMwdYWJ&keytype=ref
-
-**Licensing**
-
-Copyright Ross Lazarus 2010
-ross lazarus at g mail period com
-
-All rights reserved.
-
-Licensed under the LGPL
-
-**Obligatory screenshot**
-
-http://bitbucket.org/fubar/galaxytoolmaker/src/fda8032fe989/images/dynamicScriptTool.png
-
+if __name__ == "__main__":
+    main()
Binary file toolfactory/test-data/pyrevpos_not_tested.toolshed_sample has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolfactory/test-data/test1_log.txt	Wed Jun 09 02:28:01 2021 +0000
@@ -0,0 +1,1 @@
+## Executing Toolfactory generated command line = python /tmp/pyrevposq5dmcdy1.python /tmp/tmpqrksf8sd/files/5/b/9/dataset_5b952a86-87df-44ad-a415-ea549f3f0cee.dat output2