Temporary PR for testing test-bench deployment

.gitignore

@@ -1,6 +1,7 @@
 *.pyc
 *.mo
 *.bak
+*.pem
 user_data/
 dev.db
 .DS_Store
@@ -12,3 +13,4 @@ src/
 .env/
 .idea/
 bower_components
+staticfiles

Dockerfile

@@ -1,7 +1,7 @@
 FROM python:2.7.11
 MAINTAINER Katharine Berry <[email protected]>
 
-ENV NPM_CONFIG_LOGLEVEL=info NODE_VERSION=4.2.3 DJANGO_VERSION=1.6
+ENV NPM_CONFIG_LOGLEVEL=info NODE_VERSION=4.2.3 DJANGO_VERSION=1.9.7
 
 # Node stuff.
 
@@ -41,6 +41,17 @@ EXPOSE 8000
 # CloudPebble stuff
 RUN npm install -g bower && echo '{"allow_root": true}' > ~/.bowerrc
 
+ADD package.json /tmp/package.json
+RUN cd /tmp && npm install
+RUN mkdir -p /opt/npm && cp -a /tmp/node_modules /opt/npm/
+ENV NODE_MODULES_PATH /opt/npm/node_modules
+
+ADD package.json /tmp/package.json
+RUN cd /tmp && npm install
+RUN mkdir -p /opt/npm && cp -a /tmp/node_modules /opt/npm/
+ENV NODE_MODULES_PATH /opt/npm/node_modules
+
+
 # Grab the toolchain
 RUN curl -o /tmp/arm-cs-tools.tar https://cloudpebble-vagrant.s3.amazonaws.com/arm-cs-tools-stripped.tar && \
   tar -xf /tmp/arm-cs-tools.tar -C / && rm /tmp/arm-cs-tools.tar
@@ -55,8 +66,8 @@ RUN mkdir /sdk2 && \
   curl -L "https://s3.amazonaws.com/assets.getpebble.com/sdk3/sdk-core/sdk-core-${SDK_TWO_VERSION}.tar.bz2" | \
   tar --strip-components=1 -xj -C /sdk2
 
-ENV SDK_THREE_CHANNEL=beta
-ENV SDK_THREE_VERSION=4.0-beta16
+ENV SDK_THREE_CHANNEL=release
+ENV SDK_THREE_VERSION=4.0.1
 
 # Install SDK 3
 RUN mkdir /sdk3 && \
@@ -69,6 +80,9 @@ WORKDIR /code
 # Bower is awful.
 RUN rm -rf bower_components && cd /tmp && python /code/manage.py bower install && mv bower_components /code/
 
+ENV PYTHONUNBUFFERED 1
+
 RUN python manage.py compilemessages
+RUN python manage.py collectstatic --noinput
 
 CMD ["sh", "docker_start.sh"]

Procfile

@@ -1,2 +1,2 @@
 web: newrelic-admin run-program gunicorn -c gunicorn.py cloudpebble.wsgi
-celery: newrelic-admin run-program python manage.py celeryd -E -l info
+celery: newrelic-admin run-program celery worker -A cloudpebble -E -l info

README.md

@@ -17,6 +17,9 @@ appropriate values there. Setting environment variables also works.
 Note that you won't be able to set up integration with certain Pebble systems (e.g. Pebble SSO). This shouldn't usually
 matter; whenever these are used, an alternative route is provided and should be invoked in its absence.
 
+In order to run locally with `DEBUG=False` set, add the setting `STATICFILES_STORAGE = 'pipeline.storage.PipelineStorage'`
+to `cloudpebble/settings_local.py`.
+
 Contributing
 ------------
 

app.json

@@ -16,7 +16,6 @@
       "required": true
     },
     "BROKER_POOL_LIMIT": "1",
-    "BUILDPACK_URL": "https://github.com/pebble/cloudpebble-buildpack",
     "COMPLETION_CERTS": "/app/completion-certs.crt",
     "ENABLE_KEEN": "yes",
     "FROM_EMAIL": "[email protected]",

bin/post_compile

