From 88792b1b2e22e7ce17c888b08ba06672c9a72013 Mon Sep 17 00:00:00 2001
From: Bian Jiaping <ssbianjp@gmail.com>
Date: Sun, 18 Dec 2016 23:13:50 +0800
Subject: Fix rake guides:generate:kindle error

---
 guides/Rakefile               |  5 +++--
 guides/rails_guides/kindle.rb | 12 ++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'guides')

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
 
-- 
cgit v1.2.3