--- a/toolfactory/rgToolFactory2.py	Mon Oct 26 02:51:54 2020 +0000
+++ b/toolfactory/rgToolFactory2.py	Tue Nov 10 02:33:46 2020 +0000
@@ -23,6 +23,7 @@
 
 
 import argparse
+import copy
 import logging
 import os
 import re
@@ -33,6 +34,9 @@
 import tempfile
 import time
 
+from bioblend import galaxy
+from bioblend import toolshed
+
 import galaxyxml.tool as gxt
 import galaxyxml.tool.parameters as gxtp
 
@@ -154,13 +158,13 @@
         self.cl = []
         self.xmlcl = []
         self.is_positional = self.args.parampass == "positional"
-        if self.args.packages:
-            self.executeme = self.args.packages.split(",")[0].split(":")[0]
-        else:
+        if self.args.sysexe:
             self.executeme = self.args.sysexe
-        assert (
-            self.executeme is not None
-        ), "No system or managed executable passed in. Cannot build"
+        else:
+            if self.args.packages:
+                self.executeme = self.args.packages.split(",")[0].split(":")[0]
+            else:
+                self.executeme = None
         aCL = self.cl.append
         aXCL = self.xmlcl.append
         assert args.parampass in [
@@ -477,9 +481,9 @@
                 )
             aparm.positional = self.is_positional
             if self.is_positional:
-                aninput.positional = int(oldcl)
+                aparm.positional = int(oldcl)
             self.tinputs.append(aparm)
-            self.tparm = gxtp.TestParam(newname, value=newval)
+            tparm = gxtp.TestParam(newname, value=newval)
             self.testparam.append(tparm)
 
     def doNoXMLparam(self):
@@ -508,7 +512,7 @@
             self.tinputs.append(aninput)
             tp = gxtp.TestParam(name=newname, value="%s_sample" % newname)
             self.testparam.append(tp)
-        if len(self.outfiles > 0):
+        if len(self.outfiles) > 0:
             newname = self.outfiles[0][OCLPOS]
             newfmt = self.outfiles[0][OFMTPOS]
             anout = gxtp.OutputData(newname, format=newfmt, num_dashes=0)
@@ -531,8 +535,9 @@
         if self.args.help_text:
             helptext = open(self.args.help_text, "r").readlines()
             safertext = [html_escape(x) for x in helptext]
-            if self.args.script_path:
-                scrpt = self.script.split('\n')
+            if False and self.args.script_path:
+                scrp = self.script.split('\n')
+                scrpt = ['   %s' % x for x in scrp] # try to stop templating
                 scrpt.insert(0,"```\n")
                 if len(scrpt) > 300:
                     safertext = safertext + scrpt[:100] + ['>500 lines - stuff deleted','......'] + scrpt[-100:]
@@ -593,6 +598,7 @@
             part2 = exml.split("</tests>")[1]
             fixed = "%s\n%s\n%s" % (part1, 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")
@@ -606,8 +612,6 @@
         easiest way to generate test outputs for that case so is
         automagically selected
         """
-        s = "run cl=%s" % str(self.cl)
-        logging.debug(s)
         scl = " ".join(self.cl)
         err = None
         if self.args.parampass != "0":
@@ -623,7 +627,7 @@
                 else:
                     sto = open(self.tlog, "w")
                 sto.write(
-                        "## Executing Toolfactory generated command line = %s\n" % scl
+                       "## Executing Toolfactory generated command line = %s\n" % scl
                 )
             sto.flush()
             p = subprocess.run(self.cl, shell=False, stdout=sto, stderr=ste)
@@ -634,12 +638,15 @@
             if len(self.infiles) > 0:
                 sti = open(self.infiles[0][IPATHPOS], "rb")
             else:
-                sti = sys.stdin    
+                sti = sys.stdin
             if len(self.outfiles) > 0:
                 sto = open(self.outfiles[0][ONAMEPOS], "wb")
             else:
                 sto = sys.stdout
             p = subprocess.run(self.cl, shell=False, stdout=sto, stdin=sti)
+            sto.write(
+              "## Executing Toolfactory generated command line = %s\n" % scl
+            )
             retval = p.returncode
             sto.close()
             sti.close()
@@ -652,83 +659,49 @@
         logging.debug("run done")
         return retval
 
-    def planemo_shedload(self):
+
+    def shedLoad(self):
         """
-        planemo shed_create --shed_target testtoolshed
-        planemo shed_update --check_diff --shed_target testtoolshed
+        {'deleted': False,
+              'description': 'Tools for manipulating data',
+              'id': '175812cd7caaf439',
+              'model_class': 'Category',
+              'name': 'Text Manipulation',
+              'url': '/api/categories/175812cd7caaf439'}]
+
+
         """
         if os.path.exists(self.tlog):
-            tout = open(self.tlog, "a")
-        else:
-            tout = open(self.tlog, "w")
-        cll = ["planemo", "shed_create", "--shed_target", "local"]
-        try:
-            p = subprocess.run(
-                cll, shell=True, cwd=self.tooloutdir, stdout=tout, stderr=tout
-            )
-        except:
-            pass
-        if p.returncode != 0:
-            print("Repository %s exists" % self.args.tool_name)
+            sto = open(self.tlog, "a")
         else:
-            print("initiated %s" % self.args.tool_name)
-        cll = [
-            "planemo",
-            "shed_upload",
-            "--shed_target",
-            "local",
-            "--owner",
-            "fubar",
-            "--name",
-            self.args.tool_name,
-            "--shed_key",
-            self.args.toolshed_api_key,
-            "--tar",
-            self.newtarpath,
-        ]
-        p = subprocess.run(cll, shell=False)
-        print("Ran", " ".join(cll), "got", p.returncode)
-        tout.close()
-        return p.returncode
+            sto = open(self.tlog, "w")
 
-    def planemo_test(self, genoutputs=True):
-        """planemo is a requirement so is available for testing
-        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
-        if os.path.exists(self.tlog):
-            tout = open(self.tlog, "a")
+        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]
+        sto.write(f'############names={rnames} rids={rids}')
+        cat = 'ToolFactory generated tools'
+        if self.args.tool_name not in rnames:
+            tscat = ts.categories.get_categories()
+            cnames = [x.get('name','?') for x in tscat]
+            cids = [x.get('id','?') for x in tscat]
+            catID = None
+            if cat in cnames:
+                ci = cnames.index(cat)
+                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 res={res}')
         else:
