gkhtmltopdf 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 693828b2a9f004f9038b744c5d4a527a46f27ca55ad7c3d4638478aa2a747ade
-  data.tar.gz: 418727b131d4305641bcb66df639c961aabc73de334fd599b06d772f2b0557ba
+  metadata.gz: 074bccbef46db0aaa81947a06ea1a1d7022b75a4916dec8d76751b96bfbc607f
+  data.tar.gz: bd007b02950a0e01a6cb1a0a68c30e3f5f16604f0489568bef0899f5f2d1e84d
 SHA512:
-  metadata.gz: 8776f073004b0e5dba496316e4c95e18121784be2430b12f679dc900cfee41e7002befda8fe022f30739e8bdf33c76ce7c51cd625ed5e5095cc95f4eb60b4d3f
-  data.tar.gz: 3df53840690e009d5c39a18710867505eff22e0bbb0d6711dfc6f8cc44a73442c02f1d6f5b5c1c3ac9f5c5c327f61d377bbab9a73dafea0124ff4a20e378426b
+  metadata.gz: e359baec50a11f2276bd1354269c59667091bbf12f9285d219616569b266f18a63c40be1349667ee7cefd5550109b93c9757705a8135dd15152762c6ab98c09c
+  data.tar.gz: 2fe00c3971f0354310bbc946531eb6facb107c7649f0d191b0210ea2fd683a726cabe18613053d498ded52558eb92791a0c522bb87f16f7ad77220c72faf075b

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All noteworthy changes to this project will be documented in this file.
 
+## 1.1.1 / 2026-06-29
+
+- GeckodriverのSTDOUT/STDERR追加
+
 ## 1.1.0 / 2026-06-29
 
 - UA設定機能の追加

data/README.md

