webdrivers 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be63f40b8706535bc265158e0f481b2620886679
-  data.tar.gz: 7f6f4c8584e86f1f7826ffaf24c596bcaa8e6f5d
+  metadata.gz: fcddb954704b678fab85d7ae639d1c093387e30a
+  data.tar.gz: 27c68403706b2b469a0e4d643318321a8a3dfc88
 SHA512:
-  metadata.gz: bda8a2749978eda9c85b2e2f7373844f8a45764f4803cfa64211cae6b0e14c0d80fcfb9fa8055b89089a84ace9c0822055947845242a196e7dac0a0079b312af
-  data.tar.gz: 9b7be7499c0807a35ddca73705d275dcd062427450b6bd3001f53030d4b6f8d3123e0c5e86a174aedd0a1f9bc5c02928db5da1813cf0bf6f371bdc85590dde2c
+  metadata.gz: 4a4562dc88f07adacffd0566765813ae34e9c58bdd75243e5f9dafe28b8759d2b01c7f3ae1f41dce39735a5e6c40c8032234ed1d8fa7198720ca38245a3567a3
+  data.tar.gz: 4fda0ac9518d6f57e8a55a620a467db14dd107deb5a08842975abc6c12eca71fc4c6c309f97ef1e5346f0d56ae2351c02bc8d4c60e8748a6ec1610a1fbe46211

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 ==========
 
+2.4.0 - 2016-12-18
+----------
+
+* Update MicrosoftWebDriver version
+* Use rubyzip gem instead of zip
+* Bug fixes for download method
+
+
 2.3.2 - 2016-11-26
 ----------
 

data/README.md

@@ -2,14 +2,20 @@
 
 [![Build status](https://api.travis-ci.org/titusfortner/webdrivers.svg)](https://travis-ci.org/titusfortner/webdrivers)
 
-Run Selenium tests more easily with install and updates for all supported webdrivers.
+Run Selenium tests more easily with automatic installation and updates for all supported webdrivers.
 
 # Description
 
 `webdrivers` installs driver executables, in your gem path.
-`chromedriver` and `geckodriver` are currently supported.
 
-Drivers are stored in `~/.webdrivers` directory and used within the context of your gem path
+Currently supported:
+* `chromedriver`
+* `geckodriver`
+* `phantomjs`
+* `IEDriverServer`
+* `MicrosoftWebDriver`
+
+Drivers are stored in `~/.webdrivers/platform` directory and used within the context of your gem path
 
 
 # Usage
@@ -18,7 +24,7 @@ Drivers are stored in `~/.webdrivers` directory and used within the context of y
 
 or in your Gemfile: 
 
-`gem "webdrivers", "~> 2.1"`
+`gem "webdrivers", "~> 2.3"`
 
 
 # License

data/lib/webdrivers/common.rb

@@ -36,6 +36,9 @@ module Webdrivers
         case filename
         when /tar\.gz$/
           untargz_file(filename)
+        when /tar\.bz2$/
+          system "tar xjf #{filename}"
+          filename.gsub('.tar.bz2', '')
         when /\.zip$/
           unzip_file(filename)
         end
@@ -52,12 +55,13 @@ module Webdrivers
       end
 
       def unzip_file(filename)
-        Zip::ZipFile.open("#{Dir.pwd}/#{filename}") do |zip_file|
+        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)
-            FileUtils.mkdir_p(File.dirname(f_path))
-            zip_file.extract(f, f_path) unless File.exist?(f_path)
+            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)
           end
         end
         @top_path
@@ -76,16 +80,18 @@ 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
 
       def platform
         cfg = RbConfig::CONFIG
         case cfg['host_os']
-          when /linux/ then
-            cfg['host_cpu'] =~ /x86_64|amd64/ ? "linux64" : "linux32"
-          when /darwin/ then "mac"
-          else "win"
+        when /linux/
+          cfg['host_cpu'] =~ /x86_64|amd64/ ? "linux64" : "linux32"
+        when /darwin/
+          "mac"
+        else
+          "win"
         end
       end
 

data/lib/webdrivers/edgedriver.rb

@@ -18,7 +18,7 @@ module Webdrivers
       end
 
       def download_url(version = nil)
-        if newest_version.to_i >= 14965
+        if newest_version.to_i >= 14986
           'https://download.microsoft.com/download/1/4/1/14156DA0-D40F-460A-B14D-1B264CA081A5/MicrosoftWebDriver.exe'
         else
           'https://download.microsoft.com/download/3/2/D/32D3E464-F2EF-490F-841B-05D53C848D15/MicrosoftWebDriver.exe'

data/lib/webdrivers/phantomjs.rb

@@ -20,7 +20,7 @@ module Webdrivers
       def downloads
         doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url))
         items = doc.css(".execute").collect { |item| item["href"] }
-        format_platform = platform.dup.gsub('32', '-i686').gsub('64', 'x86_64')
+        format_platform = platform.dup.gsub('32', '-i686').gsub('64', '-x86_64')
         items.select! { |item| item.include?(format_platform) }
         items.each_with_object({}) do |item, hash|
           hash[item[/-(\d+\.\d+\.\d+)-/, 1]] = "https://bitbucket.org#{item}"