-            tout = open(self.tlog, "w")
-        if genoutputs:
-            cll = [
-                "planemo",
-                "test",
-                "--galaxy_root",
-                self.args.galaxy_root,
-                "--update_test_data",
-                xreal,
-            ]
-        else:
-            cll = ["planemo", "test", "--galaxy_root",
-                self.args.galaxy_root, 
-                xreal,]
-        p = subprocess.run(
-                cll, shell=False, cwd=self.tooloutdir, stderr=tout, stdout=tout
-            )
-        if genoutputs:
-            with os.scandir(self.testdir) as outs:
-                for entry in outs:
-                    if entry.is_file():
-                        dest = os.path.join(self.repdir, entry.name)
-                        src = os.path.join(self.testdir, entry.name)
-                        shutil.copyfile(src, dest)
-                    tout.write(
-                        "Copied output %s to %s after planemo test\n" % (src, dest)
-                    )
-        tout.close()
-        return p.returncode
+             i = rnames.index(self.args.tool_name)
+             tid = rids[i]
+        res = ts.repositories.update_repository(id=tid, tar_ball_path=self.newtarpath, commit_message=None)
+        sto.write(f'#####update res={res}')
+        sto.close()
+
 
     def eph_galaxy_load(self):
         """load the new tool from the local toolshed after planemo uploads it
@@ -751,22 +724,138 @@
             "fubar",
             "--toolshed",
             self.args.toolshed_url,
-            "--section_label",
-            "Generated Tools",
+           "--section_label",
+            "ToolFactory",
 
         ]
-        print("running\n", " ".join(cll))
+        tout.write("running\n%s\n" % " ".join(cll))
         p = subprocess.run(cll, shell=False, stderr=tout, stdout=tout)
-        if p.returncode != 0:
-            print(
-                "Repository %s installation returned %d"
-                % (self.args.tool_name, p.returncode)
-            )
+        tout.write("installed %s - got retcode %d\n" % (self.args.tool_name,p.returncode))
+        tout.close()
+        return p.returncode
+
+
+    def planemo_shedload(self):
+        """
+        planemo shed_create --shed_target testtoolshed
+        planemo shed_init --name=<name>
+                  --owner=<shed_username>
+                  --description=<short description>
+                  [--remote_repository_url=<URL to .shed.yml on github>]
+                  [--homepage_url=<Homepage for tool.>]
+                  [--long_description=<long description>]
+                  [--category=<category name>]*
+        
+        
+        planemo shed_update --check_diff --shed_target testtoolshed
+        """
+        if os.path.exists(self.tlog):
+            tout = open(self.tlog, "a")
         else:
-            print("installed %s" % self.args.tool_name)
+            tout = 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]
+        tout.write(f'############names={rnames} rids={rids}')
+        cat = 'ToolFactory generated tools'
+        if self.args.tool_name not in rnames:
+            cll = ["planemo", "shed_create", "--shed_target", "local", 
+            "--owner","fubar","--name",
+            self.args.tool_name,"--shed_key",
+            self.args.toolshed_api_key,]
+            try:
+                p = subprocess.run(
+                    cll, shell=False, cwd=self.tooloutdir, stdout=tout, stderr=tout
+                )
+            except:
+                pass
+            if p.returncode != 0:
+               tout.write("Repository %s exists" % self.args.tool_name)
+            else:
+                tout.write("initiated %s" % self.args.tool_name)
+        cll = [
+            "planemo",
+            "shed_upload",
+            "--shed_target",
+            "local",
+            "--owner",
+            "fubar",
+            "--name",
+            self.args.tool_name,
+            "--shed_key",
+            self.args.toolshed_api_key,
+            "--tar",
+            self.newtarpath,
+        ]
+        p = subprocess.run(cll, shell=False, stdout=tout, stderr=tout)
+        tout.write("Ran %s got %d" %  (" ".join(cll), p.returncode))
         tout.close()
         return p.returncode
 
+
+    def eph_test(self):
+            """
+            """
+            if os.path.exists(self.tlog):
+                tout = open(self.tlog, "a")
+            else:
+                tout = open(self.tlog, "w")
+            cll = [
+                    "shed-tools",
+                    "test",
+                 "-g",
+                self.args.galaxy_url,
+                "-a",
+                self.args.galaxy_api_key,
+                "--name",
+                self.args.tool_name,
+                "--owner",
+                "fubar",
+                   ]
+            p = subprocess.run(
+                    cll, shell=False, cwd=self.tooloutdir, stderr=tout, stdout=tout
+                )
+            tout.write("eph_test Ran %s got %d" % (" ".join(cll), p.returncode))
+            tout.close()
+            return p.returncode
+
+    def planemo_test(self, genoutputs=True):
+        """planemo is a requirement so is available for testing
+        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
+        if os.path.exists(self.tlog):
+            tout = open(self.tlog, "a")
+        else:
+            tout = open(self.tlog, "w")
+        if genoutputs:
+            dummy,tfile = tempfile.mkstemp()
+            cll = [
+                "planemo",
+                "test",
+                "--galaxy_root",
+                self.args.galaxy_root,
+                "--update_test_data",
+                xreal,
+            ]
+            p = subprocess.run(
+                    cll, shell=False, cwd=self.tooloutdir, stderr=dummy, stdout=dummy,
+                )
+            dummy.close() # throw all the log away as it will be rerun after outputs are generated
+        else:
+            cll = ["planemo", "test", "--galaxy_root",
+                self.args.galaxy_root,
+                xreal,]
+            p = subprocess.run(
+                    cll, shell=False, cwd=self.tooloutdir, stderr=tout, stdout=tout
+                )
+        tout.close()
+        return p.returncode
+
+
+
     def writeShedyml(self):
         """for planemo
         """
