webdrivers 3.3.3 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25d5c4b45553a040f4dcbc33d70a23816dc9a7f
-  data.tar.gz: 96891e1f94a57b105ae558cd2446d8844acf179a
+  metadata.gz: 6ed0fab7a9cc03600fc8fe15e15c34b7ca3ac206
+  data.tar.gz: 5aeb76b9a96babca62fee38da3ede1e113b72c7c
 SHA512:
-  metadata.gz: 3ad52c20138460fdb87ebe70a249a4b3389f3e603e5e30de37442906d99c7ede0ae572c5a243177d3095811ea42bcd77ae989b850344f2a31a361f04a323d38c
-  data.tar.gz: 38e11fb229f952fd08b248c1d69f1300ef40ebe67d8a27afc25e991a61cbf91915abeee4c4fdfcdde49f6d5885d3d41bb212f1de67f247745f859720e3e4fc42
+  metadata.gz: db7200151e7343fc6ec93b0654405a4f8b40a4bcc987c625b955b1c957d72d76f05a7774012601e8fda84ab98b01d2531dda6a64a8c186d350ee483b1b1a1e60
+  data.tar.gz: e66a2e52a69b65bf11db4f653c27123fb374bdfa7564e0779ce68e2059c959835e04061d83e5206ef86b92b032880b234cd422a9318068588860b2bfc3a8e5d0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 3.4.0 (2018-09-07)
+
+* Allow public access to `#install_dir` and `#binary`
+* Allow user to set the default download directory
+* Improve version comparisons with use of `Gem::Version` 
+
 ### 3.3.3 (2018-08-14)
 
 * Fix Geckodriver since Github changed its html again

data/lib/webdrivers.rb

@@ -10,7 +10,7 @@ module Webdrivers
 
   class << self
 
-    attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass
+    attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass, :install_dir
 
     def logger
       @logger ||= Webdrivers::Logger.new

data/lib/webdrivers/chromedriver.rb

@@ -14,10 +14,6 @@ module Webdrivers
 
       private
 
-      def normalize(string)
-        string.size == 3 ? string.gsub('.', '.0').to_f : string.to_f
-      end
-
       def file_name
         platform == "win" ? "chromedriver.exe" : "chromedriver"
       end

data/lib/webdrivers/common.rb

@@ -41,7 +41,7 @@ module Webdrivers
         url      = download_url(version)
         filename = File.basename url
 
-        Dir.mkdir(install_dir) unless File.exists?(install_dir)
+        FileUtils.mkdir_p(install_dir) unless File.exists?(install_dir)
         Dir.chdir install_dir do
           FileUtils.rm_f filename
           open(filename, "wb") do |file|
@@ -66,6 +66,14 @@ module Webdrivers
         binary
       end
 
+      def install_dir
+        Webdrivers.install_dir || File.expand_path(File.join(ENV['HOME'], ".webdrivers"))
+      end
+
+      def binary
+        File.join install_dir, file_name
+      end
+
       protected
 
       def get(url, limit = 10)
@@ -100,7 +108,14 @@ module Webdrivers
       end
 
       def download_url(version)
-        downloads[version || latest]
+        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?
@@ -109,10 +124,6 @@ module Webdrivers
         result
       end
 
-      def binary
-        File.join install_dir, file_name
-      end
-
       def site_available?
         get(base_url)
         Webdrivers.logger.debug "Found Site: #{base_url}"
@@ -174,15 +185,14 @@ module Webdrivers
         @top_path
       end
 
-      def install_dir
-        File.expand_path(File.join(ENV['HOME'], ".webdrivers")).tap { |dir| FileUtils.mkdir_p dir }
-      end
-
       # Already have latest version downloaded?
       def correct_binary?
         latest == current && File.exists?(binary)
       end
 
+      def normalize(string)
+        Gem::Version.new(string)
+      end
     end
   end
 end

data/lib/webdrivers/geckodriver.rb

@@ -14,10 +14,6 @@ module Webdrivers
 
       private
 
-      def normalize(string)
-        string.match(/(\d+)\.(\d+\.\d+)/).to_a.map {|v| v.tr('.', '')}[1..-1].join('.').to_f
-      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

data/lib/webdrivers/iedriver.rb