@@ -32,7 +32,7 @@ module Webdrivers
       end
 
       def extract_file(filename)
-        FileUtils.mv("#{platform_install_dir}/#{filename}bin/#{file_name}", file_name)
+        FileUtils.mv("#{platform_install_dir}/#{filename}/bin/#{file_name}", file_name)
       end
     end
 

data/spec/chromedriver_spec.rb

@@ -6,8 +6,10 @@ describe Webdrivers::Chromedriver do
 
   it 'downloads' do
     chromedriver.download
-    file = "#{ENV['GEM_HOME']}/bin/chromedriver"
+    suffix = chromedriver.platform == 'win' ? '.exe' : ''
+    file = "#{chromedriver.platform_install_dir}/chromedriver#{suffix}"
     expect(File.exist?(file)).to eq true
+    FileUtils.rm(file)
   end
 
   it { expect(chromedriver.newest_version.to_f).to be >= 2.25 }

data/spec/edgedriver_spec.rb

@@ -5,13 +5,17 @@ describe Webdrivers::Edgedriver do
   let(:edgedriver) { Webdrivers::Edgedriver }
 
   it 'downloads' do
+    allow(edgedriver).to receive(:newest_version).and_return(0)
     edgedriver.download
-    file = "#{ENV['GEM_HOME']}/bin/MicrosoftWebDriver"
+    file = "#{edgedriver.platform_install_dir}/MicrosoftWebDriver.exe"
     expect(File.exist?(file)).to eq true
+    FileUtils.rm(file)
   end
 
-  it { expect(edgedriver.newest_version.to_f).to be >= 2.25 }
-
+  it 'gets latest version' do
+    skip unless edgedriver.platform == 'win'
+    expect(edgedriver.newest_version.to_f).to be >= 2.25
+  end
 
   context "on a windows platform" do
     before { allow(edgedriver).to receive(:platform) { "win" } }

data/spec/geckodriver_spec.rb

@@ -6,8 +6,10 @@ describe Webdrivers::Geckodriver do
 
   it 'downloads' do
     geckodriver.download
-    file = "#{ENV['GEM_HOME']}/bin/geckodriver"
+    suffix = geckodriver.platform == 'win' ? '.exe' : ''
+    file = "#{geckodriver.platform_install_dir}/geckodriver#{suffix}"
     expect(File.exist?(file)).to eq true
+    FileUtils.rm(file)
   end
 
   it { expect(geckodriver.newest_version.to_f).to be >= 0.11 }

data/spec/iedriver_spec.rb

@@ -5,9 +5,11 @@ describe Webdrivers::IEDriver do
   let(:iedriver) { Webdrivers::IEDriver }
 
   it 'downloads' do
+    allow(iedriver).to receive(:current_version).and_return(0)
     iedriver.download
-    file = "#{ENV['GEM_HOME']}/bin/IEDriverServer"
+    file = "#{iedriver.platform_install_dir}/IEDriverServer.exe"
     expect(File.exist?(file)).to eq true
+    FileUtils.rm(file)
   end
 
   it { expect(iedriver.newest_version.to_f).to be >= 2.25 }

data/spec/phantomjs_spec.rb

@@ -6,20 +6,22 @@ describe Webdrivers::PhantomJS do
 
   it 'downloads' do
     phantomjs.download
-    file = "#{ENV['GEM_HOME']}/bin/phantomjs"
+    suffix = phantomjs.platform == 'win' ? '.exe' : ''
+    file = "#{phantomjs.platform_install_dir}/phantomjs#{suffix}"
     expect(File.exist?(file)).to eq true
+    FileUtils.rm(file)
   end
 
   it { expect(phantomjs.newest_version.to_f).to be >= 0.11 }
 
-  it { expect(phantomjs.downloads.size).to be >= 5 }
+  it { expect(phantomjs.downloads.size).to be >= 4 }
 
   context "on a linux platform" do
-    before { allow(phantomjs).to receive(:platform) { "linux32" } }
+    before { allow(phantomjs).to receive(:platform) { "linux64" } }
 
     it { expect(phantomjs.file_name).to match(/phantomjs$/) }
 
-    it { expect(phantomjs.binary_path).to match '.webdrivers/linux32/phantomjs' }
+    it { expect(phantomjs.binary_path).to match '.webdrivers/linux64/phantomjs' }
 
     it { expect(phantomjs.download_url('1.9.6')).to match("phantomjs-1.9.6-linux-") }
   end

data/webdrivers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "webdrivers"
-  s.version     = "2.3.2"
+  s.version     = "2.4.0"
   s.authors     = ["Titus Fortner"]
   s.email       = ["titusfortner@gmail.com"]
   s.homepage    = "https://github.com/titusfortner/webdrivers"
@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake",    "~> 10.0"
 
   s.add_runtime_dependency "nokogiri",    "~> 1.6"
-  s.add_runtime_dependency "zip"
+  s.add_runtime_dependency "rubyzip",     "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: zip
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Run Selenium tests more easily with install and updates for all supported
   webdrivers.
 email:
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easy installation and use of webdrivers.