added log file

Author: tr4n2uil

src/main/java/com/BrowserStack/BrowserStackLocalException.java

@@ -1,10 +1,7 @@
 package com.BrowserStack;
 
-class BrowserStackLocalException extends Exception
-
-{
-	BrowserStackLocalException(String message)
-	{
+class BrowserStackLocalException extends Exception {
+	BrowserStackLocalException(String message){
 		super(message);
 	}
 }

src/main/java/com/BrowserStack/Local.java

@@ -8,41 +8,62 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
 
 class Local {
 
   Process BrowserStackLocal = null;
   List<String> command;
+  String logFilePath;
   HashMap<String, String> parameters;
 
   void start(HashMap<String,String> options) throws Exception {
-    LocalBinary lb = new LocalBinary();
     command = new ArrayList<String>();
-    command.add(lb.binary_path); 
-    command.add(options.get("key"));
+    
+    if(options.get("binarypath") != null){
+      command.add(options.get("binarypath")); 
+    }
+    else {
+      LocalBinary lb = new LocalBinary();
+      command.add(lb.binary_path);
+    }
+      
+    logFilePath = options.get("logfile") == null ? (System.getProperty("user.dir") + "/local.log") :  options.get("logfile");
+    command.add("-logFile");
+    command.add(logFilePath);
 
+    command.add(options.get("key"));
     makeCommand(options);
 
     if (BrowserStackLocal == null){
       ProcessBuilder processBuilder = new ProcessBuilder(command);
 
-      System.out.println("Setting up Local Testing connection...");
+      if((new File(logFilePath)).exists()){
+        FileWriter f = new FileWriter(logFilePath);
+        f.write("");
+        f.close();
+      }
+
       BrowserStackLocal = processBuilder.start();
-      BufferedReader reader = new BufferedReader(new InputStreamReader(BrowserStackLocal.getInputStream()));
+      FileReader f = new FileReader(logFilePath);
+      BufferedReader reader = new BufferedReader(f);
       String string;
       int j = 0;
-      while ((string = reader.readLine()) != null) {
+      while (true) {
+        string = reader.readLine();
+        if(string == null) continue;
+
         if (string.equalsIgnoreCase("Press Ctrl-C to exit")) {
-          System.out.println("Local Testing connection has been established.");
+          f.close();
           break; 
         }
 
         if (string.contains("*** Error")){
+          f.close();
           throw new BrowserStackLocalException(string);
         }
-        if (j++ > 20) {
-          throw new BrowserStackLocalException("Could not start BrowserStackLocal"); 
-        }
       }
 
     }
@@ -51,7 +72,6 @@ void start(HashMap<String,String> options) throws Exception {
   void stop(){
     if (BrowserStackLocal != null) {
       BrowserStackLocal.destroy();
-      System.out.println("Disconnected successfully");
     }
   }
 
@@ -80,7 +100,6 @@ void init(){
     parameters.put("proxyUser", "-proxyUser");
     parameters.put("proxyPass", "-proxyPass");
     parameters.put("hosts", "-hosts");
-    parameters.put("logfile", "-logfile");
   }
 
   Local() throws Exception {

src/main/java/com/BrowserStack/LocalBinary.java

@@ -41,7 +41,7 @@ else if (osname.contains("Linux") && arch.contains("64"))
       else
         http_path="https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-ia32.zip";
   }
-  
+
   Boolean getBinary() throws Exception {
     dest_parent_dir = getAvailableDirectory();
 
@@ -56,7 +56,7 @@ Boolean getBinary() throws Exception {
       return downloadBinary(dest_parent_dir);
 
   }
-  
+
   String getAvailableDirectory() throws Exception {
     int i=0;
     while(i<orderedPaths.length){
@@ -74,7 +74,6 @@ boolean makePath(String path) {
       if (!new File(path).exists())
         new File(path).mkdirs();
       return true;
-      
     }
     catch (Exception e){
       return false;
@@ -86,33 +85,28 @@ Boolean downloadBinary(String dest_parent_dir) throws BrowserStackLocalException
       if (!new File(dest_parent_dir).exists())
         new File(dest_parent_dir).mkdirs();
 
-      System.out.println("Downloading Local Testing binaries...");
       URL url = new URL(http_path);
       String source = dest_parent_dir + "/Download.zip";
       File f = new File(source);
       FileUtils.copyURLToFile(url, f);
 
-      System.out.println("Unzipping...");
       unzipFile(source, dest_parent_dir);
-      System.out.println("Changing permissions...");
       changePermissions(binary_path);
-      System.out.println("Download complete.");
 
       return true;
     }
     catch (Exception e){
-      System.out.println(e);
       throw new BrowserStackLocalException("Error trying to download BrowserStackLocal binary");
     }
   }
 
   void unzipFile(String source, String dest) {
     try {
-         ZipFile zipFile = new ZipFile(source);
-         zipFile.extractAll(dest);    
+      ZipFile zipFile = new ZipFile(source);
+      zipFile.extractAll(dest);    
     } 
     catch (ZipException e) {
-        e.printStackTrace();
+      e.printStackTrace();
     }
   }