webdrivers 3.4.3 → 3.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d99303e61a135d89ea3845d56fa245f0b5cc33c9
-  data.tar.gz: d168c888708ea9e2b103be60569ed6649d3e3aa5
+SHA256:
+  metadata.gz: f292b9f00d51fa84cf046500d96f6e974756f4822bea030b04f020a221912e45
+  data.tar.gz: bca6951770b45c20b275eceb2339e77cdaa6089a63b9ce232264c91690a2e2f7
 SHA512:
-  metadata.gz: 8b1e0cd42257045b3564394d4baa6ccb6be8f888431d4ddcf10e8263d02614c58cc866eac2b004759efedd15198900880308e57c5c0ebc8f6e9c1f4f04478328
-  data.tar.gz: d042c82661fb58d6b1ef075b1b0861c5e724086711bdb9f02a7b91aa1d5515a48ffdc822d1e562f6355392801f45614d40da653d0c3ce55b58200895e2d81e9a
+  metadata.gz: 23bd4cbf655e4983b70f5405d2e2f1229b9f61743e1cfa81971a62f5e71920a07e557a6341842d9d5a44eda718c6cb79741c1b260561d5563bd2519b5abb3c9b
+  data.tar.gz: 37be287a21d845cbc09a7e98d524275167dd7af804a7e5a7577082e43bcfe3daaccaadf65b637dac7929a70c28561f937719b957bc45796301c4460f417ae3b7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 3.5.0.beta1 (2018-12-15)
+
+* Allow version to be specified
+
 ### 3.4.3 (2018-10-22)
 
 * Fix bug with JRuby and geckodriver (thanks twalpole)

data/lib/webdrivers/chromedriver.rb

@@ -4,15 +4,15 @@ module Webdrivers
   class Chromedriver < Common
     class << self
 