@@ -8,7 +8,6 @@ This gem converts HTML to PDF using Firefox's Geckodriver.
 [![Gem Version](https://badge.fury.io/rb/gkhtmltopdf.svg)](https://badge.fury.io/rb/gkhtmltopdf)
 ![Gem Total Downloads](https://img.shields.io/gem/dt/gkhtmltopdf)
 ![GitHub License](https://img.shields.io/github/license/fantasia-tech/gkhtmltopdf-rb)
-![Rspec](https://github.com/fantasia-tech/gkhtmltopdf-rb/actions/workflows/main.yml/badge.svg)
 
 ---
 

data/TODO.md

@@ -22,6 +22,10 @@
 - [x] UA設定機能の追加
 - [x] mktmpdirの明示的な削除
 
+## 完了 v1.1.1
+
+- [x] GeckodriverのSTDOUT/STDERR追加
+
 ## つぎ v1.2.0
 
 - [ ] 設定のStruct化?(default切り出し)

data/dockerfiles/Dockerfile.debian13-ruby32

@@ -1,4 +1,3 @@
-# escape=\
 # syntax=docker/dockerfile:1.7
 FROM ruby:3.2-slim
 

data/dockerfiles/Dockerfile.ubuntu24-ruby32

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1
 FROM ubuntu:noble
 
 RUN apt-get update

data/dockerfiles/Dockerfile.ubuntu26-ruby33

@@ -0,0 +1,35 @@
+# syntax=docker/dockerfile:1
+FROM ubuntu:resolute
+
+RUN apt-get update
+RUN apt-get install -y ruby3.3 bundler
+RUN apt-get install -y git wget xz-utils build-essential libyaml-dev
+
+# Install Noto Fonts
+RUN apt-get install -y fonts-noto
+
+# Install Firefox
+RUN wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null
+RUN tee /etc/apt/sources.list.d/mozilla.sources > /dev/null << EOF
+Types: deb
+URIs: https://packages.mozilla.org/apt
+Suites: mozilla
+Components: main
+Signed-By: /etc/apt/keyrings/packages.mozilla.org.asc
+EOF
+RUN tee /etc/apt/preferences.d/mozilla > /dev/null << EOF
+Package: *
+Pin: origin packages.mozilla.org
+Pin-Priority: 1000
+EOF
+RUN apt-get update
+RUN apt-get install -y firefox
+
+# Install Geckodriver
+RUN wget "https://github.com/mozilla/geckodriver/releases/download/v0.36.0/geckodriver-v0.36.0-linux64.tar.gz" -O geckodriver.tar.gz
+RUN tar -xzf geckodriver.tar.gz -C /usr/local/bin
+
+COPY . /app
+WORKDIR /app
+RUN bundle install
+CMD ["bundle", "exec", "rspec"]

data/docs/ForDeveloper.md

@@ -5,13 +5,18 @@
 ```bash
 $ docker build -f ./dockerfiles/Dockerfile.debian13-ruby32 . -t gkhtmltopdf-d13r32
 $ docker build -f ./dockerfiles/Dockerfile.ubuntu24-ruby32 . -t gkhtmltopdf-u24r32
+$ docker build -f ./dockerfiles/Dockerfile.ubuntu26-ruby33 . -t gkhtmltopdf-u26r33
 $ docker run --rm gkhtmltopdf-d13r32
 $ docker run --rm gkhtmltopdf-u24r32
+$ docker run --rm gkhtmltopdf-u26r33
 $ docker rmi gkhtmltopdf-d13r32
 $ docker rmi gkhtmltopdf-u24r32
+$ docker rmi gkhtmltopdf-u26r33
 ```
 
 ## Build
 
-```
+```bash
+$ gem build gkhtmltopdf.gemspec
+$ gem push
 ```

data/exe/gkhtmltopdf

@@ -6,7 +6,9 @@ require 'gkhtmltopdf'
 
 options = {
   print_options: {},
-  firefox_prefs: {}
+  firefox_prefs: {},
+  gecko_stdout: File::NULL,
+  gecko_stderr: File::NULL
 }
 
 parser = OptionParser.new do |opts|
@@ -46,6 +48,14 @@ parser = OptionParser.new do |opts|
     options[:wait_time] = v
   end
 
+  opts.on("--stdout", "Show Geckodriver stdout") do |b|
+    options[:gecko_stdout] = b ? (STDOUT) : File::NULL
+  end
+
+  opts.on("--stderr", "Show Geckodriver stderr") do |b|
+    options[:gecko_stdout] = b ? (STDERR) : File::NULL
+  end
+
   opts.on("-v", "--version", "display version") do
     puts "Gkhtmltopdf version #{Gkhtmltopdf::VERSION}"
     exit
@@ -79,6 +89,8 @@ begin
   init_options[:geckodriver_path] = options.delete(:geckodriver_path) if options[:geckodriver_path]
   init_options[:wait_time] = options.delete(:wait_time) if options[:wait_time]
   init_options[:user_agent] = options.delete(:user_agent) if options[:user_agent]
+  init_options[:gecko_stdout] = options.delete(:gecko_stdout) if options[:gecko_stdout]
+  init_options[:gecko_stdout] = options.delete(:gecko_stdout) if options[:gecko_stdout]
 
   Gkhtmltopdf.convert(input_url, output_path, print_options: options[:print_options], **init_options)
 

data/lib/gkhtmltopdf/converter.rb

@@ -12,12 +12,14 @@ module Gkhtmltopdf
   class Converter
     DEFAULT_FX_USER_AGENT = "gkhtmltopdf-rb(v#{VERSION}) by firefox and gecko".freeze
 
-    def open(geckodriver_path: nil, firefox_path: nil, wait_time: nil, port: nil, user_agent: nil)
+    def open(geckodriver_path: nil, firefox_path: nil, wait_time: nil, port: nil, user_agent: nil, gecko_stdout: nil, gecko_stderr: nil)
       @geckodriver_path = resolve_geckodriver_path!(geckodriver_path)
       @firefox_path = resolve_firefox_path!(firefox_path)
       @port = port || get_free_port
       @base_url = "http://127.0.0.1:#{@port}"
-      @pid = spawn("#{@geckodriver_path} --port #{@port}", out: File::NULL, err: File::NULL)
+      gecko_stdout = File::NULL if gecko_stdout.nil?
+      gecko_stderr = File::NULL if gecko_stderr.nil?
+      @pid = spawn("#{@geckodriver_path} --port #{@port}", out: gecko_stdout, err: gecko_stderr)
       wait_time ||= 20
       @profile_path = gen_tmp_profile(user_agent)
       wait_for_gk(wait_time)

data/lib/gkhtmltopdf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gkhtmltopdf
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/gkhtmltopdf.rb

@@ -6,17 +6,17 @@ require_relative 'gkhtmltopdf/dsl'
 require_relative 'errors'
 
 module Gkhtmltopdf
-  def self.convert(url, output_path, geckodriver_path: nil, firefox_path: nil, wait_time: nil, port: nil, user_agent: nil, print_options: {})
+  def self.convert(url, output_path, geckodriver_path: nil, firefox_path: nil, wait_time: nil, port: nil, user_agent: nil, gecko_stdout: nil, gecko_stderr: nil, print_options: {})
     converter = DSL.new
-    converter.open(geckodriver_path: geckodriver_path, firefox_path: firefox_path, wait_time: wait_time, port: port, user_agent: user_agent)
+    converter.open(geckodriver_path: geckodriver_path, firefox_path: firefox_path, wait_time: wait_time, port: port, user_agent: user_agent, gecko_stdout: gecko_stdout, gecko_stderr: gecko_stderr)
     converter.save_pdf(url, output_path, print_options: print_options)
   ensure
     converter.close
   end
 
-  def self.open(geckodriver_path: nil, firefox_path: nil, wait_time: nil, port: nil, user_agent: nil, &block)
+  def self.open(geckodriver_path: nil, firefox_path: nil, wait_time: nil, port: nil, user_agent: nil, gecko_stdout: nil, gecko_stderr: nil, &block)
     converter = DSL.new
-    converter.open(geckodriver_path: geckodriver_path, firefox_path: firefox_path, wait_time: wait_time, port: port, user_agent: user_agent)
+    converter.open(geckodriver_path: geckodriver_path, firefox_path: firefox_path, wait_time: wait_time, port: port, user_agent: user_agent, gecko_stdout: gecko_stdout, gecko_stderr: gecko_stderr)
     yield converter
   ensure
     converter.close

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gkhtmltopdf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kazuki Sakane
@@ -84,6 +84,7 @@ files:
 - TODO.md
 - dockerfiles/Dockerfile.debian13-ruby32
 - dockerfiles/Dockerfile.ubuntu24-ruby32
+- dockerfiles/Dockerfile.ubuntu26-ruby33
 - docs/ForDeveloper.md
 - exe/gkhtmltopdf
 - lib/errors.rb