Merge branch 'master' of https://github.com/WPIRoboticsProjects/GRIP into issue316

Author: PaulaRudy

.travis-scripts/before-deploy.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-ls -R build/distributions | awk '
+ls -R ui/build/distributions | awk '
 /:$/&&f{s=$0;f=0}
 /:$/&&!f{sub(/:$/,"");s=$0;f=1;next}
 NF&&f{ print s"/"$0 }'

build.gradle

@@ -15,7 +15,6 @@ plugins {
 }
 apply plugin: 'nebula-aggregate-javadocs'
 
-
 allprojects {
     apply plugin: 'java'
     apply plugin: 'application'
@@ -37,7 +36,7 @@ allprojects {
         testCompile group: 'junit', name: 'junit', version: '4.12'
     }
 
-    version = '1.1.0'
+    version = '1.1.1'
 
     compileJava {
         options.compilerArgs << "-g"
@@ -77,7 +76,8 @@ allprojects {
     }
 }
 
-def os = osdetector.classifier.replace("osx", "macosx").replace("windows-x86_32", "windows-x86")
+def os = osdetector.classifier.replace("osx", "macosx").replace("x86_32", "x86")
+def arch = osdetector.arch.replace("x86_64", "x64")
 
 project(":core") {
     apply plugin: 'java'
@@ -215,6 +215,15 @@ project(":ui") {
     }
 
     javafx {
+        profiles {
+            linux {
+                category = 'Development'
+                bundleArguments = [
+                        // for DEB bundles
+                        'email': 'wpilib@wpi.edu', // This is the email used for the deb maintainer field.
+                ]
+            }
+        }
         appID = 'GRIP'
         appName = 'GRIP'
         mainClass = "edu.wpi.grip.ui.Main"
@@ -227,6 +236,16 @@ project(":ui") {
         jvmArgs = ["-XX:-OmitStackTraceInFastThrow"]
     }
     mainClassName = javafx.mainClass
+
+    // The JavaFX plugin does not provide a way to change the installer artifact's name without changing the appName or appID,
+    // so instead, we simply rename the artifact to append the architecture (x86 or x64)
+    jfxDeploy.doLast {
+        def filet = fileTree(dir: 'build/distributions', include: "${javafx.appName}-${version}.*")
+        filet.each { File f ->
+            def f2 = new File(f.getParentFile(), "${f.getName().replace("${version}", "${version}-${arch}")}")
+            f.renameTo(f2)
+        }
+    }
 }
 
 /*

ui/src/main/java/edu/wpi/grip/ui/DeployController.java

@@ -27,6 +27,7 @@
 import java.io.InputStreamReader;
 import java.io.InterruptedIOException;
 import java.io.StringWriter;
+import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.util.Optional;
 import java.util.logging.Level;
@@ -42,6 +43,8 @@
 public class DeployController {
     private final static String GRIP_JAR = "grip.jar";
     private final static String PROJECT_FILE = "project.grip";
+    private final static String LOCAL_GRIP_JAR = URLDecoder.decode(
+            Project.class.getProtectionDomain().getCodeSource().getLocation().getPath());
 
     @FXML private TextField address;
     @FXML private TextField user;
@@ -125,7 +128,7 @@ private void deploy(String address, String user, String password, String javaHom
         setStatusAsync("Connecting to " + address, false);
 
         try (SSHClient ssh = new SSHClient()) {
-            ssh.loadKnownHosts();
+            ssh.addHostKeyVerifier((hostname, port, key) -> true);
             ssh.connect(address);
             ssh.authPassword(user, password);
 
@@ -149,8 +152,7 @@ public StreamCopier.Listener file(String name, long size) {
 
             // Upload the GRIP core JAR and the serialized project to the robot
             scp.upload(new StringInMemoryFile(PROJECT_FILE, projectWriter.toString()), deployDir + "/");
-            scp.upload(new FileSystemFile(Project.class.getProtectionDomain().getCodeSource().getLocation().getPath()),
-                    deployDir + "/" + GRIP_JAR);
+            scp.upload(new FileSystemFile(LOCAL_GRIP_JAR), deployDir + "/" + GRIP_JAR);
 
             // Stop the pipeline before running it remotely, so the two instances of GRIP don't try to publish to the
             // same NetworkTables keys.
@@ -160,7 +162,8 @@ public StreamCopier.Listener file(String name, long size) {
             setStatusAsync("Running GRIP", false);
             Session session = ssh.startSession();
             session.allocateDefaultPTY();
-            Session.Command cmd = session.exec(javaHome + "/bin/java -jar " + deployDir + "/" + GRIP_JAR + " " + deployDir + "/" + PROJECT_FILE);
+            Session.Command cmd = session.exec(javaHome + "/bin/java -jar " + deployDir + "/" + GRIP_JAR + "' '"
+                    + deployDir + "/" + PROJECT_FILE + "'");
 
             LineReader inputReader = new LineReader(new InputStreamReader(cmd.getInputStream()));
             while (isNotCanceled()) {