fixed issue #96. added travis support

Author: paxtonhare

.gitignore

@@ -8,3 +8,4 @@
 src/test/resources/user.properties
 setenv.bat
 src/test/resources/scaffold-test/
+.DS_Store

.travis.yml

@@ -0,0 +1,11 @@
+language: java
+jdk:
+  - oraclejdk7
+sudo: true
+before_install:
+  - echo 'America/Los_Angeles' | sudo tee /etc/timezone
+  - sudo dpkg-reconfigure --frontend noninteractive tzdata
+install:
+  - ./shared/dev-tasks/install-dependencies.sh
+script:
+  - '[ "${TRAVIS_SECURE_ENV_VARS}" = "false" ] && ./gradlew test'

shared/dev-tasks/install-dependencies.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then
+  ./shared/dev-tasks/travis-install-ml.sh release
+  ./shared/dev-tasks/setup-marklogic.sh
+fi

shared/dev-tasks/setup-marklogic.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+sudo /etc/init.d/MarkLogic start
+sleep 10
+curl -X POST -d "" http://localhost:8001/admin/v1/init
+sleep 10
+curl -X POST -H "Content-type: application/x-www-form-urlencoded" \
+     --data "admin-username=admin" \
+     --data "admin-password=admin" \
+     --data "realm=public" \
+     "http://localhost:8001/admin/v1/instance-admin"
+sleep 10