-      def current
+      def current_version
         Webdrivers.logger.debug "Checking current version"
         return nil unless downloaded?
         string = %x(#{binary} --version)
         Webdrivers.logger.debug "Current version of #{binary} is #{string}"
-        normalize string.match(/ChromeDriver (\d\.\d+)/)[1]
+        normalize string.match(/ChromeDriver (\d+\.\d+)/)[1]
       end
 
-      def latest
+      def latest_version
         Gem::Version.new(get(URI.join(base_url, "LATEST_RELEASE")))
       end
 

data/lib/webdrivers/common.rb

@@ -5,30 +5,40 @@ module Webdrivers
   class Common
     class << self
 
+      attr_accessor :version
+
       def update
         unless site_available?
-          return current.nil? ? nil : binary
+          return current_version.nil? ? nil : binary
         end
-        released = latest()
-        location = binary()
 
-        return location if released.nil? && File.exists?(binary) # Newer not found, keep current
+        return binary if desired_version.nil? && File.exists?(binary) # Newer not found, keep current
 
-        if released.nil? # Can't find latest and no existing binary
+        if desired_version.nil? # Can't find latest and no existing binary
           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
 
         if correct_binary?
           Webdrivers.logger.debug "Expected webdriver version found"
-          return location
+          return binary
         end
 
         remove # Remove outdated exe
         download # Fetch latest
       end
 
-      def latest
+      def desired_version
+        if self.version.is_a?(Gem::Version)
+          version
+        elsif self.version.nil?
+          latest_version
+        else
+          Gem::Version.new(self.version.to_s)
+        end
+      end
+
+      def latest_version
         downloads.keys.sort.last
       end
 
@@ -37,8 +47,8 @@ module Webdrivers
         FileUtils.rm_f binary
       end
 
-      def download(version = nil)
-        url      = download_url(version)
+      def download
+        url = downloads[desired_version]
         filename = File.basename url
 
         FileUtils.mkdir_p(install_dir) unless File.exists?(install_dir)
@@ -107,17 +117,6 @@ module Webdrivers
         Webdrivers.proxy_addr && Webdrivers.proxy_port
       end
 
-      def download_url(version)
-        key = if version.is_a?(Gem::Version)
-                version
-              elsif version.nil?
-                latest
-              else
-                Gem::Version.new(version.to_s)
-              end
-        downloads[key]
-      end
-
       def downloaded?
         result = File.exist? binary
         Webdrivers.logger.debug "File is already downloaded: #{result}"
@@ -187,7 +186,7 @@ module Webdrivers
 
       # Already have latest version downloaded?
       def correct_binary?
-        latest == current && File.exists?(binary)
+        latest_version == current_version && File.exists?(binary)
       end
 
       def normalize(string)

data/lib/webdrivers/geckodriver.rb

@@ -4,7 +4,7 @@ module Webdrivers
   class Geckodriver < Common
     class << self
 
-      def current
+      def current_version
         Webdrivers.logger.debug "Checking current version"
         return nil unless downloaded?
         string = %x(#{binary} --version)

data/lib/webdrivers/iedriver.rb

@@ -5,7 +5,7 @@ module Webdrivers
   class IEdriver < Common
     class << self
 
-      def current
+      def current_version
         Webdrivers.logger.debug "Checking current version"
         return nil unless downloaded?
         string = %x(#{binary} --version)

data/lib/webdrivers/mswebdriver.rb

@@ -3,10 +3,10 @@ module Webdrivers
 
     class << self
 
-      def current
+      def windows_version
         Webdrivers.logger.debug "Checking current version"
 
-        # current() from other webdrivers returns the version from the webdriver EXE.
+        # current_version() 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.
@@ -22,9 +22,7 @@ module Webdrivers
       # Webdriver binaries for Microsoft Edge are not backwards compatible.
       # For this reason, instead of downloading the latest binary we download the correct one for the
       # currently installed browser version.
-      def download(version = current)
-        super
-      end
+      alias :version :windows_version
 
       private
 

data/spec/chromedriver_spec.rb

@@ -4,6 +4,10 @@ describe Webdrivers::Chromedriver do
 
   let(:chromedriver) { Webdrivers::Chromedriver }
 
+  it 'updates' do
+    chromedriver.update
+  end
+
   it 'parses chromedriver versions before 2.10' do
     expect(chromedriver.send(:normalize, '2.9').version).to eq '2.9'
   end
@@ -11,7 +15,7 @@ describe Webdrivers::Chromedriver do
   it 'finds latest version' do
     old_version = Gem::Version.new("2.30")
     future_version = Gem::Version.new("2.90")
-    latest_version = chromedriver.latest
+    latest_version = chromedriver.latest_version
 
     expect(latest_version).to be > old_version
     expect(latest_version).to be < future_version
@@ -20,31 +24,33 @@ describe Webdrivers::Chromedriver do
   it 'downloads latest version by default' do
     chromedriver.remove
     chromedriver.download
-    expect(chromedriver.current).to eq chromedriver.latest
+    expect(chromedriver.current_version).to eq chromedriver.latest_version
   end
 
   it 'downloads specified version by Float' do
     chromedriver.remove
-    chromedriver.download(2.29)
-    expect(chromedriver.current.version).to eq '2.29'
+    chromedriver.version = 2.29
+    chromedriver.download
+    expect(chromedriver.current_version.version).to eq '2.29'
   end
 
   it 'downloads specified version by String' do
     chromedriver.remove
-    chromedriver.download('2.29')
-    expect(chromedriver.current.version).to eq '2.29'
+    chromedriver.version = '2.29'
+    chromedriver.download
+    expect(chromedriver.current_version.version).to eq '2.29'
   end
 
   it 'removes chromedriver' do
     chromedriver.remove
-    expect(chromedriver.current).to be_nil
+    expect(chromedriver.current_version).to be_nil
   end
 
   context 'when offline' do
     before { allow(chromedriver).to receive(:site_available?).and_return(false) }
 
     xit 'raises exception finding latest version' do
-      expect {chromedriver.latest}.to raise_error(StandardError, "Can not download from website")
+      expect {chromedriver.latest_version}.to raise_error(StandardError, "Can not download from website")
     end
 
     it 'raises exception downloading' do

data/spec/geckodriver_spec.rb

@@ -6,51 +6,56 @@ describe Webdrivers::Geckodriver do
 
   it 'raises exception if unable to get latest geckodriver and no geckodriver present' do
     geckodriver.remove
-    allow(geckodriver).to receive(:latest).and_return(nil)
+    allow(geckodriver).to receive(:desired_version).and_return(nil)
     msg = /^Unable to find the latest version of geckodriver(.exe)?; try downloading manually from (.*)?and place in (.*)?\.webdrivers$/
     expect { geckodriver.update }.to raise_exception StandardError, msg
   end
 
   it 'uses found version of geckodriver if latest release unable to be found' do
     geckodriver.download
-    allow(geckodriver).to receive(:latest).and_return(nil)
+    allow(geckodriver).to receive(:desired_version).and_return(nil)
     expect(geckodriver.update).to match(/\.webdrivers\/geckodriver/)
   end
 
   it 'finds latest version' do
     old_version = Gem::Version.new('0.17')
     future_version = Gem::Version.new('0.30')
-    latest_version = geckodriver.latest
+    desired_version = geckodriver.desired_version
 
-    expect(latest_version).to be > old_version
-    expect(latest_version).to be < future_version
+    expect(desired_version).to be > old_version
+    expect(desired_version).to be < future_version
   end
 
   it 'downloads latest version by default' do
     geckodriver.download
-    expect(geckodriver.current).to eq geckodriver.latest
+    expect(geckodriver.current_version).to eq geckodriver.desired_version
   end
 
   it 'downloads specified version' do
-    geckodriver.remove
-    geckodriver.download('0.17.0')
-    expect(geckodriver.current.version).to eq '0.17.0'
+    begin
+      geckodriver.remove
+      geckodriver.version = '0.17.0'
+      geckodriver.download
+      expect(geckodriver.current_version.version).to eq '0.17.0'
+    ensure
+      geckodriver.version = nil
+    end
   end
 
   it 'removes geckodriver' do
     geckodriver.remove
-    expect(geckodriver.current).to be_nil
+    expect(geckodriver.current_version).to be_nil
   end
 
   context 'when offline' do
     before { allow(geckodriver).to receive(:site_available?).and_return(false) }
 
     it 'raises exception finding latest version' do
-      expect {geckodriver.latest}.to raise_error(StandardError, "Can not reach site")
+      expect { geckodriver.desired_version }.to raise_error(StandardError, "Can not reach site")
     end
 
     it 'raises exception downloading' do
-      expect {geckodriver.download}.to raise_error(StandardError, "Can not reach site")
+      expect { geckodriver.download }.to raise_error(StandardError, "Can not reach site")
     end
   end
 

data/spec/iedriver_spec.rb

@@ -6,11 +6,11 @@ describe Webdrivers::IEdriver do
 
   it 'finds latest version' do
     old_version = Gem::Version.new("3.12.0")
-    future_version = Gem::Version.new("3.60.0")
-    latest_version = iedriver.latest
+    future_version = Gem::Version.new("4.0")
+    desired_version = iedriver.desired_version
 
-    expect(latest_version).to be > old_version
-    expect(latest_version).to be < future_version
+    expect(desired_version).to be > old_version
+    expect(desired_version).to be < future_version
   end
 
   it 'downloads iedriver' do
@@ -20,14 +20,14 @@ describe Webdrivers::IEdriver do
 
   it 'removes iedriver' do
     iedriver.remove
-    expect(iedriver.current).to be_nil
+    expect(iedriver.current_version).to be_nil
   end
 
   context 'when offline' do
     before { allow(iedriver).to receive(:site_available?).and_return(false) }
 
     it 'raises exception finding latest version' do
-      expect {iedriver.latest}.to raise_error(StandardError, "Can not reach site")
+      expect {iedriver.latest_version}.to raise_error(StandardError, "Can not reach site")
     end
 
     it 'raises exception downloading' do

data/spec/mswebdriver_spec.rb

@@ -6,7 +6,7 @@ describe Webdrivers::MSWebdriver do
 
   it 'downloads mswebdriver' do
     mswebdriver.remove
-    allow(mswebdriver).to receive(:current)
+    allow(mswebdriver).to receive(:desired_version).and_return(mswebdriver.latest_version)
     expect(File.exist?(mswebdriver.download)).to be true
   end
 
@@ -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(RuntimeError, "Failed to check Microsoft Edge version.")
+      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.4.3"
+  s.version     = "3.5.0.beta1"
   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.4.3
+  version: 3.5.0.beta1
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -125,12 +125,12 @@ 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.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Easy download and use of browser drivers.