Merge pull request #75 from browserstack/LOC_4239_download_custom_path

LOC 4239 Download binary at custom path if not present already

Author: VSood1104

README.md

@@ -11,7 +11,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.browserstack</groupId>
     <artifactId>browserstack-local-java</artifactId>
-    <version>1.0.9</version>
+    <version>1.1.0</version>
 </dependency>
 ```
 

browserstack.err

@@ -0,0 +1 @@
+[object Object]

pom.xml

@@ -3,7 +3,7 @@
     <groupId>com.browserstack</groupId>
     <artifactId>browserstack-local-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.9-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
 
     <name>browserstack-local-java</name>
     <description>Java bindings for BrowserStack Local</description>

src/main/java/com/browserstack/local/Local.java

@@ -23,7 +23,7 @@ public class Local {
     private LocalProcess proc = null;
 
     // Current version of binding package, used for --source option of binary
-    private final String packageVersion = "1.0.9";
+    private final String packageVersion = "1.1.0";
     private final Map<String, String> parameters;
     private final Map<String, String> avoidValueParameters;
 
@@ -53,12 +53,13 @@ public Local() {
      */
     public void start(Map<String, String> options) throws Exception {
         startOptions = options;
+        LocalBinary lb;
         if (options.get("binarypath") != null) {
-            binaryPath = options.get("binarypath");
+            lb = new LocalBinary(options.get("binarypath"));
         } else {
-            LocalBinary lb = new LocalBinary();
-            binaryPath = lb.getBinaryPath();
+            lb = new LocalBinary("");
         }
+        binaryPath = lb.getBinaryPath();
 
         makeCommand(options, "start");
 
@@ -106,12 +107,13 @@ public void stop() throws Exception {
     * @param options Options supplied for the Local instance
     **/
     public void stop(Map<String, String> options) throws Exception {
+        LocalBinary lb;
         if (options.get("binarypath") != null) {
-            binaryPath = options.get("binarypath");
+            lb = new LocalBinary(options.get("binarypath"));
         } else {
-            LocalBinary lb = new LocalBinary();
-            binaryPath = lb.getBinaryPath();
+            lb = new LocalBinary("");
         }
+        binaryPath = lb.getBinaryPath();
         makeCommand(options, "stop");
         proc = runCommand(command);
         proc.waitFor();

src/main/java/com/browserstack/local/LocalBinary.java

@@ -24,9 +24,13 @@ class LocalBinary {
             System.getProperty("java.io.tmpdir")
     };
 
-    LocalBinary() throws LocalException {
+    LocalBinary(String path) throws LocalException {
         initialize();
-        getBinary();
+        if (path != "") {
+            getBinaryOnPath(path);
+        } else {
+            getBinary();
+        }
         checkBinary();
     }
 
@@ -111,6 +115,14 @@ private boolean validateBinary() throws LocalException{
         }
     }
 
+    private void getBinaryOnPath(String path) throws LocalException {
+        binaryPath = path;
+
+        if (!new File(binaryPath).exists()) {
+            downloadBinary(binaryPath, true);
+        }
+    }
+
     private void getBinary() throws LocalException {
         String destParentDir = getAvailableDirectory();
         binaryPath = destParentDir + "/BrowserStackLocal";
@@ -120,7 +132,7 @@ private void getBinary() throws LocalException {
         }
 
         if (!new File(binaryPath).exists()) {
-            downloadBinary(destParentDir);
+            downloadBinary(destParentDir, false);
         }
     }
 
@@ -147,23 +159,26 @@ private boolean makePath(String path) {
         }
     }
 
-    private void downloadBinary(String destParentDir) throws LocalException {
+    private void downloadBinary(String destParentDir, Boolean custom) throws LocalException {
         try {
-            if (!new File(destParentDir).exists())
-                new File(destParentDir).mkdirs();
-
-            URL url = new URL(httpPath);
-            String source = destParentDir + "/BrowserStackLocal";
-            if (isOSWindows) {
-                source += ".exe";
+            String source = destParentDir;
+            if (!custom) {
+                if (!new File(destParentDir).exists())
+                    new File(destParentDir).mkdirs();
+
+                source = destParentDir + "/BrowserStackLocal";
+                if (isOSWindows) {
+                    source += ".exe";
+                }
             }
+            URL url = new URL(httpPath);
 
             File f = new File(source);
             FileUtils.copyURLToFile(url, f);
 
             changePermissions(binaryPath);
         } catch (Exception e) {
-            throw new LocalException("Error trying to download BrowserStackLocal binary");
+            throw new LocalException("Error trying to download BrowserStackLocal binary: " + e.getMessage());
         }
     }