wkhtmltopdf-installer 0.12.4.2 → 0.12.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69d18bdfab313e109039db4fd60c885ad35d6698
-  data.tar.gz: 4ff777332bb91e649b3722b0168c0de49f540786
+  metadata.gz: 61f3fcd482279bd4f7f61753bc81398ccb24591d
+  data.tar.gz: 7adf937d5f19a8037c89bf2bbc1687b97e12e233
 SHA512:
-  metadata.gz: 3dddec21bbf437b4aabedc791df495e3d30b5a19226e7ea28bbd81537ac41b882c6ef693f91f8f17f12edc2ebd63ebf5532aa34077a97f02406a4c998e4f30d6
-  data.tar.gz: 15fee36423a83f6bd2795729127d335b34ef160e9d9ae682a7c59f43464bf34e77b8ae9d4e5eb492bdd305555b8e46d147d5c30a3fad17885cdcea3660f32790
+  metadata.gz: f96f99e646c3c94628c7e1cbf742509c8d52f7628305e33d60da90ae26913b5593b63989d24ff879779f97b270bc2798f60c454b1ed6806a0d6844aeda927666
+  data.tar.gz: 39b28b2df27ae2c3643671c7ad8ed875c54e3d38ea6ab3cba390c7cf1d8994ead4345b9c7dad63585f2f74ecfbac30c87a7cc46517e869fea7cba14798eb2a47

data/ext/Makefile.linux

@@ -1,5 +1,6 @@
-DOWNLOADED = wkhtmltox.tar.xz
-BINARY = $(TMPDIR)/wkhtmltox/bin/wkhtmltopdf
+DOWNLOADED = $(TMPDIR)/wkhtmltox.deb
+BINARY = $(TMPDIR)/usr/local/bin/wkhtmltopdf
 
 unpack: tmp $(DOWNLOADED)
-	tar -C $(TMPDIR) -xf $(DOWNLOADED)
+	cd $(TMPDIR) && ar -x $(DOWNLOADED) && tar -xf data.tar.xz 
+

data/ext/Makefile.macos

@@ -1,9 +1,9 @@
-DOWNLOADED = wkhtmltox.pkg
+DOWNLOADED = $(TMPDIR)/wkhtmltox.pkg
 BINARY = $(TMPDIR)/bin/wkhtmltopdf
 
 pkg_content = $(TMPDIR)/content
 payload = $(pkg_content)/Payload
-app_tar_xz = $(TMPDIR)/usr/local/share/wkhtmltox-installer/app.tar.xz
+app_tar_xz = $(TMPDIR)/usr/local/share/wkhtmltox-installer/wkhtmltox.tar.gz
 
 unpack: tmp $(DOWNLOADED)
 	/usr/sbin/pkgutil --expand $(DOWNLOADED) $(pkg_content)

data/ext/extconf.rb

@@ -6,18 +6,18 @@ require_relative '../lib/wkhtmltopdf_installer'
 def probe
   @probe ||= case RUBY_PLATFORM
                when /x86_64-darwin.*/
-                 OpenStruct.new(script: 'macos', platform: 'osx-cocoa-x86-64', ext: 'pkg')
+                 OpenStruct.new(script: 'macos', platform: 'macos_cocoa', ext: 'pkg')
                when /x86_64-linux/
-                 OpenStruct.new(script: 'linux', platform: 'linux-generic-amd64', ext: 'tar.xz')
+                 OpenStruct.new(script: 'linux', platform: 'linux_amd64', ext: 'deb')
                when /i[3456]86-linux/
-                 OpenStruct.new(script: 'linux', platform: 'linux-generic-i386', ext: 'tar.xz')
+                 OpenStruct.new(script: 'linux', platform: 'linux_i386', ext: 'deb')
                else
                  raise NotImplementedError "Unsupported ruby platform #{RUBY_PLATFORM}"
              end
 end
 
 def version
-  WkhtmltopdfInstaller::VERSION
+  WkhtmltopdfInstaller::GEM_VERSION
 end
 
 def makefile_dir
@@ -25,13 +25,12 @@ def makefile_dir
 end
 
 # Some examples:
-# "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/#{version}/wkhtmltox-#{version}_osx-cocoa-x86-64.pkg"
-# "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/#{version}/wkhtmltox-#{version}_linux-generic-amd64.tar.xz"
-# "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/#{version}/wkhtmltox-#{version}_linux-generic-i386.tar.xz"
+# "https://github.com/vovayartsev/wkhtmltopdf-installer-ruby/releases/download/0.12.5.2/wkhtmltox-0.12.5.2-linux_amd64.deb"
+# "https://github.com/vovayartsev/wkhtmltopdf-installer-ruby/releases/download/0.12.5.2/wkhtmltox-0.12.5.2-linux_i386.deb"
+# "https://github.com/vovayartsev/wkhtmltopdf-installer-ruby/releases/download/0.12.5.2/wkhtmltox-0.12.5.2-macos_cocoa.pkg"
 
 def package_url
-  # major_version = version.gsub(/^(\d+\.\d+).*$/, '\1')
-  "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/#{version}/wkhtmltox-#{version}_#{probe.platform}.#{probe.ext}"
+  "https://github.com/vovayartsev/wkhtmltopdf-installer-ruby/releases/download/#{version}/wkhtmltox-#{version}-#{probe.platform}.#{probe.ext}"
 end
 
 # The main Makefile contains settings only. The actual work is done by os-specific Makefile.xxxxx files

data/lib/wkhtmltopdf_installer/version.rb

@@ -1,5 +1,5 @@
 module WkhtmltopdfInstaller
-  VERSION = '0.12.4'.freeze
-  RELEASE_ITERATION = 2
+  VERSION = '0.12.5'.freeze
+  RELEASE_ITERATION = 3
   GEM_VERSION = "#{VERSION}.#{RELEASE_ITERATION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wkhtmltopdf-installer
 version: !ruby/object:Gem::Version
-  version: 0.12.4.2
+  version: 0.12.5.3
 platform: ruby
 authors:
 - Vladimir Yartsev