venetian 0.2.2-aarch64-linux → 0.3.0-aarch64-linux

data/exe/playwright

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # frozen_string_literal: true
 
-require "venetian"
+require "venetian/core"
 
 begin
   Venetian.execute(*ARGV, echo: ENV.fetch("VENETIAN_DEBUG", nil))

data/lib/tasks/venetian.rake

@@ -5,7 +5,7 @@ namespace :venetian do
     Install Playwright browsers. Pass a name to install a specific browser (e.g. venetian:install[chromium]), else installs default browsers.
   USAGE
   task :install, [:browser] do |_task, args|
-    require "venetian"
+    require "venetian/core"
     Venetian::BrowserInstaller.install(args[:browser])
   end
 end

data/lib/venetian/browser_installer.rb

@@ -8,12 +8,22 @@ module Venetian
     class << self
       private
 
-      def install_dependencies?
-        Venetian.auto_install_dependencies && dependencies_supported?
+      def install_dependencies?(browser = nil, force: nil)
+        return force unless force.nil?
+
+        Venetian.auto_install_dependencies && dependencies_to_install?(browser)
+      end
+
+      def install_dry_run(browser = nil)
+        Executable.capture("install-deps", *browser&.to_s, "--dry-run", echo: debug?)
+      end
+
+      def dependencies_to_install
+        @dependencies_to_install ||= {}
       end
 
-      def install_dry_run
-        Venetian.system "install-deps", "--dry-run", exception: false, echo: ENV.fetch("VENETIAN_DEBUG", nil)
+      def debug?
+        ENV.fetch("VENETIAN_DEBUG", nil)
       end
     end
 
@@ -29,18 +39,39 @@ module Venetian
     end
 
     # Installs a browser. Raises InstallError if installation fails.
-    def self.install(browser = nil, install_dependencies: install_dependencies?)
-      Venetian.system "install", *browser&.to_s, *("--with-deps" if install_dependencies),
-                      exception: true, echo: ENV.fetch("VENETIAN_DEBUG", nil)
+    def self.install(browser = nil, install_dependencies: nil)
+      Venetian.system "install", *browser&.to_s,
+                      *("--with-deps" if install_dependencies?(browser, force: install_dependencies)),
+                      exception: true, echo: debug?
     rescue StandardError => e
       raise InstallError, e.message
     end
 
-    # Returns true if the current OS supports Playwright's dependency installer.
-    def self.dependencies_supported?(force: false)
-      return @dependencies_supported unless @dependencies_supported.nil? || force
+    # Output from a dry run where Playwright couldn't spawn its package manager, so has no way to install dependencies.
+    NO_PACKAGE_MANAGER_OUTPUT = "ENOENT" # :nodoc:
+
+    # Returns true if Playwright's dependency installer has something to install on the current OS for a browser,
+    # or for the default browsers if none given.
+    #
+    # On Linux, the dry run simulates the install with the package manager, exiting non-zero if packages are missing or
+    # if it can't simulate (e.g. no package lists yet, which the installer fixes by updating them first), unless there's
+    # no package manager it can use. On Windows, the dry run only prints the command it would run, so there is always
+    # something to install.
+    def self.dependencies_to_install?(browser = nil, force: false)
+      return true if Gem.win_platform?
+
+      dependencies_to_install.delete(browser&.to_s) if force
+      dependencies_to_install.fetch(browser&.to_s) do |key|
+        dependencies_to_install[key] = install_dry_run(browser).then do |output, status|
+          !status.success? && !output.include?(NO_PACKAGE_MANAGER_OUTPUT)
+        end
+      end
+    end
 
-      @dependencies_supported = install_dry_run || false
+    def self.dependencies_supported?(...) # :nodoc:
+      warn "Venetian::BrowserInstaller.dependencies_supported? is deprecated; use dependencies_to_install? instead.",
+           category: :deprecated, uplevel: 1
+      dependencies_to_install?(...)
     end
   end
 end

data/lib/venetian/browser_runner_extensions.rb

@@ -2,13 +2,20 @@
 
 module Venetian
   module BrowserRunnerExtensions # :nodoc:
+    ALTERNATIVE_DRIVER_OPTIONS = %i[playwright_cli_executable_path playwright_server_endpoint_url
+                                    browser_server_endpoint_url].freeze
+
+    def self.browser_to_preinstall_from(options)
+      (options[:browser_type] || :chromium).to_sym if options.values_at(*ALTERNATIVE_DRIVER_OPTIONS).none?
+    end
+
     def initialize(options = {}, *args)
