fixing repo_url parsing to get correct bucket

Author: vsoch

singularity/build/google.py

@@ -135,6 +135,18 @@ def list_bucket(bucket,storage_service):
     return objects
 
 
+def get_image_path(repo_url,commit):
+    '''get_image_path will determine an image path based on a repo url, removing
+    any token, and taking into account urls that end with .git.
+    :param repo_url: the repo url to parse:
+    :param commit: the commit to use
+    '''
+    repo_url = repo_url.split('@')[-1].strip()
+    if repo_url.endswith('.git'):
+        repo_url =  repo_url[:-4]
+    return "%s/%s" %(re.sub('^http.+//www[.]','',repo_url),commit)
+
+
 
 def run_build(build_dir=None,spec_file=None,repo_url=None,token=None,size=None,bucket_name=None,
               repo_id=None,commit=None,verbose=True,response_url=None,secret=None,branch=None,
@@ -230,7 +242,8 @@ def run_build(build_dir=None,spec_file=None,repo_url=None,token=None,size=None,b
             zf.extractall(dest_dir)
 
         # The path to the images on google drive will be the github url/commit folder
-        image_path = "%s/%s" %(re.sub('^http.+//www[.]','',params['repo_url']),params['commit'])
+        image_path = get_image_path(params['repo_url'],params['commit'])
+
         build_files = glob("%s/*" %(dest_dir))
         build_files.append(compressed_image)
         bot.logger.info("Sending build files %s to storage",'\n'.join(build_files))
@@ -304,8 +317,8 @@ def finish_build(verbose=True):
     # Start the storage service, retrieve the bucket
     storage_service = get_google_service()
     bucket = get_bucket(storage_service,params['bucket_name'])
-    image_path = "%s/%s" %(re.sub('^http.+//www[.]','',params['repo_url']),params['commit'])
-
+    image_path = get_image_path(params['repo_url'],params['commit'])
+    
     # Upload the log file
     params['log_file'] = upload_file(storage_service,
                          bucket=bucket,