Merge branch 'production'

.gitignore

@@ -15,3 +15,4 @@ toast/preferences/
 run/
 libs/groovy-2.4.1.jar
 releases/
+deploymentScripts/gradle/gradle/wrapper/gradle-wrapper.properties

build.gradle

@@ -154,17 +154,22 @@ class BuildGradle implements Plugin<Project> {
     project.task('release', dependsOn: 'build') << {
       ant.zip(destfile: "releases/Toast-${project.version}.zip",
         basedir: "release")
-	  try {
-		ant.delete(dir: "build/runnable")
-	  } catch (Exception e) {}
-	  ant.copy(tofile: "build/runnable/Toast.jar") {
-		ant.fileset(dir: "build/latest/")
-	  }
-	  ant.copy(todir: "build/runnable"){
-		ant.fileset(dir: "runnableScripts/")
-	  }
-	  ant.zip(destfile: "releases/Toast-${project.version}-RUNNABLE.zip",
-		basedir: "build/runnable")
+  	  try {
+  		    ant.delete(dir: "build/runnable")
+  	  } catch (Exception e) {}
+  	  ant.copy(tofile: "build/runnable/Toast.jar") {
+  		    ant.fileset(dir: "build/latest/")
+  	  }
+  	  ant.copy(todir: "build/runnable"){
+  		    ant.fileset(dir: "runnableScripts/")
+  	  }
+  	  ant.zip(destfile: "releases/Toast-${project.version}-RUNNABLE.zip",
+  		basedir: "build/runnable")
+
+      ant.copy(todir: "build/deployment") {
+          ant.fileset(dir: "deploymentScripts")
+      }
+      ant.zip(destfile: "releases/Toast-Deployment-Utility.zip", basedir: "build/deployment")
     }
   }
 }

build.settings

@@ -1 +1 @@
-toast.version=0.3.0
+toast.version=0.5.0

deploymentScripts/deployToast

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd gradle
+gradlew -q combo

deploymentScripts/deployToast.bat

@@ -0,0 +1,2 @@
+cd gradle
+gradlew -q combo

deploymentScripts/gradle/build.gradle

@@ -0,0 +1,106 @@
+import org.gradle.logging.StyledTextOutput;
+import org.gradle.logging.StyledTextOutputFactory;
+import static org.gradle.logging.StyledTextOutput.Style;
+
+apply plugin: Build
+
+class Build implements Plugin<Project> {
+  def project
+  def teamNumber
+
+  void apply(Project project) {
+    this.project = project
+    System.setProperty('org.gradle.color.header', 'CYAN')
+
+    project.repositories.add(project.repositories.mavenCentral())
+
+    project.getConfigurations().maybeCreate('compile')
+
+    def sshAntTask = project.getConfigurations().maybeCreate('sshAntTask')
+    project.dependencies.add(sshAntTask.name, 'org.apache.ant:ant-jsch:1.7.1')
+    project.dependencies.add(sshAntTask.name, 'jsch:jsch:0.1.29')
+
+    project.ant.taskdef(name: 'scp',
+    classname: 'org.apache.tools.ant.taskdefs.optional.ssh.Scp',
+    classpath: sshAntTask.asPath)
+
+    def dl = project.task('download') << {
+      String baseURL = "http://dev.sourcecoded.info/jaci/maven/jaci/openrio/toast/Toast";
+      download("caches/toast", "${baseURL}/maven-metadata.xml", "toast-metadata.xml")
+      def latest = getLatest()
+      println "\tLatest Toast version: ${latest}"
+      download("caches/toast", "${baseURL}/${latest}/Toast-${latest}.jar", "toast.jar")
+      println "\tToast Download Successful!"
+    }
+
+    def dp = project.task('deploy') << {
+      if (teamNumber == null) teamNumber = project.team
+      File file = new File("caches/toast/toast.jar")
+      if (!file.exists())
+        throw new Exception("Could not deploy (file not found). Have you tried running 'gradlew download' first?")
+      try {
+        deploy(rioHost(project), file)
+      } catch (Exception e) {
+        println "\tCould not deploy to Hostname, attempting IP...."
+        deploy(rioIP(project), file)
+      }
+    }
+
+    project.task('combo') << {
+      def out = services.get(StyledTextOutputFactory).create("Toast")
+      out.withStyle(Style.Header).println "Connect to the internet and hit 'enter' to download Toast!"
+      System.console().readLine()
+      dl.execute()
+      out.withStyle(Style.Header).println "Please enter your Team Number and hit 'enter'"
+      teamNumber = System.console().readLine("\tTeam Number: ")
+      out.withStyle(Style.Header).println "Connect to the same network as the RoboRIO and hit 'enter' to deploy Toast!"
+      System.console().readLine()
+      dp.execute()
+      out.withStyle(Style.Header).println "Toast has been deployed to your RoboRIO successfully! Hit 'enter' to continue!"
+      System.console().readLine()
+    }
+  }
+
+  String getLatest() {
+    def xml = new XmlSlurper().parse("caches/toast/toast-metadata.xml").versioning.versions.depthFirst()
+    return (xml.toList() as Set).last()
+  }
+
+  void download(String dest, String from, String name) {
+    File output = new File(dest, name)
+    File f = new File(dest)
+    f.mkdirs()
+    def file = new FileOutputStream(output)
+    def out = new BufferedOutputStream(file)
+    HttpURLConnection httpcon = new URL(from).openConnection()
+    httpcon.addRequestProperty("User-Agent", "Toast-Deployment")
+    out << httpcon.getInputStream()
+    out.close()
+  }
+
+  void deploy(String host, File source) {
+    println "\tAttempting to send new code to RoboRIO... ${host}"
+
+    project.ant.scp(file: "${source.getAbsolutePath()}",
+    todir:"lvuser@${host}:FRCUserProgram.jar",
+    password:"",
+    port:22,
+    trust:true)
+
+    println "\tDeploy Successful!"
+  }
+
+  String rioHost(Project project) {
+    return "roboRIO-${teamNumber}.local"
+  }
+
+  String rioIP(Project project) {
+      String team = teamNumber
+      int length = team.length();
+      if (length < 4)
+      for (int i = 0; i < 4 - length; i++)
+      team = "0" + team;
+
+      return "10." + team.substring(0, 2) + "." + team.substring(2, 4) + ".20"
+  }
+}

deploymentScripts/gradle/gradlew

@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"