Merge branch 'master' into LOC_3656_log_exception_data

Author: edwinclement08

.gitignore

@@ -7,3 +7,5 @@ MANIFEST
 venv
 build
 browserstack_local.egg-info
+build
+browserstack_local.egg-info

browserstack/local.py

@@ -5,6 +5,10 @@
 from browserstack.bserrors import BrowserStackLocalError
 
 logger = logging.getLogger(__name__)
+try:
+    from importlib.metadata import version as package_version, PackageNotFoundError
+except:
+    import pkg_resources
 
 class Local:
   def __init__(self, key=None, binary_path=None, **kwargs):
@@ -22,8 +26,30 @@ def __xstr(self, key, value):
     else:
       return ['-' + key, value]
 
+  def get_package_version(self):
+    name = "browserstack-local"
+    version = 'None'
+    use_fallback = False
+    try:
+        temp = package_version
+    except NameError: # Only catch if package_version is not defined(and not other errors)
+        use_fallback = True
+
+    if use_fallback:
+        try:
+            version = pkg_resources.get_distribution(name).version
+        except pkg_resources.DistributionNotFound:
+            version = 'None'
+    else:
+        try:
+            version = package_version(name)
+        except PackageNotFoundError:
+            version = 'None'
+
+    return version
+
   def _generate_cmd(self):
-    cmd = [self.binary_path, '-d', 'start', '-logFile', self.local_logfile_path, "-k", self.key]
+    cmd = [self.binary_path, '-d', 'start', '-logFile', self.local_logfile_path, "-k", self.key, '--source', 'python:' + self.get_package_version()]
     for o in self.options.keys():
       if self.options.get(o) is not None:
         cmd = cmd + self.__xstr(o, self.options.get(o))
@@ -55,7 +81,11 @@ def start(self, **kwargs):
     if "onlyCommand" in kwargs and kwargs["onlyCommand"]:
       return
 
-    self.proc = subprocess.Popen('ls', stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+    if 'source' in self.options:
+      del self.options['source']
+
+    self.proc = subprocess.Popen(self._generate_cmd(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     (out, err) = self.proc.communicate()
 
     os.system('echo "" > "'+ self.local_logfile_path +'"')

browserstack/local_binary.py

@@ -1,4 +1,4 @@
-import platform, os, sys, zipfile, stat, tempfile, re, subprocess
+import platform, os, sys, stat, tempfile, re, subprocess
 from browserstack.bserrors import BrowserStackLocalError
 
 try:
@@ -12,15 +12,18 @@ def __init__(self):
     self.is_windows = False
     osname = platform.system()
     if osname == 'Darwin':
-      self.http_path = "https://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal-darwin-x64"
+      self.http_path = "https://bstack-local-prod.s3.amazonaws.com/BrowserStackLocal-darwin-x64"
     elif osname == 'Linux':
-      if is_64bits:
-        self.http_path = "https://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal-linux-x64"
+      if self.is_alpine():
+        self.http_path = "https://bstack-local-prod.s3.amazonaws.com/BrowserStackLocal-alpine"
       else:
-        self.http_path = "https://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal-linux-ia32"
+        if is_64bits:
+          self.http_path = "https://bstack-local-prod.s3.amazonaws.com/BrowserStackLocal-linux-x64"
+        else:
+          self.http_path = "https://bstack-local-prod.s3.amazonaws.com/BrowserStackLocal-linux-ia32"
     else:
       self.is_windows = True
-      self.http_path = "https://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal.exe"
+      self.http_path = "https://bstack-local-prod.s3.amazonaws.com/BrowserStackLocal.exe"
 
     self.ordered_paths = [
       os.path.join(os.path.expanduser('~'), '.browserstack'),
@@ -29,6 +32,12 @@ def __init__(self):
     ]
     self.path_index = 0
 
+  def is_alpine(self):
+    grepOutput = subprocess.run("gfrep -w NAME /etc/os-release", capture_output=True, shell=True)
+    if grepOutput.stdout.decode('utf-8').find('Alpine') > -1:
+      return True
+    return False
+
   def __make_path(self, dest_path):
     try:
       if not os.path.exists(dest_path):