modified: README.md

	modified:   singularity/cli/main/__init__.py

Author: vsoch

README.md

@@ -10,4 +10,3 @@ Please see our [complete docs](https://github.com/singularityware/singularity-py
 
 ## Help and Contribution
 Please contribute to the package, or post feedback and questions as <a href="https://github.com/singularityware/singularity-python" target="_blank">issues</a>. For points that require discussion of the larger group, please use the <a href="https://groups.google.com/a/lbl.gov/forum/#!forum/singularity" target="_blank">Singularity List</a>
-

singularity/cli/main/__init__.py

@@ -68,7 +68,11 @@ def get_parser():
 
     # Compare
     compare = subparsers.add_parser("compare",
-                                    help = "views and functions to compare two containers")
+                                    help = "views and functions to compare two containers. Default calculates score.")
+
+    compare.add_argument("--outfolder", dest='outfolder', 
+                         help="full path to folder for output, stays in tmp (or pwd) if not specified", 
+                         type=str, default=None)
 
     compare.add_argument("--images", dest='images', 
                          help="images, separated by commas", 
@@ -82,10 +86,6 @@ def get_parser():
                          help="subtract one container image from the second to make a difference tree (use --images first,subtract)", 
                          default=False, action='store_true')
 
-    compare.add_argument('--simcalc', dest='simcalc', 
-                          help="calculate similarity (number) between images based on file contents.", 
-                          default=False, action='store_true')
-
 
 
     # Analysis
@@ -100,6 +100,13 @@ def get_parser():
                           help="calculate similarity score for your container vs. docker library OS.", 
                           default=False, action='store_true')
 
+    analysis.add_argument("--outfolder", dest='outfolder', 
+                         help="full path to folder for output, stays in tmp (or pwd) if not specified", 
+                         type=str, default=None)
+
+    analysis.add_argument("--image", dest='image', 
+                          help="full path to singularity image", 
+                          type=str, default=None)
 
     analysis.add_argument('--osplot', dest="osplot", 
                            help="plot similarity scores for your container vs. docker library OS.", 

singularity/cli/main/analysis.py

@@ -44,11 +44,14 @@ def main(args,parser,subparser):
 
 
     # If we are given an image, ensure full path
-    if args.image is not None:
+    image = args.image
+    if image is not None:
 
-        if not os.path.exists(args.image):
+        existed = True
+        if not os.path.exists(image):
             cli = Singularity(debug=args.debug)
-            image = cli.pull(args.image)
+            image = cli.pull(image)
+            existed = False
 
         if image is None:
             bot.error("Cannot find image. Exiting.")

singularity/cli/main/compare.py

@@ -24,6 +24,8 @@
 
 from singularity.utils import check_install           
 from singularity.logger import bot
+from singularity.cli import Singularity
+from singularity.cli.utils import clean_up
 import sys
 import os
 
@@ -47,16 +49,17 @@ def main(args,parser,subparser):
         bot.debug("Image1: %s" %image1)
         bot.debug("Image2: %s" %image2)
 
-        images = []
+        images = dict()
         cli = Singularity(debug=args.debug)
         for image in [image1,image2]:
+            existed = True
             if not os.path.exists(image):
                 image = cli.pull(image)
-            images.append(image)
+                existed = False            
+            images[image] = existed
 
         # Just for clarity
-        image1 = images[0]
-        image2 = images[1]
+        image1,image2 = list(images.keys())
 
         # the user wants to make a similarity tree
         if args.simtree is True:
@@ -68,14 +71,14 @@ def main(args,parser,subparser):
             from singularity.cli.app import make_diff_tree
             make_diff_tree(image1,image2)
 
-        elif args.simcalc is True:
+        else: # If none specified, just print score
             from singularity.analysis.compare import calculate_similarity
             score = calculate_similarity(image1,image2,by="files.txt")
             print(score["files.txt"])
 
-        clean_up(image1,existed1)
-        clean_up(image2,existed2)
-
+        for image,existed in images.items():
+            clean_up(image,existed)
+   
     else:
         print("Please specify images to compare with --images")
         subparser.print_help()

singularity/logger/message.py

@@ -305,11 +305,11 @@ def get_logging_level():
     (5) is assumed (all messages).
     '''
     try:
-        level = int(os.environ.get("MESSAGELEVEL", DEBUG))
+        level = int(os.environ.get("MESSAGELEVEL", INFO))
 
     except ValueError:
 
-        level = os.environ.get("MESSAGELEVEL", DEBUG)
+        level = os.environ.get("MESSAGELEVEL", INFO)
         if level == "CRITICAL":
             return CRITICAL
         elif level == "ABORT":