shared/dev-tasks/travis-install-ml.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# runs command from parameters and exits with the eoror code of the command
+# if it fails
+function successOrExit {
+    "$@"
+    local status=$?
+    if [ $status -ne 0 ]; then
+        echo "$1 exited with error: $status"
+        exit $status
+    fi
+}
+
+set | grep TRAVIS
+
+test $1 && arg1=$1
+if [[ $arg1 = 'release' ]]; then
+  ver=8.0-5
+  fname=MarkLogic-${ver}.x86_64.rpm
+  fnamedeb="marklogic_"
+  fnamedeb=$fnamedeb$ver
+  suff="_amd64.deb"
+  fnamedeb=$fnamedeb$suff
+
+  curl -c cookies.txt --data "email=${MLBUILD_USER}&password=${MLBUILD_PASSWORD}" https://developer.marklogic.com/login
+  dl_link=$(curl -b cookies.txt --data "download=/download/binaries/8.0/${fname}" https://developer.marklogic.com/get-download-url | perl -pe 's/.*"path":"([^"]+).*/\1/')
+  url="https://developer.marklogic.com${dl_link}"
+
+  echo "********* Downloading MarkLogic $ver"
+
+  successOrExit curl -k -o ./$fname $url
+
+  fname=$(pwd)/$fname
+
+  sudo apt-get update
+  sudo apt-get install wajig alien rpm lsb-base dpkg-dev debhelper build-essential
+  (cd /etc && sudo ln -s default sysconfig)
+  sudo wajig rpminstall $fname
+
+  echo "********* MarkLogic $ver installed"
+else
+  # find today
+  day=$(date +"%Y%m%d")
+
+  # if the user passed a day string as a param then use it instead
+  test $1 && day=$1
+  # make a version number out of the date
+  ver="8.0-$day"
+
+  echo "********* Downloading MarkLogic nightly $ver"
+
+  # fetch/install ML nightly
+  fname="MarkLogic-$ver.x86_64.rpm"
+  fnamedeb="marklogic_"
+  fnamedeb=$fnamedeb$ver
+  suff="_amd64.deb"
+  fnamedeb=$fnamedeb$suff
+
+  url="https://root.marklogic.com/nightly/builds/linux64/rh6-intel64-80-test-1.marklogic.com/b8_0/pkgs.$day/$fname"
+
+  status=$(curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD --head --write-out %{http_code} --silent --output /dev/null $url)
+  if [[ $status = 200 ]]; then
+    successOrExit curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD -o ./$fname $url
+
+    fname=$(pwd)/$fname
+
+    sudo apt-get update
+    sudo apt-get install alien dpkg-dev debhelper build-essential
+    sudo alien -d -k $fname
+    sudo dpkg -i $fnamedeb
+
+    echo "********* MarkLogic nightly $ver installed"
+  else
+    echo "CANNOT DOWNLOAD: status = $status for date $day (URL=\"$url\")"
+    exit 1
+  fi
+fi

src/main/java/com/marklogic/appdeployer/command/appservers/UpdateRestApiServersCommand.java

@@ -13,17 +13,24 @@
  */
 public class UpdateRestApiServersCommand extends AbstractCommand {
 
+    private String restApiFilename;
+
     public UpdateRestApiServersCommand() {
         setExecuteSortOrder(SortOrderConstants.UPDATE_REST_API_SERVERS);
     }
 
+    public UpdateRestApiServersCommand(String restApiFilename) {
+        this();
+        this.restApiFilename = restApiFilename;
+    }
+
     /**
      * This uses a different file than that of creating a REST API, as the payload for /v1/rest-apis differs from that
      * of the /manage/v2/servers endpoint.
      */
     @Override
     public void execute(CommandContext context) {
-        File f = context.getAppConfig().getConfigDir().getRestApiServerFile();
+        File f = findRestApiConfigFile(context);
         if (f.exists()) {
             AppConfig appConfig = context.getAppConfig();
 
@@ -43,4 +50,11 @@ public void execute(CommandContext context) {
         }
     }
 
+    protected File findRestApiConfigFile(CommandContext context) {
+        if (restApiFilename != null) {
+            return new File(context.getAppConfig().getConfigDir().getBaseDir(), restApiFilename);
+        } else {
+            return context.getAppConfig().getConfigDir().getRestApiServerFile();
+        }
+    }
 }

src/main/java/com/marklogic/rest/util/RestConfig.java

@@ -30,13 +30,13 @@ public String toString() {
      * Using the java.net.URI constructor that takes a string. Using any other constructor runs into encoding problems,
      * e.g. when a mimetype has a plus in it, that plus needs to be encoded, but doing as %2B will result in the % being
      * double encoded.
-     * 
+     *
      * @param path
      * @return
      */
     public URI buildUri(String path) {
         try {
-            return new URI(String.format("%s://%s:%d%s", getScheme(), getHost(), getPort(), path));
+            return new URI(String.format("%s://%s:%d%s", getScheme(), getHost(), getPort(), path.replace(" ", "+")));
         } catch (URISyntaxException ex) {
             throw new RuntimeException("Unable to build URI for path: " + path + "; cause: " + ex.getMessage(), ex);
         }

src/test/java/com/marklogic/appdeployer/command/admin/RequireAtLeastMl8Test.java

@@ -1,6 +1,7 @@
 package com.marklogic.appdeployer.command.admin;
 
 import org.junit.Test;
+import org.junit.After;
 
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
 
@@ -11,4 +12,9 @@ public void testThatNoExceptionIsThrown() {
         initializeAppDeployer(new RequireAtLeastMl8Command());
         appDeployer.deploy(appConfig);
     }
+
+    @After
+    public void teardown() {
+        undeploySampleApp();
+    }
 }

src/test/java/com/marklogic/appdeployer/command/databases/ClearDatabaseTest.java

@@ -16,14 +16,14 @@ public void teardown() {
 
     /**
      * Testing against the modules database, but the operation is the same regardless of database.
-     * 
+     *
      * Also, for the modules database, ml-gradle 1.+ had the ability to exclude certain modules from being deleted in
      * case those modules were needed by the REST API rewriter. But in that case, it's usually preferable to just use
      * the XCC approach for loading asset modules.
      */
     @Test
     public void modulesDatabase() {
-        initializeAppDeployer(new DeployRestApiServersCommand(), buildLoadModulesCommand());
+        initializeAppDeployer(new DeployRestApiServersCommand(true), buildLoadModulesCommand());
 
         appDeployer.deploy(appConfig);
 

src/test/java/com/marklogic/appdeployer/command/servers/UpdateRestApiServersTest.java

@@ -29,7 +29,7 @@ public void updateMainAndRestRestApiServers() {
                 appConfig.getTestRestServerName(), "digest");
 
         // Now redeploy with the update command
-        initializeAppDeployer(new DeployRestApiServersCommand(), new UpdateRestApiServersCommand());
+        initializeAppDeployer(new DeployRestApiServersCommand(true), new UpdateRestApiServersCommand());
         appDeployer.deploy(appConfig);
 
         assertAuthentication(