updated options

Author: tr4n2uil

README.md

@@ -34,7 +34,7 @@ pip install browserstack-local
 * `localIdentifier`: If doing simultaneous multiple local testing connections, set this uniquely for different processes
 * `hosts`: List of hosts and ports where Local must be enabled for eg. localhost,3000,1,localhost,3001,0
 * `logfile`: Path to file where Local logs be saved to
-* `binaryPath`: Optional path to Local binary
+* `binarypath`: Optional path to Local binary
 
 
 ## Tests

browserstack/local.py

@@ -4,10 +4,6 @@
 
 class Local:
   def __init__(self, key=None, binary_path=None):
-    if binary_path is None:
-      self.binary_path = LocalBinary().get_binary()
-    else:
-      self.binary_path = binary_path
     self.options = {
       'key': key,
       'logfile_flag': '-logFile',
@@ -29,6 +25,12 @@ def _generate_cmd(self):
   def start(self, **kwargs):
     for key, value in kwargs.iteritems():
       self.__add_arg(key, value)
+    
+    if self.options['binary_path'] is None:
+      self.binary_path = LocalBinary().get_binary()
+    else:
+      self.binary_path = binary_path
+
     if "onlyCommand" in kwargs and kwargs["onlyCommand"]: 
       return
 
@@ -65,25 +67,27 @@ def __add_arg(self, key, value):
       self.options['only_automate'] = '-onlyAutomate'
     elif key == 'forcelocal' and value:
       self.options['forcelocal'] = '-forcelocal'
-    elif key == 'local_identifier':
+    elif key == 'localIdentifier':
       self.options['local_identifier'] = '-localIdentifier ' + str(value)
     elif key == 'f':
       self.options['folder_flag'] = '-f'
       self.options['folder_path'] = str(value)
-    elif key == 'proxy_host':
+    elif key == 'proxyHost':
       self.options['proxy_host'] = '-proxyHost ' + str(value)
-    elif key == 'proxy_port':
+    elif key == 'proxyPort':
       self.options['proxy_port'] = '-proxyPort ' + str(value)
-    elif key == 'proxy_user':
+    elif key == 'proxyUser':
       self.options['proxy_user'] = '-proxyUser ' + str(value)
-    elif key == 'proxy_pass':
+    elif key == 'proxyPass':
       self.options['proxy_pass'] = '-proxyPass ' + str(value)
     elif key == 'hosts':
       self.options['hosts'] = str(value)
     elif key == 'logfile':
       self.options['logfile_flag'] = '-logFile'
       self.options['logfile'] = str(value)
       self.local_logfile_path = str(value)
+    elif key == 'binarypath':
+      self.options['binarypath'] = str(value)
     elif key != 'onlyCommand':
       raise BrowserStackLocalError('Attempted to pass invalid option to binary')
 

tests/test_local.py

@@ -26,22 +26,22 @@ def test_force_kill(self):
     self.assertIn('-force', self.local._generate_cmd())
 
   def test_only_automate(self):
-    self.local.start(only_automate=True, onlyCommand=True)
+    self.local.start(onlyAutomate=True, onlyCommand=True)
     self.assertIn('-onlyAutomate', self.local._generate_cmd())
 
   def test_force_local(self):
     self.local.start(forcelocal=True, onlyCommand=True)
     self.assertIn('-forcelocal', self.local._generate_cmd())
 
   def test_proxy(self):
-    self.local.start(proxy_host='localhost', proxy_port=2000, proxy_user='hello', proxy_pass='test123', onlyCommand=True)
+    self.local.start(proxyHost='localhost', proxyPort=2000, proxyUser='hello', proxyPass='test123', onlyCommand=True)
     self.assertIn('-proxyHost localhost', self.local._generate_cmd())
     self.assertIn('-proxyPort 2000', self.local._generate_cmd())
     self.assertIn('-proxyUser hello', self.local._generate_cmd())
     self.assertIn('-proxyPass test123', self.local._generate_cmd())
 
   def test_local_identifier(self):
-    self.local.start(local_identifier='mytunnel', onlyCommand=True)
+    self.local.start(localIdentifier='mytunnel', onlyCommand=True)
     self.assertIn('-localIdentifier mytunnel', self.local._generate_cmd())
 
   def test_invalid_option(self):