Merge branch 'mainmast' into horizon

Author: jpolitz

.travis.yml

@@ -0,0 +1,48 @@
+language: ruby
+rvm:
+  - 2.2
+env:
+  - secure: "E19TyEFE1iQSRrZI4w6ahWgFGEFZBiUgxn/Pqq5sQwHlMNpai+bVydDRVlcQ0NsrdPmyXY/4+29wMjsAHbSaiBuqgG5PbtpChJK7a+8583G6CrbkWdZgwkMDpqPQ2IBEWVYeybvl36wuXJ4HNCqImPODWvX1Wxzk5RCK/gM4PNu3OdmQm3+6O8y1N6r0Y/lnqeAxhaZ5wv01/6EE3I3rAbnFxnu0wIJ7AfNV64VRk+tqwYuM5fLXrl6yhelSwp9q5CLEwvvYknBkklHAXbvxc2qo8XfZb6Zb701NyGvFW86Acgo1dytqV+BNmxNj4FfnXj+rxi/SDpiKEifzj5UYLIAgAx/qbxWSHD8SHiOL1WMa7N3vN2Dh+O+9vCLDwtpzbC0kJqxVMei8buAR4pLReZO0OsmHGXDPApoqOdxvQ0Z2VtEWojIWaJSIl0gTaWKAPAE6GMT0zRQcmm6GPXmLpWGc/9MZKJ5lTXQloucRaStRhPYV4x2HNF4vVZmJ0RWQexAX4qsUiaVFs0jdnJTDvgyPWj+f7qJaaqNFfXz9TyP2N8LSjPdGBYfkWIbkv8dXjJCufXX29BbOD5Yq1NcRQxgTnQO1cvXs1/MJOrK8tCAQ/rZUqQakBMg71fhznOm2lejiiingfnq846C1v27KxZzFLnGIOfDUbMAgS1sbGUU="
+script:
+- echo "Skipping tests"
+#- mocha --harmony
+before_install:
+- . $HOME/.nvm/nvm.sh
+- nvm install stable
+- nvm use stable
+- npm install -g heroku-cli
+install:
+- npm install --ignore-scripts
+- make web
+- make deploy-cpo-main
+script:
+- echo "No tests on deploy branch"
+before_deploy:
+- export SHORT_COMMIT=`echo $TRAVIS_COMMIT | cut -c1-7`
+- export GIT_REV=`echo $TRAVIS_COMMIT`
+- export GIT_BRANCH=`echo $TRAVIS_BRANCH`
+- heroku config:set --app code-pyret-org GIT_REV=$GIT_REV
+- heroku config:set --app code-pyret-org GIT_BRANCH=$GIT_REV
+- heroku config:set --app code-pyret-org CURRENT_PYRET_RELEASE=$SHORT_COMMIT
+- heroku config:set --app code-pyret-org PYRET=https://d251z2akfyabv3.cloudfront.net/releases/$SHORT_COMMIT/cpo-main.jarr.gz.js
+deploy:
+- provider: s3
+  access_key_id: AKIAJI5QOXMOMALYEG3Q
+  secret_access_key:
+    secure: eNHYX/jlPW4ZWOhl3q2XzXaEG0RF3LyNmJ2VULnAocCKfgcSLvrAJalzXZ7wyK7WOBPN9liaLaams0Vq0WqabS09F7TQQYQG0yHx5L2bxkiUmJmMlpku0/Her1/6j+QH7YlLHjHmHF4HNJUgEpp/mwDF4x4/NdQ9H8wGdJSw3OwkE7+27Xg/5OmgKkDOJR/6d9y5Ha8PvVeEt1XC4OMtEn+Himao/X8GUVtrCmnyaACoyuIAS0aYkD5YdpXoluNJW3Iv/aqZOic5zrxx0XCfAneD/bQfCI0LneOICOjLxWkHttjFVTLfzJr4cCB1mFfAAh6fh0BipTVQZze3qp02ziKDJgYPD/Lo6pyuyG+ENwCS/s0jOywpTT4L0MdGUC50eNrrRFpQ5Fch6e2zvdWoj9/eB42VDijP8d+nguwRm/gt/z/6vo4jZaVGdlZaUr4Bx1ejX/30aiw+ezQjPoD2A7tAH7A9qygVAPmvJ7kvYOf+jLzhQUxkQna4lx2BdpirhX/QT8GLoei6LuZ/MQmy79jmlQnR7PUpeVwuN4DK0X5W/0774wPcFhETvr7IpF5DWdZlb8wqg8440abhD2sYBYqpmv9FehdEBSgyFvA2uxIZ7AcBICv47Lz9cvB6rjN1cjAUWRaSB9q54ej18l8o68OZUXe1TY5ek3c+Go2V88k=
+  bucket: pyret-releases
+  local-dir: build/release
+  upload-dir: releases
+  acl: public_read
+  skip_cleanup: true
+  detect_encoding: true
+  on:
+    repo: brownplt/code.pyret.org
+    branch: release
+- provider: heroku
+  app: code-pyret-org
+  api_key:
+    secure: h516V/Ze+mXMWSinCVzpwuRBsdx3nNbo7iEsWovrdIoVwz01tEQnwaTsGMviOq7P/X5bu+PuOAD0Kpm3lfds0/ctaB4y/O5zKvba1A4jdHSjvgADRvgbx1FxoArkwnuI1s9/TFfTXdN7zFDbJWFiXy3g0o7xp5X22Q21ZgrjGLv0fNBbxRvIm441lQgn13uZD45+uS12jSDMJ7DZU7vBoSnq1DACWHNuWORb/PRZnDPpwjKUwX9BEYaYmkoupB2WpgcSTlglVnDpFHnaOmUO/yeJHlsuFe4E4BMRrjccsSB2ZGdj05YtR4pg2biQSJmXMe8+OfBpteH8MF4LYH4mIEsA56xDR47IYGaGDo7oxIaS6gWE7u+w2UkMO5/Tv4W+V9hHEoAA9stX52x8jHDUe8qcYs/Gb/GWYLQFkolr8dczrBF/kojUELm7KztlOWmPCxW6kTd3M4imWO0bbHEHgDDlxLbhBgYLkh+Jw3BSwaDeWx2G00Xy/cZ2XELN1s5cnQ+g7A2/YjaRos2hX59HCFALgx8FoMzXCmnUXZX5hqUloMjY1a/zomw+fa5WEOYF41TRQmkdqwmwj9WiW160jXtOJbdKTncdw9BXc9OULDjGg4FbPPMCT/zva3AsMYoWbGJdLLEhQPyUsf1gzPz7ToZ5E8ykxWpopNDQg7i2mKY=
+  on:
+    repo: brownplt/code.pyret.org
+    branch: release

