webdrivers 3.2.4 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca1ac3aeef06a8be8d433cde3199d6fe8609b88d
-  data.tar.gz: c51bbd846ff0fbb6e21213be144a1f9c72538616
+  metadata.gz: 38a8045b1c217acbc4ef3163a4c5cf9c7b49f39d
+  data.tar.gz: c37958c1c522eaa4678052ffa59699287f182cce
 SHA512:
-  metadata.gz: c9fc8f2e6c6e1268fc69fc7c76f197234da084b11f3298f8742449f4e44ee5d4b2605369c03ac0efcb5895814dcb4207c1514a3419486f2c5603c49576b4c48f
-  data.tar.gz: 81ffe1608b1d783df44a7e75075ed601e4fb6553e244733153f4098803ff05e0ba4acaa604398c7cf232ffe05ec6211a6731d5ced87e337078b27299f6e92c45
+  metadata.gz: 3f393257af259775e469647eb1d6bd3bc2afd869ffc7fbf03a9bf00188d6be30157cf214610f0398c0451f06ef99b1d3d9ff0abbe5769c1595373308e097cacf
+  data.tar.gz: 30e8898a5314378a9df00b15100bdb5c63e914b991d683b42fccc3422ddd351ebcf4c0f67b181df010418333ca7dfcd3c35a49045f069337dce7e02a9a768977

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-### 3.2.3 (2017-01-04)
+### 3.3.0 (2018-04-29)
+
+* Ensures downloading correct MSWebdriver version (Thanks kapoorlakshya) 
+
+### 3.2.4 (2017-01-04)
 
 * Improve error message when unable to find the latest driver
 

data/lib/webdrivers/common.rb

@@ -9,18 +9,24 @@ module Webdrivers
         unless site_available?
           return current.nil? ? nil : binary
         end
-        released = latest()
-        location = binary()
+        released      = latest()
+        location      = binary()
+        binary_exists = File.exists?(location)
 
-        return location if released.nil? && File.exist?(location)
+        return location if released.nil? && binary_exists
 
         if released.nil?
           msg = "Unable to find the latest version of #{file_name}; try downloading manually from #{base_url} and place in #{install_dir}"
           raise StandardError, msg
         end
 
-        return location if current == released
-        remove && download
+        if current == released && binary_exists # Already have latest/matching one
+          Webdrivers.logger.debug "Expected webdriver version found"
+          return location
+        end
+
+        remove if binary_exists # Remove outdated exe
+        download
       end
 
       def latest
@@ -33,7 +39,7 @@ module Webdrivers
       end
 
       def download(version = nil)
-        url = download_url(version)
+        url      = download_url(version)
         filename = File.basename url
 
         Dir.mkdir(install_dir) unless File.exists?(install_dir)
@@ -83,7 +89,7 @@ module Webdrivers
       def http
         if using_proxy
           return Net::HTTP.Proxy(Webdrivers.proxy_addr, Webdrivers.proxy_port,
-                          Webdrivers.proxy_user, Webdrivers.proxy_pass)
+                                 Webdrivers.proxy_user, Webdrivers.proxy_pass)
         end
         return Net::HTTP
       end
@@ -151,7 +157,7 @@ module Webdrivers
         tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(filename))
 
         File.open(file_name, "w+b") do |ucf|
-          tar_extract.each {|entry| ucf << entry.read}
+          tar_extract.each { |entry| ucf << entry.read }
           File.basename ucf
         end
       end
@@ -160,7 +166,7 @@ module Webdrivers
         Zip::File.open("#{Dir.pwd}/#{filename}") do |zip_file|
           zip_file.each do |f|
             @top_path ||= f.name
-            f_path = File.join(Dir.pwd, f.name)
+            f_path    = File.join(Dir.pwd, f.name)
             FileUtils.rm_rf(f_path) if File.exist?(f_path)
             FileUtils.mkdir_p(File.dirname(f_path)) unless File.exist?(File.dirname(f_path))
             zip_file.extract(f, f_path)
@@ -170,7 +176,7 @@ module Webdrivers
       end
 
       def install_dir
-        File.expand_path(File.join(ENV['HOME'], ".webdrivers")).tap {|dir| FileUtils.mkdir_p dir}
+        File.expand_path(File.join(ENV['HOME'], ".webdrivers")).tap { |dir| FileUtils.mkdir_p dir }
       end
     end
   end

data/lib/webdrivers/mswebdriver.rb

