imgkit 1.0.0 → 1.0.1

data/.gitignore

@@ -1,22 +1,3 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
+pkg/*
+*.gem
 .bundle

data/README.md

@@ -81,6 +81,6 @@ image when you need to.
 
 ## Copyright
 
-Copyright (c) 2010 Chris Continanza 
+Copyright (c) 2010 <a href="mailto:christopher.continanza@gmail.com">Chris Continanza</a>
 Based on work by Jared Pace  
 See LICENSE for details.

data/Rakefile

@@ -1,45 +1,2 @@
-require 'rubygems'
-require 'rake'
 require 'bundler'
-Bundler.require(:development)
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "imgkit"
-    gem.summary = %Q{HTML+CSS -> JPG}
-    gem.description = %Q{Uses wkhtmltoimage to create Images using HTML}
-    gem.email = "christopher.continanza@gmail.com"
-    gem.homepage = "http://github.com/csquared/IMGKit"
-    gem.authors = ["csquared"]
-    gem.add_development_dependency "rspec", "~> 2.0.0.beta.8"
-    gem.add_development_dependency "rspec-core", "~> 2.0.0.beta.8"
-    gem.add_development_dependency 'mocha'
-    gem.post_install_message = File.read('POST_INSTALL')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "IMGKit #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+Bundler::GemHelper.install_tasks

data/bin/imgkit

@@ -6,7 +6,7 @@ require 'open-uri'
 require 'imgkit/configuration'
 
 def detect_architecture
-  case Config::CONFIG['host_os']
+  case Config::CONFIG['arch']
   when /x86_64-linux/i
     'amd64'
   when /linux/i
@@ -24,10 +24,15 @@ def cleanup(install_to)
 end
 
 def download_wkhtmltoimage(arch)
-  page = open("http://code.google.com/p/wkhtmltopdf/downloads/list").read
-  download = page.match(/href=".*name=(.*wkhtmltoimage-.*#{arch}.*?)&/) || raise("File not found..")
-  download = download[1]
-  url = "http://wkhtmltopdf.googlecode.com/files/#{download}"
+  if ENV['BZIP'] 
+    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..")
+    download = download[1]
+    url = "http://wkhtmltopdf.googlecode.com/files/#{download}"
+  end
   puts "Downloading #{download} from #{url}"
   
   `curl #{url} > #{download}`
@@ -37,36 +42,49 @@ end
 def install(download, arch, install_to)
   puts "Installing #{download} to #{install_to}"
   if download =~ /.tar.bz2$/
-    `tar xjvf #{download}`
-    `mv wkhtmltoimage-#{arch} #{install_to}`
+    `sudo tar xjvf #{download}`
+    `sudo mv wkhtmltoimage-#{arch} #{install_to}`
   elsif download =~ /.tar.lzma$/
     raise "couldn't extract archive: lzcat not found" unless system("which lzcat > /dev/null 2>/dev/null")
-    `lzcat #{download} | tar x`
-    `mv wkhtmltoimage-#{arch} #{install_to}`
+    puts "Warning: lzcat is broken on Ubuntu. Re-run with --use-bzip to install alternate version"
+    `sudo lzcat #{download} | tar x`
+    `sudo mv wkhtmltoimage-#{arch} #{install_to}`
   else
-    `mv #{download} #{install_to}`
+    `sudo mv #{download} #{install_to}`
   end
   `sudo chmod +x #{install_to}`
 end
 
+@command = Proc.new { puts "Nothing to do: use --help"}
+
 OptionParser.new do |parser|
   parser.banner = "IMGKit\n\nOptions are:"
 
+  parser.on("--use-bzip", "Force bzip download for Ubuntu because lzcat is broken") do
+    ENV['BZIP'] = 'true'
+  end
+
   parser.on("--install-wkhtmltoimage", "Install wkhtmltoimage binaries (TO=/usr/local/bin ARCHITECTURE=i386)") do
-    architecture = ENV['ARCHITECTURE'] || detect_architecture
-    install_to = ENV['TO'] || IMGKit.configuration.wkhtmltoimage
-    
-    Dir.chdir '/tmp'
-    
-    cleanup(install_to)
-    download = download_wkhtmltoimage(architecture)
-    install(download, architecture, install_to)
+    @command = Proc.new do
+      architecture = ENV['ARCHITECTURE'] || detect_architecture
+      install_to = ENV['TO'] || IMGKit.configuration.wkhtmltoimage
+      
+      Dir.chdir '/tmp'
+      
+      cleanup(install_to)
+      download = download_wkhtmltoimage(architecture)
+      install(download, architecture, install_to)
+    end
   end
 
   parser.on("--version", "Show Version.") do
-    root = File.dirname(File.dirname(__FILE__))
-    puts File.read(File.join(root, 'VERSION'))
+    @command = Proc.new do
+      root = File.dirname(File.dirname(__FILE__))
+      puts File.read(File.join(root, 'VERSION'))
+    end
   end
 
   parser.on("-h", "--help", "Show this.") { puts parser; exit }
 end.parse!
+
+@command.call

data/imgkit.gemspec

@@ -1,84 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "imgkit/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{imgkit}
-  s.version = "1.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.name        = "imgkit"
+  s.version     = IMGKit::VERSION
+  s.platform    = Gem::Platform::RUBY
   s.authors = ["csquared"]
-  s.date = %q{2010-12-13}
-  s.default_executable = %q{imgkit}
-  s.description = %q{Uses wkhtmltoimage to create Images using HTML}
   s.email = %q{christopher.continanza@gmail.com}
-  s.executables = ["imgkit"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     ".rspec",
-     ".rvmrc",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "POST_INSTALL",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "bin/imgkit",
-     "imgkit.gemspec",
-     "lib/imgkit.rb",
-     "lib/imgkit/configuration.rb",
-     "lib/imgkit/imgkit.rb",
-     "lib/imgkit/source.rb",
-     "spec/fixtures/example.css",
-     "spec/fixtures/example.html",
-     "spec/imgkit_spec.rb",
-     "spec/source_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/csquared/IMGKit}
-  s.post_install_message = %q{******************************************************************
+  s.homepage    = "http://rubygems.org/gems/imgkit"
+  s.summary =  %q{HTML+CSS -> JPG}
+  s.description = %q{Uses wkhtmltoimage to create Images using HTML}
+  s.post_install_message = File.read('POST_INSTALL')
 
-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)
+  s.rubyforge_project = "imgkit"
 
-******************************************************************
-}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{HTML+CSS -> JPG}
-  s.test_files = [
-    "spec/imgkit_spec.rb",
-     "spec/source_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
-      s.add_development_dependency(%q<rspec-core>, ["~> 2.0.0.beta.8"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
-      s.add_dependency(%q<rspec-core>, ["~> 2.0.0.beta.8"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
-    s.add_dependency(%q<rspec-core>, ["~> 2.0.0.beta.8"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-  end
 end
-

data/lib/imgkit/version.rb

@@ -0,0 +1,3 @@
+class IMGKit
+  VERSION = "1.0.1"
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - csquared
@@ -14,65 +14,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 -06:00
-default_executable: imgkit
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 8
-        version: 2.0.0.beta.8
-  type: :development
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 8
-        version: 2.0.0.beta.8
-  type: :development
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id003
+date: 2010-12-14 00:00:00 -06:00
+default_executable: 
+dependencies: []
+
 description: Uses wkhtmltoimage to create Images using HTML
 email: christopher.continanza@gmail.com
 executables: 
 - imgkit
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
@@ -84,20 +37,20 @@ files:
 - POST_INSTALL
 - README.md
 - Rakefile
-- VERSION
 - bin/imgkit
 - imgkit.gemspec
 - lib/imgkit.rb
 - lib/imgkit/configuration.rb
 - lib/imgkit/imgkit.rb
 - lib/imgkit/source.rb
+- lib/imgkit/version.rb
 - spec/fixtures/example.css
 - spec/fixtures/example.html
 - spec/imgkit_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/csquared/IMGKit
+homepage: http://rubygems.org/gems/imgkit
 licenses: []
 
 post_install_message: |
@@ -110,8 +63,8 @@ post_install_message: |
   
   ******************************************************************
 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -119,7 +72,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 420051578781479221
       segments: 
       - 0
       version: "0"
@@ -133,12 +85,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: imgkit
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: HTML+CSS -> JPG
 test_files: 
+- spec/fixtures/example.css
+- spec/fixtures/example.html
 - spec/imgkit_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.0