webdrivers 3.5.0.beta1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f292b9f00d51fa84cf046500d96f6e974756f4822bea030b04f020a221912e45
-  data.tar.gz: bca6951770b45c20b275eceb2339e77cdaa6089a63b9ce232264c91690a2e2f7
+  metadata.gz: ddc5e44a53b52ce88415b480985d2311a80f05503458781ac7e7304d3a18e604
+  data.tar.gz: '091a196ecafe8884afb8aa622af317f870a6863632af1d7eba496fdb1c4bf312'
 SHA512:
-  metadata.gz: 23bd4cbf655e4983b70f5405d2e2f1229b9f61743e1cfa81971a62f5e71920a07e557a6341842d9d5a44eda718c6cb79741c1b260561d5563bd2519b5abb3c9b
-  data.tar.gz: 37be287a21d845cbc09a7e98d524275167dd7af804a7e5a7577082e43bcfe3daaccaadf65b637dac7929a70c28561f937719b957bc45796301c4460f417ae3b7
+  metadata.gz: bbe539d47bdc43515eeeedb2a31f098255498f7d1fa2506587fad44ec44fd703aab8566693eea35833de3f60f954a110532dbc45d579a574f8aeed3f813830dc
+  data.tar.gz: ff60fc0f3367ea39306625cffc766066528f97fefede0bb9bed2c6097306000b2a50ab38b2865c7eef07ba36088883ffab6c6d590338a3acfabd0c7f02d564c1

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 3.5.0 (2018-12-15)
+
 ### 3.5.0.beta1 (2018-12-15)
 
 * Allow version to be specified

data/lib/webdrivers/chromedriver.rb

@@ -13,6 +13,7 @@ module Webdrivers
       end
 
       def latest_version
+        raise StandardError, "Can not reach site" unless site_available?
         Gem::Version.new(get(URI.join(base_url, "LATEST_RELEASE")))
       end
 
@@ -27,7 +28,6 @@ module Webdrivers
       end
 
       def downloads
-        raise StandardError, "Can not download from website" unless site_available?
         Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
 
         @downloads ||= begin

data/lib/webdrivers/common.rb

@@ -12,9 +12,11 @@ module Webdrivers
           return current_version.nil? ? nil : binary
         end
 
-        return binary if desired_version.nil? && File.exists?(binary) # Newer not found, keep current
+        # Newer not specified or latest not found, so use existing
+        return binary if desired_version.nil? && File.exists?(binary)
 
-        if desired_version.nil? # Can't find latest and no existing binary
+        # Can't find desired and no existing binary
+        if desired_version.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
@@ -39,6 +41,8 @@ module Webdrivers
       end
 
       def latest_version
+        raise StandardError, "Can not reach site" unless site_available?
+
         downloads.keys.sort.last
       end
 
@@ -48,6 +52,8 @@ module Webdrivers
       end
 
       def download
+        raise StandardError, "Can not reach site" unless site_available?
+
         url = downloads[desired_version]
         filename = File.basename url
 
@@ -105,10 +111,11 @@ module Webdrivers
 
       def http
         if using_proxy
-          return Net::HTTP.Proxy(Webdrivers.proxy_addr, Webdrivers.proxy_port,
+          Net::HTTP.Proxy(Webdrivers.proxy_addr, Webdrivers.proxy_port,
                                  Webdrivers.proxy_user, Webdrivers.proxy_pass)
+        else
+          Net::HTTP
         end
-        return Net::HTTP
       end
 
       private
@@ -124,6 +131,7 @@ module Webdrivers
       end
 
       def site_available?
+        Webdrivers.logger.debug "Looking for Site: #{base_url}"
         get(base_url)
         Webdrivers.logger.debug "Found Site: #{base_url}"
         true

data/lib/webdrivers/geckodriver.rb

@@ -15,7 +15,6 @@ module Webdrivers
       private
 
       def downloads
-        raise StandardError, "Can not reach site" unless site_available?
         Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
 
         @downloads ||= begin

data/lib/webdrivers/iedriver.rb

@@ -24,7 +24,6 @@ module Webdrivers
       end
 
       def downloads
-        raise StandardError, "Can not reach site" unless site_available?
         Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
 
         @downloads ||= begin

data/lib/webdrivers/mswebdriver.rb

@@ -24,6 +24,10 @@ module Webdrivers
       # currently installed browser version.
       alias :version :windows_version
 
+      def version=(*)
+        raise "Version can not be set for MSWebdriver because it is dependent on the version of Edge"
+      end
+
       private
 
       def file_name
@@ -31,11 +35,11 @@ module Webdrivers
       end
 
       def downloads
-        raise StandardError, "Can not reach site" unless site_available?
         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']
+          key = normalize link.text.scan(/\d+/).first.to_i
+          hash[key] = link['href']
         end
       end
 

data/spec/chromedriver_spec.rb

@@ -49,12 +49,12 @@ describe Webdrivers::Chromedriver do
   context 'when offline' do
     before { allow(chromedriver).to receive(:site_available?).and_return(false) }
 
-    xit 'raises exception finding latest version' do
-      expect {chromedriver.latest_version}.to raise_error(StandardError, "Can not download from website")
+    it 'raises exception finding latest version' do
+      expect {chromedriver.latest_version}.to raise_error(StandardError, "Can not reach site")
     end
 
     it 'raises exception downloading' do
-      expect {chromedriver.download}.to raise_error(StandardError, "Can not download from website")
+      expect {chromedriver.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.5.0.beta1"
+  s.version     = "3.5.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.5.0.beta1
+  version: 3.5.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -125,9 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6