@@ -4,51 +4,42 @@ module Webdrivers
 
       def current
         Webdrivers.logger.debug "Checking current version"
-        version = %x(ver)
-        Webdrivers.logger.debug "Current version of Windows Build is #{version}"
-        version[/\d+\.\d+\.\d+/][/[^\.]\d+$/]
-      end
 
-      def latest
-        # unknown; have to always download
+        # current() from other webdrivers returns the version from the webdriver EXE.
+        # Unfortunately, MicrosoftWebDriver.exe does not have an option to get the version.
+        # To work around it we query the currently installed version of Microsoft Edge instead
+        # and compare it to the list of available downloads.
+        version = `powershell (Get-AppxPackage -Name Microsoft.MicrosoftEdge).Version`
+        raise "Failed to check Microsoft Edge version." if version.empty? # Package name changed?
+        Webdrivers.logger.debug "Current version of Microsoft Edge is #{version.chomp!}"
+
+        build = version.split('.')[1] # "41.16299.248.0" => "16299"
+        Webdrivers.logger.debug "Expecting MicrosoftWebDriver.exe version #{build}"
+        build.to_i
       end
 
       private
 
       def normalize(string)
-        string.match(/(\d+)\.(\d+\.\d+)/).to_a.map {|v| v.tr('.', '')}[1..-1].join('.').to_f
+        string.match(/(\d+)\.(\d+\.\d+)/).to_a.map { |v| v.tr('.', '') }[1 .. -1].join('.').to_f
       end
 
       def file_name
         "MicrosoftWebDriver.exe"
       end
 
-      def download_url(_version = nil)
+      def downloads
         raise StandardError, "Can not reach site" unless site_available?
-
-        case current.to_i
-        when 10240
-          Webdrivers.logger.debug "Attempting to Download Build for 10240"
-          "https://download.microsoft.com/download/8/D/0/8D0D08CF-790D-4586-B726-C6469A9ED49C/MicrosoftWebDriver.msi"
-        when 10586
-          Webdrivers.logger.debug "Attempting to Download Build for 10586"
-          "https://download.microsoft.com/download/C/0/7/C07EBF21-5305-4EC8-83B1-A6FCC8F93F45/MicrosoftWebDriver.msi"
-        when 14393
-          Webdrivers.logger.debug "Attempting to Download Build for 14393"
-          "https://download.microsoft.com/download/3/2/D/32D3E464-F2EF-490F-841B-05D53C848D15/MicrosoftWebDriver.exe"
-        when 15063
-          Webdrivers.logger.debug "Attempting to Download Build for 15063"
-          "https://download.microsoft.com/download/3/4/2/342316D7-EBE0-4F10-ABA2-AE8E0CDF36DD/MicrosoftWebDriver.exe"
-        else
-          Webdrivers.logger.debug "Attempting to Download Latest Insider's Version"
-          "https://download.microsoft.com/download/1/4/1/14156DA0-D40F-460A-B14D-1B264CA081A5/MicrosoftWebDriver.exe"
+        array = Nokogiri::HTML(get(base_url)).xpath("//li[@class='driver-download']/a")
+        array.each_with_object({}) do |link, hash|
+          next if link.text == 'Insiders'
+          hash[link.text.scan(/\d+/).first.to_i] = link['href']
         end
       end
 
       def base_url
-        'https://www.microsoft.com/en-us/download'
+        'https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/'
       end
-
     end
   end
 end

data/spec/geckodriver_spec.rb

@@ -19,7 +19,7 @@ describe Webdrivers::Geckodriver do
 
   it 'finds latest version' do
     expect(geckodriver.latest).to be > 0.17
-    expect(geckodriver.latest).to be < 0.2
+    expect(geckodriver.latest).to be <= 0.201
   end
 
   it 'downloads latest version by default' do

data/spec/mswebdriver_spec.rb

@@ -19,7 +19,7 @@ describe Webdrivers::MSWebdriver do
     before { allow(mswebdriver).to receive(:site_available?).and_return(false) }
 
     it 'raises exception downloading' do
-      expect {mswebdriver.download}.to raise_error(StandardError, "Can not reach site")
+      expect { mswebdriver.download }.to raise_error(StandardError, "Can not reach site")
     end
   end
 

data/webdrivers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "webdrivers"
-  s.version     = "3.2.4"
+  s.version     = "3.3.0"
   s.authors     = ["Titus Fortner"]
   s.email       = ["titusfortner@gmail.com"]
   s.homepage    = "https://github.com/titusfortner/webdrivers"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.3.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec