diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | guides/Rakefile | 5 | ||||
| -rw-r--r-- | guides/rails_guides/kindle.rb | 12 |
4 files changed, 10 insertions, 13 deletions
@@ -44,7 +44,7 @@ group :doc do gem "sdoc", "1.0.0.beta2" gem "redcarpet", "~> 3.2.3", platforms: :ruby gem "w3c_validators" - gem "kindlerb", ">= 1.0.1" + gem "kindlerb", "~> 1.2.0" end # Active Support. diff --git a/Gemfile.lock b/Gemfile.lock index 0763efc001..3a616402f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,7 +213,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.0.2) - kindlerb (1.0.1) + kindlerb (1.2.0) mustache nokogiri libxml-ruby (2.9.0) @@ -396,7 +396,7 @@ DEPENDENCIES hiredis jquery-rails json (>= 2.0.0) - kindlerb (>= 1.0.1) + kindlerb (~> 1.2.0) libxml-ruby listen (>= 3.0.5, < 3.2) minitest (< 5.3.4) diff --git a/guides/Rakefile b/guides/Rakefile index bf501f6a64..f241cf5918 100644 --- a/guides/Rakefile +++ b/guides/Rakefile @@ -13,8 +13,9 @@ namespace :guides do desc "Generate .mobi file. The kindlegen executable must be in your PATH. You can get it for free from http://www.amazon.com/gp/feature.html?docId=1000765211" task :kindle do - unless `kindlerb -v 2> /dev/null` =~ /kindlerb 1.0.1/ - abort "Please `gem install kindlerb` and make sure you have `kindlegen` in your PATH" + require 'kindlerb' + unless Kindlerb.kindlegen_available? + abort "Please run `setupkindlerb` to install kindlegen" end unless `convert` =~ /convert/ abort "Please install ImageMagick`" diff --git a/guides/rails_guides/kindle.rb b/guides/rails_guides/kindle.rb index 4b73ae9518..5ac802c817 100644 --- a/guides/rails_guides/kindle.rb +++ b/guides/rails_guides/kindle.rb @@ -1,9 +1,6 @@ #!/usr/bin/env ruby -unless `which kindlerb` - abort "Please gem install kindlerb" -end - +require 'kindlerb' require "nokogiri" require "fileutils" require "yaml" @@ -28,10 +25,9 @@ module Kindle generate_document_metadata(mobi_outfile) puts "Creating MOBI document with kindlegen. This may take a while." - cmd = "kindlerb . > #{File.absolute_path logfile} 2>&1" - puts cmd - system(cmd) - puts "MOBI document generated at #{File.expand_path(mobi_outfile, output_dir)}" + if Kindlerb.run(output_dir) + puts "MOBI document generated at #{File.expand_path(mobi_outfile, output_dir)}" + end end end |