added dynamic args

Author: tr4n2uil

browserstack/local.py

@@ -3,37 +3,42 @@
 from browserstack.bserrors import BrowserStackLocalError
 
 class Local:
-  def __init__(self, key=None, binary_path=None):
-    self.options = {
-      'key': key,
-      'logfile_flag': '-logFile',
-      'logfile_path': os.path.join(os.getcwd(), 'local.log')
-    }
-    self.local_folder_path = None
-    self.local_logfile_path = self.options['logfile_path']
+  def __init__(self, key=os.environ['BROWSERSTACK_ACCESS_KEY'], binary_path=None):
+    self.key = key
+    self.options = None
+    self.local_logfile_path = os.path.join(os.getcwd(), 'local.log')
 
-  def __xstr(self, obj):
-    if obj is None:
-      return ''
-    return str(obj)
+  def __xstr(self, key, value):
+    if key is None:
+      return ['']
+    if str(value).lower() == "true":
+      return ['-' + key]
+    else:
+      return ['-' + key, value]
 
   def _generate_cmd(self):
-    options_order = ['logfile_flag', 'logfile_path', 'folder_flag', 'key', 'folder_path', 'forcelocal', 'local_identifier', 'only', 'only_automate', 'proxy_host', 'proxy_port', 'proxy_user', 'proxy_pass', 'forceproxy', 'force', 'verbose', 'hosts']
-    cmd = [self.__xstr(self.options.get(o)) for o in options_order if self.options.get(o) is not None]
-    return [self.binary_path] + cmd
+    cmd = [self.binary_path, '-logFile', self.local_logfile_path, self.key]
+    for o in self.options.keys():
+      if self.options.get(o) is not None:
+        cmd = cmd + self.__xstr(o, self.options.get(o))
+    return cmd
 
   def start(self, **kwargs):
-    for key, value in kwargs.items():
-      self.__add_arg(key, value)
-    
+    self.options = kwargs
+
     if 'binarypath' in self.options:
       self.binary_path = binary_path
     else:
       self.binary_path = LocalBinary().get_binary()
 
+    if 'logfile' in self.options:
+      self.local_logfile_path = self.options['logfile']
+      del self.options['logfile']
+
     if "onlyCommand" in kwargs and kwargs["onlyCommand"]: 
       return
 
+    print self._generate_cmd()
     self.proc = subprocess.Popen(self._generate_cmd(), stdout=subprocess.PIPE)
     self.stderr = self.proc.stderr
 
@@ -56,43 +61,6 @@ def isRunning(self):
       return True if self.proc.poll() is None else False
     return False
 
-  def __add_arg(self, key, value):
-    if key == 'verbose' and value:
-      self.options['verbose'] = '-v'
-    elif key == 'force' and value:
-      self.options['force'] = '-force'
-    elif key == 'only' and value:
-      self.options['only'] = '-only'
-    elif key == 'onlyAutomate' and value:
-      self.options['only_automate'] = '-onlyAutomate'
-    elif key == 'forcelocal' and value:
-      self.options['forcelocal'] = '-forcelocal'
-    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 == 'proxyHost':
-      self.options['proxy_host'] = '-proxyHost ' + str(value)
-    elif key == 'proxyPort':
-      self.options['proxy_port'] = '-proxyPort ' + str(value)
-    elif key == 'proxyUser':
-      self.options['proxy_user'] = '-proxyUser ' + str(value)
-    elif key == 'proxyPass':
-      self.options['proxy_pass'] = '-proxyPass ' + str(value)
-    elif key == 'hosts':
-      self.options['hosts'] = str(value)
-    elif key == 'forceproxy' and value:
-      self.options['forceproxy'] = '-forceproxy'
-    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')
-
   def stop(self):
     try:
       self.proc.terminate()

tests/test_local.py

@@ -13,7 +13,7 @@ def test_start_local(self):
     self.assertNotEqual(self.local.proc.pid, 0)
 
   def test_verbose(self):
-    self.local.start(verbose=True, onlyCommand=True)
+    self.local.start(v=True, onlyCommand=True)
     self.assertIn('-v', self.local._generate_cmd())
 
   def test_local_folder(self):
@@ -33,23 +33,37 @@ def test_force_local(self):
     self.local.start(forcelocal=True, onlyCommand=True)
     self.assertIn('-forcelocal', self.local._generate_cmd())
 
+  def test_custom_boolean_argument(self):
+    self.local.start(boolArg1=True, boolArg2=True, onlyCommand=True)
+    self.assertIn('-boolArg1', self.local._generate_cmd())
+    self.assertIn('-boolArg2', self.local._generate_cmd())
+
+  def test_custom_keyval(self):
+    self.local.start(customKey1="custom value1", customKey2="custom value2", onlyCommand=True)
+    self.assertIn('-customKey1', self.local._generate_cmd())
+    self.assertIn('custom value1', self.local._generate_cmd())
+    self.assertIn('-customKey2', self.local._generate_cmd())
+    self.assertIn('custom value2', self.local._generate_cmd())
+
   def test_proxy(self):
     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())
+    self.assertIn('-proxyHost', self.local._generate_cmd())
+    self.assertIn('localhost', self.local._generate_cmd())
+    self.assertIn('-proxyPort', self.local._generate_cmd())
+    self.assertIn(2000, self.local._generate_cmd())
+    self.assertIn('-proxyUser', self.local._generate_cmd())
+    self.assertIn('hello', self.local._generate_cmd())
+    self.assertIn('-proxyPass', self.local._generate_cmd())
+    self.assertIn('test123', self.local._generate_cmd())
 
   def test_force_proxy(self):
     self.local.start(forceproxy=True, onlyCommand=True)
     self.assertIn('-forceproxy', self.local._generate_cmd())
 
   def test_local_identifier(self):
     self.local.start(localIdentifier='mytunnel', onlyCommand=True)
-    self.assertIn('-localIdentifier mytunnel', self.local._generate_cmd())
-
-  def test_invalid_option(self):
-    self.assertRaises(BrowserStackLocalError, lambda: self.local.start(random=True))
+    self.assertIn('-localIdentifier', self.local._generate_cmd())
+    self.assertIn('mytunnel', self.local._generate_cmd())
 
   def test_running(self):
     self.assertFalse(self.local.isRunning())