-      @venetian_browser_type = options[:browser_type] || :chromium
+      @venetian_browser = BrowserRunnerExtensions.browser_to_preinstall_from(options) if Venetian.auto_install_browsers
       super
     end
 
     def start
-      BrowserInstaller.install(@venetian_browser_type) if Venetian.auto_install_browsers
+      BrowserInstaller.install(@venetian_browser) if @venetian_browser
       super
     end
   end

data/lib/venetian/core.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "venetian/version"
+require "venetian/upstream"
+require "venetian/executable"
+require "venetian/browser_installer"
+require "venetian/gemspec"
+
+module Venetian # :nodoc:
+  class << self
+    attr_accessor :auto_install_dependencies
+  end
+
+  class Error < StandardError; end
+
+  self.auto_install_dependencies = true
+
+  def self.execute(*, echo: true, **)
+    Executable.execute(*, echo: echo, **)
+  end
+
+  def self.system(*, echo: true, **)
+    Executable.system(*, echo: echo, **)
+  end
+end

data/lib/venetian/executable.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "open3"
+require "shellwords"
+
 module Venetian
   # # \Executable
   #
@@ -7,6 +10,10 @@ module Venetian
   module Executable
     class Executor # :nodoc:
       public :system, :exec
+
+      def capture(*command)
+        Open3.capture2e(*command)
+      end
     end
 
     DEFAULT_DIR = File.expand_path(File.join(__dir__, "..", "..", "exe")) # :nodoc:
@@ -109,11 +116,31 @@ module Venetian
         end
       end
 
+      # Runs the Playwright executable with the given arguments, returning its combined output and status.
+      def capture(*args, echo: true)
+        [*base_command, *args].then do |command|
+          puts command.shelljoin if echo
+          executor.capture(*command).tap do |output, _|
+            puts output if echo
+          end
+        end
+      end
+
       # Returns the base command to execute Playwright.
       def base_command
         [path, File.join(File.dirname(path), "package", "cli.js")]
       end
 
+      # Returns the base command as a single string, as expected by +:playwright_cli_executable_path+.
+      def cli_command
+        if Gem.win_platform?
+          base_command.collect { |arg| %("#{arg}") }
+                      .join(" ")
+        else
+          base_command.shelljoin
+        end
+      end
+
       private
 
       def ensure_exe_dir_exists!

data/lib/venetian/gemspec.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "pathname"
+
 module Venetian
   GEMSPEC = Gem.loaded_specs.values.reverse.find do |spec|
     spec.gem_dir == Pathname.new(__dir__).join("..", "..").expand_path.to_path

data/lib/venetian/playwright.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "playwright"
+
+require "venetian/core"
+
+module Venetian # :nodoc:
+  # Starts Playwright using the bundled executable. Accepts the same arguments as +Playwright.create+,
+  # so +:playwright_cli_executable_path+ can still be overridden.
+  def self.start(**options, &)
+    options[:playwright_cli_executable_path] ||= Executable.cli_command
+    Playwright.create(**options, &)
+  end
+end

data/lib/venetian/playwright_create_extensions.rb

@@ -3,7 +3,10 @@
 module Venetian
   module PlaywrightCreateExtensions # :nodoc:
     def initialize(options = {}, *)
-      super({ playwright_cli_executable_path: Executable.base_command.shelljoin }.merge(options), *)
+      unless options[:playwright_cli_executable_path]
+        options = options.merge(playwright_cli_executable_path: Executable.cli_command)
+      end
+      super
     end
   end
 end

data/lib/venetian/system_test_case_extension.rb

@@ -16,7 +16,9 @@ module Venetian
       def driven_by(driver, options: {}, **)
         super
 
-        self.venetian_browser_type = driver == :playwright ? options.fetch(:browser_type, :chromium).to_sym : nil
+        self.venetian_browser_type = if driver == :playwright
+                                       BrowserRunnerExtensions.browser_to_preinstall_from(options)
+                                     end
       end
 
       def install_playwright_browsers

data/lib/venetian/upstream.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "playwright"
+require "playwright/version"
 
 module Venetian
   # # \Upstream

data/lib/venetian/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Venetian
-  VERSION = "0.2.2"
-  COMPATIBLE_PLAYWRIGHT_VERSION = "1.62.1"
+  VERSION = "0.3.0"
+  COMPATIBLE_PLAYWRIGHT_VERSION = "1.63.0"
 end