@@ -35,8 +35,7 @@ rm /tmp/*.tar.*
 
 # Make sure the database is up to date.
 echo "Performing database migration."
-python manage.py syncdb --noinput
-python manage.py migrate
+python manage.py migrate --fake-initial
 
 echo "Compiling gettext files"
 python manage.py compilemessages

bootstrap.sh

@@ -32,6 +32,14 @@ ln -s /vagrant/user_data/export /var/www/export
 # Fix broken pip in 14.04
 easy_install pip
 
+# Allow pip to access pebblehq packages
+sudo -u vagrant mkdir .pip
+cat << 'EOF' >  /home/vagrant/.pip/pip.conf
+[global]
+trusted-host = pypi.hq.getpebble.com
+index-url = http://pypi.hq.getpebble.com/simple/
+EOF
+
 # CloudPebble python requirements.
 pip install -r /vagrant/requirements.txt
 
@@ -40,7 +48,6 @@ easy_install requests==2.7.0
 
 # Make sure we have a useful database and our JS dependencies.
 pushd /vagrant
-    sudo -u vagrant python manage.py syncdb --noinput
     sudo -u vagrant python manage.py migrate
     sudo -u vagrant python manage.py bower install
 popd
@@ -105,6 +112,14 @@ pushd /pypkjs
     deactivate
 popd
 
+
+mkdir pebble-test
+pushd pebble-test
+	git clone [email protected]:pebble/pebblesdk-test.git .
+	# must first have access to pebble.loghash
+	pip install -r requirements.txt
+popd
+
 sudo -u vagrant mkdir qemu-controller
 pushd qemu-controller
     git clone https://github.com/pebble/cloudpebble-qemu-controller.git .
@@ -169,7 +184,8 @@ console log
 script
     export PATH="$PATH:/home/vagrant/arm-cs-tools/bin:/home/vagrant/sdk2/bin"
     export DEBUG=yes
-    exec /usr/bin/python manage.py celery worker --autoreload --loglevel=info --no-color
+    # The following line is untested after move to Django 1.9
+    exec celery worker --autoreload --loglevel=info --no-color
 end script
 
 EOF
@@ -221,6 +237,8 @@ script
     export PKJS_BIN=/pypkjs/phonesim.py
     export PKJS_VIRTUALENV=/pypkjs/.env
     export QEMU_IMAGE_ROOT=/home/vagrant/qemu-tintin-images
+    export PEBBLE_TEST_BIN=/home/vagrant/pebble-test/runner.py
+    export PEBBLE_LOGHASH_DICT=/home/vagrant/loghash/loghash_dict.json
     export DEBUG=yes
     export QCON_PORT=8003
     exec /usr/bin/python controller.py

cloudpebble/__init__.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import
+
+# This will make sure the app is always imported when
+# Django starts so that shared_task will use this app.
+from .celery import app as celery_app

cloudpebble/celery.py

@@ -0,0 +1,22 @@
+from __future__ import absolute_import
+
+import os
+
+from celery import Celery
+
+# set the default Django settings module for the 'celery' program.
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cloudpebble.settings')
+
+from django.conf import settings  # noqa
+
+app = Celery('cloudpebble')
+
+# Using a string here means the worker will not have to
+# pickle the object when using Windows.
+app.config_from_object('django.conf:settings')
+app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+
+
+@app.task(bind=True)
+def debug_task(self):
+    print('Request: {0!r}'.format(self.request))

cloudpebble/compressors.py

@@ -0,0 +1,53 @@
+from __future__ import unicode_literals
+
+import codecs
+import tempfile
+
+from django.contrib.staticfiles.storage import staticfiles_storage
+
+from pipeline.conf import settings
+from pipeline.compressors import SubProcessCompressor
+from pipeline.utils import source_map_re, path_depth
+
+
+class ConcatenatingUglifyJSCompressor(SubProcessCompressor):
+    def compress_js(self, js):
+        command = [settings.UGLIFYJS_BINARY, settings.UGLIFYJS_ARGUMENTS]
+        if self.verbose:
+            command.append(' --verbose')
+        return self.execute_command(command, js)
+
+    def concatenate_files(self, paths, out_path):
+        args = [settings.CONCATENATOR_BINARY]
+        args += [staticfiles_storage.path(p) for p in paths]
+        args += ['-o', out_path]
+        args += ['-d', staticfiles_storage.base_location]
+        self.execute_command(args)
+
+    def compress_js_with_source_map(self, paths):
+        concatenated_js_file = tempfile.NamedTemporaryFile()
+        source_map_file = tempfile.NamedTemporaryFile()
+        try:
+            self.concatenate_files(paths, concatenated_js_file.name)
+            args = [settings.UGLIFYJS_BINARY]
+            args += [concatenated_js_file.name]
+            args += ["--in-source-map", concatenated_js_file.name + ".map"]
+            args += ["--source-map", source_map_file.name]
+            args += ["--source-map-root", staticfiles_storage.base_url]
+            args += ["--prefix", "%s" % path_depth(staticfiles_storage.base_location)]
+            args += settings.UGLIFYJS_ARGUMENTS
+            if self.verbose:
+                args.append('--verbose')
+
+            js = self.execute_command(args)
+
+            with codecs.open(source_map_file.name, encoding='utf-8') as f:
+                source_map = f.read()
+
+            # Strip out existing source map comment (it will be re-added with packaging)
+            js = source_map_re.sub('', js)
+
+            return js, source_map
+        finally:
+            concatenated_js_file.close()
+            source_map_file.close()