Adaptation for browserup proxy

Author: dmitry-viskov

Diff for: .gitignore

@@ -3,7 +3,13 @@
 *.pyc
 dist/
 build/
+venv/
+tools/
 *.egg-info/
 .cache/
-bmp.log
+.pytest_cache/
+bup.log
 .idea/
+.DS_Store
+geckodriver.log
+server.log

Diff for: .travis.yml

@@ -17,6 +17,7 @@ python:
   - 3.3
   - 3.4
   - 3.5
+  - 3.6
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start

Diff for: CONTRIBUTING.md

@@ -1,26 +1,27 @@
 #!/usr/bin/env bash
+
 if [ "$(uname)" == "Darwin" ]; then
     echo "We're on a MAC!"
    chromeDriver="chromedriver_mac64.zip"
-   geckoDriverVersion="v0.13.0"
+   geckoDriverVersion="v0.24.0"
    geckoDriver="geckodriver-$geckoDriverVersion-macos.tar.gz"
 else
     echo "We're not on a MAC!"
    chromeDriver="chromedriver_linux64.zip"
-   geckoDriverVersion="v0.14.0"
+   geckoDriverVersion="v0.24.0"
    geckoDriver="geckodriver-$geckoDriverVersion-linux64.tar.gz"
 fi
 rm -rf tools
 mkdir -p tools && \
 cd tools && \
-wget https://github.com/lightbody/browsermob-proxy/releases/download/browsermob-proxy-2.1.4/browsermob-proxy-2.1.4-bin.zip && \
-unzip -o browsermob-proxy-2.1.4-bin.zip && \
-rm -rf browsermob-proxy*.zip* && \
-wget http://selenium-release.storage.googleapis.com/3.0/selenium-server-standalone-3.0.1.jar && \
+wget https://github.com/browserup/browserup-proxy/releases/download/v1.1.0/browserup-proxy-1.1.0.zip && \
+unzip -o browserup-proxy-1.1.0.zip && \
+rm -rf browserup-proxy*.zip* && \
+wget https://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar && \
 wget https://github.com/mozilla/geckodriver/releases/download/${geckoDriverVersion}/${geckoDriver} && \
 tar zxf ${geckoDriver} && \
 rm -rf ${geckoDriver}* && \
-wget https://chromedriver.storage.googleapis.com/2.27/${chromeDriver} && \
+wget https://chromedriver.storage.googleapis.com/74.0.3729.6/${chromeDriver} && \
 unzip ${chromeDriver} && \
 rm -rf ${chromeDriver}* && \
-cd .. 
+cd ..

Diff for: History.md

@@ -0,0 +1,6 @@
+__version__ = '0.1.0'
+
+from .server import RemoteServer, Server
+from .client import Client
+
+__all__ = ['RemoteServer', 'Server', 'Client']

Diff for: bootstrap.sh

@@ -13,7 +13,7 @@ def __init__(self, url, params=None, options=None):
         Initialises a new Client object
 
 
-        :param url: This is where the BrowserMob Proxy lives
+        :param url: This is where the BrowserUp Proxy lives
         :param params: URL query (for example httpProxy and httpsProxy vars)
         :param options: Dictionary that can contain the port of an existing
                         proxy to use (for example 'existing_proxy_port_to_use')
@@ -33,7 +33,7 @@ def __init__(self, url, params=None, options=None):
             try:
                 jcontent = json.loads(content)
             except Exception as e:
