Ember/updated Webreview

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "webreview-fe"]
+	path = webreview-fe
+	url = https://github.com/grow/webreview-fe

Makefile

@@ -0,0 +1,55 @@
+version ?= auto
+project ?= betawebreview
+
+run-frontend:
+	cd webreview-fe && ember serve
+
+run-backend:
+	virtualenv env
+	. env/bin/activate
+	dev_appserver.py \
+		--port=8088 .
+
+install:
+	virtualenv env
+	. env/bin/activate
+	./env/bin/pip install \
+	  --upgrade \
+	  --allow-unverified dateutil \
+	  --allow-external dateutil \
+	  -r \
+	  requirements.txt
+	./env/bin/gaenv --lib lib --no-import
+
+test:
+	. env/bin/activate
+	./env/bin/nosetests \
+	  -v \
+	  --rednose \
+	  --nocapture \
+	  --with-gae \
+	  --gae-lib-root=$(HOME)/google_appengine \
+	  --with-coverage \
+	  --cover-erase \
+	  --cover-html \
+	  --cover-html-dir=htmlcov \
+	  --cover-package=app \
+	  app/
+
+deploy:
+	$(MAKE) test
+	cd webreview-fe && ember build && cd ..
+	gcloud app deploy \
+		-q \
+		--verbosity=error \
+		--project=$(project) \
+		--version=$(version) \
+		--no-promote \
+		app.yaml
+	gcloud app deploy \
+		-q \
+		--no-promote \
+		--verbosity=error \
+		--project=$(project) \
+		--version=$(version) \
+		index.yaml

README.md

@@ -22,6 +22,7 @@ Run the below command and follow the on-screen instructions to install dependenc
 
     ./scripts/setup
 
+1. The Google App Engine SDK is required. Currently, the version packaged with the gcloud SDK is not compatible with the test runner, so you'll have to download the [standalone GoogleAppEngineLauncher](https://cloud.google.com/appengine/downloads).
 1. Run `./scripts/test` to verify tests pass.
 1. Run `./scripts/run` to start a development server.
 

app.yaml

@@ -2,7 +2,15 @@ api_version: 1
 runtime: python27
 threadsafe: true
 
+instance_class: F4_1G
+
+env_variables:
+  GAE_USE_SOCKETS_HTTPLIB: 'anyvalue'  # https://github.com/shazow/urllib3/issues/618#issuecomment-101795512
+  JETWAY_CONFIG: config/jetway.googwebreview.yaml
+
 libraries:
+- name: lxml
+  version: latest
 - name: endpoints
   version: latest
 - name: ssl 
@@ -26,22 +34,13 @@ handlers:
   secure: always
 
 - url: /_ah/spi/.*
-  script: jetway.main.endpoints_app
-
-- url: /_jetway/[^/]*/static/css
-  static_dir: dist/css
+  script: app.main.endpoints_app
 
-- url: /_jetway/[^/]*/static/js
-  static_dir: dist/js
-
-- url: /_jetway/[^/]*/static/html
-  static_dir: jetway/frontend/static/html
-
-- url: /_jetway/[^/]*/static/images
-  static_dir: jetway/frontend/static/images
+- url: /_webreview/assets
+  static_dir: dist/assets
 
 - url: /.*
-  script: jetway.main.app
+  script: app.main.app
 
 skip_files:
 - ^(.*/)?#.*#
@@ -55,10 +54,15 @@ skip_files:
 - ^(.*/)?index\.yaml
 - ^(.*/)?index\.yml
 - ^(.*/)?run_tests.py
+- ^.*.example
+- ^.*bower_components.*
+- ^.*node_modules.*
+- ^.*tmp.*
 - bower_components
 - env
 - htmlconv
 - lib/Crypto
+- lib/PIL
 - node_modules
 - testing
-- ^.*.example
+- webreview-fe

jetway/api_errors.py → app/api_errors.py

@@ -2,7 +2,7 @@
 import httplib
 
 
-class Error(Exception):
+class Error(remote.ApplicationError):
   pass
 
 

jetway/auth/handlers.py → app/auth/handlers.py

@@ -1,6 +1,6 @@
 from apiclient import discovery
 from google.appengine.api import memcache
-from jetway.users import users
+from app.users import users
 from oauth2client import appengine
 from webapp2_extras import auth as webapp2_auth
 from webapp2_extras import security

