webdrivers 3.9.4 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e0c2a5c2fd095d45921dd927a01a0a181e27ab
-  data.tar.gz: 0d9be64a36320745d3d3eb17771c79ed53e6136a
+  metadata.gz: 35e2346c87541df0f3aade8f330ef3f9df6376cd
+  data.tar.gz: fd9c3d144960b435ff139b1d6b7073ef9ebd5a87
 SHA512:
-  metadata.gz: ddea9e942925176d9239e06fd414e432e8a114fdd83279760001c0bc6080f8a4e6aaef8ca2bccefaac49e7d5988905f569ac2c3409e902c57e54dc6fd17bf911
-  data.tar.gz: '0997d4066700cdefe6aea6acb59d96eac15475c0e9eaf5f3d053bda153d0b49d92ed512bba5c40e5a6bedb1aa2cce23ae6c586aa725ab9dd6d994c36736d2498'
+  metadata.gz: 0dd52833bcd3c354c45ec026c6d041d845018274fe27164a0fa0ec31f002b917221463659d9aa51e09824805444158775e63ba3b7c94c66e833b7f0dca09e2ab
+  data.tar.gz: 00e2e731f00ee020511d62fab5084eeaff766ffef19d7f11cba06e9a13dcd73ed31d2fd043811e5160de4dc920a515d9d74ee8244de7b7dd7484054fe7bed7d3

data/.rubocop.yml

