fixes for builder

Author: vsoch

setup.py

@@ -7,7 +7,7 @@
     name="singularity",
 
     # Version number:
-    version="0.39",
+    version="0.40",
 
     # Application author details:
     author="Vanessa Sochat",

singularity/build/google.py

@@ -192,7 +192,7 @@ def run_build(build_dir=None,spec_file=None,repo_url=None,token=None,size=None,b
     if os.path.exists(spec_file):
         bot.logger.info("Found spec file %s in repository",spec_file)
 
-        # If size is None, get from image + 200 padding
+        # If size is None, get from image + 50 padding
         if params['size'] == None:
             bot.logger.info("Size not detected for build. Will estimate with 200MB padding.")
             params['size'] = estimate_image_size(spec_file=spec_file,

singularity/build/scripts/singularity-build-latest.sh

@@ -12,7 +12,7 @@ sudo pip3 install --upgrade google
 sudo pip3 install oauth2client==3.0.0
 sudo pip3 install gitpython
 cd /tmp && git clone https://github.com/singularityware/singularity-python
-cd singularity-python && python3 setup.py sdist && sudo python3 setup.py install
+cd singularity-python && python3 setup.py sdist && sudo python3 setup.py install && cd ..
 python3 -c "from singularity.build.google import run_build; run_build()" > /tmp/.shub-log 2>&1
 command=$(echo "from singularity.build.google import finish_build; finish_build(logfile='/tmp/.shub-log')")
 python3 -c "$command"

singularity/package.py

@@ -24,7 +24,7 @@
 import os
 
 
-def estimate_image_size(spec_file=None,sudopw=None,padding=200):
+def estimate_image_size(spec_file=None,sudopw=None,padding=50):
     '''estimate_image_size will generate an image in a directory, and add
     some padding to it to estimate the size of the image file to generate
     :param sudopw: the sudopw for Singularity, root should provide ''

singularity/utils.py

@@ -234,17 +234,22 @@ def read_file(filename,mode="r"):
 ############################################################################
 
 
-def calculate_folder_size(folder_path):
+def calculate_folder_size(folder_path,truncate=True):
     '''calculate_folder size recursively walks a directory to calculate
-    a total size (in)
+    a total size (in MB)
     :param folder_path: the path to calculate size for
+    :param truncate: if True, converts size to an int
     '''
     total_size = 0
     for dirpath, dirnames, filenames in os.walk(folder_path):
         for filey in filenames:
-            fp = os.path.join(dirpath, filey)
-            total_size += os.path.getsize(fp)
-    return total_size
+            file_path = os.path.join(dirpath, filey)
+            if os.path.isfile(file_path) and not os.path.islink(file_path):
+                total_size += os.path.getsize(file_path) # this is bytes
+    size_mb = total_size / 1000000
+    if truncate == True:
+        size_mb = int(size_mb)
+    return size_mb
 
 
 def remove_unicode_dict(input_dict):