new pip version, some bug fixed on using current dir and showing muta…

…nts that append code

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='universalmutator',
-    version='1.0',
+    version='1.0.1',
     description='Universal regexp-based mutation tool',
     long_description_content_type="text/markdown",
     long_description=open('README.md').read(),

universalmutator/analyze.py

@@ -97,7 +97,7 @@ def main():
         with open(fromFile, 'r') as file:
             onlyMutants = file.read().split()
 
-    mdir = ""
+    mdir = "."
     try:
         mdirpos = args.index("--mutantDir")
     except ValueError:
@@ -107,6 +107,7 @@ def main():
         mdir = args[mdirpos + 1]
         args.remove("--mutantDir")
         args.remove(mdir)
+    if mdir[-1] != "/":
         mdir += "/"
 
     src = args[1]

universalmutator/checkcov.py

@@ -17,7 +17,7 @@ def main():
         print("       --tstl: process <coverfile> that is output from TSTL internal report")
         sys.exit(0)
 
-    mdir = ""
+    mdir = "."
     try:
         mdirpos = args.index("--mutantDir")
     except ValueError:
@@ -27,6 +27,7 @@ def main():
         mdir = args[mdirpos + 1]
         args.remove("--mutantDir")
         args.remove(mdir)
+    if mdir[-1] != "/":
         mdir += "/"
 
     src = args[1]

universalmutator/genmutants.py

@@ -197,7 +197,7 @@ def main():
                         for line in d:
                             lines.append(int(line))
 
-    mdir = ""
+    mdir = "."
     try:
         mdirpos = args.index("--mutantDir")
     except ValueError:
@@ -207,6 +207,7 @@ def main():
         mdir = args[mdirpos + 1]
         args.remove("--mutantDir")
         args.remove(mdir)
+    if mdir[-1] != "/":
         mdir += "/"
 
     ignoreFile = None

universalmutator/prioritize.py

@@ -36,7 +36,7 @@ def main():
         args.remove("--noSDPriority")
         noSDPriority = True
 
-    mdir = ""
+    mdir = "."
     try:
         mdirpos = args.index("--mutantDir")
     except ValueError:
@@ -46,9 +46,10 @@ def main():
         mdir = args[mdirpos + 1]
         args.remove("--mutantDir")
         args.remove(mdir)
+    if mdir[-1] != "/":
         mdir += "/"
 
-    sdir = ""
+    sdir = "."
     try:
         sdirpos = args.index("--sourceDir")
     except ValueError:
@@ -58,6 +59,7 @@ def main():
         sdir = args[sdirpos + 1]
         args.remove("--sourceDir")
         args.remove(sdir)
+    if sdir[-1] != "/":
         sdir += "/"
 
     cutoff = 0.0

universalmutator/prune.py

@@ -21,7 +21,7 @@ def main():
     outfile = sys.argv[2]
     config = sys.argv[3]
 
-    mdir = ""
+    mdir = "."
     try:
         mdirpos = args.index("--mutantDir")
     except ValueError:
@@ -31,9 +31,10 @@ def main():
         mdir = args[mdirpos + 1]
         args.remove("--mutantDir")
         args.remove(mdir)
+    if mdir[-1] != "/":
         mdir += "/"
 
-    sdir = ""
+    sdir = "."
     try:
         sdirpos = args.index("--sourceDir")
     except ValueError:
@@ -43,6 +44,7 @@ def main():
         sdir = args[sdirpos + 1]
         args.remove("--sourceDir")
         args.remove(sdir)
+    if sdir[-1] != "/":
         sdir += "/"
 
     mutants = []

universalmutator/show.py

@@ -18,7 +18,7 @@ def main():
 
     infile = sys.argv[1]
 
-    mdir = ""
+    mdir = "."
     try:
         mdirpos = args.index("--mutantDir")
     except ValueError:
@@ -28,9 +28,10 @@ def main():
         mdir = args[mdirpos + 1]
         args.remove("--mutantDir")
         args.remove(mdir)
+    if mdir[-1] != "/":
         mdir += "/"
-
-    sdir = ""
+        
+    sdir = "."
     try:
         sdirpos = args.index("--sourceDir")
     except ValueError:
@@ -40,6 +41,7 @@ def main():
         sdir = args[sdirpos + 1]
         args.remove("--sourceDir")
         args.remove(sdir)
+    if sdir[-1] != "/":
         sdir += "/"
 
     mutants = []

universalmutator/utils.py

@@ -190,5 +190,10 @@ def readMutant(mutant, source, mutantDir=None):
             diffFound = True
             break
         pos += 1
+    mpos = pos
+    if not diffFound:
+        if len(mcode) > len(scode):
+            pos = len(scode)-1
+            diffFound = True
     assert diffFound, "mutant " + mfile + " and source " + source + " are identical!"
-    return (mutant, source, pos, scode[pos], mcode[pos])
+    return (mutant, source, pos, scode[pos], mcode[mpos])