data/lib/venetian.rb

@@ -2,33 +2,18 @@
 
 require "capybara/playwright"
 
-require "venetian/version"
-require "venetian/upstream"
-require "venetian/executable"
+require "venetian/playwright"
 require "venetian/playwright_create_extensions"
-require "venetian/browser_installer"
 require "venetian/browser_runner_extensions"
-require "venetian/gemspec"
-require "venetian/railtie" if defined? Rails
+require "venetian/railtie" if defined?(Rails::Railtie)
 
 # # Venetian
 #
-# Native Playwright driver for Capybara.
+# Native Playwright driver for Ruby.
 module Venetian
   class << self
-    attr_accessor :auto_install_browsers, :auto_install_dependencies
+    attr_accessor :auto_install_browsers
   end
 
-  class Error < StandardError; end
-
   self.auto_install_browsers = true
-  self.auto_install_dependencies = true
-
-  def self.execute(*, echo: true, **)
-    Executable.execute(*, echo: echo, **)
-  end
-
-  def self.system(*, echo: true, **)
-    Executable.system(*, echo: echo, **)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: venetian
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: aarch64-linux
 authors:
 - Justin Malčić
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.62.0
+        version: 1.63.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.62.0
+        version: 1.63.0
 description: Bundles the Playwright driver binary in platform-specific gem variants
   and integrates with `capybara-playwright-driver`.
 email:
@@ -112,18 +112,21 @@ files:
 - exe/aarch64-linux/package/lib/tools/skills/playwright-component-testing/references/gallery-spec.md
 - exe/aarch64-linux/package/lib/tools/skills/playwright-component-testing/references/migration.md
 - exe/aarch64-linux/package/lib/tools/skills/playwright-component-testing/references/react.md
+- exe/aarch64-linux/package/lib/tools/skills/playwright-component-testing/references/typing.md
 - exe/aarch64-linux/package/lib/tools/skills/playwright-component-testing/references/vue.md
 - exe/aarch64-linux/package/lib/tools/skills/playwright-trace/SKILL.md
 - exe/aarch64-linux/package/lib/tools/utils/extension.js
 - exe/aarch64-linux/package/lib/tools/utils/socketConnection.js
 - exe/aarch64-linux/package/lib/utilsBundle.js
 - exe/aarch64-linux/package/lib/utilsBundle.js.LICENSE
+- exe/aarch64-linux/package/lib/vite/dashboard/assets/codeMirrorModule--QdMvsKi.css
+- exe/aarch64-linux/package/lib/vite/dashboard/assets/codeMirrorModule-CQ8RZGBm.js
 - exe/aarch64-linux/package/lib/vite/dashboard/assets/codicon-DCmgc-ay.ttf
 - exe/aarch64-linux/package/lib/vite/dashboard/assets/firefox-1bWoP6pv.svg
 - exe/aarch64-linux/package/lib/vite/dashboard/assets/firefox-beta-k3eOH_eK.svg
 - exe/aarch64-linux/package/lib/vite/dashboard/assets/firefox-nightly-Cp5nfeDT.svg
-- exe/aarch64-linux/package/lib/vite/dashboard/assets/index-CyWAfh-p.js
-- exe/aarch64-linux/package/lib/vite/dashboard/assets/index-DhC616m4.css
+- exe/aarch64-linux/package/lib/vite/dashboard/assets/index-AwgwcYie.css
+- exe/aarch64-linux/package/lib/vite/dashboard/assets/index-hRvO4yU2.js
 - exe/aarch64-linux/package/lib/vite/dashboard/assets/safari-na3_-uQk.svg
 - exe/aarch64-linux/package/lib/vite/dashboard/index.html
 - exe/aarch64-linux/package/lib/vite/dashboard/playwright-logo.svg
@@ -131,29 +134,29 @@ files:
 - exe/aarch64-linux/package/lib/vite/htmlReport/report.css
 - exe/aarch64-linux/package/lib/vite/htmlReport/report.js
 - exe/aarch64-linux/package/lib/vite/recorder/assets/codeMirrorModule--QdMvsKi.css
-- exe/aarch64-linux/package/lib/vite/recorder/assets/codeMirrorModule-CwYYHbcZ.js
+- exe/aarch64-linux/package/lib/vite/recorder/assets/codeMirrorModule-CVQWJZAA.js
 - exe/aarch64-linux/package/lib/vite/recorder/assets/codicon-DCmgc-ay.ttf
