webdrivers 5.0.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4c9d9a6544732e58eb7a88d34e39b188b5ff658caaa14fbdff15931a69d1e2d
-  data.tar.gz: 92a4997e99508bb79374838461cd2fee48591185b271dd6ce170628c51a02c2c
+  metadata.gz: abf2f2c3590d8497b09a84c7f2b55c2b8c5a5cf5752d178fcd4e4a852c0cfd2c
+  data.tar.gz: 422f61f2c96fa03e7d4ae5b8564d52058f13334d51ccda07b334805bb2403d6b
 SHA512:
-  metadata.gz: fb469a584a66b14097ec87b6a8f2ad30e2cbefdaeef91efd2a50f16ff0451c8a748f8607d53d06ceed3506d61e54ef31b9997e068f9e55dfe9136f8012570234
-  data.tar.gz: ed61ff78edd17f205673242eeba0fa76dcb2df9675a7d8dc4c813e8dd056799a44b13c1a10b238eeb36bae96cc188ca20c4edd71aebf9ec48e9a78e613136f17
+  metadata.gz: dad2443ef52807af22f9780064bb72c226e9101e9997bd787e6ccd3c8a2e161357eb46f476e663a046bee4b9848002f2112a3db5e03a13cd7ca87b564708f54b
+  data.tar.gz: 809752d1ef3e67e1fe8a5021eeafe3ab93ad1436c1c894ca6765e8f9e739caf8b4b359d2f2ced0ee61cd118cb7492a8281049f60695d2ba0ec5a51d3fa76b1f4

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 5.2.0 (2022-09-29)
+* `chromedriver` - Fix downloading on M1 macs from version 106.0.5249.61 ([#237](https://github.com/titusfortner/webdrivers/issues/237), thanks jmccure)
+
+# 5.1.0 (2022-09-19)
+* Improve error messages (#232, thanks dan-jensen)
+* Fix circular require bug with railtie (#233, thanks amatsuda)
+* Support downloading correct geckodriver on Apple silicon (#234 thanks stephannv)
+* Update linux locations for Chrome to latest chromedriver finder (thanks entretechno-jeremiah) 
+* Add support for Microsoft Edge on Linux (#236)
+
 # 5.0.0 (2021-10-19)
 * Require Selenium 4+
 * Remove custom Logger and use the one in Selenium 4

data/lib/webdrivers/chrome_finder.rb

@@ -8,7 +8,7 @@ module Webdrivers
     class << self
       def version
         version = send("#{System.platform}_version", location)
-        raise VersionError, 'Failed to find Chrome version.' if version.nil? || version.empty?
+        raise VersionError, 'Failed to determine Chrome 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
@@ -18,7 +18,7 @@ module Webdrivers
         chrome_bin = user_defined_location || send("#{System.platform}_location")
         return chrome_bin unless chrome_bin.nil?
 
-        raise BrowserNotFound, 'Failed to find Chrome binary.'
+        raise BrowserNotFound, 'Failed to determine Chrome binary location.'
       end
 
       private
@@ -90,7 +90,17 @@ module Webdrivers
       def linux_location
         return wsl_location if System.wsl_v1?
 
-        directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /snap/bin /opt/google/chrome]
+        directories = %w[
+          /usr/local/sbin
+          /usr/local/bin
+          /usr/sbin
+          /usr/bin
+          /sbin
+          /bin
+          /snap/bin
+          /opt/google/chrome
+          /opt/chromium.org/chromium
+        ]
         files = %w[google-chrome chrome chromium chromium-browser]
 
         directories.each do |dir|

data/lib/webdrivers/chromedriver.rb

@@ -97,6 +97,14 @@ module Webdrivers
         false
       end
 
+      def apple_filename(driver_version)
+        if apple_m1_compatible?(driver_version)
+          driver_version >= normalize_version('106.0.5249.61') ? 'mac_arm64' : 'mac64_m1'
+        else
+          'mac64'
+        end
+      end
+
       def direct_url(driver_version)
         "#{base_url}/#{driver_version}/chromedriver_#{driver_filename(driver_version)}.zip"
       end
@@ -107,8 +115,7 @@ module Webdrivers
         elsif System.platform == 'linux'
           'linux64'
         elsif System.platform == 'mac'
-          apple_arch = apple_m1_compatible?(driver_version) ? '_m1' : ''
-          "mac64#{apple_arch}"
+          apple_filename(driver_version)
         else
           raise 'Failed to determine driver filename to download for your OS.'
         end

data/lib/webdrivers/edge_finder.rb

@@ -69,18 +69,17 @@ module Webdrivers
       end
 
       def linux_location
-        # directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /snap/bin /opt/google/chrome]
-        # files = %w[microsoft-edge] # Based on Microsoft Edge 89.0.760.0 dev
-        #
-        # directories.each do |dir|
-        #   files.each do |file|
-        #     option = "#{dir}/#{file}"
-        #     return option if File.exist?(option)
-        #   end
-        # end
-        #
-        # nil
-        raise 'Default location not yet known'
+        directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /snap/bin /opt/microsoft/edge]
+        files = %w[microsoft-edge microsoft-edge-beta microsoft-edge-dev]
+
+        directories.each do |dir|
+          files.each do |file|
+            option = "#{dir}/#{file}"
+            return option if File.exist?(option)
+          end
+        end
+
+        nil
       end
 
       def win_version(location)

data/lib/webdrivers/edgedriver.rb

@@ -22,8 +22,7 @@ module Webdrivers
       #
       # @return [String]
       def base_url
-        # 'https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/'
-        'https://msedgedriver.azureedge.net/'
+        'https://msedgedriver.azureedge.net'
       end
 
       private
@@ -76,14 +75,10 @@ module Webdrivers
         false
       end
 
-      def linux_compatible?(driver_version)
-        System.platform == 'linux' && driver_version >= normalize_version('89.0.731.0')
-      end
-
       def driver_filename(driver_version)
         if System.platform == 'win' || System.wsl_v1?
           "win#{System.bitsize}" # 32 or 64-bit
-        elsif linux_compatible?(driver_version)
+        elsif System.platform == 'linux'
           'linux64'
         elsif System.platform == 'mac'
           # Determine M1 or Intel architecture

data/lib/webdrivers/geckodriver.rb

@@ -51,7 +51,7 @@ module Webdrivers
         when 'linux'
           "linux#{System.bitsize}.tar.gz"
         when 'mac'
-          'macos.tar.gz'
+          System.apple_m1_architecture? ? 'macos-aarch64.tar.gz' : 'macos.tar.gz'
         when 'win'
           "win#{System.bitsize}.zip"
         end

data/lib/webdrivers/railtie.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'webdrivers'
 require 'rails'
 
 module Webdrivers

data/lib/webdrivers/version.rb

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

data/spec/webdrivers/chromedriver_spec.rb

@@ -168,8 +168,8 @@ describe Webdrivers::Chromedriver do
     end
 
     it 'raises VersionError for beta version' do
-      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. '\
+      allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('999.0.0')
+      msg = 'Unable to find latest point release version for 999.0.0. '\
 'You appear to be using a non-production version of Chrome. '\
 'Please set `Webdrivers::Chromedriver.required_version = <desired driver version>` '\
 'to a known chromedriver version: https://chromedriver.storage.googleapis.com/index.html'

data/spec/webdrivers/edgedriver_spec.rb

@@ -6,7 +6,6 @@ describe Webdrivers::Edgedriver do
   let(:edgedriver) { described_class }
 
   before do
-    skip 'Edge is not yet supported on Linux' if Webdrivers::System.platform == 'linux'
     edgedriver.remove
   end
 
@@ -123,19 +122,19 @@ describe Webdrivers::Edgedriver do
 
     context 'when required version is 0' do
       it 'downloads the latest version' do
-        allow(edgedriver).to receive(:latest_version).and_return(Gem::Version.new('77.0.207.0'))
+        allow(edgedriver).to receive(:latest_version).and_return(Gem::Version.new('98.0.1089.1'))
         edgedriver.required_version = 0
         edgedriver.update
-        expect(edgedriver.current_version.version).to eq('77.0.207.0')
+        expect(edgedriver.current_version.version).to eq('98.0.1089.1')
       end
     end
 
     context 'when required version is nil' do
       it 'downloads the latest version' do
-        allow(edgedriver).to receive(:latest_version).and_return(Gem::Version.new('77.0.207.0'))
+        allow(edgedriver).to receive(:latest_version).and_return(Gem::Version.new('98.0.1089.1'))
         edgedriver.required_version = nil
         edgedriver.update
-        expect(edgedriver.current_version.version).to eq('77.0.207.0')
+        expect(edgedriver.current_version.version).to eq('98.0.1089.1')
       end
     end
   end
@@ -165,11 +164,11 @@ describe Webdrivers::Edgedriver do
     end
 
     it 'raises VersionError for beta version' do
-      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. '\
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('999.0.0')
+      msg = 'Unable to find latest point release version for 999.0.0. '\
 'You appear to be using a non-production version of Edge. '\
 'Please set `Webdrivers::Edgedriver.required_version = <desired driver version>` '\
-'to a known edgedriver version: Can not reach https://msedgedriver.azureedge.net/'
+'to a known edgedriver version: Can not reach https://msedgedriver.azureedge.net'
 
       expect { edgedriver.latest_version }.to raise_exception(Webdrivers::VersionError, msg)
     end
@@ -178,7 +177,7 @@ describe Webdrivers::Edgedriver do
       allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('77.0.9999')
       msg = 'Unable to find latest point release version for 77.0.9999. '\
 'Please set `Webdrivers::Edgedriver.required_version = <desired driver version>` '\
-'to a known edgedriver version: Can not reach https://msedgedriver.azureedge.net/'
+'to a known edgedriver version: Can not reach https://msedgedriver.azureedge.net'
 
       expect { edgedriver.latest_version }.to raise_exception(Webdrivers::VersionError, msg)
     end

data/spec/webdrivers/geckodriver_spec.rb

@@ -92,6 +92,40 @@ describe Webdrivers::Geckodriver do
       msg = /Net::HTTPServerException: 404 "Not Found"/
       expect { geckodriver.update }.to raise_error(StandardError, msg)
     end
+
+    context 'when platform is Apple Sillicon' do
+      it 'downloads aarch64 binary' do
+        allow(Webdrivers::System).to receive(:platform).and_return('mac')
+        allow(Webdrivers::System).to receive(:apple_m1_architecture?).and_return(true)
+        base = 'https://github.com/mozilla/geckodriver/releases/download'
+        binary = 'geckodriver-v0.31.0-macos-aarch64.tar.gz'
+        url = "#{base}/v0.31.0/#{binary}"
+
+        allow(Webdrivers::System).to receive(:download).with(url, geckodriver.driver_path)
+
+        geckodriver.required_version = '0.31.0'
+        geckodriver.update
+
+        expect(Webdrivers::System).to have_received(:download).with(url, geckodriver.driver_path)
+      end
+    end
+
+    context 'when platform isn\'t Apple Sillicon' do
+      it 'downloads default binary' do
+        allow(Webdrivers::System).to receive(:platform).and_return('mac')
+        allow(Webdrivers::System).to receive(:apple_m1_architecture?).and_return(false)
+        base = 'https://github.com/mozilla/geckodriver/releases/download'
+        binary = 'geckodriver-v0.31.0-macos.tar.gz'
+        url = "#{base}/v0.31.0/#{binary}"
+
+        allow(Webdrivers::System).to receive(:download).with(url, geckodriver.driver_path)
+
+        geckodriver.required_version = '0.31.0'
+        geckodriver.update
+
+        expect(Webdrivers::System).to have_received(:download).with(url, geckodriver.driver_path)
+      end
+    end
   end
 
   describe '#current_version' do

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Titus Fortner
 - Lakshya Kapoor
 - Thomas Walpole
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2022-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -212,9 +212,9 @@ licenses:
 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/5.0.0
-  source_code_uri: https://github.com/titusfortner/webdrivers/tree/v5.0.0
-post_install_message:
+  documentation_uri: https://www.rubydoc.info/gems/webdrivers/5.2.0
+  source_code_uri: https://github.com/titusfortner/webdrivers/tree/v5.2.0
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -229,18 +229,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.3.22
+signing_key: 
 specification_version: 4
 summary: Easy download and use of browser drivers.
 test_files:
 - spec/spec_helper.rb
 - spec/webdrivers/chrome_finder_spec.rb
-- spec/webdrivers/chromedriver_spec.rb
 - spec/webdrivers/edge_finder_spec.rb
+- spec/webdrivers/webdrivers_spec.rb
+- spec/webdrivers/system_spec.rb
 - 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/geckodriver_spec.rb
+- spec/webdrivers/chromedriver_spec.rb
 - spec/webdrivers_proxy_support_spec.rb