Merge branch 'master' into tutorial

Conflicts:
	config.py
	static/js/app.js
	test/data/test.db

data/buildlogs.py

@@ -3,6 +3,10 @@ import json
 
 
 class BuildLogs(object):
+  ERROR = 'error'
+  COMMAND = 'command'
+  PHASE = 'phase'
+
   def __init__(self, redis_host):
     self._redis = redis.StrictRedis(host=redis_host)
 
@@ -17,24 +21,27 @@ class BuildLogs(object):
     """
     return self._redis.rpush(self._logs_key(build_id), json.dumps(log_obj))
 
-  def append_log_message(self, build_id, log_message):
+  def append_log_message(self, build_id, log_message, log_type=None):
     """
     Wraps the message in an envelope and push it to the end of the log entry
-    list and returns the new length of the list.
+    list and returns the index at which it was inserted.
     """
     log_obj = {
       'message': log_message
     }
-    return self._redis.rpush(self._logs_key(build_id), json.dumps(log_obj))
 
-  def get_log_entries(self, build_id, start_index, end_index):
+    if log_type:
+      log_obj['type'] = log_type
+
+    return self._redis.rpush(self._logs_key(build_id), json.dumps(log_obj)) - 1
+
+  def get_log_entries(self, build_id, start_index):
     """ 
     Returns a tuple of the current length of the list and an iterable of the
-    requested log entries. End index is inclusive.
+    requested log entries.
     """
     llen = self._redis.llen(self._logs_key(build_id))
-    log_entries = self._redis.lrange(self._logs_key(build_id), start_index,
-                                     end_index)
+    log_entries = self._redis.lrange(self._logs_key(build_id), start_index, -1)
     return (llen, (json.loads(entry) for entry in log_entries))
 
   @staticmethod

data/database.py

@@ -215,6 +215,8 @@ class RepositoryBuild(BaseModel):
   resource_key = CharField()
   tag = CharField()
   phase = CharField(default='waiting')
+  started = DateTimeField(default=datetime.now)
+  display_name = CharField()
 
 
 class QueueItem(BaseModel):

data/model.py

@@ -1309,9 +1309,11 @@ def list_repository_builds(namespace_name, repository_name,
   return fetched
 
 
-def create_repository_build(repo, access_token, resource_key, tag):
+def create_repository_build(repo, access_token, resource_key, tag,
+                            display_name):
   return RepositoryBuild.create(repository=repo, access_token=access_token,
-                                resource_key=resource_key, tag=tag)
+                                resource_key=resource_key, tag=tag,
+                                display_name=display_name)
 
 
 def create_webhook(repo, params_obj):

data/queue.py

@@ -64,5 +64,5 @@ class WorkQueue(object):
 
 
 image_diff_queue = WorkQueue('imagediff')
-dockerfile_build_queue = WorkQueue('dockerfilebuild')
+dockerfile_build_queue = WorkQueue('dockerfilebuild2')
 webhook_queue = WorkQueue('webhook')

data/userfiles.py

@@ -59,3 +59,9 @@ class UserRequestFiles(object):
     full_key = os.path.join(self._prefix, file_id)
     k = Key(self._bucket, full_key)
     return k.generate_url(expires_in)
+
+  def get_file_checksum(self, file_id):
+    self._initialize_s3()
+    full_key = os.path.join(self._prefix, file_id)
+    k = self._bucket.lookup(full_key)
+    return k.etag[1:-1][:7]