-                raise Exception("Could not read Browsermob-Proxy json\n"
+                raise Exception("Could not read Browserup-Proxy json\n"
                                 "Another server running on this port?\n%s..." % content[:512])
             self.port = jcontent['port']
         url_parts = self.host.split(":")
@@ -68,7 +68,7 @@ def webdriver_proxy(self):
     def add_to_capabilities(self, capabilities):
         """
         Adds an 'proxy' entry to a desired capabilities dictionary with the
-        BrowserMob proxy information
+        BrowserUp proxy information
 
 
         :param capabilities: The Desired capabilities object from Selenium WebDriver
@@ -82,7 +82,7 @@ def add_to_capabilities(self, capabilities):
     def add_to_webdriver_capabilities(self, capabilities):
         self.add_to_capabilities(capabilities)
 
-    # browsermob proxy api
+    # browserup proxy api
     @property
     def proxy_ports(self):
         """
@@ -108,7 +108,7 @@ def new_har(self, ref=None, options=None, title=None):
         This sets a new HAR to be recorded
 
         :param str ref: A reference for the HAR. Defaults to None
-        :param dict options: A dictionary that will be passed to BrowserMob
+        :param dict options: A dictionary that will be passed to BrowserUp
             Proxy with specific keywords. Keywords are:
 
                 - captureHeaders: Boolean, capture headers
@@ -200,8 +200,8 @@ def response_interceptor(self, js):
         """
         Executes the java/js code against each response
         `HttpRequest request <https://netty.io/4.1/api/io/netty/handler/codec/http/HttpRequest.html>`_,
-        `HttpMessageContents contents <https://raw.githubusercontent.com/lightbody/browsermob-proxy/master/browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java>`_,
-        `HttpMessageInfo messageInfo <https://raw.githubusercontent.com/lightbody/browsermob-proxy/master/browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java>`_
+        `HttpMessageContents contents <https://raw.githubusercontent.com/browserup/browserup-proxy/master/browserup-proxy-core/src/main/java/com/browserup/bup/util/HttpMessageContents.java>`_,
+        `HttpMessageInfo messageInfo <https://raw.githubusercontent.com/browserup/browserup-proxy/master/browserup-proxy-core/src/main/java/com/browserup/bup/util/HttpMessageInfo.java>`_
         are available objects to interact with.
         :param str js: the js/java code to execute
         """
@@ -214,8 +214,8 @@ def request_interceptor(self, js):
         """
         Executes the java/js code against each response
         `HttpRequest request <https://netty.io/4.1/api/io/netty/handler/codec/http/HttpRequest.html>`_,
-        `HttpMessageContents contents <https://raw.githubusercontent.com/lightbody/browsermob-proxy/master/browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageContents.java>`_,
-        `HttpMessageInfo messageInfo <https://raw.githubusercontent.com/lightbody/browsermob-proxy/master/browsermob-core/src/main/java/net/lightbody/bmp/util/HttpMessageInfo.java>`_
+        `HttpMessageContents contents <https://raw.githubusercontent.com/browserup/browserup-proxy/master/browserup-proxy-core/src/main/java/com/browserup/bup/util/HttpMessageContents.java>`_,
+        `HttpMessageInfo messageInfo <https://raw.githubusercontent.com/browserup/browserup-proxy/master/browserup-proxy-core/src/main/java/com/browserup/bup/util/HttpMessageInfo.java>`_
         are available objects to interact with.
         :param str js: the js/java code to execute
         """
@@ -293,7 +293,7 @@ def remap_hosts(self, address=None, ip_address=None, hostmap=None):
         :param str address: url that you wish to remap
         :param str ip_address: IP Address that will handle all traffic for
             the address passed in
-        :param **hostmap: Other hosts to be added as keyword arguments
+        :param hostmap: Other hosts to be added as keyword arguments
         """
         hostmap = hostmap if hostmap is not None else {}
         if (address is not None and ip_address is not None):
@@ -347,13 +347,3 @@ def clear_all_rewrite_url_rules(self):
 
         r = requests.delete('%s/proxy/%s/rewrite' % (self.host, self.port))
         return r.status_code
-
-    def retry(self, retry_count):
-        """
-        Retries. No idea what its used for, but its in the API...
-
-        :param int retry_count: the number of retries
-        """
-        r = requests.put('%s/proxy/%s/retry' % (self.host, self.port),
-                         {'retrycount': retry_count})
-        return r.status_code