@@ -20,10 +20,6 @@ module Webdrivers
 
       private
 
-      def normalize(string)
-        Gem::Version.new(string)
-      end
-
       def file_name
         "IEDriverServer.exe"
       end

data/lib/webdrivers/mswebdriver.rb

@@ -28,10 +28,6 @@ module Webdrivers
 
       private
 
-      def normalize(string)
-        string.match(/(\d+)\.(\d+\.\d+)/).to_a.map { |v| v.tr('.', '') }[1 .. -1].join('.').to_f
-      end
-
       def file_name
         "MicrosoftWebDriver.exe"
       end

data/spec/chromedriver_spec.rb

@@ -5,12 +5,16 @@ describe Webdrivers::Chromedriver do
   let(:chromedriver) { Webdrivers::Chromedriver }
 
   it 'parses chromedriver versions before 2.10' do
-    expect(chromedriver.send :normalize, '2.9').to eq 2.09
+    expect(chromedriver.send(:normalize, '2.9').version).to eq '2.9'
   end
 
   it 'finds latest version' do
-    expect(chromedriver.latest).to be > 2.30
-    expect(chromedriver.latest).to be < 2.9
+    old_version = Gem::Version.new("2.30")
+    future_version = Gem::Version.new("2.90")
+    latest_version = chromedriver.latest
+
+    expect(latest_version).to be > old_version
+    expect(latest_version).to be < future_version
   end
 
   it 'downloads latest version by default' do
@@ -19,10 +23,16 @@ describe Webdrivers::Chromedriver do
     expect(chromedriver.current).to eq chromedriver.latest
   end
 
-  it 'downloads specified version' do
+  it 'downloads specified version by Float' do
     chromedriver.remove
     chromedriver.download(2.29)
-    expect(chromedriver.current).to eq 2.29
+    expect(chromedriver.current.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'
   end
 
   it 'removes chromedriver' do
@@ -42,4 +52,18 @@ describe Webdrivers::Chromedriver do
     end
   end
 
+  it 'allows setting of install directory' do
+    begin
+      install_dir = File.expand_path(File.join(ENV['HOME'], ".webdrivers2"))
+      Webdrivers.install_dir = install_dir
+      expect(chromedriver.install_dir).to eq install_dir
+    ensure
+      Webdrivers.install_dir = nil
+    end
+  end
+
+  it 'returns full location of binary' do
+    install_dir = File.expand_path(File.join(ENV['HOME'], ".webdrivers"))
+    expect(chromedriver.binary).to match /#{install_dir}\/chromedriver/
+  end
 end

data/spec/geckodriver_spec.rb

@@ -18,8 +18,12 @@ describe Webdrivers::Geckodriver do
   end
 
   it 'finds latest version' do
-    expect(geckodriver.latest).to be > 0.17
-    expect(geckodriver.latest).to be <= 0.30
+    old_version = Gem::Version.new('0.17')
+    future_version = Gem::Version.new('0.30')
+    latest_version = geckodriver.latest
+
+    expect(latest_version).to be > old_version
+    expect(latest_version).to be < future_version
   end
 
   it 'downloads latest version by default' do
@@ -29,8 +33,8 @@ describe Webdrivers::Geckodriver do
 
   it 'downloads specified version' do
     geckodriver.remove
-    geckodriver.download(0.17)
-    expect(geckodriver.current).to eq 0.17
+    geckodriver.download('0.17.0')
+    expect(geckodriver.current.version).to eq '0.17.0'
   end
 
   it 'removes geckodriver' do

data/spec/iedriver_spec.rb

@@ -5,7 +5,12 @@ describe Webdrivers::IEdriver do
   let(:iedriver) { Webdrivers::IEdriver }
 
   it 'finds latest version' do
-    expect(iedriver.latest.segments).to eq [3, 12, 0]
+    old_version = Gem::Version.new("3.12.0")
+    future_version = Gem::Version.new("3.60.0")
+    latest_version = iedriver.latest
+
+    expect(latest_version).to be > old_version
+    expect(latest_version).to be < future_version
   end
 
   it 'downloads iedriver' do

data/webdrivers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "webdrivers"
-  s.version     = "3.3.3"
+  s.version     = "3.4.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.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec