webdrivers 4.1.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d16f809899161b5099baae7ca53e6d71d376083fe3cecf0278acef552605ec
-  data.tar.gz: 3c4dcab7d0e285716adfe50d0e78a172e9cab65202192c02726df3790d7b96b3
+  metadata.gz: 7f905a3a4839d0f0a56317926d560cab4ee29f98b3d36d4feb1bb671e3f1b23b
+  data.tar.gz: 44ae96f9ba7edfbb2fb1bd1fd7ef319e73643f5a43c0fce59c51e2b94c1a25c8
 SHA512:
-  metadata.gz: 9123c087f485c843954414de9004c137bb5a7fc1619ad4bc4fc9ec79ce5ed2433f6377994347a46bd06d96f7dd69049192c8631363608088f30159f2fae2b33b
-  data.tar.gz: af36c0d87ffad38e87dea124abc387e79bdc2fc5127fee456d3992e6c19f912a8943d5cdb11ec8d6600ed41f92c2fa8f3f018a2a4a34e76c1338cf5ee25b5068
+  metadata.gz: 73d60000abc1ad06f692ee556bca7bd57403cde91f2152b5349fda2b0feaa2afb261dd87b1e16f6f8c74e843634b8dbde3da85ed666164920e78163fed764029
+  data.tar.gz: 1c94fde9cafdb1929a3e70ada28c7dfec07cbae6f68220e247ffe62343700c5b3ca2c0556d1d028d4d25b0f6bbd76923c402f1925574ec6f117eb8c4066e6255

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4.6
+  TargetRubyVersion: 2.4.10
 
 require:
   - rubocop-rspec
@@ -11,7 +11,7 @@ Layout/SpaceInsideHashLiteralBraces:
 Layout/EndOfLine:
   EnforcedStyle: lf
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   IgnoredPatterns:
     - '\s+# rubocop:disable'
@@ -23,6 +23,7 @@ Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
     - 'lib/webdrivers/tasks/*.rake'
+    - 'webdrivers.gemspec'
 
 Metrics/ClassLength:
   Max: 116

data/.travis.yml

@@ -8,34 +8,34 @@ addons:
   chrome: stable
 script: bundle exec rake $RAKE_TASK
 before_install:
-  - gem update --system
-  - gem update bundler
+  - gem update --system -N
+  - gem install bundler -N
 matrix:
   include:
-    - rvm: 2.6.3
+    - rvm: 2.4
       env: RAKE_TASK=spec
-    - rvm: 2.5.5
+    - rvm: 2.5
       env: RAKE_TASK=spec
-    - rvm: 2.4.6
+    - rvm: 2.6
       env: RAKE_TASK=spec
-    - rvm: 2.4.6
+    - rvm: 2.7
       os: osx
       env: RAKE_TASK=spec
-    - rvm: 2.4.6
+    - rvm: 2.7
       env: RAKE_TASK=rubocop
-    - rvm: jruby-9.2.7.0
+    - rvm: jruby-9.2.11.1
       jdk: openjdk8
       env: RAKE_TASK=spec
-    - rvm: 2.6
+    - rvm: 2.7
       env: RAKE_TASK=spec
       gemfile: gemfiles/Gemfile.edge
       os: osx
-      osx_image: xcode10.2
+      osx_image: xcode11.3
       addons:
         chrome: stable
         homebrew:
           taps: homebrew/cask-versions
           casks:
-            - microsoft-edge-dev
+            - microsoft-edge
   allow_failures:
     - gemfile: gemfiles/Gemfile.edge

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 4.4.0 (2020-05-31)
+* Implement initial support for WSLv1 ([#172](https://github.com/titusfortner/webdrivers/issues/172)). Thanks G-Rath!
+* Chrome/Edgedriver - Fix [#171](https://github.com/titusfortner/webdrivers/issues/171) by making sure the cached
+driver build version matches the browser build version before using it.
+* Chrome/Edgedriver - Driver version check now matches the driver and browser `major.minor.build` versions instead of just 
+the major version to be fully compliant with the `chromedriver` version selection
+[document](https://chromedriver.chromium.org/downloads/version-selection).
+
+### 4.3.0 (2020-04-14)
+* Add support for Microsoft Edge (Chromium) stable
+* Drop support for Ruby < 2.4.0
+
+### 4.2.0 (2019-12-27)
+* Add support for Microsoft Edge (Chromium) Beta releases ([#155](https://github.com/titusfortner/webdrivers/pull/155))
+* Use tilde expansion to resolve user's home directory ([#166](https://github.com/titusfortner/webdrivers/pull/161))
+* Add support for Chromium installed using Snap on Ubuntu ([#163](https://github.com/titusfortner/webdrivers/pull/163)). Thanks Tietew!
+
+### 4.1.3 (2019-10-07)
+* Require rubyzip version 1.3.0 or higher to fix [rubyzip#403](https://github.com/rubyzip/rubyzip/pull/403). Thanks rhymes! ([#153](https://github.com/titusfortner/webdrivers/pull/153))
+* Fix a bug where the file deletion confirmation was printed even when there were no files to delete.
+
+### 4.1.2 (2019-07-29)
+* Fix a bug related to raising `BrowserNotFound`.
+
 ### 4.1.1 (2019-07-18)
 * Raise `BrowserNotFound` if Chrome and Edge binary are not found (issue [#144](https://github.com/titusfortner/webdrivers/issues/144)).
 
@@ -9,10 +33,10 @@ and [#93](https://github.com/titusfortner/webdrivers/issues/93))
 * Fix a bug where the user given Chrome binary path via `Selenium::WebDriver::Chrome.path` 
 was not properly escaped (issue [#139](https://github.com/titusfortner/webdrivers/issues/139))
 * Fix miscellaneous code warnings.
-* **Announcement**: As of 06/21/2019, `heroku-buildpack-google-chrome` 
+* ~~**Announcement**: As of 06/21/2019, `heroku-buildpack-google-chrome` 
 no longer requires a [workaround](https://github.com/titusfortner/webdrivers/wiki/Heroku-buildpack-google-chrome) 
 to work with this gem. See [heroku-buildpack-google-chrome#73](https://github.com/heroku/heroku-buildpack-google-chrome/pull/73) 
-for more information.
+for more information.~~
 
 ### 4.0.1 (2019-06-12)
 * Cache time now defaults to 86,400 Seconds (24 hours). Please note the special exception for `chromedriver` in the [README](https://github.com/titusfortner/webdrivers#special-exception-for-chromedriver-and-msedgedriver) (issue [#132](https://github.com/titusfortner/webdrivers/issues/132))

data/README.md

@@ -13,7 +13,7 @@ Run Selenium tests more easily with automatic installation and updates for all s
 * [chromedriver](http://chromedriver.chromium.org/)
 * [geckodriver](https://github.com/mozilla/geckodriver)
 * [IEDriverServer](https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver)
-* [msedgedriver](https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/)  - Dev and Canary releases on Windows and macOS only
+* [msedgedriver](https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/)
 
 ## Usage
 
@@ -68,7 +68,7 @@ Webdrivers::Geckodriver.required_version  = '0.23.0'
 Webdrivers::IEdriver.required_version     = '3.14.0'
 
 # Edge (Chromium)
-Webdrivers::Edgedriver.required_version     = '76.0.183.0'
+Webdrivers::Edgedriver.required_version   = '76.0.183.0'
 ```
 
 You can explicitly trigger the update in your code, but this will happen
@@ -92,10 +92,10 @@ variable. **Only set one to avoid confusion**.
 
 ##### Special exception for chromedriver and msedgedriver
 
-Cache time will be respected as long as a driver binary exists and the major versions of
-the browser and the driver match. For example, if you update Chrome or Edge to v76 and its driver is
-still at v75, `webdrivers` will ignore the cache time and update the driver to make sure you're
-using a compatible version.
+Cache time will be respected as long as a driver binary exists and the major.minor.build versions of
+the browser and the driver match. For example, if you update Chrome or Edge to v76.0.123 and its driver is
+still at v76.0.100, `webdrivers` will ignore the cache time and update the driver to make sure you're
+using a compatible build version.
 
 ### Proxy
 
@@ -217,11 +217,9 @@ variable.
 This is also required if Google Chrome is not installed in its
 [default location](https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver).
 
-##### CircleCI Users
+##### Heroku Users
 
-Follow the specific instructions [here](https://github.com/titusfortner/webdrivers/wiki/Heroku-buildpack-google-chrome) if your CI environment provides custom shims for Chrome or Chromium.
-
-Please note that as of 06/21/2019, [`heroku-buildpack-google-chrome`](https://github.com/heroku/heroku-buildpack-google-chrome/pull/73) no longer requires this workaround.
+Follow the specific instructions [here](https://github.com/titusfortner/webdrivers/wiki/Heroku-buildpack-google-chrome) if you're using `heroku-buildpack-google-chrome`.
 
 #### Microsoft Edge (Chromium)
 

data/appveyor.yml

@@ -2,30 +2,30 @@ build: off
 cache:
   - vendor/bundle
 image:
-  - Visual Studio 2017
+  - Visual Studio 2019
 environment:
   matrix:
-    - RUBY_VERSION: Ruby24
+    - RUBY_VERSION: Ruby24-x64
       RUBY_BIN: ruby
-      RAKE_TASK: spec
+      RAKE_TASK: rubocop
       SCRIPT_CONTEXT: bundle exec
-    - RUBY_VERSION: Ruby24
+    - RUBY_VERSION: Ruby24-x64
       RUBY_BIN: ruby
-      RAKE_TASK: rubocop
+      RAKE_TASK: spec
       SCRIPT_CONTEXT: bundle exec
-    - RUBY_VERSION: Ruby25
+    - RUBY_VERSION: Ruby25-x64
       RUBY_BIN: ruby
       RAKE_TASK: spec
       SCRIPT_CONTEXT: bundle exec
-    - RUBY_VERSION: Ruby26
+    - RUBY_VERSION: Ruby26-x64
       RUBY_BIN: ruby
       RAKE_TASK: spec
       SCRIPT_CONTEXT: bundle exec
-    - RUBY_VERSION: jruby-9.2.7.0
+    - RUBY_VERSION: jruby-9.2.11.1
       RUBY_BIN: jruby
       RAKE_TASK: spec
       SCRIPT_CONTEXT: jruby -G -S
-    - RUBY_VERSION: Ruby26
+    - RUBY_VERSION: Ruby26-x64
       RUBY_BIN: ruby
       RAKE_TASK: spec
       SCRIPT_CONTEXT: bundle exec
@@ -34,8 +34,8 @@ install:
   - ps: if ($env:RUBY_BIN -eq 'jruby') { support\install_jruby.ps1 }
   - ps: support\install_msedge.ps1
   - set PATH=C:\%RUBY_VERSION%\bin;%PATH%
-  - '%RUBY_BIN% -S gem update --system'
-  - '%RUBY_BIN% -S gem install bundler'
+  - '%RUBY_BIN% -S gem update --system -N'
+  - '%RUBY_BIN% -S gem install bundler -N'
   - '%RUBY_BIN% -S bundle install'
 before_test:
   - '%RUBY_BIN% -v'

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'webdrivers'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/webdrivers/chrome_finder.rb

@@ -46,6 +46,30 @@ module Webdrivers
             return option if File.exist?(option)
           end
         end
+
+        nil
+      end
+
+      def wsl_location
+        _, drive, user = ENV['PATH'].match(%r{/([a-z])/Users/([^/:]+)/AppData/}).to_a
+
+        roots = [
+          "#{drive}:\\Users\\#{user}\\AppData\\Local",
+          "#{drive}:\\Program Files (x86)",
+          "#{drive}:\\Program Files"
+        ]
+
+        directories = %w[Google\\Chrome\\Application Chromium\\Application]
+        file = 'chrome.exe'
+
+        directories.each do |dir|
+          roots.each do |root|
+            option = System.to_wsl_path("#{root}\\#{dir}\\#{file}")
+            return option if File.exist?(option)
+          end
+        end
+
+        nil
       end
 
       def mac_location
@@ -59,10 +83,14 @@ module Webdrivers
             return option if File.exist?(option)
           end
         end
+
+        nil
       end
 
       def linux_location
-        directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /opt/google/chrome]
+        return wsl_location if System.wsl?
+
+        directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /snap/bin /opt/google/chrome]
         files = %w[google-chrome chrome chromium chromium-browser]
 
         directories.each do |dir|
@@ -71,13 +99,21 @@ module Webdrivers
             return option if File.exist?(option)
           end
         end
+
+        nil
       end
 
       def win_version(location)
-        System.call("powershell (Get-ItemProperty '#{location}').VersionInfo.ProductVersion")&.strip
+        System.call("powershell.exe \"(Get-ItemProperty '#{location}').VersionInfo.ProductVersion\"")&.strip
+      end
+
+      def wsl_version(location)
+        win_version(System.to_win32_path(location))
       end
 
       def linux_version(location)
+        return wsl_version(location) if System.wsl?
+
         System.call(location, '--product-version')&.strip
       end
 

data/lib/webdrivers/chromedriver.rb

@@ -29,9 +29,14 @@ module Webdrivers
       def latest_version
         @latest_version ||= begin
           # Versions before 70 do not have a LATEST_RELEASE file
-          return normalize_version('2.41') if release_version < normalize_version('70')
+          return normalize_version('2.41') if browser_build_version < normalize_version('70')
 
-          latest_applicable = with_cache(file_name) { latest_point_release(release_version) }
+          # Cache check
+          # Cached version should exist and be compatible with the current browser version.
+          # Otherwise, fetch the latest compatible driver.
+          latest_applicable = with_cache(file_name,
+                                         current_build_version,
+                                         browser_build_version) { latest_point_release(browser_build_version) }
 
           Webdrivers.logger.debug "Latest version available: #{latest_applicable}"
           normalize_version(latest_applicable)
@@ -80,7 +85,7 @@ module Webdrivers
       end
 
       def file_name
-        System.platform == 'win' ? 'chromedriver.exe' : 'chromedriver'
+        System.platform == 'win' || System.wsl? ? 'chromedriver.exe' : 'chromedriver'
       end
 
       def download_url
@@ -92,24 +97,39 @@ module Webdrivers
                     normalize_version(required_version)
                   end
 
-        file_name = System.platform == 'win' ? 'win32' : "#{System.platform}64"
+        file_name = System.platform == 'win' || System.wsl? ? 'win32' : "#{System.platform}64"
         url = "#{base_url}/#{version}/chromedriver_#{file_name}.zip"
         Webdrivers.logger.debug "chromedriver URL: #{url}"
         @download_url = url
       end
 
-      # Returns release version from the currently installed Chrome version
+      # Returns major.minor.build version from the currently installed chromedriver version
       #
       # @example
-      #   73.0.3683.75 -> 73.0.3683
-      def release_version
-        chrome = normalize_version(browser_version)
-        normalize_version(chrome.segments[0..2].join('.'))
+      #   73.0.3683.68 (major.minor.build.patch) -> 73.0.3683 (major.minor.build)
+      def current_build_version
+        build_ver = if current_version.nil? # Driver not found
+                      nil
+                    else
+                      current_version.segments[0..2].join('.')
+                    end
+        normalize_version(build_ver)
       end
 
+      # Returns major.minor.build version from the currently installed Chrome version
+      #
+      # @example
+      #   73.0.3683.75 (major.minor.build.patch) -> 73.0.3683 (major.minor.build)
+      def browser_build_version
+        normalize_version(browser_version.segments[0..2].join('.'))
+      end
+      alias chrome_build_version browser_build_version
+
+      # Returns true if an executable driver binary exists
+      # and its build version matches the browser build version
       def sufficient_binary?
         super && current_version && (current_version < normalize_version('70.0.3538') ||
-            current_version.segments.first == release_version.segments.first)
+          current_build_version == browser_build_version)
       end
     end
   end

data/lib/webdrivers/common.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rubygems/package'
-require 'zip'
 require 'webdrivers/logger'
 require 'webdrivers/network'
 require 'webdrivers/system'
@@ -22,7 +21,7 @@ module Webdrivers
   end
 
   DEFAULT_CACHE_TIME = 86_400 # 24 hours
-  DEFAULT_INSTALL_DIR = File.expand_path(File.join(ENV['HOME'], '.webdrivers'))
+  DEFAULT_INSTALL_DIR = File.expand_path('~/.webdrivers')
 
   class << self
     attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass
@@ -158,9 +157,15 @@ module Webdrivers
         nil
       end
 
-      def with_cache(file_name)
-        if System.valid_cache?(file_name)
-          normalize_version System.cached_version(file_name)
+      # Returns cached driver version if cache is still valid and the driver binary exists.
+      # Otherwise caches the given version (typically the latest available)
+      # In case of Chrome, it also verifies that the driver build and browser build versions are compatible.
+      # Example usage: lib/webdrivers/chromedriver.rb:34
+      def with_cache(file_name, driver_build = nil, browser_build = nil)
+        if System.valid_cache?(file_name) && exists? && (driver_build == browser_build)
+          cached_version = System.cached_version(file_name)
+          Webdrivers.logger.debug "using cached version as latest: #{cached_version}"
+          normalize_version cached_version
         else
           version = yield
           System.cache_version(file_name, version)

data/lib/webdrivers/edge_finder.rb

@@ -37,7 +37,10 @@ module Webdrivers
 
       def win_location
         envs = %w[LOCALAPPDATA PROGRAMFILES PROGRAMFILES(X86)]
-        directories = ['\\Microsoft\\Edge Dev\\Application', '\\Microsoft\\Edge SxS\\Application']
+        directories = ['\\Microsoft\\Edge\\Application',
+                       '\\Microsoft\\Edge Beta\\Application',
+                       '\\Microsoft\\Edge Dev\\Application',
+                       '\\Microsoft\\Edge SxS\\Application']
         file = 'msedge.exe'
 
         directories.each do |dir|
@@ -52,6 +55,7 @@ module Webdrivers
       def mac_location
         directories = ['', File.expand_path('~')]
         files = ['/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge',
+                 '/Applications/Microsoft Edge Beta.app/Contents/MacOS/Microsoft Edge Beta',
                  '/Applications/Microsoft Edge Dev.app/Contents/MacOS/Microsoft Edge Dev',
                  '/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary']
 

data/lib/webdrivers/system.rb

@@ -4,6 +4,12 @@ require 'rubygems/package'
 require 'zip'
 require 'English'
 
+# validate zip entry sizes to avoid zip bombs
+# see https://github.com/rubyzip/rubyzip#size-validation
+# and https://github.com/rubyzip/rubyzip/pull/403 for further details
+# this will be the default in rubyzip 2.0+
+Zip.validate_entry_sizes = true
+
 module Webdrivers
   #
   # @api private
@@ -14,11 +20,13 @@ module Webdrivers
         max_attempts = 3
         attempts_made = 0
         delay = 0.5
-        Webdrivers.logger.debug "Deleting #{file}"
 
         begin
           attempts_made += 1
-          File.delete file if File.exist? file
+          if File.exist? file
+            Webdrivers.logger.debug "Deleting #{file}"
+            File.delete file
+          end
         rescue Errno::EACCES # Solves an intermittent file locking issue on Windows
           sleep(delay)
           retry if File.exist?(file) && attempts_made <= max_attempts
@@ -140,6 +148,25 @@ module Webdrivers
         end
       end
 
+      # @return [TrueClass, FalseClass]
+      def wsl?
+        platform == 'linux' && File.open('/proc/version').read.include?('Microsoft')
+      end
+
+      # @param [String] path
+      # @return [String]
+      def to_win32_path(path)
+        return path if /[a-z]:\\/iu.match?(path)
+
+        call("wslpath -w '#{path}'").chomp
+      end
+
+      # @param [String] path
+      # @return [String]
+      def to_wsl_path(path)
+        call("wslpath -u '#{path}'").chomp
+      end
+
       def bitsize
         Selenium::WebDriver::Platform.bitsize
       end

data/lib/webdrivers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Webdrivers
-  VERSION = '4.1.1'
+  VERSION = '4.4.0'
 end

data/spec/webdrivers/chrome_finder_spec.rb

@@ -47,4 +47,57 @@ describe Webdrivers::ChromeFinder do
       expect { chrome_finder.version }.to raise_error(Webdrivers::BrowserNotFound)
     end
   end
+
+  context 'when running in WSL' do
+    before do
+      skip "The current platform cannot be WSL, as it's not Linux" unless Selenium::WebDriver::Platform.linux?
+
+      allow(Webdrivers::System).to receive(:wsl?).and_return(true)
+      allow(Webdrivers::System).to receive(:to_wsl_path).and_return('')
+      allow(Webdrivers::System).to receive(:to_win32_path).and_return('')
+    end
+
+    it 'checks Windows locations for Chrome' do
+      drive = 'c'
+      user = 'WinUser'
+      file = 'chrome.exe'
+      path = [
+        '/home/wsl-user/.local/bin',
+        '/usr/local/bin',
+        '/usr/local/games',
+        '/usr/bin',
+        "/#{drive}/Users/#{user}/AppData/Local/Microsoft/WindowsApps",
+        '/snap/bin'
+      ].join ':'
+
+      allow(chrome_finder).to receive(:user_defined_location).and_return(nil)
+      allow(ENV).to receive(:[]).with('WD_CHROME_PATH').and_return(nil)
+      allow(ENV).to receive(:[]).with('PATH').and_return(path)
+      allow(File).to receive(:exist?).and_return(false)
+
+      locations = [
+        "#{drive}:\\Users\\#{user}\\AppData\\Local\\Google\\Chrome\\Application\\#{file}",
+        "#{drive}:\\Program Files (x86)\\Chromium\\Application\\#{file}",
+        "#{drive}:\\Program Files\\Google\\Chrome\\Application\\#{file}"
+      ]
+
+      # CIs don't support WSL yet, so our mocks lead to the error path for simplicity
+      expect { chrome_finder.location }.to raise_error(Webdrivers::BrowserNotFound)
+
+      locations.each do |dir|
+        expect(Webdrivers::System).to have_received(:to_wsl_path).with(dir)
+      end
+    end
+
+    it 'uses win_version to get the Chrome version using win32 path' do
+      allow(chrome_finder).to receive(:win_version).and_return('')
+      allow(File).to receive(:exist?).and_return(true)
+
+      # CIs don't support WSL yet, so our mocks lead to the error path for simplicity
+      expect { chrome_finder.version }.to raise_error(Webdrivers::VersionError)
+
+      expect(Webdrivers::System).to have_received(:to_win32_path)
+      expect(chrome_finder).to have_received(:win_version)
+    end
+  end
 end

data/spec/webdrivers/chromedriver_spec.rb

@@ -106,15 +106,16 @@ describe Webdrivers::Chromedriver do
       end
     end
 
-    it 'makes a network call if cached driver does not match the browser' do
+    it 'makes network calls if cached driver does not match the browser' do
       Webdrivers::System.cache_version('chromedriver', '71.0.3578.137')
+      allow(chromedriver).to receive(:current_version).and_return(Gem::Version.new('71.0.3578.137'))
       allow(chromedriver).to receive(:browser_version).and_return(Gem::Version.new('73.0.3683.68'))
       allow(Webdrivers::Network).to receive(:get).and_return('73.0.3683.68')
       allow(Webdrivers::System).to receive(:download)
 
       chromedriver.update
 
-      expect(Webdrivers::Network).to have_received(:get).once
+      expect(Webdrivers::Network).to have_received(:get).twice
     end
 
     context 'when required version is 0' do
@@ -155,19 +156,19 @@ describe Webdrivers::Chromedriver do
 
   describe '#latest_version' do
     it 'returns 2.41 if the browser version is less than 70' do
-      allow(chromedriver).to receive(:browser_version).and_return('69.0.0')
+      allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('69.0.0')
 
       expect(chromedriver.latest_version).to eq(Gem::Version.new('2.41'))
     end
 
     it 'returns the correct point release for a production version greater than 70' do
-      allow(chromedriver).to receive(:browser_version).and_return '71.0.3578.9999'
+      allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('71.0.3578.9999')
 
       expect(chromedriver.latest_version).to eq Gem::Version.new('71.0.3578.137')
     end
 
     it 'raises VersionError for beta version' do
-      allow(chromedriver).to receive(:browser_version).and_return('100.0.0')
+      allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('100.0.0')
       msg = 'Unable to find latest point release version for 100.0.0. '\
 'You appear to be using a non-production version of Chrome. '\
 'Please set `Webdrivers::Chromedriver.required_version = <desired driver version>` '\
@@ -177,7 +178,7 @@ describe Webdrivers::Chromedriver do
     end
 
     it 'raises VersionError for unknown version' do
-      allow(chromedriver).to receive(:browser_version).and_return('72.0.9999.0000')
+      allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('72.0.9999.0000')
       msg = 'Unable to find latest point release version for 72.0.9999. '\
 'Please set `Webdrivers::Chromedriver.required_version = <desired driver version>` '\
 'to a known chromedriver version: https://chromedriver.storage.googleapis.com/index.html'
@@ -199,9 +200,12 @@ describe Webdrivers::Chromedriver do
       expect(File.exist?("#{Webdrivers::System.install_dir}/chromedriver.version")).to eq true
     end
 
-    it 'does not make network call if cache is valid' do
+    it 'does not make network calls if cache is valid and driver exists' do
       allow(Webdrivers).to receive(:cache_time).and_return(3600)
       Webdrivers::System.cache_version('chromedriver', '71.0.3578.137')
+      allow(chromedriver).to receive(:current_version).and_return Gem::Version.new('71.0.3578.137')
+      allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('71.0.3578.137')
+      allow(Webdrivers::System).to receive(:exists?).and_return(true)
       allow(Webdrivers::Network).to receive(:get)
 
       expect(chromedriver.latest_version).to eq Gem::Version.new('71.0.3578.137')
@@ -209,10 +213,11 @@ describe Webdrivers::Chromedriver do
       expect(Webdrivers::Network).not_to have_received(:get)
     end
 
-    it 'makes a network call if cache is expired' do
+    it 'makes network calls if cache is expired' do
       Webdrivers::System.cache_version('chromedriver', '71.0.3578.137')
+      allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('71.0.3578.137')
       allow(Webdrivers::Network).to receive(:get).and_return('73.0.3683.68')
-      allow(Webdrivers::System).to receive(:valid_cache?)
+      allow(Webdrivers::System).to receive(:valid_cache?).and_return(false)
 
       expect(chromedriver.latest_version).to eq Gem::Version.new('73.0.3683.68')
 

data/spec/webdrivers/edgedriver_spec.rb

@@ -114,15 +114,16 @@ describe Webdrivers::Edgedriver do
       end
     end
 
-    it 'makes a network call if cached driver does not match the browser' do
+    it 'makes network calls if cached driver does not match the browser' do
       Webdrivers::System.cache_version('msedgedriver', '71.0.3578.137')
-      allow(edgedriver).to receive(:browser_version).and_return(Gem::Version.new('73.0.3683.68'))
+      allow(edgedriver).to receive(:current_version).and_return Gem::Version.new('71.0.3578.137')
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('73.0.3683.68')
       allow(Webdrivers::Network).to receive(:get).and_return('73.0.3683.68'.encode('UTF-16'))
       allow(Webdrivers::System).to receive(:download)
 
       edgedriver.update
 
-      expect(Webdrivers::Network).to have_received(:get).once
+      expect(Webdrivers::Network).to have_received(:get).twice
     end
 
     context 'when required version is 0' do
@@ -163,13 +164,13 @@ describe Webdrivers::Edgedriver do
 
   describe '#latest_version' do
     it 'returns the correct point release for a production version' do
-      allow(edgedriver).to receive(:browser_version).and_return '77.0.207.0'
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('77.0.207.0')
 
       expect(edgedriver.latest_version).to be_between(Gem::Version.new('77.0.207.0'), Gem::Version.new('78'))
     end
 
     it 'raises VersionError for beta version' do
-      allow(edgedriver).to receive(:browser_version).and_return('100.0.0')
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('100.0.0')
       msg = 'Unable to find latest point release version for 100.0.0. '\
 'You appear to be using a non-production version of Edge. '\
 'Please set `Webdrivers::Edgedriver.required_version = <desired driver version>` '\
@@ -196,28 +197,31 @@ describe Webdrivers::Edgedriver do
     end
 
     it 'creates cached file' do
-      allow(edgedriver).to receive(:browser_version).and_return('77.0.207.0')
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('77.0.207.0')
       allow(Webdrivers::Network).to receive(:get).and_return('77.0.207.0'.encode('UTF-16'))
 
       edgedriver.latest_version
       expect(File.exist?("#{Webdrivers::System.install_dir}/msedgedriver.version")).to eq true
     end
 
-    it 'does not make network call if cache is valid' do
+    it 'does not make network calls if cache is valid and driver exists' do
       allow(Webdrivers).to receive(:cache_time).and_return(3600)
-      Webdrivers::System.cache_version('msedgedriver', '77.0.207.0')
+      Webdrivers::System.cache_version('msedgedriver', '82.0.445.0')
+      allow(edgedriver).to receive(:current_version).and_return Gem::Version.new('82.0.445.0')
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('82.0.445.0')
+      allow(Webdrivers::System).to receive(:exists?).and_return(true)
       allow(Webdrivers::Network).to receive(:get)
 
-      expect(edgedriver.latest_version).to eq Gem::Version.new('77.0.207.0')
+      expect(edgedriver.latest_version).to eq Gem::Version.new('82.0.445.0')
 
       expect(Webdrivers::Network).not_to have_received(:get)
     end
 
-    it 'makes a network call if cache is expired' do
+    it 'makes network calls if cache is expired' do
       Webdrivers::System.cache_version('msedgedriver', '71.0.3578.137')
       allow(Webdrivers::Network).to receive(:get).and_return('77.0.207.0'.encode('UTF-16'))
-      allow(Webdrivers::System).to receive(:valid_cache?)
-      allow(edgedriver).to receive(:browser_version).and_return('77.0.207.0')
+      allow(Webdrivers::System).to receive(:valid_cache?).and_return(false)
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('77.0.207.0')
 
       expect(edgedriver.latest_version).to eq Gem::Version.new('77.0.207.0')
 

data/spec/webdrivers/geckodriver_spec.rb

@@ -135,9 +135,10 @@ You can obtain a copy of the license at https://mozilla.org/MPL/2.0/"
       expect(File.exist?("#{Webdrivers::System.install_dir}/geckodriver.version")).to eq true
     end
 
-    it 'does not make network call if cache is valid' do
+    it 'does not make network calls if cache is valid and driver exists' do
       allow(Webdrivers).to receive(:cache_time).and_return(3600)
       Webdrivers::System.cache_version('geckodriver', '0.23.0')
+      allow(Webdrivers::System).to receive(:exists?).and_return(true)
       allow(Webdrivers::Network).to receive(:get)
 
       expect(geckodriver.latest_version).to eq Gem::Version.new('0.23.0')

data/spec/webdrivers/i_edriver_spec.rb

@@ -115,9 +115,10 @@ describe Webdrivers::IEdriver do
       expect(File.exist?("#{Webdrivers::System.install_dir}/IEDriverServer.version")).to eq true
     end
 
-    it 'does not make network call if cache is valid' do
+    it 'does not make network calls if cache is valid and driver exists' do
       allow(Webdrivers).to receive(:cache_time).and_return(3600)
       Webdrivers::System.cache_version('IEDriverServer', '3.4.0')
+      allow(Webdrivers::System).to receive(:exists?).and_return(true)
       allow(Webdrivers::Network).to receive(:get)
 
       expect(iedriver.latest_version).to eq Gem::Version.new('3.4.0')

data/spec/webdrivers/system_spec.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+wsl_proc_contents = [
+  'Linux version 4.4.0-18362-Microsoft',
+  '(Microsoft@Microsoft.com)',
+  '(gcc version 5.4.0 (GCC) )',
+  '#836-Microsoft',
+  'Mon May 05 16:04:00 PST 2020'
+].join ' '
+
+describe Webdrivers::System do
+  describe '#wsl?' do
+    context 'when the current platform is linux' do
+      before { allow(described_class).to receive(:platform).and_return 'linux' }
+
+      it 'checks /proc/version' do
+        allow(File).to receive(:open).with('/proc/version').and_return(StringIO.new(wsl_proc_contents))
+
+        expect(described_class.wsl?).to eq true
+      end
+    end
+
+    context 'when the current platform is mac' do
+      before { allow(described_class).to receive(:platform).and_return 'mac' }
+
+      it 'does not bother checking proc' do
+        allow(File).to receive(:open).and_call_original
+
+        expect(described_class.wsl?).to eq false
+
+        expect(File).not_to have_received(:open).with('/proc/version')
+      end
+    end
+  end
+
+  describe '#to_win32_path' do
+    before { allow(described_class).to receive(:call).and_return("C:\\path\\to\\folder\n") }
+
+    it 'uses wslpath' do
+      described_class.to_win32_path '/c/path/to/folder'
+
+      expect(described_class).to have_received(:call).with('wslpath -w \'/c/path/to/folder\'')
+    end
+
+    it 'removes the trailing newline' do
+      expect(described_class.to_win32_path('/c/path/to/folder')).not_to end_with('\n')
+    end
+
+    context 'when the path is already in Windows format' do
+      it 'returns early' do
+        expect(described_class.to_win32_path('D:\\')).to eq 'D:\\'
+
+        expect(described_class).not_to have_received(:call)
+      end
+    end
+  end
+
+  describe '#to_wsl_path' do
+    before { allow(described_class).to receive(:call).and_return("/c/path/to/folder\n") }
+
+    it 'uses wslpath' do
+      described_class.to_wsl_path 'C:\\path\\to\\folder'
+
+      expect(described_class).to have_received(:call).with('wslpath -u \'C:\\path\\to\\folder\'')
+    end
+
+    it 'removes the trailing newline' do
+      expect(described_class.to_wsl_path('/c/path/to/folder')).not_to end_with('\n')
+    end
+  end
+end

data/support/install_jruby.ps1

@@ -1,5 +1,5 @@
-$downloadLink = "https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.7.0/jruby-dist-9.2.7.0-bin.zip"
-$zipPath = "c:\jruby-dist-9.2.7.0-bin.zip"
+$downloadLink = "https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.11.1/jruby-dist-9.2.11.1-bin.zip"
+$zipPath = "c:\jruby-dist-9.2.11.1-bin.zip"
 
 Write-Host "Installing $($env:RUBY_VERSION)" -ForegroundColor cyan
 appveyor DownloadFile "$($downloadLink)" -FileName "$($zipPath)"

data/support/install_msedge.ps1

@@ -1,17 +1,11 @@
-$downloadDevLink = "https://go.microsoft.com/fwlink/?linkid=2069324&Channel=Dev&language=en-us&Consent=0&IID=85213fc4-6a13-57ae-9082-72910982ede8"
-$downloadCanaryLink = "https://go.microsoft.com/fwlink/?linkid=2084706&Channel=Canary&language=en-us&Consent=0&IID=85213fc4-6a13-57ae-9082-72910982ede8"
-$devSetup = "C:\MicrosoftEdgeSetupDev.exe"
-$canarySetup = "C:\MicrosoftEdgeSetupCanary.exe"
+$downloadLink = "https://go.microsoft.com/fwlink/?linkid=2108834&Channel=Stable&language=en"
+$installerFile = "C:\MicrosoftEdgeSetup.exe"
 
 #  Note: We're purposely skipping the -Wait flag in Start-Process.
 #  This is because Edge auto-launches after the setup is done and
 #  Start-Process continues to indefinitely wait on that process.
-Write-Host "Installing Microsoft Edge (Dev)..." -ForegroundColor cyan
-Invoke-WebRequest $downloadDevLink -OutFile $devSetup # Download Dev
-Start-Process $devSetup # Run installer
-Write-Host "Microsoft Edge (Dev) installed.`n" -ForegroundColor green
-
-Write-Host "Installing Microsoft Edge (Canary)..." -ForegroundColor cyan
-Invoke-WebRequest $downloadCanaryLink -OutFile $canarySetup # Download Canary
-Start-Process $canarySetup # Run installer
-Write-Host "Microsoft Edge (Canary) installed.`n" -ForegroundColor green
+Write-Host "Downloading Microsoft Edge (Stable)..." -ForegroundColor cyan
+Invoke-WebRequest $downloadLink -OutFile $installerFile
+Write-Host "Installing..." -ForegroundColor cyan
+Start-Process $installerFile
+Write-Host "Microsoft Edge (Stable) installed.`n" -ForegroundColor green

data/webdrivers.gemspec

@@ -7,6 +7,7 @@ require 'webdrivers/version'
 Gem::Specification.new do |s|
   s.name        = 'webdrivers'
   s.version     = Webdrivers::VERSION
+  s.required_ruby_version = '>= 2.4.0'
   s.authors     = ['Titus Fortner', 'Lakshya Kapoor', 'Thomas Walpole']
   s.email       = %w[titusfortner@gmail.com kapoorlakshya@gmail.com]
   s.homepage    = 'https://github.com/titusfortner/webdrivers'
@@ -14,13 +15,19 @@ Gem::Specification.new do |s|
   s.description = 'Run Selenium tests more easily with install and updates for all supported webdrivers.'
   s.licenses    = ['MIT']
 
+  s.metadata = {
+    'bug_tracker_uri' => 'https://github.com/titusfortner/webdrivers/issues',
+    'changelog_uri' => 'https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md',
+    'documentation_uri' => "https://www.rubydoc.info/gems/webdrivers/#{Webdrivers::VERSION}",
+    'source_code_uri' => "https://github.com/titusfortner/webdrivers/tree/v#{Webdrivers::VERSION}"
+  }
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
   s.add_development_dependency 'ffi', '~> 1.0' # For selenium-webdriver on Windows
-  s.add_development_dependency 'irb'
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rubocop', '~>0.66'
@@ -29,6 +36,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '~>0.16'
 
   s.add_runtime_dependency 'nokogiri', '~> 1.6'
-  s.add_runtime_dependency 'rubyzip', '~> 1.0'
+  s.add_runtime_dependency 'rubyzip', '>= 1.3.0'
   s.add_runtime_dependency 'selenium-webdriver', '>= 3.0', '< 4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.4.0
 platform: ruby
 authors:
 - Titus Fortner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -26,20 +26,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: irb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,16 +128,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +163,9 @@ description: Run Selenium tests more easily with install and updates for all sup
 email:
 - titusfortner@gmail.com
 - kapoorlakshya@gmail.com
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -191,6 +179,8 @@ files:
 - README.md
 - Rakefile
 - appveyor.yml
+- bin/console
+- bin/setup
 - gemfiles/Gemfile.edge
 - lib/webdrivers.rb
 - lib/webdrivers/Rakefile
@@ -217,6 +207,7 @@ files:
 - spec/webdrivers/edgedriver_spec.rb
 - spec/webdrivers/geckodriver_spec.rb
 - spec/webdrivers/i_edriver_spec.rb
+- spec/webdrivers/system_spec.rb
 - spec/webdrivers/webdrivers_spec.rb
 - spec/webdrivers_proxy_support_spec.rb
 - support/install_jruby.ps1
@@ -225,7 +216,11 @@ files:
 homepage: https://github.com/titusfortner/webdrivers
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/titusfortner/webdrivers/issues
+  changelog_uri: https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webdrivers/4.4.0
+  source_code_uri: https://github.com/titusfortner/webdrivers/tree/v4.4.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -234,14 +229,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Easy download and use of browser drivers.