puppeteer-ruby 0.37.2 → 0.37.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a83ed41b8bd2c8068dc4a1738fa16abe80e88e59fb21c4768994ae640bb5b567
-  data.tar.gz: 6e67fb0d381644bb376d09d01213320170aa5f9ec429694c9b98888bd2006722
+  metadata.gz: 84ede7b4fc083303903e960a08d2a21b44866b2b47662489005e09e6e955df01
+  data.tar.gz: aba2c71b916d6779560a200fff6685cb9f4ba83dc2b04e092926fb121add3155
 SHA512:
-  metadata.gz: b229ccf33f63425298aa0d70051d6d6a1d61d9509bf6030499521b11494fb7b9ece03fa63ab5c31be6b0a552f28b5d7b571b6c930027445cee60bbcadaada24c
-  data.tar.gz: 6f35fb3ea22f4cd557e062576fdb95939f16e62c611f09469bf8d7647f72ff380000e1b94ac8e1412b03f9107124a5ce21914c4e2b839e893ecd275ed73b9ef3
+  metadata.gz: 3b6a5cc66476c8954ab1ae942df3be6ad161ffe3aeb9b1ea51bde681f6cd9cf32d61d251980ab5d7f0907923b5ac42871cd7e99fbb55f0c00205ee231190f595
+  data.tar.gz: 7329fc6a4f8d1933efee34180c6d051e73613da2189b2af5226629d681c9f4b52abadf5eb548f45cb3af37d3ab1f093067b5e67e10e8c3cde09815a4fa3a0e4c

data/CHANGELOG.md

@@ -1,7 +1,13 @@
-### master [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.2...master)]
+### master [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.3...master)]
 
 - xxx
 
+### 0.37.3 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.2...0.37.3)]
+
+Improvement:
+
+- Improve the logic of detection of Chrome/Firefox executable path on Linux.
+
 ### 0.37.2 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.1...0.37.2)]
 
 Bugfix:

data/README.md