@@ -872,11 +961,15 @@
     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 NOT 127.0.0.1 - it won't work if tool_sheds_conf.xml has localhost
+    #a("--galaxy_api_key", default="1e62ddad74fe9bf112859f4e9efea48b")
+    #a("--toolshed_api_key", default="9154c91f2a162bf12fda15764f43846c")
+
+    a("--toolshed_api_key", default="fakekey")
     a("--galaxy_api_key", default="fakekey")
-    a("--toolshed_url", default="http://localhost:9009")
-    a("--toolshed_api_key", default="fakekey")
     a("--galaxy_root", default="/galaxy-central")
 
+
     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 configuration file'
@@ -893,32 +986,16 @@
     r = ScriptRunner(args)
     r.writeShedyml()
     r.makeTool()
-    if args.command_override or args.test_override:
-        retcode = r.planemo_test(genoutputs=True)  # this fails :( - see PR
-        r.moveRunOutputs()
-        r.makeToolTar()
-        retcode = r.planemo_test(genoutputs=False)
-        r.moveRunOutputs()
-        if args.make_Tool == "gentestinstall":
-            r.planemo_shedload()
-            r.eph_galaxy_load()
-    else:
-        retcode = r.run()
-        if retcode:
-            sys.stderr.write(
-                "## Run failed with return code %d. Cannot build yet. Please fix and retry"
-                % retcode
-            )
-            sys.exit(1)
-        else:
-            r.moveRunOutputs()
-            r.makeToolTar()
-            if args.make_Tool in ["gentestinstall", "gentest"]:
-                r.planemo_test(genoutputs=False)
-                r.moveRunOutputs()
-                if args.make_Tool == "gentestinstall":
-                    r.planemo_shedload()
-                    r.eph_galaxy_load()
+    retcode = r.planemo_test(genoutputs=True)  # this fails :( - see PR
+    r.moveRunOutputs()
+    r.makeToolTar()
+    retcode = r.planemo_test(genoutputs=False)
+    r.moveRunOutputs()
+    if args.make_Tool == "gentestinstall":
+        retcode = r.planemo_shedload() #r.shedLoad()
+        print(f'planemo_shedload returned {retcode}')
+        r.eph_galaxy_load()
+
 
 
 if __name__ == "__main__":