From 9dafca8d222be50515656f338dbc5f5122011b6c Mon Sep 17 00:00:00 2001 From: Steve Johnson Date: Tue, 9 Apr 2013 14:43:13 -0500 Subject: [PATCH 1/3] Removed wkhtmltopdf-binary dependancy --- Gemfile | 1 - Gemfile.lock | 2 -- wisepdf.gemspec | 3 --- 3 files changed, 6 deletions(-) diff --git a/Gemfile b/Gemfile index 1e9f768..ecb8bd2 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,6 @@ source "http://rubygems.org" group :development, :test do gem 'sqlite3' - gem 'wkhtmltopdf-binary' gem "shoulda", ">= 0" gem "bundler", ">= 1.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index 44ad441..32ba12b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,7 +97,6 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.36) - wkhtmltopdf-binary (0.9.9.1) PLATFORMS ruby @@ -108,4 +107,3 @@ DEPENDENCIES rails (>= 3.0.0) shoulda sqlite3 - wkhtmltopdf-binary diff --git a/wisepdf.gemspec b/wisepdf.gemspec index bb8dc8d..5f141df 100644 --- a/wisepdf.gemspec +++ b/wisepdf.gemspec @@ -97,14 +97,12 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, [">= 1.0.0"]) s.add_development_dependency(%q, ["~> 1.6.4"]) s.add_development_dependency(%q, [">= 3.0.0"]) else s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 1.0.0"]) s.add_dependency(%q, ["~> 1.6.4"]) @@ -112,7 +110,6 @@ Gem::Specification.new do |s| end else s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 1.0.0"]) s.add_dependency(%q, ["~> 1.6.4"]) From 80efd83c0b1b744d90e58c21292850b6e0245272 Mon Sep 17 00:00:00 2001 From: Steve Johnson Date: Tue, 9 Apr 2013 14:46:24 -0500 Subject: [PATCH 2/3] Updated documentation --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 01d1c41..1be34de 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,10 @@ More information about [wkhtmltopdf](http://code.google.com/p/wkhtmltopdf/) coul Add this to your Gemfile: gem 'wisepdf' + +if you don't already have wkhtmltopdf installed on your machine you can get up and running quickly by adding this to your Gemfile: + + gem 'wkhtmltopdf-binary' then do: From 78f20defbc6b2003bd4e03c220f138c12bdea01b Mon Sep 17 00:00:00 2001 From: Steve Johnson Date: Tue, 9 Apr 2013 15:00:09 -0500 Subject: [PATCH 3/3] Added wkhtmltopdf-binary back to Gemfile so test don't break on machines without wkhtmltopdf --- Gemfile | 3 ++- Gemfile.lock | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ecb8bd2..6b6f736 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,8 @@ source "http://rubygems.org" group :development, :test do gem 'sqlite3' - + gem 'wkhtmltopdf-binary' + gem "shoulda", ">= 0" gem "bundler", ">= 1.0.0" gem "jeweler" diff --git a/Gemfile.lock b/Gemfile.lock index 32ba12b..44ad441 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,6 +97,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.36) + wkhtmltopdf-binary (0.9.9.1) PLATFORMS ruby @@ -107,3 +108,4 @@ DEPENDENCIES rails (>= 3.0.0) shoulda sqlite3 + wkhtmltopdf-binary