@@ -41,7 +41,7 @@ NOTE: `require 'puppeteer-ruby'` is not necessary in Rails.
 ```ruby
 require 'puppeteer-ruby'
 
-Puppeteer.launch(headless: false, slow_mo: 50, args: ['--guest', '--window-size=1280,800']) do |browser|
+Puppeteer.launch(headless: false, slow_mo: 50, args: ['--window-size=1280,800']) do |browser|
   page = browser.new_page
   page.viewport = Puppeteer::Viewport.new(width: 1280, height: 800)
   page.goto("https://github.com/", wait_until: 'domcontentloaded')

data/docs/api_coverage.md

@@ -1,6 +1,6 @@
 # API coverages
-- Puppeteer version: v11.0.0
-- puppeteer-ruby version: 0.37.2
+- Puppeteer version: v12.0.0
+- puppeteer-ruby version: 0.37.3
 
 ## Puppeteer
 

data/lib/puppeteer/executable_path_finder.rb

@@ -0,0 +1,28 @@
+class Puppeteer::ExecutablePathFinder
+  # @param executable_names [Array<String>] executable file names to find.
+  def initialize(*executable_names)
+    @executable_names = executable_names
+  end
+
+  def find_executables_in_path
+    Enumerator.new do |result|
+      @executable_names.each do |name|
+        # Find the first existing path.
+        paths.each do |path|
+          candidate = File.join(path, name)
+          next unless File.exist?(candidate)
+          result << candidate
+          break
+        end
+      end
+    end
+  end
+
+  def find_first
+    find_executables_in_path.first
+  end
+
+  private def paths
+    ENV['PATH'].split(File::PATH_SEPARATOR)
+  end
+end

data/lib/puppeteer/launcher/chrome.rb

@@ -48,7 +48,7 @@ module Puppeteer::Launcher
         if @launch_options.channel
           executable_path_for_channel(@launch_options.channel.to_s)
         else
-          @launch_options.executable_path || executable_path_for_channel('chrome')
+          @launch_options.executable_path || fallback_executable_path
         end
       use_pipe = chrome_arguments.include?('--remote-debugging-pipe')
       runner = Puppeteer::BrowserRunner.new(chrome_executable, chrome_arguments, temporary_user_data_dir)
@@ -216,10 +216,14 @@ module Puppeteer::Launcher
       if channel
         executable_path_for_channel(channel.to_s)
       else
-        executable_path_for_channel('chrome')
+        fallback_executable_path
       end
     end
 
+    private def fallback_executable_path
+      executable_path_for_channel('chrome')
+    end
+
     CHROMIUM_CHANNELS = {
       windows: {
         'chrome' => "#{ENV['PROGRAMFILES']}\\Google\\Chrome\\Application\\chrome.exe",
@@ -236,7 +240,16 @@ module Puppeteer::Launcher
         'msedge' => '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge',
       },
       linux: {
-        'chrome' => '/opt/google/chrome/chrome',
+        'chrome' => -> {
+          Puppeteer::ExecutablePathFinder.new(
+            'google-chrome-stable',
+            'google-chrome',
+            'chrome',
+            'chromium-freeworld',
+            'chromium-browser',
+            'chromium',
+          ).find_first
+        },
         'chrome-beta' => '/opt/google/chrome-beta/chrome',
         'chrome-dev' => '/opt/google/chrome-unstable/chrome',
       },
@@ -254,6 +267,10 @@ module Puppeteer::Launcher
         end
 
       chrome_path = chrome_path_map[channel]
+      if chrome_path.is_a?(Proc)
+        chrome_path = chrome_path.call
+      end
+
       unless chrome_path
         raise ArgumentError.new("Invalid channel: '#{channel}'. Allowed channel is #{chrome_path_map.keys}")
       end

data/lib/puppeteer/launcher/firefox.rb

@@ -42,7 +42,7 @@ module Puppeteer::Launcher
         if @launch_options.channel
           executable_path_for_channel(@launch_options.channel.to_s)
         else
-          @launch_options.executable_path || executable_path_for_channel('nightly')
+          @launch_options.executable_path || fallback_executable_path
         end
       runner = Puppeteer::BrowserRunner.new(firefox_executable, firefox_arguments, temporary_user_data_dir)
       runner.start(
@@ -138,14 +138,18 @@ module Puppeteer::Launcher
       if channel
         executable_path_for_channel(channel.to_s)
       else
-        executable_path_for_channel('firefox')
+        fallback_executable_path
       end
     end
 
+    private def fallback_executable_path
+      executable_path_for_channel('firefox')
+    end
+
     FIREFOX_EXECUTABLE_PATHS = {
       windows: "#{ENV['PROGRAMFILES']}\\Firefox Nightly\\firefox.exe",
       darwin: '/Applications/Firefox Nightly.app/Contents/MacOS/firefox',
-      linux: '/usr/bin/firefox',
+      linux: -> { Puppeteer::ExecutablePathFinder.new('firefox').find_first },
     }.freeze
 
     # @param channel [String]
@@ -163,6 +167,9 @@ module Puppeteer::Launcher
         else
           FIREFOX_EXECUTABLE_PATHS[:linux]
         end
+      if firefox_path.is_a?(Proc)
+        firefox_path = firefox_path.call
+      end
 
       unless File.exist?(firefox_path)
         raise "Nightly version of Firefox is not installed on this system.\nExpected path: #{firefox_path}"

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 module Puppeteer
-  VERSION = '0.37.2'
+  VERSION = '0.37.3'
 end

data/lib/puppeteer.rb

@@ -33,6 +33,7 @@ require 'puppeteer/dialog'
 require 'puppeteer/dom_world'
 require 'puppeteer/emulation_manager'
 require 'puppeteer/exception_details'
+require 'puppeteer/executable_path_finder'
 require 'puppeteer/execution_context'
 require 'puppeteer/file_chooser'
 require 'puppeteer/frame'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.37.2
+  version: 0.37.3
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -282,6 +282,7 @@ files:
 - lib/puppeteer/event_callbackable.rb
 - lib/puppeteer/events.rb
 - lib/puppeteer/exception_details.rb
+- lib/puppeteer/executable_path_finder.rb
 - lib/puppeteer/execution_context.rb
 - lib/puppeteer/file_chooser.rb
 - lib/puppeteer/frame.rb