chromedriver-helper 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df768e5ebc420cae5c5ba9d9a512e39f36030a1d
-  data.tar.gz: e8f602c7919db642e7cd94d28370a3b6b45d9e0a
+  metadata.gz: 0cf62727ee028fa0e91b8867a7eae498cbc9577b
+  data.tar.gz: a3529789da5ffac99204f2db6dac4ea9cc893288
 SHA512:
-  metadata.gz: 626d368e041ad821f3d503162f0edbd0f1f62a52f612e90f5f320e5854ffacd68cee55f9f354189eb0189a2df3960c8814539424c0c4977b510954c5fef9023b
-  data.tar.gz: 37c6653d713d2f5e53837903cfe1882e467f6edb0f1c7d58eb7b7859c563f35d6705107d888894c391468cc2d84a110de828dbc415fa52d65af121a66ec9cee8
+  metadata.gz: 6e89499aca520cbcb21fa7acdd387929d983eb93d624713fc1bb2b4ae9f32c11e0d8e54edc1646e0be8f33fce31fe18509902e3ad7a82092140ba76cbe86aec6
+  data.tar.gz: 2ab325ecd08e895c93522be086367ab396b5ba06232e72178288ad22ef2703c518e44888766418ec6c636f78f00ff20da7482b1672b38b751f71ab3cde050c16

data/.gitignore

