imgkit 1.3.1 → 1.3.2

data/POST_INSTALL

@@ -2,7 +2,11 @@
 
 Now install wkhtmltoimage binaries:
 Global: sudo `which imgkit` --install-wkhtmltoimage
-or inside RVM folder: export TO=`which imgkit | sed 's:/imgkit:/wkhtmltoimage:'` && imgkit --install-wkhtmltoimage
-(run imgkit --help to see more options)
+        rvmsudo imgkit --install-wkhtmltoimage
+(installs to default /usr/local/bin/wkhtmltoimage)
+
+inside RVM folder: export TO=`which imgkit | sed 's:/imgkit:/wkhtmltoimage:'` && imgkit --install-wkhtmltoimage
+(you'll have to configure the location of the binary if you do this!)
 
+(run imgkit --help to see more options)
 ******************************************************************

data/bin/imgkit

@@ -4,23 +4,32 @@ require 'optparse'
 require 'rbconfig'
 require 'open-uri'
 require 'imgkit/configuration'
+require 'imgkit/version'
+
+GOOGLE_CODE_URL = "http://code.google.com/p/wkhtmltopdf/downloads/list"
 
 def detect_architecture
-  case Config::CONFIG['arch']
+  case arch = Config::CONFIG['arch']
   when /x86_64-linux/i
     'amd64'
   when /linux/i
     'i386'
   when /darwin/i
-    'OS-X.i386'
+    'OSX'
   else
-    raise "No binaries found for your system. Please install wkhtmltoimage by hand."
+    cant_find_binaries(arch)
   end
 end
 
+def cant_find_binaries(arch)
+  puts "Sorry, I couldn't find the binary for your architecture (#{arch}) \n  at #{GOOGLE_CODE_URL}"
+  puts "Please go to that page, unzip the appropriate binary, and install"
+  exit(1)
+end
+
 def cleanup(install_to)
-  `rm -rf wkhtmltoimage*`
-  `rm #{install_to}`
+  `rm -rf wkhtmltoimage*` rescue nil
+  `rm #{install_to}` rescue nil
 end
 
 def download_wkhtmltoimage(arch)
@@ -28,8 +37,8 @@ def download_wkhtmltoimage(arch)
     download = "wkhtmltoimage-0.10.0_beta4-static-#{arch}.tar.bz2"
     url = "http://wkhtmltopdf.googlecode.com/files/wkhtmltoimage-0.10.0_beta4-static-#{arch}.tar.bz2"
   else
-    page = open("http://code.google.com/p/wkhtmltopdf/downloads/list").read
-    download = page.match(/href=".*name=(.*wkhtmltoimage-.*#{arch}.*?)&/) || raise("File not found..")
+    page = open(GOOGLE_CODE_URL).read
+    download = page.match(/href=".*name=(.*wkhtmltoimage-.*#{arch}.*?)&/) or cant_find_binaries(arch)
     download = download[1]
     url = "http://wkhtmltopdf.googlecode.com/files/#{download}"
   end
@@ -43,7 +52,7 @@ def install(download, arch, install_to)
   puts "Installing #{download} to #{install_to}"
   if download =~ /.tar.bz2$/
     `sudo tar xjvf #{download}`
-    `sudo mv wkhtmltoimage-#{arch} #{install_to}`
+    `sudo mv wkhtmltoimage #{install_to}`
   elsif download =~ /.tar.lzma$/
     raise "couldn't extract archive: lzcat not found" unless system("which lzcat > /dev/null 2>/dev/null")
     puts "Warning: lzcat is broken on Ubuntu. Re-run with --use-bzip to install alternate version"
@@ -79,8 +88,7 @@ OptionParser.new do |parser|
 
   parser.on("--version", "Show Version.") do
     @command = Proc.new do
-      root = File.dirname(File.dirname(__FILE__))
-      puts File.read(File.join(root, 'VERSION'))
+      puts IMGKit::VERSION
     end
   end
 

data/lib/imgkit.rb

@@ -3,3 +3,4 @@ require 'open3'
 require 'imgkit/source'
 require 'imgkit/imgkit'
 require 'imgkit/configuration'
+require 'imgkit/version'

data/lib/imgkit/version.rb

@@ -1,3 +1,3 @@
 class IMGKit
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: imgkit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - csquared
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 Z
+date: 2011-06-29 00:00:00 Z
 dependencies: []
 
 description: Uses wkhtmltoimage to create Images using HTML
@@ -52,9 +52,13 @@ post_install_message: |
   
   Now install wkhtmltoimage binaries:
   Global: sudo `which imgkit` --install-wkhtmltoimage
-  or inside RVM folder: export TO=`which imgkit | sed 's:/imgkit:/wkhtmltoimage:'` && imgkit --install-wkhtmltoimage
-  (run imgkit --help to see more options)
+          rvmsudo imgkit --install-wkhtmltoimage
+  (installs to default /usr/local/bin/wkhtmltoimage)
+  
+  inside RVM folder: export TO=`which imgkit | sed 's:/imgkit:/wkhtmltoimage:'` && imgkit --install-wkhtmltoimage
+  (you'll have to configure the location of the binary if you do this!)
   
+  (run imgkit --help to see more options)
   ******************************************************************
 
 rdoc_options: []
@@ -66,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3909095106456771647
+      hash: -3332981170482838796
       segments: 
       - 0
       version: "0"