Merge branch 'master' into master

Author: tioteath

.docker/Dockerfile-archlinux

@@ -0,0 +1,8 @@
+FROM archlinux:latest
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN pacman -Sy --noconfirm \
+  ruby fontconfig freetype2 libjpeg libpng libxext libxrender
+
+CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

.gitignore

@@ -15,3 +15,4 @@ bin/wkhtmltopdf_debian_9_i386
 bin/wkhtmltopdf_debian_10_i386
 bin/wkhtmltopdf_ubuntu_16.04_i386
 bin/wkhtmltopdf_ubuntu_18.04_i386
+bin/wkhtmltopdf_archlinux_amd64

CHANGELOG

@@ -1,6 +1,20 @@
-# 0.12.6.3
+# 0.12.6.6
 Add removal of the gzipped binaries in the gem native extension build step (disabled by default)
 
+# 0.12.6.5
+
+Fix ability to use on Debian 9 systems
+
+# 0.12.6.4
+
+Fix version detection for Debian
+Use version match check that works on older Ruby versions
+
+# 0.12.6.3
+
+Add support for Archlinux and Manjaro
+Add ability to override which binary is detected for you based on `ENV['WKHTMLTOPDF_HOST_SUFFIX']`
+
 # 0.12.6.2
 
 OS mapping for more distros, based in official support OS for wkhtmltopdf

README.md

@@ -39,6 +39,10 @@ CentOS
 
     rpm2cpio wkhtmltox-0.12.5-1.centos7.x86_64.rpm | cpio -idmv
 
+Archlinux/manjaro
+
+    tar -xf wkhtmltox-0.12.6-1.archlinux.x86_64.tar.xz
+
 macOS
 
     xar -xf wkhtmltox-0.12.5-1.macos-cocoa.pkg

bin/wkhtmltopdf

@@ -17,7 +17,7 @@ suffix = case RbConfig::CONFIG['host_os']
            os_based_on_ubuntu_16_04 = os.start_with?('ubuntu_16.') || os.start_with?('ubuntu_17.')
            os = 'ubuntu_16.04' if os_based_on_ubuntu_16_04
 
-           os_based_on_ubuntu_18_04 = os.start_with?('ubuntu_18.') || os.start_with?('ubuntu_19.') || os.start_with?('elementary') || os.start_with?('linuxmint') || os.start_with?('pop')
+           os_based_on_ubuntu_18_04 = os.start_with?('ubuntu_18.') || os.start_with?('ubuntu_19.') || os.start_with?('elementary') || os.start_with?('linuxmint') || os.start_with?('pop') || os.start_with?('zorin')
            os = 'ubuntu_18.04' if os_based_on_ubuntu_18_04
 
            os_based_on_ubuntu_20_04 = os.start_with?('ubuntu_20.')
@@ -29,9 +29,15 @@ suffix = case RbConfig::CONFIG['host_os']
            os_based_on_centos_7 = os.start_with?('amzn_2')
            os = 'centos_7' if os_based_on_centos_7
 
-           os_based_on_debian_9 = /deepin/.match?(os)
+           os_based_on_debian_9 = (/(debian_9|deepin)/ =~ os)
            os = 'debian_9' if os_based_on_debian_9
 
+           os_based_on_debian = !os_based_on_debian_9 && os.start_with?('debian')
+           os = 'debian_10' if os_based_on_debian
+
+           os_based_on_archlinux = os.start_with?('arch_') || os.start_with?('manjaro_')
+           os = 'archlinux' if os_based_on_archlinux
+
            architecture = RbConfig::CONFIG['host_cpu'] == 'x86_64' ? 'amd64' : 'i386'
 
            "#{os}_#{architecture}"
@@ -41,6 +47,8 @@ suffix = case RbConfig::CONFIG['host_os']
            'unknown'
          end
 
+suffix = ENV['WKHTMLTOPDF_HOST_SUFFIX'] unless ENV['WKHTMLTOPDF_HOST_SUFFIX'].to_s.empty?
+
 binary = "#{__FILE__}_#{suffix}"
 
 if File.exist?("#{binary}.gz") && !File.exist?(binary)
@@ -51,7 +59,7 @@ end
 
 unless File.exist? binary
   raise 'Invalid platform, must be running on Ubuntu 16.04/18.04/20.04 ' \
-        'CentOS 6/7/8, Debian 9/10, or intel-based Cocoa macOS ' \
+        'CentOS 6/7/8, Debian 9/10, archlinux amd64, or intel-based Cocoa macOS ' \
         "(missing binary: #{binary})."
 end
 

bin/wkhtmltopdf_archlinux_amd64.gz

@@ -64,3 +64,10 @@ services:
       dockerfile: .docker/Dockerfile-deepin
     volumes:
       - .:/root/wkhtmltopdf_binary_gem
+
+  archlinux:
+    build:
+      context: .
+      dockerfile: .docker/Dockerfile-archlinux
+    volumes:
+      - .:/root/wkhtmltopdf_binary_gem

docker-compose.yml

@@ -38,6 +38,10 @@ def test_with_ubuntu_20
     test with: 'ubuntu_20.04'
   end
 
+  def test_with_archlinux
+    test with: 'archlinux'
+  end
+
   def test_with_macos
     assert_equal `bin/wkhtmltopdf --version`.strip, 'wkhtmltopdf 0.12.6 (with patched qt)'
   end

test/test_with_docker.rb

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wkhtmltopdf-binary"
-  s.version = "0.12.6.2"
+  s.version = "0.12.6.5"
   s.license = "Apache-2.0"
   s.author = "Zakir Durumeric"
   s.email = "[email protected]"