Merge remote-tracking branch 'origin/master' into rustedbuilds

Conflicts:
	test/data/test.db

static/js/app.js

@@ -791,6 +791,7 @@ quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'angu
       when('/repository/:namespace/:name/image/:image', {templateUrl: '/static/partials/image-view.html', controller: ImageViewCtrl, reloadOnSearch: false}).
       when('/repository/:namespace/:name/admin', {templateUrl: '/static/partials/repo-admin.html', controller:RepoAdminCtrl, reloadOnSearch: false}).
       when('/repository/:namespace/:name/build', {templateUrl: '/static/partials/repo-build.html', controller:RepoBuildCtrl, reloadOnSearch: false}).
+      when('/repository/:namespace/:name/build/:buildid/buildpack', {templateUrl: '/static/partials/build-package.html', controller:BuildPackageCtrl, reloadOnSearch: false}).
       when('/repository/', {title: 'Repositories', description: 'Public and private docker repositories list',
                             templateUrl: '/static/partials/repo-list.html', controller: RepoListCtrl}).
       when('/user/', {title: 'Account Settings', description:'Account settings for Quay.io', templateUrl: '/static/partials/user-admin.html',
@@ -2536,17 +2537,42 @@ quayApp.directive('buildLogCommand', function () {
     scope: {
       'command': '=command'
     },
+    controller: function($scope, $element) {
+      $scope.getWithoutStep = function(fullTitle) {
+        var colon = fullTitle.indexOf(':');
+        if (colon <= 0) {
+          return '';
+        }
+        
+        return $.trim(fullTitle.substring(colon + 1));
+      };
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
+quayApp.directive('dockerfileCommand', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/dockerfile-command.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+      'command': '=command'
+    },
     controller: function($scope, $element, $sanitize) {
       var registryHandlers = {
         'quay.io': function(pieces) {
           var rnamespace =  pieces[pieces.length - 2];
-          var rname = pieces[pieces.length - 1];
+          var rname = pieces[pieces.length - 1].split(':')[0];
           return '/repository/' + rnamespace + '/' + rname + '/'; 
         },
 
         '': function(pieces) {
           var rnamespace = pieces.length == 1 ? '_' : pieces[0];
-          var rname = pieces[pieces.length - 1];
+          var rname = pieces[pieces.length - 1].split(':')[0];
           return 'https://index.docker.io/u/' + rnamespace + '/' + rname + '/';
         }
       };
@@ -2563,25 +2589,18 @@ quayApp.directive('buildLogCommand', function () {
         }
       };
      
-      $scope.getCommandKind = function(fullTitle) {
-        var colon = fullTitle.indexOf(':');
-        var title = getTitleWithoutStep(fullTitle);
-        if (!title) {
-          return null;
-        }
-
+      $scope.getCommandKind = function(title) {
         var space = title.indexOf(' ');
         return title.substring(0, space);
       };
 
-      $scope.getCommandTitleHtml = function(fullTitle) {
-        var title = getTitleWithoutStep(fullTitle) || fullTitle;
+      $scope.getCommandTitleHtml = function(title) {
         var space = title.indexOf(' ');
         if (space <= 0) {
           return $sanitize(title);
         }
         
-        var kind = $scope.getCommandKind(fullTitle);
+        var kind = $scope.getCommandKind(title);
         var sanitized = $sanitize(title.substring(space + 1));
         
         var handler = kindHandlers[kind || ''];
@@ -2590,21 +2609,50 @@ quayApp.directive('buildLogCommand', function () {
         } else {
           return sanitized;
         }
-      };
-
-      var getTitleWithoutStep = function(fullTitle) {
-        var colon = fullTitle.indexOf(':');
-        if (colon <= 0) {
-          return null;
-        }
-        
-        return $.trim(fullTitle.substring(colon + 1));
-      };
+      };      
     }
   };
   return directiveDefinitionObject;
 });
 
+
+quayApp.directive('dockerfileView', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/dockerfile-view.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+      'contents': '=contents'
+    },
+    controller: function($scope, $element, $sanitize) {
+      $scope.$watch('contents', function(contents) {
+        $scope.lines = [];
+
+        var lines = contents ? contents.split('\n') : [];
+        for (var i = 0; i < lines.length; ++i) {
+          var line = $.trim(lines[i]);
+          var kind = 'text';
+          if (line && line[0] == '#') {
+            kind = 'comment';
+          } else if (line.match(/^([A-Z]+\s)/)) {
+            kind = 'command';
+          }
+
+          var lineInfo = {
+            'text': $sanitize(line),
+            'kind': kind
+          };
+          $scope.lines.push(lineInfo);
+        }
+      });
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
 quayApp.directive('buildStatus', function () {
   var directiveDefinitionObject = {
     priority: 0,

static/js/controllers.js

@@ -774,6 +774,137 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi
   loadViewInfo();
 }
 
+function BuildPackageCtrl($scope, Restangular, ApiService, $routeParams, $rootScope, $location, $timeout) {
+  var namespace = $routeParams.namespace;
+  var name = $routeParams.name;
+  var buildid = $routeParams.buildid;
+
+  var params = {
+    'repository': namespace + '/' + name,
+    'build_uuid': buildid
+  };
+
+  $scope.initializeTree = function() {
+    if ($scope.drawn) {
+      $scope.tree.notifyResized();
+      return;
+    }
+
+    $scope.drawn = true;
+    $timeout(function() {
+      $scope.tree.draw('file-tree-container');
+    }, 10);
+  };
+
+  $scope.downloadForUser = function() {
+    var blob = $scope.zip.generate({type:"blob"});
+    saveAs(blob, $scope.repobuild['display_name'] + '.zip');
+  };
+
+  var processBuildPack = function(response) {
+    // Try to load as a zip file.
+    var zipFiles = null;
+    var zip = null;
+    try {      
+      var zip = new JSZip(response);
+      zipFiles = zip.files;
+    } catch (e) {
+    }
+    
+    // Find the Dockerfile in the zip file. If there isn't any zip file, then the response
+    // itself (should) be the Dockerfile.
+    if (zipFiles && Object.keys(zipFiles).length) {
+      // Load the dockerfile contents.
+      var dockerfile = zip.file('Dockerfile');
+      if (dockerfile) {
+        $scope.dockerFileContents = dockerfile.asText();
+      }
+
+      // Build the zip file tree.
+      $scope.zip = zip;
+      $scope.tree = new FileTree(Object.keys(zipFiles));
+      $($scope.tree).bind('fileClicked', function(e) {
+        var file = zip.file(e.path);
+        if (file) {
+          var blob = new Blob([file.asArrayBuffer()]);
+          saveAs(blob, file.name);
+        }
+      });      
+    } else {
+      $scope.dockerFileContents = response;
+    }
+
+    $scope.loaded = true;
+  };
+  
+  var downloadBuildPack = function() {
+    $scope.downloadProgress = 0;
+    $scope.downloading = true;
+
+    ApiService.getRepoBuildArchiveUrl(null, params).then(function(resp) {
+      startDownload(resp['url']);
+    }, function() {
+      $scope.downloading = false;
+      $scope.downloadError = true;
+    });
+  };
+
+  var startDownload = function(url) {
+    var request = new XMLHttpRequest();
+    request.open('GET', url, true);
+    if (request.overrideMimeType) {
+      request.overrideMimeType('text/plain; charset=x-user-defined');
+    }
+    request.onprogress = function(e) {
+      $scope.$apply(function() {
+        var percentLoaded;
+        if (e.lengthComputable) {
+          $scope.downloadProgress = (e.loaded / e.total) * 100;
+        }
+      });
+    };
+    request.onerror = function() {
+      $scope.$apply(function() {
+        $scope.downloading = false;
+        $scope.downloadError = true;
+      });
+    };
+    request.onreadystatechange = function() {
+      var state = request.readyState;
+      if (state == 4) {
+        $scope.$apply(function() {
+          $scope.downloading = false;
+          processBuildPack(request.responseText);
+        });
+        return;
+      }
+    };
+    request.send();
+  };
+
+  var getBuildInfo = function() {
+    $scope.repository_build = ApiService.getRepoBuildStatus(null, params, true).then(function(resp) {
+      if (!resp['is_writer']) {
+        $rootScope.title = 'Unknown build';
+        $scope.accessDenied = true;
+        return;
+      }
+      
+      $rootScope.title = 'Repository Build Pack - ' + resp['display_name'];
+      $scope.repobuild = resp;
+      $scope.repo = {
+        'namespace': namespace,
+        'name': name
+      };
+
+      downloadBuildPack();
+      return resp;
+    });
+  };
+
+  getBuildInfo();
+}
+
 function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope, $location, $interval, $sanitize, ansi2html) {
   var namespace = $routeParams.namespace;
   var name = $routeParams.name;
@@ -805,7 +936,7 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
   };
 
   $scope.adjustLogHeight = function() {
-    $('.build-logs').height($(window).height() - 385);
+    $('.build-logs').height($(window).height() - 415);
   };
 
   $scope.askRestartBuild = function(build) {