@@ -3,3 +3,6 @@
 Gemfile.lock
 pkg/*
 chromedriver.log
+.tags
+concourse/private.yml
+concourse/chromedriver-helper.final.yml

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format=documentation
+--order=random

data/CHANGELOG.md

@@ -1,6 +1,14 @@
-Changelog
+chromedriver-helper changelog
 ==========
 
+1.1.0 - 2017-03-19
+----------
+
+Features:
+
+* Allow user to choose what version of chromedriver runs. [#34] (Thanks, @jonny5!)
+
+
 1.0.0 - 2015-06-06
 ----------
 

data/README.md

@@ -35,11 +35,23 @@ then, in your specs:
     end
 
 
-# Updating Chromedriver
+# Specifying a version
 
-If you'd like to force-upgrade to the latest version of chromedriver,
-run the script `chromedriver-update` that also comes packaged with
-this gem.
+If you want to run a specific version of chromedriver, you can set the version like so:
+
+    Chromedriver.set_version "2.24"
+
+Or, from the command line, you can run
+
+    chromedriver-update 2.24
+
+
+# Updating to latest Chromedriver
+
+If you'd like to force-upgrade to the latest version of chromedriver:
+
+1. delete the directory `$HOME/.chromedriver-helper`
+2. run `chromedriver-update`
 
 This might be necessary on platforms on which Chrome auto-updates,
 which has been known to introduce incompatibilities with older
@@ -55,6 +67,26 @@ The code lives at
 Open a Github Issue, or send a pull request! Thanks! You're the best.
 
 
+## CentOS 6 and 7
+
+Apparently recent versions of `chromedriver` won't run on CentOS 6 and 7, due to the [problems explained here](https://chrome.richardlloyd.org.uk/). The error messages look something like:
+
+```
+chromedriver: /usr/lib64/libstdc++.so.6: version `GLIBCXX_3.4.15' not found (required by /home/vagrant/.chromedriver-helper/linux64/chromedriver)
+chromedriver: /usr/lib64/libstdc++.so.6: version `CXXABI_1.3.5' not found (required by /home/vagrant/.chromedriver-helper/linux64/chromedriver)
+chromedriver: /usr/lib64/libstdc++.so.6: version `GLIBCXX_3.4.14' not found (required by /home/vagrant/.chromedriver-helper/linux64/chromedriver)
+
+```
+
+You can get `chromedriver` to work on these systems by running the `install_chrome.sh` script on the page linked to above, and then making sure your `chromedriver` process has `LD_LIBRARY_PATH` set so that `/opt/google/chrome/lib` is present, e.g.
+
+```
+$ LD_LIBRARY_PATH=/opt/google/chrome/lib chromedriver
+Starting ChromeDriver 2.28.455506 (18f6627e265f442aeec9b6661a49fe819aeeea1f) on port 9515
+Only local connections are allowed.
+
+```
+
 # License
 
 MIT licensed, see LICENSE.txt for full details.

data/Rakefile

@@ -1,6 +1,9 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
+require 'concourse'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+Concourse.new("chromedriver-helper").create_tasks!

data/bin/chromedriver

@@ -2,4 +2,4 @@
 
 require "chromedriver/helper"
 
-Chromedriver::Helper.new.run *ARGV
+Chromedriver::Helper.new.run(*ARGV)

data/bin/chromedriver-update

@@ -2,4 +2,4 @@
 
 require "chromedriver/helper"
 
-Chromedriver::Helper.new.update
+Chromedriver::Helper.new.update(ARGV[0])

data/chromedriver-helper.gemspec

@@ -2,24 +2,33 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "chromedriver/helper/version"
 
+def windows?
+  RbConfig::CONFIG['target_os'] =~ /mingw32|mswin/
+end
+
 Gem::Specification.new do |s|
   s.name        = "chromedriver-helper"
   s.version     = Chromedriver::Helper::VERSION
   s.authors     = ["Mike Dalessio"]
   s.email       = ["mike.dalessio@gmail.com"]
-  s.homepage    = "https://github.com/flavorjones/loofah"
+  s.homepage    = "https://github.com/flavorjones/chromedriver-helper"
   s.summary     = "Easy installation and use of chromedriver."
   s.description = "Easy installation and use of chromedriver, the Chromium project's selenium webdriver adapter."
   s.licenses    = ["MIT"]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  begin
+    s.files         = `git ls-files`.split("\n")
+    s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+    s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  rescue Exception => e
+    warn "WARNING: could not set spec.files: #{e.class}: #{e}"
+  end
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec",   "~> 3.0"
-  s.add_development_dependency "rake",    "~> 10.0"
+  s.add_development_dependency "rspec",     "~> 3.0"
+  s.add_development_dependency "rake",      "~> 10.0"
+  s.add_development_dependency "concourse", "~> 0.12"
 
-  s.add_runtime_dependency "nokogiri",    "~> 1.6"
-  s.add_runtime_dependency "archive-zip", "~> 0.7.0"
+  s.add_runtime_dependency "nokogiri",      "~> 1.6"
+  s.add_runtime_dependency "archive-zip",   "~> 0.7.0"
 end

data/concourse/chromedriver-helper.yml

@@ -0,0 +1,78 @@
+resources:
+  - name: ci
+    type: git
+    source:
+      uri: https://github.com/flavorjones/chromedriver-helper/
+      branch: master
+      disable_ci_skip: true # always get the latest pipeline configuration
+
+  - name: nokogiri-ci
+    type: git
+    source:
+      uri: https://github.com/sparklemotion/nokogiri/
+      branch: master
+      disable_ci_skip: true # always get the latest pipeline configuration
+
+  - name: chromedriver-helper
+    type: git
+    source:
+      uri: https://github.com/flavorjones/chromedriver-helper/
+      branch: master
+      ignore_paths:
+        - concourse/**
+
+jobs:
+  <% ruby_version = RUBIES[:mri].last %>
+  - name: ruby-<%= ruby_version %>
+    public: true
+    plan:
+      - get: ci
+      - get: chromedriver-helper
+        trigger: true
+      - task: rake-test
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: {repository: ruby, tag: "<%= ruby_version %>"}
+          inputs:
+            - name: ci
+            - name: chromedriver-helper
+          run:
+            path: ci/concourse/tasks/rake-test/run.sh
+
+  - name: windows-install-ruby-2.3
+    public: true
+    serial_groups: [windows-configuration]
+    plan:
+      - get: nokogiri-ci
+      - get: chromedriver-helper
+        trigger: true
+      - task: setup
+        config:
+          platform: windows
+          inputs:
+            - name: nokogiri-ci
+              path: ci
+          run:
+            path: powershell
+            args: ["-File", "ci/concourse/tasks/windows-config/install-ruby-and-devkit.ps1"]
+
+  - name: ruby-2.3-devkit
+    public: true
+    plan:
+      - get: ci
+      - get: nokogiri-ci
+      - get: chromedriver-helper
+        trigger: true
+        passed: ["windows-install-ruby-2.3"]
+      - task: rake-test
+        config:
+          platform: windows
+          inputs:
+            - name: ci
+            - name: nokogiri-ci
+            - name: chromedriver-helper
+          run:
+            path: powershell
+            args: ["-File", "ci/concourse/tasks/rake-test/run.ps1"]

data/concourse/tasks/rake-test/run.ps1

@@ -0,0 +1,12 @@
+. "nokogiri-ci\concourse\shared\common.ps1"
+
+prepend-path $ruby23_bin_path
+$env:RUBYOPT = "-rdevkit"
+
+push-location chromedriver-helper
+
+    stream-cmd "gem" "install bundler"
+    stream-cmd "bundle" "install"
+    stream-cmd "bundle" "exec rake spec"
+
+pop-location

data/concourse/tasks/rake-test/run.sh

@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+set -e -x -u
+
+export NOKOGIRI_USE_SYSTEM_LIBRARIES=t
+
+pushd chromedriver-helper
+
+  bundle install
+  bundle exec rake spec
+
+popd

data/lib/chromedriver/helper.rb

@@ -6,37 +6,67 @@ require 'open-uri'
 require 'archive/zip'
 
 module Chromedriver
-  class Helper
+  def self.set_version(version)
+    Chromedriver::Helper.new.update(version)
+  end
 
-    def run *args
+  class Helper
+    def run(*args)
       download
       exec binary_path, *args
     end
 
-    def download hit_network=false
-      return if File.exists?(binary_path) && ! hit_network
-      url = download_url
-      filename = File.basename url
+    def download(hit_network = false)
+      return if File.exist?(binary_path) && !hit_network
+
+      raise "Version not found for #{download_version}" unless download_url
+
+      filename = File.basename download_url
       Dir.chdir platform_install_dir do
         FileUtils.rm_f filename
         File.open(filename, "wb") do |saved_file|
-          URI.parse(url).open("rb") do |read_file|
+          URI.parse(download_url).open("rb") do |read_file|
             saved_file.write(read_file.read)
           end
         end
-        raise "Could not download #{url}" unless File.exists? filename
+
+        raise "Could not download #{download_url}" unless File.exists? filename
         Archive::Zip.extract(filename, '.', :overwrite => :all)
       end
       raise "Could not unzip #{filename} to get #{binary_path}" unless File.exists? binary_path
       FileUtils.chmod "ugo+rx", binary_path
+      File.open(version_path, 'w') { |file| file.write(download_version) }
+    end
+
+    def update(version = nil)
+      if version
+        @download_version = version
+      end
+
+      hit_network = (current_version != download_version) ? true : false
+      download(hit_network)
     end
 
-    def update
-      download true
+    def current_version
+      @current_version ||= if File.exist?(version_path)
+                             File.read(version_path).strip
+                           end
+    end
+
+    def download_version
+      @download_version ||= current_version || google_code_parser.newest_download_version.to_s
     end
 
     def download_url
-      GoogleCodeParser.new(platform).newest_download
+      @download_url ||= google_code_parser.version_download_url(download_version)
+    end
+
+    def google_code_parser
+      @google_code_parser ||= GoogleCodeParser.new(platform)
+    end
+
+    def version_path
+      @version_path ||= File.join(base_install_dir, ".chromedriver-version")
     end
 
     def binary_path
@@ -48,17 +78,25 @@ module Chromedriver
     end
 
     def platform_install_dir
-      dir = File.join install_dir, platform
+      dir = File.join version_install_dir, platform
       FileUtils.mkdir_p dir
       dir
     end
 
-    def install_dir
-      dir = File.expand_path File.join(ENV['HOME'], ".chromedriver-helper")
+    def version_install_dir
+      dir = File.expand_path File.join(base_install_dir, download_version)
       FileUtils.mkdir_p dir
       dir
     end
 
+    def base_install_dir
+      @base_install_dir ||= begin
+        dir = File.expand_path File.join(ENV['HOME'], ".chromedriver-helper")
+        FileUtils.mkdir_p dir
+        dir
+      end
+    end
+
     def platform
       cfg = RbConfig::CONFIG
       case cfg['host_os']
@@ -68,6 +106,5 @@ module Chromedriver
       else "win"
       end
     end
-
   end
 end

data/lib/chromedriver/helper/google_code_parser.rb

@@ -14,14 +14,21 @@ module Chromedriver
       end
 
       def downloads
-        doc = Nokogiri::XML.parse(source)
-        items = doc.css("Contents Key").collect {|k| k.text }
-        items.reject! {|k| !(/chromedriver_#{platform}/===k) }
-        items.map {|k| "#{BUCKET_URL}/#{k}"}
+        @downloads ||= begin
+          doc = Nokogiri::XML.parse(source)
+          items = doc.css("Contents Key").collect {|k| k.text }
+          items.reject! {|k| !(/chromedriver_#{platform}/===k) }
+          items.map {|k| "#{BUCKET_URL}/#{k}"}
+        end
       end
 
-      def newest_download
-        (downloads.sort { |a, b| version_of(a) <=> version_of(b)}).last
+      def newest_download_version
+        @newest_download_version ||= downloads.map { |download| version_of(download) }.max
+      end
+
+      def version_download_url(version)
+        gem_version = Gem::Version.new(version)
+        downloads.find { |download_url| version_of(download_url) == gem_version }
       end
 
       private

data/lib/chromedriver/helper/version.rb

@@ -1,5 +1,5 @@
 module Chromedriver
   class Helper
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/google_code_parser_spec.rb

@@ -19,24 +19,30 @@ describe Chromedriver::Helper::GoogleCodeParser do
     end
   end
 
-  describe "#newest_download" do
+  describe "#newest_download_version" do
     it "returns the last URL for the platform" do
-      expect(parser.newest_download).to eq "http://chromedriver.storage.googleapis.com/2.4/chromedriver_mac32.zip"
+      expect(parser.newest_download_version).to eq Gem::Version.new("2.4")
     end
 
     context "out-of-order versions" do
       before do
         allow(parser).to receive(:downloads).and_return([
-            "http://chromedriver.storage.googleapis.com/2.3/chromedriver_mac32.zip",
-            "http://chromedriver.storage.googleapis.com/2.4/chromedriver_mac32.zip",
-            "http://chromedriver.storage.googleapis.com/2.14/chromedriver_mac32.zip",
-            "http://chromedriver.storage.googleapis.com/2.2/chromedriver_mac32.zip",
-          ])
+          "http://chromedriver.storage.googleapis.com/2.3/chromedriver_mac32.zip",
+          "http://chromedriver.storage.googleapis.com/2.4/chromedriver_mac32.zip",
+          "http://chromedriver.storage.googleapis.com/2.14/chromedriver_mac32.zip",
+          "http://chromedriver.storage.googleapis.com/2.2/chromedriver_mac32.zip",
+        ])
       end
 
       it "returns the newest version" do
-        expect(parser.newest_download).to eq("http://chromedriver.storage.googleapis.com/2.14/chromedriver_mac32.zip")
+        expect(parser.newest_download_version).to eq(Gem::Version.new("2.14"))
       end
     end
   end
+
+  describe '#version_download_url' do
+    it 'returns the version asked for' do
+      expect(parser.version_download_url(2.0)).to eq "http://chromedriver.storage.googleapis.com/2.0/chromedriver_mac32.zip"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chromedriver-helper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Dalessio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: concourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +91,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -86,6 +101,9 @@ files:
 - bin/chromedriver
 - bin/chromedriver-update
 - chromedriver-helper.gemspec
+- concourse/chromedriver-helper.yml
+- concourse/tasks/rake-test/run.ps1
+- concourse/tasks/rake-test/run.sh
 - lib/chromedriver/helper.rb
 - lib/chromedriver/helper/google_code_parser.rb
 - lib/chromedriver/helper/version.rb
@@ -94,7 +112,7 @@ files:
 - spec/google_code_parser_spec.rb
 - spec/helper_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/flavorjones/loofah
+homepage: https://github.com/flavorjones/chromedriver-helper
 licenses:
 - MIT
 metadata: {}
@@ -114,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Easy installation and use of chromedriver.