Combine repositories into Tutor

.gitignore

@@ -7,7 +7,7 @@
 /coverage
 /coverage-selenium.json
 /docs*
-
+archive.tar.gz
+/*/dist
 *.cjsx.js
-
 /phantomjsdriver.log

.travis.yml

@@ -1,8 +1,13 @@
 # `sudo:false` for faster builds.
 sudo: false
 language: node_js
-node_js:
-  - "0.12.10"
+env:
+  - OX_PROJECT=tutor
+  - OX_PROJECT=coach
+  - OX_PROJECT=exercises
+  - OX_PROJECT=shared
+before_install:
+  - "npm install -g npm@^3"
 script:
   - npm run ci
 after_failure:

README.md

@@ -4,7 +4,7 @@
 [![dependency status][dependency-image]][dependency-url]
 [![dev dependency status][dev-dependency-image]][dev-dependency-url]
 
-The JavaScript client for openstax Tutor.
+The Front-end code for Openstax Tutor related projects
 
 ## Install
 
@@ -14,16 +14,16 @@ The JavaScript client for openstax Tutor.
   - If you don’t have `git` installed you can install homebrew and then `brew install git`
 1. `cd tutor-js` move into the checked out directory
 1. `npm install`
-1. `npm start`
+1. `npm run serve <project>` *(where <project is one of tutor|coach|exercises)*
 1. Point your browser to <http://localhost:8000> to use the mock data in `/api`
 
 
 ## Development
 
-- `npm start` starts up a local development webserver which rebuilds files when changed
-- `npm test` runs unit tests
+- `npm run serve <project>` starts up a local development webserver which rebuilds files when changed
+- `npm test` runs unit tests for all projects
 - `npm run coverage` generates a code coverage report
-- `gulp prod` builds minified files for production
+- `npm run build <project> archive` builds minified files for production
 
 Use `PORT=8000 npm start` to change the default webserver port.
 

bin/build

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+bin/checkinputs "$@"
+
+export OX_PROJECT=$1
+echo Building: $OX_PROJECT
+export NODE_ENV=production
+
+[ -d $OX_PROJECT/dist ] && rm -r $OX_PROJECT/dist
+
+webpack --progress --config webpack.config.js
+
+if [ $2 == "archive" ]; then
+    cd $OX_PROJECT
+   # credit/blame to: http://stackoverflow.com/questions/8201729/rename-files-to-md5-sum-extension-bash
+   for F in dist/*.min.*; do
+       mv $F `md5sum $F | perl -MFile::Basename -ne '($m, $f) = split(/\s+/,$_); $f=basename($f); $f =~ m/(.*?)\.(.*)/; print "dist/$1-$m.$2"'`
+   done
+   tar -czf ../archive.tar.gz dist/*
+fi

bin/checkinputs

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+    echo "No project to build was given. usage:"
+    echo "$0 <tutor|exercises|coach>"
+    exit 1
+fi

bin/serve

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+bin/checkinputs "$@"
+
+export OX_PROJECT=$1
+echo Serving: $OX_PROJECT
+
+webpack-dev-server --progress --config webpack.config.js

bin/tdd

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+on_termination() {
+  echo killing webpack $WEBPACK_PID
+  kill -TERM $WEBPACK_PID 2>/dev/null
+}
+
+bin/checkinputs "$@"
+
+trap on_termination SIGTERM SIGINT
+
+export OX_PROJECT=$1
+echo TDD: $OX_PROJECT
+
+
+webpack-dev-server --config webpack.config.js &
+WEBPACK_PID=$!
+echo webpack started pid: $WEBPACK_PID
+
+
+karma start test/karma.config.js --auto-watch --no-single-run

bin/test

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+bin/checkinputs "$@"
+
+export OX_PROJECT=$1
+echo Test: $OX_PROJECT
+
+karma start test/karma.config.js --single-run

bin/test-ci

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ev
+
+# travis should be setting the OX_PROJECT variable
+# export OX_PROJECT='tutor'
+
+karma start test/karma.config.js --single-run

coach/.gitignore

@@ -0,0 +1,6 @@
+/node_modules
+*.orig
+/.tmp
+/dist
+/assets
+/test-failed-*.png

coach/.travis.yml

@@ -0,0 +1,7 @@
+# `sudo:false` for faster builds.
+sudo: false
+language: node_js
+node_js:
+  - "0.10"
+after_failure:
+  - npm list

coach/Gulpfile.coffee

@@ -0,0 +1,132 @@
+_ = require 'underscore'
+coffeelint      = require 'gulp-coffeelint'
+del             = require 'del'
+env             = require 'gulp-env'
+gulp            = require 'gulp'
+gutil           = require 'gulp-util'
+gzip            = require 'gulp-gzip'
+karma           = require 'karma'
+rev             = require 'gulp-rev'
+tar             = require 'gulp-tar'
+watch           = require 'gulp-watch'
+webpack         = require 'webpack'
+webpackServer   = require 'webpack-dev-server'
+WPExtractText   = require 'extract-text-webpack-plugin'
+
+getWebpackConfig = require './webpack.config'
+
+TestRunner      = require './test/config/test-runner'
+
+KARMA_DEV_CONFIG =
+  configFile: __dirname + '/test/karma-dev.config.coffee'
+  singleRun: false
+
+KARMA_CONFIG =
+  configFile: __dirname + '/test/config/karma.config.coffee'
+  singleRun: true
+
+KARMA_COVERAGE_CONFIG =
+  configFile: __dirname + '/test/config/karma-coverage.config.coffee'
+  singleRun: true
+
+DIST_DIR = './dist'
+
+# -----------------------------------------------------------------------
+#  Build Javascript and Styles using webpack
+# -----------------------------------------------------------------------
+gulp.task '_cleanDist', (done) ->
+  del(['./dist/*'], done)
+
+gulpWebpack = (name) ->
+  env(vars:{ NODE_ENV: 'production' })
+  config = getWebpackConfig(name, process.env.NODE_ENV is 'production')
+  webpack(config, (err, stats) ->
+    throw new gutil.PluginError("webpack", err) if err
+    gutil.log("[webpack]", stats.toString({
+      # output options
+    }))
+  )
+
+gulp.task '_buildMain', _.partial(gulpWebpack, 'main')
+gulp.task '_buildMainMin', _.partial(gulpWebpack, 'main.min')
+gulp.task '_buildFull', _.partial(gulpWebpack, 'fullBuild')
+gulp.task '_buildFullMin', _.partial(gulpWebpack, 'fullBuild.min')
+gulp.task '_buildDemo', _.partial(gulpWebpack, 'demo')
+
+gulp.task 'build', ['_cleanDist', '_buildMain', '_buildMainMin', '_buildFull', '_buildFullMin']
+
+gulp.task '_tagRev', ['build'], ->
+  gulp.src("#{DIST_DIR}/*.min.*")
+    .pipe(rev())
+    .pipe(gulp.dest(DIST_DIR))
+    .pipe(rev.manifest())
+    .pipe(gulp.dest(DIST_DIR))
+
+# -----------------------------------------------------------------------
+#  Production
+# -----------------------------------------------------------------------
+
+gulp.task '_archive', ['_tagRev'], ->
+  gulp.src(["#{DIST_DIR}/*"], base: DIST_DIR)
+    .pipe(tar('archive.tar'))
+    .pipe(gzip())
+    .pipe(gulp.dest(DIST_DIR))
+
+# -----------------------------------------------------------------------
+#  Development
+# -----------------------------------------------------------------------
+#
+gulp.task '_karma', ->
+  server = new karma.Server(KARMA_DEV_CONFIG)
+  server.start()
+
+# TODO will rewrite this to fit new config
+gulp.task '_webserver', ->
+  env(vars:{ NODE_ENV: 'development' })
+  config = getWebpackConfig('devServer', process.env.NODE_ENV is 'production')
+  server = new webpackServer(webpack(config), config.devServer)
+  server.listen(config.devServer.port, '0.0.0.0', (err) ->
+    throw new gutil.PluginError("webpack-dev-server", err) if err
+  )
+
+# -----------------------------------------------------------------------
+#  Public Tasks
+# -----------------------------------------------------------------------
+#
+# External tasks called by various people (devs, testers, Travis, production)
+#
+# TODO: Add this to webpack
+gulp.task 'lint', ->
+  gulp.src(['./src/**/*.{cjsx,coffee}', './*.coffee', './test/**/*.{cjsx,coffee}'])
+  .pipe(coffeelint())
+  # Run through both reporters so lint failures are visible and Travis will error
+  .pipe(coffeelint.reporter())
+  .pipe(coffeelint.reporter('fail'))
+
+gulp.task 'prod', ['_archive']
+
+gulp.task 'serve', ['_webserver']
+
+gulp.task 'test', ['lint'], (done) ->
+  server = new karma.Server(KARMA_CONFIG)
+  server.start()
+
+gulp.task 'coverage', ->
+  server = new karma.Server(KARMA_COVERAGE_CONFIG)
+  server.start()
+
+# clean out the dist directory before running since otherwise stale files might be served from there.
+# The _webserver task builds and serves from memory with a fallback to files in dist
+gulp.task 'dev', ['_cleanDist', '_webserver']
+
+gulp.task 'testrunner', ->
+  runner = new TestRunner()
+  watch('{src,test}/**/*', (change) ->
+    runner.onFileChange(change) unless change.unlink
+  )
+
+gulp.task 'tdd', ['_cleanDist', '_webserver', 'testrunner']
+
+gulp.task 'demo', ['_buildDemo']
+
+gulp.task 'release', ['build', 'demo']

coach/README.md

@@ -0,0 +1,23 @@
+See it [here](https://openstax.github.io/concept-coach/).
+
+# To run locally:
+
+you need to have [tutor-server](https://github.com/openstax/tutor-server) running locally.  Then,
+
+1. Clone this repo
+1. `npm install`
+1. `DEV_PORT=3004 gulp tdd`
+  * Replace with whatever port you'd like
+1. In `tutor-server`'s `config/secrets.yml`, add `http://localhost:3004` to the list of `cc-origins`
+  * Starts around line 20.
+1. Restart the `tutor-server`
+1. Go to `http://localhost:3004` and the Launch button for Concept Coach should be there!
+
+
+# To build for release and deployment:
+
+1. Run `npm run release`
+  * This will switch to gh-pages branch, merge master into it, and then build
+1. Commit files and push to github gh-pages branch
+1. Tag and make release in github
+1. Copy sha hash of tag into webview's `bower.json`