wkhtmltopdf-installer 0.12.3.3 → 0.12.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7ba4e1c72abb27b386338621ab9750e97a08a869
-  data.tar.gz: d26843c1c044cfb431d21f79fef837eb830df1ea
+SHA256:
+  metadata.gz: 1f8d57ab6c83d496681d19d20bf623e023039927fe83acf9dae16cb14c669ba4
+  data.tar.gz: ab1e11643e0b5de253da6a77e6df860f27689541002fbfb5c58c09d7ef8121db
 SHA512:
-  metadata.gz: fdce29b8af569b39156afed2dcd5cfdfcbc4c5567368141db378e06a5d59635dfa2345162e6a9b5b07220673d54c8e7c2b0f3338d44617fb7d17cbb0cd0532ce
-  data.tar.gz: 1b640e06786948a86fe6de47a0fe7196068b639565530e96f5c42d3d0e551d07482712438ffe8a5ccb0ebcbb52ce311ffd24661b0c73076dcf4f38afe9c11470
+  metadata.gz: a639b014792956818e2789abf0c385a6fb25033c55dd269716080208038e482602150d0b080eaf7b4490986f9fba2633fc7f1d5ad8af47889ba239ddf4913079
+  data.tar.gz: e510dffb40dddc63e8691ead0c7f567c16ab0b31cbc5da09833615d31538bf28aeb0c2e0494be69ac765604b7c73b0fb450ea8b68f237431770dec7f4857e1c3

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,12 +1,12 @@
-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)
-	pkgutil --expand $(DOWNLOADED) $(pkg_content)
-	tar -xf $(payload) -C $(TMPDIR)
-	tar -xzf $(app_tar_xz) -C $(TMPDIR)
+	/usr/sbin/pkgutil --expand $(DOWNLOADED) $(pkg_content)
+	/usr/bin/tar -xf $(payload) -C $(TMPDIR)
+	/usr/bin/tar -xzf $(app_tar_xz) -C $(TMPDIR)
 

data/ext/extconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mkmf'
 require 'tmpdir'
 require 'ostruct'
@@ -5,19 +7,19 @@ 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')
-               when /x86_64-linux/
-                 OpenStruct.new(script: 'linux', platform: 'linux-generic-amd64', ext: 'tar.xz')
-               when /i[3456]86-linux/
-                 OpenStruct.new(script: 'linux', platform: 'linux-generic-i386', ext: 'tar.xz')
-               else
-                 raise NotImplementedError "Unsupported ruby platform #{RUBY_PLATFORM}"
+             when /darwin.*/ # both M1 ARM and x86 are supported for macos
+               OpenStruct.new(script: 'macos', platform: 'macos_cocoa', ext: 'pkg')
+             when /x86_64-linux/
+               OpenStruct.new(script: 'linux', platform: 'linux_amd64', ext: 'deb')
+             when /i[3456]86-linux/
+               OpenStruct.new(script: 'linux', platform: 'linux_i386', ext: 'deb')
+             else
+               raise NotImplementedError, "Unsupported ruby platform #{RUBY_PLATFORM}"
              end
 end
 
 def version
-  WkhtmltopdfInstaller::VERSION
+  WkhtmltopdfInstaller::BINARIES_VERSION
 end
 
 def makefile_dir
@@ -25,12 +27,12 @@ def makefile_dir
 end
 
 # Some examples:
-# "http://download.gna.org/wkhtmltopdf/0.12/#{version}/wkhtmltox-#{version}_osx-cocoa-x86-64.pkg"
-# "http://download.gna.org/wkhtmltopdf/0.12/#{version}/wkhtmltox-#{version}_linux-generic-amd64.deb"
-# "http://download.gna.org/wkhtmltopdf/0.12/#{version}/wkhtmltox-#{version}_linux-generic-i386.deb"
+# "https://github.com/vovayartsev/wkhtmltopdf-installer-ruby/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.linux_amd64.deb"
+# "https://github.com/vovayartsev/wkhtmltopdf-installer-ruby/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.linux_i386.deb"
+# "https://github.com/vovayartsev/wkhtmltopdf-installer-ruby/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.macos_cocoa.pkg"
+
 def package_url
-  major_version = version.gsub(/^(\d+\.\d+).*$/, '\1')
-  "http://download.gna.org/wkhtmltopdf/#{major_version}/#{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
@@ -44,4 +46,3 @@ install: copy clean
 include Makefile.#{probe.script}
 include Makefile.common
 EOF
-

data/lib/wkhtmltopdf_installer/version.rb

@@ -1,5 +1,11 @@
+# frozen_string_literal: true
+
 module WkhtmltopdfInstaller
-  VERSION = '0.12.3'.freeze
-  RELEASE_ITERATION = 3
+  # VERSION corresponds to wkhtmltopdf's version
+  VERSION = '0.12.6'
+  RELEASE_ITERATION = 2
   GEM_VERSION = "#{VERSION}.#{RELEASE_ITERATION}"
+
+  # This is a version of binaries from https://github.com/vovayartsev/wkhtmltopdf-installer-ruby/releases
+  BINARIES_VERSION = "0.12.6-1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wkhtmltopdf-installer
 version: !ruby/object:Gem::Version
-  version: 0.12.3.3
+  version: 0.12.6.2
 platform: ruby
 authors:
 - Vladimir Yartsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies: []
 description: Downloads wkhtmltopdf binary during 'Building native extension...' phase
 email: vovayartsev@gmail.com
@@ -44,8 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Light-weight cross-platform wkhtmltopdf binary installer