From 8714cc6ae795be9932854d4a8b78a39f5f51ecea Mon Sep 17 00:00:00 2001
From: Harish Ved <ved.harish3@gmail.com>
Date: Mon, 12 Sep 2016 20:23:10 +0530
Subject: [PATCH 1/3] Avoid boolean

---
 .../java/com/browserstack/local/Local.java    | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/browserstack/local/Local.java b/src/main/java/com/browserstack/local/Local.java
index 001c83a..b2e08b6 100644
--- a/src/main/java/com/browserstack/local/Local.java
+++ b/src/main/java/com/browserstack/local/Local.java
@@ -23,22 +23,24 @@ public class Local {
     private LocalProcess proc = null;
 
     private final Map<String, String> parameters;
+    private final Map<String, String> avoidValueParameters;
 
     public Local() {
+        avoidValueParameters = new HashMap<String, String>();
+        avoidValueParameters.put("v", "-vvv");
+        avoidValueParameters.put("force", "-force");
+        avoidValueParameters.put("forcelocal", "-forcelocal");
+        avoidValueParameters.put("onlyAutomate", "-onlyAutomate");
+        avoidValueParameters.put("forceproxy", "-forceproxy");
+
         parameters = new HashMap<String, String>();
-        parameters.put("v", "-vvv");
         parameters.put("f", "-f");
-        parameters.put("force", "-force");
         parameters.put("only", "-only");
-        parameters.put("forcelocal", "-forcelocal");
         parameters.put("localIdentifier", "-localIdentifier");
-        parameters.put("onlyAutomate", "-onlyAutomate");
         parameters.put("proxyHost", "-proxyHost");
         parameters.put("proxyPort", "-proxyPort");
         parameters.put("proxyUser", "-proxyUser");
         parameters.put("proxyPass", "-proxyPass");
-        parameters.put("forceproxy", "-forceproxy");
-        parameters.put("hosts", "-hosts");
     }
 
     /**
@@ -124,13 +126,17 @@ private void makeCommand(Map<String, String> options, String opCode) {
             if (IGNORE_KEYS.contains(parameter)) {
                 continue;
             }
-            if (parameters.get(parameter) != null) {
-                command.add(parameters.get(parameter));
+            if (avoidValueParameters.get(parameter) != null && opt.getValue().trim().toLowerCase() != "false") {
+                command.add(avoidValueParameters.get(parameter));
             } else {
-                command.add("-" + parameter);
-            }
-            if (opt.getValue() != null) {
-                command.add(opt.getValue().trim());
+                if (parameters.get(parameter) != null) {
+                    command.add(parameters.get(parameter));
+                } else {
+                    command.add("-" + parameter);
+                }
+                if (opt.getValue() != null) {
+                    command.add(opt.getValue().trim());
+                }
             }
         }
     }

From 5a133831ae87149baae504d4b6f0baf8f27aa9ce Mon Sep 17 00:00:00 2001
From: Harish Ved <ved.harish3@gmail.com>
Date: Mon, 12 Sep 2016 20:42:18 +0530
Subject: [PATCH 2/3] update plugin version

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ed5a1ac..ea05cdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.3</version>
+                        <version>1.6.7</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>
@@ -130,7 +130,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.3</version>
+                <version>1.6.7</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>

From 0d7b046623aa4690aac6d22bc67ea9397836004d Mon Sep 17 00:00:00 2001
From: Vibhaj Rajan <vibhaj8@gmail.com>
Date: Sun, 18 Sep 2016 17:43:23 +0530
Subject: [PATCH 3/3] fixes api mismatch error

---
 src/main/java/com/browserstack/local/Local.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/browserstack/local/Local.java b/src/main/java/com/browserstack/local/Local.java
index b2e08b6..b46210f 100644
--- a/src/main/java/com/browserstack/local/Local.java
+++ b/src/main/java/com/browserstack/local/Local.java
@@ -77,7 +77,7 @@ public void start(Map<String, String> options) throws Exception {
 
             JSONObject obj = new JSONObject(!stdout.equals("") ? stdout : stderr);
             if(!obj.getString("state").equals("connected")){
-                throw new LocalException(obj.getString("message"));
+                throw new LocalException(obj.getJSONObject("message").getString("message"));
             }
             else {
                 pid = obj.getInt("pid");