geordi 9.6.0 → 9.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c01ad424ea8f33ca03229ba4d0355201bba562ee1de253f0135838b8e4163c3
-  data.tar.gz: 8d011dfa82297202b05c8620a95e828ba96dcb797fcef6dc60d514e881601cd3
+  metadata.gz: 8a4dc434853c2c8af63e6ac18e69cca013d3a15316401f710c90deab74cd9bbb
+  data.tar.gz: c158a1f4c095120bfbd3ce9aacbd6bf13424994cdfd1ea5c2d5d8b613db5179e
 SHA512:
-  metadata.gz: b9f691c5367a2f41937703e18dda5be92f69a4bac77cb31f5c89429156576126675f1c4dd00b84d3eecb1dda328c45fd81eb92cf36c9fd2b8d5689b9c37587ff
-  data.tar.gz: d25a7208ab06766bda59c11d0d1c4a331ee17b8ac2f60d9de82f608759b942c3d067db7d7984929a90ba43775b7772f0b424771489b9f440e711033c955dc9c1
+  metadata.gz: 2260516cf299c4202fbf276c36abbee42190fb9e48b0f583b1af05a457c7676f6d23ccaee7d2bd8ddc2bcdfa923a255cae706dc5c1414c97eab1be58635ad205
+  data.tar.gz: e556b2806dea5a5badbcdad1c22faad5fb56daf95923f1c5ac88f64f1a764d18aacf4d0d683ad0f2b050cbdb131482895da3d58157992af2e11d67e75d0e75bf

data/CHANGELOG.md

@@ -10,10 +10,21 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
-# 9.5.1 - 2023-04-26
+# 9.6.1 2023-09-22
 
 ### Compatible changes
+* `chromedriver-update` command: Retrieve chromedriver from new location 
 
+
+# 9.6.0 2023-07-24
+
+### Compatible changes
+* Add suggestions of related commands
+
+
+# 9.5.1 2023-04-26
+
+### Compatible changes
 * `cucumber` command: Support the passing of options without "=" 
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (9.6.0)
+    geordi (9.6.1)
       thor (~> 1)
 
 GEM

data/lib/geordi/chromedriver_updater.rb

@@ -1,9 +1,12 @@
 require 'open3'
 require 'net/http'
 require 'tempfile'
+require 'json'
+require 'fileutils'
 
 module Geordi
   class ChromedriverUpdater
+    VERSIONS_PER_MILESTONES_URL = "https://googlechromelabs.github.io/chrome-for-testing/latest-versions-per-milestone-with-downloads.json"
 
     def run(options)
       chrome_version = determine_chrome_version
@@ -11,7 +14,7 @@ module Geordi
 
       latest_chromedriver_version = latest_version(chrome_version)
       if current_chromedriver_version == latest_chromedriver_version
-        Interaction.success "No update required: Chromedriver is already on the latest version v#{latest_chromedriver_version}!" unless options[:quiet_if_matching]
+        Interaction.note "No update required. Chromedriver is already on the latest version #{latest_chromedriver_version}." unless options[:quiet_if_matching]
       else
         update_chromedriver(latest_chromedriver_version)
       end
@@ -49,8 +52,8 @@ module Geordi
 
     # Check https://groups.google.com/a/chromium.org/g/chromium-discuss/c/4BB4jmsRyv8/m/TY3FXS4HBgAJ
     # for information how chrome version numbers work
-    def major_version(full_version)
-      full_version.match(/^(\d+\.\d+\.\d+)\.\d+$/)[1]
+    def milestone_version(full_version)
+      full_version.match(/^\d+/)[0]
     end
 
     def update_chromedriver(latest_chromedriver_version)
@@ -62,39 +65,68 @@ module Geordi
       Interaction.success "Chromedriver updated to v#{determine_chromedriver_version}."
     end
 
-    def download_chromedriver(latest_version)
-      uri = URI("https://chromedriver.storage.googleapis.com/#{latest_version}/chromedriver_linux64.zip")
-      response = Net::HTTP.get_response(uri)
-
-      if response.is_a?(Net::HTTPSuccess)
-        file = Tempfile.new(['chromedriver', '.zip'])
+    def download_chromedriver(version)
+      fetch_response(chromedriver_url(version), "Could not download chromedriver v#{version}.") do |response|
+        file = Tempfile.new(%w[chromedriver .zip])
         file.write(response.body)
 
         file
-      else
-        Interaction.fail("Could not download chromedriver v#{latest_version}.")
       end
     end
 
-    def latest_version(chrome_version)
-      return @latest_version if @latest_version
-
-      uri = URI("https://chromedriver.storage.googleapis.com/LATEST_RELEASE_#{major_version(chrome_version)}")
+    def fetch_response(url, error_message)
+      uri = URI(url)
       response = Net::HTTP.get_response(uri)
 
       if response.is_a?(Net::HTTPSuccess)
-        @latest_version = response.body.to_s
+        yield(response)
       else
-        Interaction.fail("Could not download the chromedriver v#{chrome_version}.")
+        Interaction.fail(error_message)
+      end
+    end
+
+    def chromedriver_url(chrome_version)
+        chromedriver_per_platform = chromedriver_download_data.dig("milestones", milestone_version(chrome_version), "downloads", "chromedriver")
+        chromedriver = chromedriver_per_platform&.find do |chromedriver|
+          chromedriver["platform"] == "linux64"
+        end
+
+        if chromedriver && chromedriver["url"]
+          chromedriver["url"]
+        else
+          Interaction.fail("Could not find chromedriver download url for Chrome version v#{chrome_version}.")
+        end
+    end
+
+    def chromedriver_download_data
+      return @chromedriver_download_data if @chromedriver_download_data
+
+      fetch_response(VERSIONS_PER_MILESTONES_URL, "Could not find chromedriver download data") do |response|
+        begin
+          chromedriver_download_data = JSON.parse(response.body)
+        rescue JSON::ParserError
+          Interaction.fail("Could not parse chromedriver download data.")
+        end
+        @chromedriver_download_data = chromedriver_download_data
       end
     end
 
+    def latest_version(chrome_version)
+      latest_version = chromedriver_download_data.dig("milestones", milestone_version(chrome_version), "version")
+      latest_version || Interaction.fail("Could not find matching chromedriver for Chrome v#{chrome_version}.")
+    end
+
     def unzip(zip, output_dir)
       _stdout_str, _error_str, status = Open3.capture3('unzip', '-d', output_dir, '-o', zip.path)
 
       unless status.success?
         Interaction.fail("Could not unzip #{zip.path}.")
       end
+
+      # the archive contains a folder in which the relevant files are located. These files must be moved to ~/bin.
+      FileUtils.mv("#{output_dir}/chromedriver-linux64/chromedriver", output_dir)
+      FileUtils.mv("#{output_dir}/chromedriver-linux64//LICENSE.chromedriver", output_dir)
+      FileUtils.rm_rf("#{output_dir}/chromedriver-linux64")
     end
   end
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '9.6.0'.freeze
+  VERSION = '9.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 9.6.0
+  version: 9.6.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails