Merge pull request #253 from seleniumbase/selenium-grid-updates

Update seleniumbase console scripts

Author: mdmintz

seleniumbase/console_scripts/ReadMe.md

@@ -49,6 +49,19 @@ file name while keeping the original file intact.
 Works with Katalon Recorder scripts.
 See: http://www.katalon.com/automation-recorder
 
+### download
+
+* Usage:
+``seleniumbase download [ITEM]``
+        (Options: server)
+
+* Example:
+``seleniumbase download server``
+
+* Output:
+Downloads the specified item.
+(server is required for using your own Selenium Grid)
+
 ### grid-hub
 
 * Usage:

seleniumbase/console_scripts/run.py

@@ -8,13 +8,15 @@
 seleniumbase install chromedriver
 seleniumbase mkdir browser_tests
 seleniumbase convert my_old_webdriver_unittest.py
+seleniumbase download server
 seleniumbase grid-hub start
 seleniumbase grid-node start --hub=127.0.0.1
 """
 
 import sys
 from seleniumbase.console_scripts import sb_mkdir
 from seleniumbase.console_scripts import sb_install
+from seleniumbase.utilities.selenium_grid import download_selenium_server
 from seleniumbase.utilities.selenium_grid import grid_hub
 from seleniumbase.utilities.selenium_grid import grid_node
 from seleniumbase.utilities.selenium_ide import convert_ide
@@ -91,6 +93,20 @@ def show_convert_usage():
     print("")
 
 
+def show_download_usage():
+    print("  ** download **")
+    print("")
+    print("  Usage:")
+    print("            seleniumbase download [ITEM]")
+    print("                  (Options: server")
+    print("  Example:")
+    print("            seleniumbase download server")
+    print("  Output:")
+    print("            Downloads the specified item.")
+    print("            (server is required for using your own Selenium Grid)")
+    print("")
+
+
 def show_grid_hub_usage():
     print("  ** grid-hub **")
     print("")
@@ -132,6 +148,7 @@ def show_detailed_help():
     show_install_usage()
     show_mkdir_usage()
     show_convert_usage()
+    show_download_usage()
     show_grid_hub_usage()
     show_grid_node_usage()
 
@@ -169,6 +186,12 @@ def main():
         else:
             show_basic_usage()
             show_mkdir_usage()
+    elif command == "download":
+        if len(command_args) >= 1:
+            download_selenium_server.main(force_download=True)
+        else:
+            show_basic_usage()
+            show_download_usage()
     elif command == "grid-hub":
         if len(command_args) >= 1:
             grid_hub.main()
@@ -195,6 +218,10 @@ def main():
                 print("")
                 show_convert_usage()
                 return
+            elif command_args[0] == "download":
+                print("")
+                show_download_usage()
+                return
             elif command_args[0] == "grid-hub":
                 print("")
                 show_grid_hub_usage()

seleniumbase/utilities/selenium_grid/ReadMe.md

@@ -4,16 +4,22 @@ The Selenium Grid Hub lets you distribute tests to run in parallel across multip
 
 ### Running the Selenium Grid Hub
 
-The following commands will work once you've installed seleniumbase, which comes with the seleniumbase console scripts interface.
+The following commands will work once you've installed seleniumbase.
 
-Grid Hub server controls:
+#### <img src="https://cdn2.hubspot.net/hubfs/100006/images/sb_logo_box2.png" title="SeleniumBase" height="32"> Downloading the Selenium Server JAR file:
+```
+seleniumbase download server
+```
+* (Required for using your own Selenium Grid)
+
+#### <img src="https://cdn2.hubspot.net/hubfs/100006/images/sb_logo_box2.png" title="SeleniumBase" height="32"> Grid Hub server controls:
 ```
 seleniumbase grid-hub {start|stop|restart} [OPTIONS]
 ```
 Options:
 * ``-v``, ``--verbose``  (Increases verbosity of logging output.)
 
-Grid node server controlls:
+#### <img src="https://cdn2.hubspot.net/hubfs/100006/images/sb_logo_box2.png" title="SeleniumBase" height="32"> Grid node server controls:
 ```
 seleniumbase grid-node {start|stop|restart} --hub=[HUB_IP] [OPTIONS]
 ```

seleniumbase/utilities/selenium_grid/download_selenium_server.py

@@ -8,8 +8,8 @@
     from urllib.request import urlopen
 
 SELENIUM_JAR = ("http://selenium-release.storage.googleapis.com"
-                "/3.14/selenium-server-standalone-3.14.0.jar")
-JAR_FILE = "selenium-server-standalone-3.14.0.jar"
+                "/3.141/selenium-server-standalone-3.141.59.jar")
+JAR_FILE = "selenium-server-standalone-3.141.59.jar"
 RENAMED_JAR_FILE = "selenium-server-standalone.jar"
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
@@ -39,8 +39,8 @@ def is_available_locally():
     return os.path.isfile(FULL_EXPECTED_PATH)
 
 
-def main():
-    if not is_available_locally():
+def main(force_download=True):
+    if force_download or not is_available_locally():
         download_selenium_server()
         for filename in os.listdir("."):
             # If multiple copies exist, keep only the latest and rename it.

seleniumbase/utilities/selenium_grid/grid_hub.py

@@ -50,7 +50,7 @@ def main():
     file.close()
 
     from seleniumbase.utilities.selenium_grid import download_selenium_server
-    download_selenium_server.main()  # Nothing happens if already exists
+    download_selenium_server.main(force_download=False)  # Only runs if needed
 
     if "linux" in sys.platform or "darwin" in sys.platform:
         if grid_hub_command == "start":

seleniumbase/utilities/selenium_grid/grid_node.py

@@ -61,7 +61,7 @@ def main():
     file.close()
 
     from seleniumbase.utilities.selenium_grid import download_selenium_server
-    download_selenium_server.main()  # Nothing happens if already exists
+    download_selenium_server.main(force_download=False)  # Only runs if needed
 
     if "linux" in sys.platform or "darwin" in sys.platform:
         if grid_hub_command == "start":

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.17.9',
+    version='1.17.10',
     description='All-in-One Test Automation Framework',
     long_description=long_description,
     long_description_content_type='text/markdown',