-- exe/aarch64-linux/package/lib/vite/recorder/assets/index-DYjdXIbE.js
-- exe/aarch64-linux/package/lib/vite/recorder/assets/index-l_lX622x.css
+- exe/aarch64-linux/package/lib/vite/recorder/assets/index-BZpYJZ-P.css
+- exe/aarch64-linux/package/lib/vite/recorder/assets/index-hrlLqLtq.js
 - exe/aarch64-linux/package/lib/vite/recorder/index.html
 - exe/aarch64-linux/package/lib/vite/recorder/playwright-logo.svg
-- exe/aarch64-linux/package/lib/vite/traceViewer/assets/codeMirrorModule-rXmQmLUY.js
-- exe/aarch64-linux/package/lib/vite/traceViewer/assets/defaultSettingsView-B-dXF5JN.js
+- exe/aarch64-linux/package/lib/vite/traceViewer/assets/codeMirrorModule-BbkfBe3n.js
+- exe/aarch64-linux/package/lib/vite/traceViewer/assets/defaultSettingsView-Ds6CBOo0.js
 - exe/aarch64-linux/package/lib/vite/traceViewer/assets/urlMatch-L3liM589.js
-- exe/aarch64-linux/package/lib/vite/traceViewer/assets/xtermModule-BuZfJS5v.js
+- exe/aarch64-linux/package/lib/vite/traceViewer/assets/xtermModule-DywYcAf8.js
 - exe/aarch64-linux/package/lib/vite/traceViewer/codeMirrorModule.-QdMvsKi.css
 - exe/aarch64-linux/package/lib/vite/traceViewer/codicon.DCmgc-ay.ttf
-- exe/aarch64-linux/package/lib/vite/traceViewer/defaultSettingsView.BLFoOugd.css
+- exe/aarch64-linux/package/lib/vite/traceViewer/defaultSettingsView.Bqk9acqE.css
+- exe/aarch64-linux/package/lib/vite/traceViewer/index.B4cLoZK3.js
 - exe/aarch64-linux/package/lib/vite/traceViewer/index.B_TqY17P.css
-- exe/aarch64-linux/package/lib/vite/traceViewer/index.KZ4wOW1K.js
 - exe/aarch64-linux/package/lib/vite/traceViewer/index.html
 - exe/aarch64-linux/package/lib/vite/traceViewer/manifest.webmanifest
 - exe/aarch64-linux/package/lib/vite/traceViewer/playwright-logo.svg
 - exe/aarch64-linux/package/lib/vite/traceViewer/snapshot.B_Jk1wbt.js
 - exe/aarch64-linux/package/lib/vite/traceViewer/snapshot.html
 - exe/aarch64-linux/package/lib/vite/traceViewer/sw.bundle.js
-- exe/aarch64-linux/package/lib/vite/traceViewer/uiMode.C7UW1sC9.css
-- exe/aarch64-linux/package/lib/vite/traceViewer/uiMode.Dzuouizj.js
+- exe/aarch64-linux/package/lib/vite/traceViewer/uiMode.CU5KtEkS.js
+- exe/aarch64-linux/package/lib/vite/traceViewer/uiMode.CyMfwkXJ.css
 - exe/aarch64-linux/package/lib/vite/traceViewer/uiMode.html
 - exe/aarch64-linux/package/lib/vite/traceViewer/xtermModule.kHJ-D0s7.css
 - exe/aarch64-linux/package/lib/webp_codec.LICENSE
@@ -168,8 +171,10 @@ files:
 - lib/venetian.rb
 - lib/venetian/browser_installer.rb
 - lib/venetian/browser_runner_extensions.rb
+- lib/venetian/core.rb
 - lib/venetian/executable.rb
 - lib/venetian/gemspec.rb
+- lib/venetian/playwright.rb
 - lib/venetian/playwright_create_extensions.rb
 - lib/venetian/railtie.rb
 - lib/venetian/system_test_case_extension.rb
@@ -180,8 +185,8 @@ homepage: https://github.com/jmalcic/venetian
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://malcic.codes/software/venetian
-  playwright_version: 1.62.1
+  homepage_uri: https://malcic.codes/projects/software/venetian
+  playwright_version: 1.63.0
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/jmalcic/venetian
 rdoc_options: []
@@ -198,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Playwright executables for Ruby
 test_files: []