@@ -22,6 +22,7 @@ Metrics/MethodLength:
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
+    - 'lib/webdrivers/tasks/*.rake'
 
 Metrics/ClassLength:
   Max: 116

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+### 4.0.0.rc1 (2019-05-20)
+* locate Chrome binary the same way as chromedriver to ensure the correct browser version is obtained by default 
+* add rake tasts for update, remove and version
+* removed all deprecated code
+
 ### 3.9.4 (2019-05-20)
 * Fix bug from bug fix that warned users about setting cache time when it was already set (issue #118) 
-* make #base_url public for easier mocking (issue #113)
+* make #base_url public for easier mocking (issue #109)
 
 ### 3.9.3 (2019-05-17)
 * Fix the bug that warned users about setting cache time when it was already set 

data/LICENSE.txt

@@ -1,6 +1,7 @@
 (The MIT License)
 
 Copyright (c) 2017-2019: Titus Fortner
+Copyright (c) 2019: Lakshya Kapoor, Thomas Walpole
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -31,9 +31,10 @@ through Selenium.
 
 ### Specific Drivers
 
-If you want webdrivers to only manage specific drivers you can specify as follows:
+If you want webdrivers to only manage specific drivers you can specify one or more as follows:
 ```ruby
 require 'webdrivers/chromedriver'
+require 'webdrivers/firefox'
 require 'webdrivers/iedriver'
 ```
 
@@ -45,6 +46,9 @@ The default download location is `~/.webdrivers` directory, and this is configur
  Webdrivers.install_dir = '/webdrivers/install/dir'
 ```
 
+Alternatively, you can define the path via the `WD_INSTALL_DIR` environment
+variable.
+
 ### Version Pinning
 
 If you would like to use a specific (older or beta) version, you can specify it for each driver. Otherwise, 
@@ -57,14 +61,12 @@ Webdrivers::Chromedriver.required_version = '2.46'
 # Firefox
 Webdrivers::Geckodriver.required_version  = '0.23.0'
 
-# Microsoft Internet Explorer
+# Internet Explorer
 Webdrivers::IEdriver.required_version     = '3.14.0'
-
-# Microsoft Edge
-Webdrivers::MSWebdriver.required_version  = '17134'
 ```
 
-You can explicitly trigger the update in your code, but this will happen automatically when the driver is initialized:
+You can explicitly trigger the update in your code, but this will happen
+automatically when the driver is initialized:
 
 ```ruby
 Webdrivers::Chromedriver.update
@@ -72,12 +74,17 @@ Webdrivers::Chromedriver.update
 
 ### Caching Drivers
 
-You can set Webdrivers to only look for updates if the previous check was longer ago than a specified number of seconds.
+You can set Webdrivers to only look for updates if the previous check
+was longer ago than a specified number of seconds.
+
 ```ruby
 Webdrivers.cache_time = 86_400
 ```
 
-The default in 3.9 is zero, and the default for 4.x will be 24 hours (86,400 seconds)
+Alternatively, you can define this value via the `WD_CACHE_TIME` environment
+variable. 
+
+The default is set to 24 hours (86,400 seconds).
 
 ### Proxy
 
@@ -113,6 +120,39 @@ require 'net_http_ssl_fix'
 
 Other solutions are documented on the RubyGems [website](https://guides.rubygems.org/ssl-certificate-update/).
 
+### Rake tasks
+
+Each driver has its own set of `rake` tasks (with `Railtie` support) that
+you can call once before executing the tests.  These are especially 
+useful if you're running tests in parallel and want to avoid performing 
+an update check per thread.
+
+```bash
+$ bundle exec rake -T
+rake webdrivers:chromedriver:remove           # Force remove chromedriver
+rake webdrivers:chromedriver:update[version]  # Remove and download updated chromedriver if necessary
+rake webdrivers:chromedriver:version          # Print current chromedriver version
+rake webdrivers:geckodriver:remove            # Force remove geckodriver
+rake webdrivers:geckodriver:update[version]   # Remove and download updated geckodriver if necessary
+rake webdrivers:geckodriver:version           # Print current geckodriver version
+rake webdrivers:iedriver:remove               # Force remove IEDriverServer
+rake webdrivers:iedriver:update[version]      # Remove and download updated IEDriverServer if necessary
+rake webdrivers:iedriver:version              # Print current IEDriverServer version
+```
+
+These tasks respect the `WD_INSTALL_DIR` and `WD_CACHE_TIME` environment
+variables which can also be passed through the `rake` command:
+
+```bash
+$ bundle exec rake webdrivers:chromedriver:update[2.46] webdrivers:geckodriver:update[0.24.0] WD_CACHE_TIME=86_400 WD_INSTALL_DIR='my_dir'
+2019-05-20 19:03:01 INFO Webdrivers Updated to chromedriver 2.46.628388
+2019-05-20 19:03:04 INFO Webdrivers Updated to geckodriver 0.24.0
+```
+
+Please note that these tasks do not use any of the configurations from your
+project (code) and only respect the `ENV` variables and the version (optional)
+passed to the `rake` task.
+
 ### Logging
 
 The logging level can be configured for debugging purpose:
@@ -129,7 +169,7 @@ The version of `chromedriver` will depend on the version of Chrome you are using
 
  * For versions >= 70, the downloaded version of `chromedriver` will match the installed version of Google Chrome. 
  More information [here](http://chromedriver.chromium.org/downloads/version-selection).
- * For versions <=  69, `chromedriver` version 2.46 will be downloaded.
+ * For versions <=  69, `chromedriver` version 2.41 will be downloaded.
  * For beta versions, you'll have to set the desired beta version of `chromedriver` 
  using `Webdrivers::Chromedriver.required_version`.
  
@@ -161,9 +201,5 @@ see LICENSE.txt for full details and copyright.
 
 ## Contributing
 
-Bug reports and pull requests are welcome [on GitHub](https://github.com/titusfortner/webdrivers). Run `bundle exec rake` and squash the commits in your PRs.
-
-## Copyright
-
-Copyright (c) 2017-2019 Titus Fortner
-See LICENSE for details
+Bug reports and pull requests are welcome [on GitHub](https://github.com/titusfortner/webdrivers). 
+Run `bundle exec rake` and squash the commits in your PRs.

data/lib/webdrivers/Rakefile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require 'webdrivers'
+
+path = File.expand_path(__dir__)
+Dir.glob("#{path}/tasks/*.rake").each { |f| import f }

data/lib/webdrivers/chrome_finder.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Webdrivers
+  class ChromeFinder
+    class << self
+      def version
+        location = Selenium::WebDriver::Chrome.path || send("#{System.platform}_location")
+        version = send("#{System.platform}_version", location)
+
+        raise VersionError, 'Failed to find Chrome binary or its version.' if version.nil? || version.empty?
+
+        Webdrivers.logger.debug "Browser version: #{version}"
+        version[/\d+\.\d+\.\d+\.\d+/] # Google Chrome 73.0.3683.75 -> 73.0.3683.75
+      end
+
+      def win_location
+        return Selenium::WebDriver::Chrome.path unless Selenium::WebDriver::Chrome.path.nil?
+
+        envs = %w[LOCALAPPDATA PROGRAMFILES PROGRAMFILES(X86)]
+        directories = ['\\Google\\Chrome\\Application', '\\Chromium\\Application']
+        file = 'chrome.exe'
+
+        directories.each do |dir|
+          envs.each do |root|
+            option = "#{ENV[root]}\\#{dir}\\#{file}"
+            return option if File.exist?(option)
+          end
+        end
+      end
+
+      def mac_location
+        directories = ['', File.expand_path('~')]
+        files = ['/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+                 '/Applications/Chromium.app/Contents/MacOS/Chromium']
+
+        directories.each do |dir|
+          files.each do |file|
+            option = "#{dir}/#{file}"
+            return option if File.exist?(option)
+          end
+        end
+      end
+
+      def linux_location
+        directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /opt/google/chrome]
+        files = %w[google-chrome chrome chromium chromium-browser]
+
+        directories.each do |dir|
+          files.each do |file|
+            option = "#{dir}/#{file}"
+            return option if File.exist?(option)
+          end
+        end
+      end
+
+      def win_version(location)
+        System.call("powershell (Get-ItemProperty '#{location}').VersionInfo.ProductVersion")&.strip
+      end
+
+      def linux_version(location)
+        System.call("#{Shellwords.escape location} --product-version")&.strip
+      end
+
+      def mac_version(location)
+        System.call("#{Shellwords.escape location} --version")&.strip
+      end
+    end
+  end
+end

data/lib/webdrivers/chromedriver.rb

@@ -2,6 +2,7 @@
 
 require 'shellwords'
 require 'webdrivers/common'
+require 'webdrivers/chrome_finder'
 
 module Webdrivers
   class Chromedriver < Common
@@ -42,12 +43,7 @@ module Webdrivers
       #
       # @return [Gem::Version]
       def chrome_version
-        ver = send("chrome_on_#{System.platform}").chomp
-
-        raise VersionError, 'Failed to find Chrome binary or its version.' if ver.nil? || ver.empty?
-
-        Webdrivers.logger.debug "Browser version: #{ver}"
-        normalize_version ver[/\d+\.\d+\.\d+\.\d+/] # Google Chrome 73.0.3683.75 -> 73.0.3683.75
+        normalize_version ChromeFinder.version
       end
 
       #
@@ -110,61 +106,6 @@ module Webdrivers
         normalize_version(chrome.segments[0..2].join('.'))
       end
 
-      def chrome_on_win
-        if browser_binary
-          Webdrivers.logger.debug "Browser executable: '#{browser_binary}'"
-          return System.call("powershell (Get-ItemProperty '#{browser_binary}').VersionInfo.ProductVersion").strip
-        end
-
-        # Workaround for Google Chrome when using Jruby on Windows.
-        # @see https://github.com/titusfortner/webdrivers/issues/41
-        if RUBY_PLATFORM == 'java'
-          ver = 'powershell (Get-Item -Path ((Get-ItemProperty "HKLM:\\Software\\Microsoft' \
-          "\\Windows\\CurrentVersion\\App` Paths\\chrome.exe\").\\'(default)\\'))" \
-          '.VersionInfo.ProductVersion'
-          return System.call(ver).strip
-        end
-
-        # Default to Google Chrome
-        reg = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe'
-        executable = System.call("powershell (Get-ItemProperty '#{reg}' -Name '(default)').'(default)'").strip
-        Webdrivers.logger.debug "Browser executable: '#{executable}'"
-        ps = "(Get-Item (Get-ItemProperty '#{reg}').'(default)').VersionInfo.ProductVersion"
-        System.call("powershell #{ps}").strip
-      end
-
-      def chrome_on_linux
-        if browser_binary
-          Webdrivers.logger.debug "Browser executable: '#{browser_binary}'"
-          return System.call("#{Shellwords.escape browser_binary} --product-version").strip
-        end
-
-        # Default to Google Chrome
-        executable = System.call('which google-chrome').strip
-        Webdrivers.logger.debug "Browser executable: '#{executable}'"
-        System.call("#{executable} --product-version").strip
-      end
-
-      def chrome_on_mac
-        if browser_binary
-          Webdrivers.logger.debug "Browser executable: '#{browser_binary}'"
-          return System.call("#{Shellwords.escape browser_binary} --version").strip
-        end
-
-        # Default to Google Chrome
-        executable = Shellwords.escape '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
-        Webdrivers.logger.debug "Browser executable: #{executable}"
-        System.call("#{executable} --version").strip
-      end
-
-      #
-      # Returns user defined browser executable path from Selenium::WebDrivers::Chrome#path.
-      #
-      def browser_binary
-        # For Chromium, Brave, or whatever else
-        Selenium::WebDriver::Chrome.path
-      end
-
       def sufficient_binary?
         super && current_version && (current_version < normalize_version('70.0.3538') ||
             current_version.segments.first == release_version.segments.first)

data/lib/webdrivers/common.rb

@@ -6,6 +6,7 @@ require 'webdrivers/logger'
 require 'webdrivers/network'
 require 'webdrivers/system'
 require 'selenium-webdriver'
+require 'webdrivers/version'
 
 module Webdrivers
   class ConnectionError < StandardError
@@ -18,22 +19,22 @@ module Webdrivers
   end
 
   class << self
-    attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass, :install_dir
+    attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass
+    attr_writer :install_dir, :cache_time
 
     #
     # Returns the amount of time (Seconds) the gem waits between two update checks.
     #
     def cache_time
-      @cache_time || 0
+      @cache_time || ENV['WD_CACHE_TIME'].to_i
     end
 
     #
-    # Set the amount of time (Seconds) the gem waits between two update checks. Disable
-    # Common.cache_warning.
+    # Returns the install (download) directory path for the drivers.
     #
-    def cache_time=(value)
-      Common.cache_warning = true
-      @cache_time = value
+    # @return [String]
+    def install_dir
+      @install_dir || ENV['WD_INSTALL_DIR'] || File.expand_path(File.join(ENV['HOME'], '.webdrivers'))
     end
 
     def logger
@@ -65,17 +66,6 @@ end
   class Common
     class << self
       attr_writer :required_version
-      attr_accessor :cache_warning
-
-      def version
-        Webdrivers.logger.deprecate("#{self.class}#version", "#{self.class}#required_version")
-        required_version
-      end
-
-      def version=(version)
-        Webdrivers.logger.deprecate("#{self.class}#version=", "#{self.class}#required_version=")
-        self.required_version = version
-      end
 
       #
       # Returns the user defined required version.
@@ -100,14 +90,6 @@ end
         System.download(download_url, driver_path)
       end
 
-      def desired_version
-        old = "#{self.class}#desired_version"
-        new = "#{self.class}#required_version or #{self.class}#latest_version"
-        Webdrivers.logger.deprecate(old, new)
-
-        desired_version == EMPTY_VERSION ? latest_version : normalize_version(desired_version)
-      end
-
       #
       # Deletes the existing driver binary.
       #
@@ -118,16 +100,6 @@ end
         System.delete driver_path
       end
 
-      def download
-        Webdrivers.logger.deprecate('#download', '#update')
-        System.download(download_url, driver_path)
-      end
-
-      def binary
-        Webdrivers.logger.deprecate('#binary', '#driver_path')
-        driver_path
-      end
-
       #
       # Returns path to the driver binary.
       #
@@ -181,11 +153,6 @@ end
         if System.valid_cache?(file_name)
           normalize_version System.cached_version(file_name)
         else
-          unless Common.cache_warning
-            Webdrivers.logger.warn 'Driver caching is turned off in this version, but will be '\
-                                  'enabled by default in 4.x. Set the value with `Webdrivers#cache_time=` in seconds'
-            Common.cache_warning = true
-          end
           version = yield
           System.cache_version(file_name, version)
           normalize_version version

data/lib/webdrivers/railtie.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'webdrivers'
+require 'rails'
+
+module Webdrivers
+  class Railtie < Rails::Railtie
+    railtie_name :webdrivers
+
+    rake_tasks do
+      path = File.expand_path(__dir__)
+      Dir.glob("#{path}/tasks/*.rake").each { |f| load f }
+    end
+  end
+end

data/lib/webdrivers/system.rb

@@ -26,7 +26,7 @@ module Webdrivers
       end
 
       def install_dir
-        Webdrivers.install_dir || File.expand_path(File.join(ENV['HOME'], '.webdrivers'))
+        Webdrivers.install_dir
       end
 
       def cache_version(file_name, version)

data/lib/webdrivers/tasks/chromedriver.rake

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+namespace :webdrivers do
+  require 'webdrivers/chromedriver'
+
+  namespace :chromedriver do
+    Webdrivers.logger.level = :info
+
+    desc 'Print current chromedriver version'
+    task :version do
+      gem_ver = Webdrivers::Chromedriver.current_version
+      if gem_ver
+        Webdrivers.logger.info "chromedriver #{gem_ver.version}"
+      else
+        Webdrivers.logger.warn 'No existing chromedriver found.'
+      end
+    end
+
+    desc 'Remove and download updated chromedriver if necessary'
+    task :update, [:version] do |_, args|
+      args.with_defaults(version: 0)
+      Webdrivers.cache_time                     = ENV.fetch('WD_CACHE_TIME', 86_400)
+      Webdrivers.install_dir                    = ENV.fetch('WD_INSTALL_DIR', nil)
+      Webdrivers::Chromedriver.required_version = args.version
+      Webdrivers::Chromedriver.update
+      Webdrivers.logger.info "Updated to chromedriver #{Webdrivers::Chromedriver.current_version}"
+    end
+
+    desc 'Force remove chromedriver'
+    task :remove do
+      unless File.exist? Webdrivers::Chromedriver.driver_path
+        Webdrivers.logger.info 'No existing chromedriver to remove.'
+        next # Return early
+      end
+
+      cur_version = Webdrivers::Chromedriver.current_version
+      Webdrivers::Chromedriver.remove
+
+      if File.exist? Webdrivers::Chromedriver.driver_path # Failed for some reason
+        Webdrivers.logger.error 'Failed to remove chromedriver. Please try removing manually.'
+      else
+        Webdrivers.logger.info "Removed chromedriver #{cur_version}."
+      end
+    end
+  end
+end

data/lib/webdrivers/tasks/geckodriver.rake

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+namespace :webdrivers do
+  require 'webdrivers/geckodriver'
+
+  namespace :geckodriver do
+    Webdrivers.logger.level = :info
+
+    desc 'Print current geckodriver version'
+    task :version do
+      gem_ver = Webdrivers::Geckodriver.current_version
+      if gem_ver
+        Webdrivers.logger.info "geckodriver #{gem_ver.version}"
+      else
+        Webdrivers.logger.warn 'No existing geckodriver found.'
+      end
+    end
+
+    desc 'Remove and download updated geckodriver if necessary'
+    task :update, [:version] do |_, args|
+      args.with_defaults(version: 0)
+      Webdrivers.cache_time                    = ENV.fetch('WD_CACHE_TIME', 86_400)
+      Webdrivers.install_dir                   = ENV.fetch('WD_INSTALL_DIR', nil)
+      Webdrivers::Geckodriver.required_version = args.version
+      Webdrivers::Geckodriver.update
+      Webdrivers.logger.info "Updated to geckodriver #{Webdrivers::Geckodriver.current_version}"
+    end
+
+    desc 'Force remove geckodriver'
+    task :remove do
+      unless File.exist? Webdrivers::Geckodriver.driver_path
+        Webdrivers.logger.info 'No existing geckodriver to remove.'
+        next # Return early
+      end
+
+      cur_version = Webdrivers::Geckodriver.current_version
+      Webdrivers::Geckodriver.remove
+
+      if File.exist? Webdrivers::Geckodriver.driver_path # Failed for some reason
+        Webdrivers.logger.error 'Failed to remove geckodriver. Please try removing manually.'
+      else
+        Webdrivers.logger.info "Removed geckodriver #{cur_version}."
+      end
+    end
+  end
+end

data/lib/webdrivers/tasks/iedriver.rake

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+namespace :webdrivers do
+  require 'webdrivers/iedriver'
+
+  namespace :iedriver do
+    Webdrivers.logger.level = :info
+
+    desc 'Print current IEDriverServer version'
+    task :version do
+      gem_ver = Webdrivers::IEdriver.current_version
+      if gem_ver
+        Webdrivers.logger.info "IEDriverServer #{gem_ver.version}"
+      else
+        Webdrivers.logger.warn 'No existing IEDriverServer found.'
+      end
+    end
+
+    desc 'Remove and download updated IEDriverServer if necessary'
+    task :update, [:version] do |_, args|
+      args.with_defaults(version: 0)
+      Webdrivers.cache_time                 = ENV.fetch('WD_CACHE_TIME', 86_400)
+      Webdrivers.install_dir                = ENV.fetch('WD_INSTALL_DIR', nil)
+      Webdrivers::IEdriver.required_version = args.version
+      Webdrivers::IEdriver.update
+      Webdrivers.logger.info "Updated to IEDriverServer #{Webdrivers::IEdriver.current_version}"
+    end
+
+    desc 'Force remove IEDriverServer'
+    task :remove do
+      unless File.exist? Webdrivers::IEdriver.driver_path
+        Webdrivers.logger.info 'No existing IEDriverServer to remove.'
+        next # Return early
+      end
+
+      cur_version = Webdrivers::IEdriver.current_version
+      Webdrivers::IEdriver.remove
+
+      if File.exist? Webdrivers::IEdriver.driver_path # Failed for some reason
+        Webdrivers.logger.error 'Failed to remove IEDriverServer. Please try removing manually.'
+      else
+        Webdrivers.logger.info "Removed IEDriverServer #{cur_version}."
+      end
+    end
+  end
+end

data/lib/webdrivers/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Webdrivers
+  VERSION = '4.0.0.rc1'
+end

data/lib/webdrivers.rb

@@ -3,4 +3,4 @@
 require 'webdrivers/chromedriver'
 require 'webdrivers/geckodriver'
 require 'webdrivers/iedriver'
-require 'webdrivers/mswebdriver'
+require 'webdrivers/railtie' if defined?(Rails)

data/spec/webdrivers/chromedriver_spec.rb

@@ -116,6 +116,31 @@ describe Webdrivers::Chromedriver do
 
       expect(Webdrivers::Network).to have_received(:get).twice
     end
+
+    context 'when required version is 0' do
+      it 'downloads the latest version' do
+        allow(chromedriver).to receive(:latest_version).and_return(Gem::Version.new('72.0.3626.7'))
+        chromedriver.required_version = 0
+        chromedriver.update
+        expect(chromedriver.current_version.version).to eq('72.0.3626.7')
+      end
+    end
+
+    context 'when required version is nil' do
+      it 'downloads the latest version' do
+        allow(chromedriver).to receive(:latest_version).and_return(Gem::Version.new('72.0.3626.7'))
+        chromedriver.required_version = nil
+        chromedriver.update
+        expect(chromedriver.current_version.version).to eq('72.0.3626.7')
+      end
+    end
+
+    context 'when ENV variable WD_CACHE_TIME is set' do
+      it 'uses cache time value from ENV variable' do
+        allow(ENV).to receive(:[]).with('WD_CACHE_TIME').and_return('999')
+        expect(Webdrivers.cache_time).to be(999)
+      end
+    end
   end
 
   describe '#current_version' do
@@ -234,19 +259,26 @@ describe Webdrivers::Chromedriver do
 
   describe '#install_dir' do
     it 'uses ~/.webdrivers as default value' do
-      expect(Webdrivers::System.install_dir).to include('.webdriver')
+      expect(Webdrivers.install_dir).to include('.webdriver')
     end
 
     it 'uses provided value' do
       begin
-        install_dir = File.expand_path(File.join(ENV['HOME'], '.webdrivers2'))
+        install_dir            = File.expand_path(File.join(ENV['HOME'], '.webdrivers2'))
         Webdrivers.install_dir = install_dir
 
-        expect(Webdrivers::System.install_dir).to eq install_dir
+        expect(Webdrivers.install_dir).to eq install_dir
       ensure
         Webdrivers.install_dir = nil
       end
     end
+
+    context 'when ENV variable WD_INSTALL_DIR is set' do
+      it 'uses path from the ENV variable' do
+        allow(ENV).to receive(:[]).with('WD_INSTALL_DIR').and_return('custom_dir')
+        expect(Webdrivers.install_dir).to be('custom_dir')
+      end
+    end
   end
 
   describe '#driver_path' do

data/webdrivers.gemspec

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push File.expand_path('../lib', __dir__)
+lib = File.expand_path('lib', __dir__)
+$:.unshift lib unless $:.include?(lib)
+require "webdrivers/version"
 
 Gem::Specification.new do |s|
   s.name        = 'webdrivers'
-  s.version     = '3.9.4'
-  s.authors     = ['Titus Fortner', 'Lakshya Kapoor']
+  s.version     = Webdrivers::VERSION
+  s.authors     = ['Titus Fortner', 'Lakshya Kapoor', 'Thomas Walpole']
   s.email       = %w[titusfortner@gmail.com kapoorlakshya@gmail.com]
   s.homepage    = 'https://github.com/titusfortner/webdrivers'
   s.summary     = 'Easy download and use of browser drivers.'

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 3.9.4
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Titus Fortner
 - Lakshya Kapoor
+- Thomas Walpole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -171,19 +172,24 @@ files:
 - Rakefile
 - appveyor.yml
 - lib/webdrivers.rb
+- lib/webdrivers/Rakefile
+- lib/webdrivers/chrome_finder.rb
 - lib/webdrivers/chromedriver.rb
 - lib/webdrivers/common.rb
 - lib/webdrivers/geckodriver.rb
 - lib/webdrivers/iedriver.rb
 - lib/webdrivers/logger.rb
-- lib/webdrivers/mswebdriver.rb
 - lib/webdrivers/network.rb
+- lib/webdrivers/railtie.rb
 - lib/webdrivers/system.rb
+- lib/webdrivers/tasks/chromedriver.rake
+- lib/webdrivers/tasks/geckodriver.rake
+- lib/webdrivers/tasks/iedriver.rake
+- lib/webdrivers/version.rb
 - spec/spec_helper.rb
 - spec/webdrivers/chromedriver_spec.rb
 - spec/webdrivers/geckodriver_spec.rb
 - spec/webdrivers/i_edriver_spec.rb
-- spec/webdrivers/ms_webdriver_spec.rb
 - spec/webdrivers/webdrivers_spec.rb
 - spec/webdrivers_proxy_support_spec.rb
 - webdrivers.gemspec
@@ -202,9 +208,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14.4
@@ -216,6 +222,5 @@ test_files:
 - spec/webdrivers/chromedriver_spec.rb
 - spec/webdrivers/geckodriver_spec.rb
 - spec/webdrivers/i_edriver_spec.rb
-- spec/webdrivers/ms_webdriver_spec.rb
 - spec/webdrivers/webdrivers_spec.rb
 - spec/webdrivers_proxy_support_spec.rb

data/lib/webdrivers/mswebdriver.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'webdrivers/common'
-
-module Webdrivers
-  class MSWebdriver
-    class << self
-      attr_accessor :ignore
-    end
-  end
-end
-
-module Selenium
-  module WebDriver
-    module Edge
-      if defined?(Selenium::WebDriver::VERSION) && Selenium::WebDriver::VERSION > '3.141.0'
-        class Service < WebDriver::Service
-          class << self
-            alias se_driver_path driver_path
-
-            def driver_path
-              unless Webdrivers::MSWebdriver.ignore
-                Webdrivers.logger.warn 'Microsoft WebDriver for the Edge browser is no longer supported by Webdrivers'\
-          ' gem. Due to changes in Edge implementation, the correct version can no longer be accurately provided. '\
-          'Download driver, and specify the location with `Selenium::WebDriver::Edge.driver_path = "/driver/path"`, '\
-          'or place it in PATH Environment Variable. '\
-          'Download directions here: https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/#downloads '\
-          'To remove this warning in Webdrivers 3.x, set `Webdrivers.MSWebdriver.ignore`'
-              end
-
-              se_driver_path
-            end
-          end
-        end
-      else
-        class << self
-          alias se_driver_path driver_path
-
-          def driver_path
-            unless Webdrivers::MSWebdriver.ignore
-              Webdrivers.logger.warn 'Microsoft WebDriver for the Edge browser is no longer supported by Webdrivers'\
-          ' gem. Due to changes in Edge implementation, the correct version can no longer be accurately provided. '\
-          'Download driver, and specify the location with `Selenium::WebDriver::Edge.driver_path = "/driver/path"`, '\
-          'or place it in PATH Environment Variable. '\
-          'Download directions here: https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/#downloads '\
-          'To remove this warning in Webdrivers 3.x, set `Webdrivers.MSWebdriver.ignore`'
-            end
-
-            se_driver_path
-          end
-        end
-      end
-    end
-  end
-end

data/spec/webdrivers/ms_webdriver_spec.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Webdrivers::MSWebdriver do
-  let(:mswebdriver) { described_class }
-
-  it 'gives deprecation for using it' do
-    msg = /WARN Webdrivers Microsoft WebDriver for the Edge browser is no longer supported by Webdrivers gem/
-
-    if defined?(Selenium::WebDriver::VERSION) && Selenium::WebDriver::VERSION > '3.141.0'
-      expect { Selenium::WebDriver::Edge::Service.driver_path }.to output(msg).to_stdout_from_any_process
-    else
-      expect { Selenium::WebDriver::Edge.driver_path }.to output(msg).to_stdout_from_any_process
-    end
-  end
-
-  it 'does not give deprecation when set to ignore' do
-    described_class.ignore = true
-
-    service = instance_double(Selenium::WebDriver::Service, host: '', start: nil, uri: '')
-    bridge = instance_double(Selenium::WebDriver::Remote::Bridge, create_session: nil, session_id: '')
-
-    allow(Selenium::WebDriver::Service).to receive(:new).and_return(service)
-    allow(Selenium::WebDriver::Remote::Bridge).to receive(:new).and_return(bridge)
-    allow(Selenium::WebDriver::Remote::W3C::Bridge).to receive(:new)
-
-    expect { Selenium::WebDriver.for :edge }.not_to output.to_stdout_from_any_process
-  end
-end