lib/geordi/chromedriver_updater.rb in geordi-3.0.0 vs lib/geordi/chromedriver_updater.rb in geordi-3.0.1

@@ -2,26 +2,25 @@
 require 'net/http'
 require 'tempfile'
 
 module Geordi
   class ChromedriverUpdater
-    include Geordi::Interaction
 
     def run
       chrome_version = determine_chrome_version
       chromedriver_version = determine_chromedriver_version
 
       if skip_update?(chrome_version, chromedriver_version)
-        warn("No update required, you are using for both executables the same version #{chrome_version}!")
+        Interaction.warn("No update required, you are using for both executables the same version #{chrome_version}!")
       else
         chromedriver_zip = download_chromedriver(chrome_version)
         unzip(chromedriver_zip, File.expand_path('~/bin'))
 
         chromedriver_zip.unlink
 
         # We need to determine the version again, as it could be nil in case no chromedriver was installed before
-        note "Chromedriver updated to version #{determine_chromedriver_version}"
+        Interaction.note "Chromedriver updated to version #{determine_chromedriver_version}"
       end
     end
 
     private
 
@@ -30,11 +29,11 @@
       chrome_version = unless stdout_str.nil?
         stdout_str[/\AGoogle Chrome (\d+)/, 1]
       end
 
       if !status.success? || chrome_version.nil?
-        raise('Could not determine the current Google Chrome version')
+        Interaction.fail('Could not determine the current Google Chrome version')
       else
         chrome_version.to_i
       end
     end
 
@@ -45,11 +44,11 @@
       chromedriver_version = unless stdout_str.nil?
         stdout_str[/\AChromeDriver (\d+)/, 1]
       end
 
       if !status.success? || chromedriver_version.nil?
-        raise('Could not determine the current chromedriver version')
+        Interaction.fail('Could not determine the current chromedriver version')
       else
         chromedriver_version.to_i
       end
     end
 
@@ -67,29 +66,29 @@
         file = Tempfile.new(['chromedriver', '.zip'])
         file.write(response.body)
 
         file
       else
-        raise("Could not download chromedriver version #{latest_version}")
+        Interaction.fail("Could not download chromedriver version #{latest_version}")
       end
     end
 
     def latest_version(chrome_version)
       uri = URI("https://chromedriver.storage.googleapis.com/LATEST_RELEASE_#{chrome_version}")
       response = Net::HTTP.get_response(uri)
 
       if response.is_a?(Net::HTTPSuccess)
         response.body.to_s
       else
-        raise("Could not find the latest version for Google Chrome version #{chrome_version}")
+        Interaction.fail("Could not find the latest version for Google Chrome version #{chrome_version}")
       end
     end
 
     def unzip(zip, output_dir)
       _stdout_str, _error_str, status = Open3.capture3('unzip', '-d', output_dir, '-o', zip.path)
 
       unless status.success?
-        raise("Could not unzip #{zip.path}")
+        Interaction.fail("Could not unzip #{zip.path}")
       end
     end
   end
 end