jetway/avatars/avatars.py → app/avatars/avatars.py

@@ -1,7 +1,7 @@
 from google.appengine.ext import blobstore
 from google.appengine.ext import ndb
-from jetway.files import files
-from jetway.files import messages as file_messages
+from app.files import files
+from app.files import messages as file_messages
 import appengine_config
 import datetime
 import time
@@ -65,7 +65,8 @@ def create_upload_url(cls, entity):
     letter = entity.key.kind()[:1].lower()
     avatar_ident = '{}/{}'.format(letter, entity.ident)
     root = '{}/jetway/avatars/{}'.format(gcs_bucket, avatar_ident)
-    return blobstore.create_upload_url('/avatars/{}'.format(avatar_ident), gs_bucket_name=root)
+    return blobstore.create_upload_url(
+        '/avatars/{}'.format(avatar_ident), gs_bucket_name=root)
 
   def update(self, gs_object_name):
     if self.gs_basename:
@@ -80,9 +81,11 @@ def create_url(cls, owner):
       return path
     num = owner.ident[0]
     scheme = os.getenv('wsgi.url_scheme')
-    hostname = os.getenv('DEFAULT_VERSION_HOSTNAME')
+    hostname = os.getenv('HTTP_HOST')
     sep = '.' if scheme == 'http' else '-dot-'
-    return '//avatars{}{}{}{}'.format(num, sep, hostname, path)
+    if '-dot-' in hostname:
+      return '//{}{}'.format(hostname, path)
+    return '//avatars-{}{}{}{}'.format(num, sep, hostname, path)
 
   @classmethod
   def generate(cls, ident):

jetway/avatars/messages.py → app/avatars/messages.py

@@ -1,6 +1,6 @@
 from protorpc import messages
-from jetway.owners import messages as owner_messages
-from jetway.projects import messages as project_messages
+from app.owners import messages as owner_messages
+from app.projects import messages as project_messages
 
 
 class CreateUploadUrlRequest(messages.Message):

jetway/avatars/services.py → app/avatars/services.py

@@ -1,7 +1,7 @@
 from protorpc import remote
-from jetway import api
-from jetway.avatars import avatars
-from jetway.avatars import messages
+from app import api
+from app.avatars import avatars
+from app.avatars import messages
 
 
 class AvatarService(api.Service):

app/buildbot/buildbot.py

@@ -0,0 +1,110 @@
+from requests import auth
+import appengine_config
+import requests
+
+BASE = '{}/api'.format(appengine_config.BUILDBOT_URL)
+
+VERIFY = False
+
+
+class Error(Exception):
+  pass
+
+
+class ConnectionError(Error):
+  pass
+
+
+class IntegrationError(Error):
+  pass
+
+
+class Buildbot(object):
+
+  @property
+  def env(self):
+    return {
+        'WEBREVIEW_API_KEY': appengine_config.BUILDBOT_API_KEY,
+    }
+
+  @property
+  def auth(self):
+    return auth.HTTPBasicAuth(
+        appengine_config.BUILDBOT_USERNAME,
+        appengine_config.BUILDBOT_PASSWORD)
+
+  def create_job(self, git_url, remote):
+    data = {
+        'git_url': git_url,
+        'remote': remote,
+        'env': self.env,
+    }
+    try:
+      resp = requests.post(BASE + '/jobs', json=data, auth=self.auth,
+                           verify=VERIFY)
+      resp.raise_for_status()
+    except Exception as e:
+      raise ConnectionError(e)
+    content = resp.json()
+    if 'error' in content:
+      raise IntegrationError(content['error'])
+    return content
+
+  def get_job(self, job_id):
+    try:
+      resp = requests.get(BASE + '/jobs/{}'.format(job_id), auth=self.auth,
+                          verify=VERIFY)
+      resp.raise_for_status()
+    except Exception as e:
+      raise ConnectionError(e)
+    content = resp.json()
+    if 'error' in content:
+      raise IntegrationError(content['error'])
+    return content
+
+  def get_contents(self, job_id, path=None, ref=None):
+    path = path or '/'
+    try:
+      request_path = BASE + '/git/repos/{}/contents{}'.format(job_id, path)
+      resp = requests.get(request_path, auth=self.auth, verify=VERIFY)
+      resp.raise_for_status()
+    except Exception as e:
+      raise ConnectionError(e)
+    content = resp.json()
+    if 'error' in content:
+      raise IntegrationError(content['error'])
+    return content
+
+  def read_file(self, job_id, path, ref):
+    try:
+      request_path = BASE + '/git/repos/{}/raw/{}{}'.format(job_id, ref, path)
+      resp = requests.get(request_path, auth=self.auth, verify=VERIFY)
+      resp.raise_for_status()
+    except Exception as e:
+      raise ConnectionError(e)
+    return resp.content
+
+  def write_file(self, job_id, path, contents, message, ref, sha,
+                 committer, author):
+    data = {
+        'branch': ref,
+        'path': path,
+        'message': message,
+        'content': contents,
+        'sha': sha,
+        'committer': committer,
+        'author': author,
+    }
+    try:
+      resp = requests.post(
+          BASE + '/jobs/{}/contents/update'.format(job_id),
+          json=data,
+          auth=self.auth,
+          verify=VERIFY)
+      resp.raise_for_status()
+    except Exception as e:
+      raise ConnectionError(e)
+    result = resp.json()
+    if 'error' in result:
+      raise IntegrationError(result['error'])
+    return result

app/buildbot/messages.py

@@ -0,0 +1,11 @@
+from protorpc import messages
+
+
+class CommitMessage(messages.Message):
+  sha = messages.StringField(1)
+
+
+class BranchMessage(messages.Message):
+  name = messages.StringField(1)
+  commit = messages.MessageField(CommitMessage, 2)
+  ident = messages.StringField(3)

app/catalogs/__init__.py

@@ -0,0 +1 @@
+from . import babel_compatibility_patch

app/catalogs/babel_compatibility_patch.py

@@ -0,0 +1,64 @@
+from babel import localedata
+import pickle
+import os
+
+# NOTE: Babel does not support "fuzzy" locales. A locale is considered "fuzzy"
+# when a corresponding "localedata" file that matches a given locale's full
+# identifier (e.g. "en_US") does not exist. Here's one example: "en_BD". CLDR
+# does not have a localedata file matching "en_BD" (English in Bangladesh), but
+# it does have individual files for "en" and also "bn_BD". As it turns
+# out, localedata files that correspond to a locale's full identifier (e.g.
+# "bn_BD.dat") are actually pretty light on the content (largely containing
+# things like start-of-week information) and most of the "meat" of the data is
+# contained in the main localedata file, e.g. "en.dat".
+#
+# Users may need to generate pages corresponding to locales that we don't
+# have full localedata for, and until Babel supports fuzzy locales, we'll
+# monkeypatch two Babel functions to provide partial support for fuzzy locales.
+#
+# With this monkeypatch, locales will be valid even if Babel doesn't have a
+# localedata file matching a locale's full identifier, but locales will still
+# fail with a ValueError if the user specifies a territory that does not exist.
+# With this patch, a user can, however, specify an invalid language. Obviously,
+# this patch should be removed when/if Babel adds support for fuzzy locales.
+# Optionally, we may want to provide users with more control over whether a
+# locale is valid or invalid, but we can revisit that later.
+
+# See: https://github.com/grow/pygrow/issues/93
+
+
+def fuzzy_load(name, merge_inherited=True):
+  localedata._cache_lock.acquire()
+  try:
+    data = localedata._cache.get(name)
+    if not data:
+      # Load inherited data
+      if name == 'root' or not merge_inherited:
+        data = {}
+      else:
+        parts = name.split('_')
+        if len(parts) == 1:
+          parent = 'root'
+        else:
+          parent = '_'.join(parts[:-1])
+        data = fuzzy_load(parent).copy()
+      filename = os.path.join(localedata._dirname, '%s.dat' % name)
+      try:
+        fileobj = open(filename, 'rb')
+        try:
+          if name != 'root' and merge_inherited:
+            localedata.merge(data, pickle.load(fileobj))
+          else:
+            data = pickle.load(fileobj)
+          localedata._cache[name] = data
+        finally:
+          fileobj.close()
+      except IOError:
+        pass
+    return data
+  finally:
+    localedata._cache_lock.release()
+
+
+localedata.exists = lambda name: True
+localedata.load = fuzzy_load