.travis.yml.release

@@ -27,6 +27,7 @@ PYRET=$(call NODE_MODULE,pyret-lang)/../..
 CPOMAIN=build/web/js/cpo-main.jarr
 CPOGZ=build/web/js/cpo-main.jarr.gz.js
 PHASEA=pyret/build/phaseA/pyret.jarr
+COMMITID=$(shell git rev-parse --short HEAD)
 
 .PHONY : test_node_module
 test_node_module:
@@ -371,7 +372,11 @@ link-pyret:
 	ln -s $(PYRET) pyret
 	(cd $(PYRET) && $(MAKE) phaseA-deps)
 
-deploy-cpo-main: link-pyret $(CPOMAIN) $(CPOGZ)
+deploy-cpo-main: link-pyret $(CPOMAIN) cpo-main-release 
+
+cpo-main-release: $(CPOGZ)
+	mkdir -p build/release/$(COMMITID);
+	cp $(CPOGZ) build/release/$(COMMITID)/
 
 TROVE_JS := src/web/js/trove/*.js
 TROVE_ARR := src/web/arr/trove/*.arr

Makefile

@@ -187,4 +187,50 @@ https://devcenter.heroku.com/articles/getting-started-with-nodejs
         $ heroku ps:scale web=1
 
 7.	Now run `heroku open` or visit appname.herokuapp.com.
+
 8.  Tips for redeploy: if you don't see a successful build under heroku webiste's activity tab, but get "everything is up-to-date" when you run `git push heroku <localbranch>:master`, or your build doesn't look up-to-date, you can do an empty commit: `git commit --allow-empty -m "force deploy"`
+
+## Production Deployment
+
+This branch (`release`) is pushed to in order to trigger deploys of the "real"
+version of code.pyret.org.  If you have permission to push to this branch, you
+can cause code.pyret.org to update simply by pushing.
+
+There are several encrypted credentials stored in Travis.  Anyone's will work,
+they just need to have access to the right places. 
+
+- The access key id and access token for an appropriate S3 bucket.  This is
+  where the built and compressed `cpo-main.jarr.gz` file will go.
+- The access key for a Heroku account, which goes in two places; first, in the
+  `global` section so the heroku toolbelt can run, and second in the api\_key
+  field of the Heroku deployment itself.  This needs to be a Heroku account
+  that has access to the `code-pyret-org` project
+
+The build creates `cpo-main.jarr.gz`, stores it in
+`build/release/<short-commit-id>/cpo-main.jarr.gz`, and then copies that
+directory over to the given S3 bucket.
+
+It then sets the current Heroku `PYRET` variable to point to the appropriate
+URL – in the current deployment, this URL is an AWS CloudFront endpoint that
+is backed by a S3 bucket, but any path to the bucket with the right ending
+commit hash will work.  Note that it is quite useful to update this variable
+because it changes the URL that is fetched on loading CPO, so it will bypass
+the users' browser cache the next time they visit.  It's a Good Idea to have
+very long cache settings on the CPO main JavaScript file, and also good to make
+sure folks get the update.
+
+In addition, this means that it's easy to roll back using Heroku's rollback
+feature, since all the copies of the built standalones are available.
+
+This branch doesn't run the Selenium tests; the various development branches
+and master do that.  Mainly this is for expedience, since all commits go
+through a development branch that runs tests anyway, so it would merely
+lengthen the path to deploying.  Also, running the tests on multiple browsers
+causes the heroku build to fire twice, which causes an error (see
+https://github.com/travis-ci/travis-ci/issues/929).
+
+This branch is access-controlled to admins of brownplt and a few others.  This
+is mainly to prevent _mistakes_ (Oops!  I pushed to `release` and it broke!)
+more than to lock anyone out.
+
+

README.md

@@ -48,8 +48,8 @@
     "mustache-express": "^1.3.2",
     "node-uuid": "^1.4.8",
     "popper.js": "^1.16.1",
-    "pyret-codemirror-mode": "github:brownplt/pyret-codemirror-mode#master",
-    "pyret-lang": "git://github.com/brownplt/pyret-lang.git#horizon",
+    "pyret-codemirror-mode": "git://github.com/brownplt/pyret-codemirror-mode.git#master",
+    "pyret-lang": "git+https://github.com/brownplt/pyret-lang.git#master",
     "q": "~1.4.1",
     "react": "^15.7.0",
     "react-dom": "^15.7.0",

package-lock.json

@@ -0,0 +1,89 @@
+{
+  "name": "code.pyret.org",
+  "version": "0.0.0",
+  "description": "A simple IDE for Pyret",
+  "main": "index.js",
+  "engines": {
+    "npm": "3.x"
+  },
+  "dependencies": {
+    "babel-core": "^6.17.0",
+    "babel-eslint": "^6.0.4",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-transform-decorators-legacy": "1.3.4",
+    "babel-polyfill": "^6.9.1",
+    "babel-preset-es2015": "6.16.0",
+    "babel-preset-react": "6.16.0",
+    "babel-preset-stage-2": "6.17.0",
+    "body-parser": "^1.15.2",
+    "codemirror": "~5.19.0",
+    "colorspaces": "0.1.4",
+    "cookie-parser": "^1.0.1",
+    "cookie-session": "^1.0.1",
+    "css-loader": "0.25.0",
+    "csurf": "^1.1.0",
+    "d3": "~3",
+    "d3-tip": "git://github.com/sorawee/d3-tip",
+    "dotenv": "^2.0.0",
+    "es6-shim": "0.35.0",
+    "eslint": "^2.12.0",
+    "express": "^4.1.1",
+    "git-rev-sync": "^1.7.1",
+    "googleapis": "^12.4.0",
+    "isparta-loader": "2.0.0",
+    "jasmine-core": "2.5.2",
+    "js-md5": "^0.4.1",
+    "jwt-simple": "^0.2.0",
+    "karma": "1.3.0",
+    "karma-babel-preprocessor": "6.0.1",
+    "karma-chrome-launcher": "2.0.0",
+    "karma-coverage": "1.1.1",
+    "karma-coveralls": "1.1.2",
+    "karma-jasmine": "1.0.2",
+    "karma-sourcemap-loader": "0.3.7",
+    "karma-webpack": "1.8.0",
+    "lodash": "~2.4.1",
+    "mocha": "^2.2.1",
+    "mustache": "^0.8.1",
+    "mustache-express": "^1.2.1",
+    "node-static": "^0.7.3",
+    "node-uuid": "^1.4.1",
+    "pyret-codemirror-mode": "git://github.com/brownplt/pyret-codemirror-mode#master",
+    "pyret-ide": "git://github.com/pcardune/pyret-ide#master",
+    "pyret-lang": "git://github.com/brownplt/pyret-lang.git#horizon",
+    "q": "~1.4.1",
+    "react": "^15.3.2",
+    "react-dom": "^15.3.2",
+    "redis": "^0.10.3",
+    "request": "^2.34.0",
+    "requirejs": "2.1.14",
+    "s-expression": "~2.2.0",
+    "script-loader": "~0.7.0",
+    "seedrandom": "~2.3.10",
+    "selenium-webdriver": "^2.41.0",
+    "style-loader": "0.13.1",
+    "supervisor": "^0.11.0",
+    "url.js": "^1.0.2",
+    "webpack": "^1.13.1",
+    "webpack-dev-server": "^1.14.1"
+  },
+  "scripts": {
+    "local-install": "heroku local:run npm install",
+    "postinstall": "webpack && make -j3 web",
+    "test": "karma start --single-run",
+    "test-watch": "karma start",
+    "lint": "eslint src",
+    "build": "heroku local:run make web-local",
+    "mocha": "heroku local:run mocha",
+    "start": "heroku local:run supervisor --poll-interval 700 --watch src/run.js,src/server.js src/run.js & heroku local:run webpack-dev-server --port 5001"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/brownplt/code.pyret.org"
+  },
+  "author": "Joe Politz",
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "babel-preset-stage-2": "^6.17.0"
+  }
+}

package.json

@@ -125,13 +125,6 @@ <h2 id="menutitle" class="screenreader-only">Navigation Controls</h2>
                   tabindex="-1" target="_blank" href="https://groups.google.com/forum/#!forum/pyret-discuss">Discuss Pyret</a>
               </div>
             </li>
-            <li role="presentation">
-              <div id="fullConnectButton" class="menuButton loginOnly">
-                <a class="focusable" role="menuitem"
-                  aria-describedby="mhelp-submenu mhelp-activate mhelp-escape-submenu"
-                  tabindex="-1" href="javascript:void(0)">Enable Full Google Access</a>
-              </div>
-            </li>
             <li role="presentation">
               <div id="choose-context" class="menuButton">
                 <a class="focusable" role="menuitem"