wkhtmltopdf-binary current version?

rakefile → Rakefile

@@ -9,7 +9,7 @@ spec = Gem::Specification.new do |s|
   s.email = "[email protected],[email protected]"
   s.platform = Gem::Platform::RUBY
   s.summary = "Provides binaries for WKHTMLTOPDF project in an easily accessible package."
-  s.files = FileList["{bin}/**/*"].to_a
+  s.files = FileList["{bin,libexec,lib}/*"].to_a
   s.has_rdoc = false
   s.executables << "wkhtmltopdf"
   s.require_path = '.'

bin/wkhtmltopdf

@@ -1,19 +1,17 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
-executable = case RUBY_PLATFORM
+arch = case RUBY_PLATFORM
   when /64.*linux/
-    'wkhtmltopdf_linux_amd64'
+    'linux-amd64'
   when /linux/
-    'wkhtmltopdf_linux_386'
+    'linux-x86'
   when /darwin/
-    'wkhtmltopdf_darwin_386'
+    'darwin-x86'
   else
     raise "Invalid platform. Must be running linux or intel-based Mac OS."
 end
 
-arguments = $*.map { |x| x.include?(' ') ? "'" + x + "'" : x }
+args = $*.map { |x| x.include?(' ') ? "'" + x + "'" : x }
+cmd = File.expand_path "#{File.dirname(__FILE__)}/../libexec/wkhtmltopdf-#{arch}"
 
-executable = File.join(File.dirname(__FILE__), executable)
-r = system(executable + " " + arguments.join(" "))
-
-exit r ? 0 : 1
+exec "#{cmd} #{args.join(' ')}"

wkhtmltopdf-binary.gemspec

@@ -13,20 +13,11 @@ Gem::Specification.new do |s|
   s.email = '[email protected],[email protected]'
 
   s.bindir = 'bin'
-  s.executables = ['wkhtmltopdf']
+  s.executables = %w(wkhtmltopdf)
 
-  s.files = [
-    'lib/wkhtmltopdf-binary.rb',
-    'bin/wkhtmltopdf_linux_amd64',
-    'bin/wkhtmltopdf-binary.rb',
-    'bin/wkhtmltopdf',
-    'bin/wkhtmltopdf_darwin_386',
-    'bin/wkhtmltopdf_linux_386'
-  ]
+  s.files = %w(
+    lib/wkhtmltopdf-binary.rb bin/wkhtmltopdf
+    libexec/wkhtmltopdf-darwin-x86
+    libexec/wkhtmltopdf-linux-amd64
+    libexec/wkhtmltopdf-linux-x86)
 end
-
-
-
-
-
-