1 files changed, 4 insertions, 6 deletions
diff --git a/guides/rails_guides/generator.rb b/guides/rails_guides/generator.rb
index 3b124ef236..aa900454c8 100644
--- a/guides/rails_guides/generator.rb
+++ b/guides/rails_guides/generator.rb
@@ -84,7 +84,7 @@ module RailsGuides
       @warnings = ENV['WARNINGS'] == '1'
       @all      = ENV['ALL']      == '1'
       @kindle   = ENV['KINDLE']   == '1'
-      @version  = ENV['RAILS_VERSION'] || `git rev-parse --short HEAD`.chomp
+      @version  = ENV['RAILS_VERSION'] || 'local'
       @lang     = ENV['GUIDES_LANGUAGE']
     end
 
@@ -112,11 +112,9 @@ module RailsGuides
     end
 
     def generate_mobi
-      opf = "#{output_dir}/rails_guides.opf"
+      require 'rails_guides/kindle'
       out = "#{output_dir}/kindlegen.out"
-
-      system "kindlegen #{opf} -o #{mobi} > #{out} 2>&1"
-      puts "Guides compiled as Kindle book to #{mobi}"
+      Kindle.generate(output_dir, mobi, out)
       puts "(kindlegen log at #{out})."
     end
 
@@ -186,7 +184,7 @@ module RailsGuides
     def generate?(source_file, output_file)
       fin  = File.join(source_dir, source_file)
       fout = output_path_for(output_file)
-      all || !File.exists?(fout) || File.mtime(fout) < File.mtime(fin)
+      all || !File.exist?(fout) || File.mtime(fout) < File.mtime(fin)
     end
 
     def generate_guide(guide, output_file)