Serve exercises from the HEAD of master of xjava

- otherwise this journey is testing not the latest copy of xjava, but
  what's at origin/master.
- add progress indicator.
- x-api can't serve binaries; must clean xjava of any build artifacts
  (e.g. .class files) before attempting to serve.

Signed-off-by: Bronwyn Perry-Huston <bronhuston@gmail.com>
Signed-off-by: Cen Ge <cge@corelogic.com>
Signed-off-by: John Ryan <jtigger@infosysengr.com>

.travis.yml

@@ -10,10 +10,10 @@ addons:
   apt:
     packages:
       - tree
-      - jq
 before_install:
   - rvm install 2.2.1
   - rvm use 2.2.1
 
 script:
-  - bin/journey-setup-ci.sh
+  - bin/run-unit-tests-in-ci.sh
+  - bin/run-journey-test-in-ci.sh

bin/journey-setup-local.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# Local clean-up
-rm -rf ~/workspace/exercism/x-api
-killall ruby
-
-set -e
-
-export GOPATH=$HOME/workspace
-REPO_ROOT=~/workspace/exercism/xjava
-EXERCISM_HOME=~/workspace/exercism/exercises
-SET_RUBY_VER_CMD="rbenv local 2.2.1"
-
-mkdir -p ~/workspace/exercism
-cd ~/workspace/exercism/
-git clone https://github.com/exercism/x-api
-cd x-api
-git submodule init -- metadata
-git submodule init -- tracks/java
-git submodule update
-
-$SET_RUBY_VER_CMD
-gem install bundler
-bundle install
-
-RACK_ENV=development rackup&
-
-sleep 5
-
-export PATH=$PATH:$GOPATH/bin
-go get -u github.com/exercism/cli/exercism
-exercism -v
-
-mkdir -p $EXERCISM_HOME
-cd $EXERCISM_HOME
-exercism configure --dir=$EXERCISM_HOME
-exercism configure --api http://localhost:9292
-
-exercism debug
-
-cd $REPO_ROOT
-EXERCISES=`cat config.json | jq '.problems []' --raw-output`
-
-for EXERCISE in $EXERCISES; do
-  exercism fetch java $EXERCISE
-  cp -R -H $REPO_ROOT/exercises/$EXERCISE/src/example/java/* $EXERCISM_HOME/java/$EXERCISE/src/main/java/
-  cd $EXERCISM_HOME/java/$EXERCISE/
-  gradle test
-done

bin/journey-setup-ci.sh → bin/run-journey-test-in-ci.sh

@@ -2,10 +2,10 @@
 set -e
 
 eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.5.3 bash)"
-export HOME=$HOME/build/bronhuston
+export HOME=$PWD/..
 export GOPATH=$HOME
 
-REPO_ROOT=$HOME
+REPO_ROOT=~/xjava
 EXERCISM_HOME=~/workspace/exercism/exercises
 SET_RUBY_VER_CMD=""
 
@@ -14,8 +14,8 @@ cd ~/workspace/exercism/
 git clone https://github.com/exercism/x-api
 cd x-api
 git submodule init -- metadata
-git submodule init -- tracks/java
 git submodule update
+( cd tracks && rmdir java && ln -s $REPO_ROOT java && cd java/exercises && gradle clean )
 
 $SET_RUBY_VER_CMD
 gem install bundler
@@ -38,10 +38,18 @@ exercism debug
 
 cd $REPO_ROOT
 EXERCISES=`cat config.json | jq '.problems []' --raw-output`
+TOTAL_EXERCISES=`cat config.json | jq '.problems | length'`
+CURRENT_EXERCISE_NUMBER=1
 
 for EXERCISE in $EXERCISES; do
+  echo ''
+  echo '****' Testing $EXERCISE '('$CURRENT_EXERCISE_NUMBER / $TOTAL_EXERCISES') ****'
+  echo ''
   exercism fetch java $EXERCISE
   cp -R -H $REPO_ROOT/exercises/$EXERCISE/src/example/java/* $EXERCISM_HOME/java/$EXERCISE/src/main/java/
   cd $EXERCISM_HOME/java/$EXERCISE/
   gradle test
+
+  CURRENT_EXERCISE_NUMBER=$((CURRENT_EXERCISE_NUMBER + 1))
 done
+

bin/run-journey-test-locally.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+
+if [ "$0" != "./bin/run-journey-test-locally.sh" ]; then
+  echo "This script must be run from the root of the xjava checkout."
+  echo "Please change directory there and try again."
+  echo -e "\n  $ ./bin/run-journey-test-locally.sh"
+  exit 1
+fi
+
+function teardown() {
+  if [ "$XAPI_PID" != "" ] ; then
+     kill $XAPI_PID
+  fi
+}
+
+trap teardown EXIT
+
+set -e
+
+REPO_ROOT=$PWD
+BUILD_DIR=$REPO_ROOT/build
+export GOPATH=$BUILD_DIR/go
+XAPI_HOME=$BUILD_DIR/x-api
+EXERCISM_HOME=$BUILD_DIR/exercism
+SET_RUBY_VER_CMD="rbenv local 2.2.1"
+
+if [ -d "$BUILD_DIR" ] ; then
+  rm -rf "$BUILD_DIR"
+fi
+
+mkdir -p $XAPI_HOME
+cd $XAPI_HOME
+git clone https://github.com/exercism/x-api .
+git submodule init -- metadata
+git submodule update
+( cd tracks && rmdir java && ln -s $REPO_ROOT java && cd java/exercises && gradle clean )
+
+
+$SET_RUBY_VER_CMD
+gem install bundler
+bundle install
+
+RACK_ENV=development rackup&
+export XAPI_PID=$!
+
+sleep 5
+
+export PATH=$PATH:$GOPATH/bin
+go get -u github.com/exercism/cli/exercism
+EXERCISM="exercism --config $EXERCISM_HOME/.exercism.json"
+
+
+mkdir -p $EXERCISM_HOME
+cd $EXERCISM_HOME
+$EXERCISM configure --dir=$EXERCISM_HOME
+$EXERCISM configure --api http://localhost:9292
+
+$EXERCISM debug
+
+cd $REPO_ROOT
+EXERCISES=`cat config.json | jq '.problems []' --raw-output`
+TOTAL_EXERCISES=`cat config.json | jq '.problems | length'`
+CURRENT_EXERCISE_NUMBER=1
+
+for EXERCISE in $EXERCISES; do
+  echo ''
+  echo '****' Testing $EXERCISE '('$CURRENT_EXERCISE_NUMBER / $TOTAL_EXERCISES') ****'
+  echo ''
+  $EXERCISM fetch java $EXERCISE
+  cp -R -H $REPO_ROOT/exercises/$EXERCISE/src/example/java/* $EXERCISM_HOME/java/$EXERCISE/src/main/java/
+  cd $EXERCISM_HOME/java/$EXERCISE/
+  gradle test
+
+  CURRENT_EXERCISE_NUMBER=$((CURRENT_EXERCISE_NUMBER + 1))
+done

bin/build.sh → bin/run-unit-tests-in-ci.sh

@@ -1,13 +1,15 @@
 #!/bin/bash
 set -e
-pushd exercises
 gradle --version
-echo ""
-echo ">>> Running tests..."
-TERM=dumb gradle check compileStarterSourceJava --continue
-popd
 
 echo ""
 echo ">>> Running configlet..."
 bin/fetch-configlet
 bin/configlet .
+
+pushd exercises
+echo ""
+echo ">>> Running tests..."
+TERM=dumb gradle check compileStarterSourceJava --continue
+popd
+

x-api

@@ -1 +0,0 @@
-Subproject commit eecf15a0af868a1611e7e5b82cdb955beb9a8605