modified: analysis/reproduce/utils.py

	modified:   package/utils.py
	modified:   tests/test_client.py

Author: vsoch

singularity/analysis/reproduce/utils.py

@@ -27,7 +27,11 @@
 '''
 
 from singularity.cli import Singularity
-from .criteria import assess_content, include_file
+from .criteria import (
+    assess_content, 
+    include_file,
+    is_root_owned
+)
 from singularity.logger import bot
 import hashlib
 import tarfile

singularity/package/utils.py

@@ -75,33 +75,31 @@ def zip_up(file_list,zip_name,output_folder=None):
                 content = [content]
             for copyfile in content:
                 zf.write(copyfile,os.path.basename(copyfile))
+                os.remove(copyfile)
 
-        # If it's a list, write to new file, and save
-        elif isinstance(content,list):
-            filey = write_file("%s/%s" %(tmpdir,filename),"\n".join(content))
-            zf.write(filey,filename)
-            os.remove(filey)
-
-        # If it's a dict, save to json
-        elif isinstance(content,dict):
-            filey = write_json(content,"%s/%s" %(tmpdir,filename))
-            zf.write(filey,filename)
-            os.remove(filey)
-
-        # If it's a string, do the same
-        elif isinstance(content,str) or filename.endswith('json'):
-            filey = write_file("%s/%s" %(tmpdir,filename),content)
-            zf.write(filey,filename)
-            os.remove(filey)
-
-        # Otherwise, just write the content into a new archive
-        elif isinstance(content,bytes):
-            filey = write_file("%s/%s" %(tmpdir,filename),content.decode('utf-8'))
-            zf.write(filey,filename)
-            os.remove(filey)
-
-        else: 
-            zf.write(content,filename)
+        else:
+
+            output_file = "%s/%s" %(tmpdir, filename)
+        
+            # If it's a list, write to new file, and save
+            if isinstance(content,list):
+                write_file(output_file,"\n".join(content))
+        
+            # If it's a dict, save to json
+            elif isinstance(content,dict):
+                write_json(content,output_file)
+
+            # If bytes, need to decode
+            elif isinstance(content,bytes):
+                write_file(output_file,content.decode('utf-8'))
+   
+            # String or other
+            else: 
+                output_file = write_file(output_file,content)
+
+            if os.path.exists(output_file):
+                zf.write(output_file,filename)
+                os.remove(output_file)
 
     # Close the zip file    
     zf.close()

singularity/tests/test_client.py

@@ -60,7 +60,7 @@ def test_commands(self):
         container = "%s/container.img" %(self.tmpdir)
         created_container = self.cli.create(container)
         self.assertEqual(created_container,container)
-        self.assertTrue(os.path.exists(container))
+        self.assertTrue(os.path.exists(created_container))
         os.remove(container)
 
         print("Testing client.pull command")