RubyGems - softcover - Versions diffs - 0.6.7 → 0.6.9 - Mend

softcover 0.6.7 → 0.6.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

checksums.yaml +4 -4
data/.pull_requests/1385766008 +0 -0
data/.pull_requests/1385778329 +0 -0
data/lib/softcover/builders/epub.rb +1 -1
data/lib/softcover/builders/mobi.rb +32 -9
data/lib/softcover/builders/pdf.rb +0 -1
data/lib/softcover/cli.rb +5 -1
data/lib/softcover/commands/epub_validator.rb +2 -3
data/lib/softcover/template/gitignore +1 -0
data/lib/softcover/template/html/stylesheets/softcover.css +15 -1
data/lib/softcover/template/softcover.sty +2 -1
data/lib/softcover/version.rb +1 -1
data/softcover.gemspec +1 -1
data/spec/builders/mobi_spec.rb +25 -28
data/spec/builders/preview_spec.rb +25 -44
metadata +6 -4

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18e10cc07c83b7d50616aa5a8a627b434ed437de
-  data.tar.gz: 9579bb03abbf836ed83e86aef3a2ecb996183f5f
+  metadata.gz: 5647cff927ffdc738c3bec013c0c729d3397a429
+  data.tar.gz: 1d588aa9b57576bbec00cafed17338e6b9daec4b
 SHA512:
-  metadata.gz: 45e0e95ed9a948cce46ebb8c282345af60d3befbb578cce6d7ea1b674e43a7ff575d41f86cd527ebc4dc1dcfa22f075d9af8a78baf463e3d554f89223ee6d0ff
-  data.tar.gz: 9c7d2c428d7c4856f1a97cb70e1a9538982372b869e08a920773cb457c13a4ff5ecf117da1c19339ba328cf0e22ad5ff322312861850daf6b7a79e8be2b44e6d
+  metadata.gz: cb8ef238014720f30ce9a72e08c49ad2ba06100b44ef92ce2034e74c09be8859c47031e394eb802b38b86550b08ff967f8ecb276c6a7ac40db9da75421c64b0b
+  data.tar.gz: ce8b423b371662063f4068378b7d4e5670f1a8d93cdc9621bc8dba818728602d4b04fbed5fe329899dc483a2964a867bff4e122d40a0928e24b43bc96a2f6825

data/.pull_requests/1385766008 ADDED Viewed

File without changes

data/.pull_requests/1385778329 ADDED Viewed

File without changes

data/lib/softcover/builders/epub.rb CHANGED Viewed

@@ -373,7 +373,7 @@ module Softcover
 %(<?xml version="1.0" encoding="UTF-8"?>
 <ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
     <head>
-        <meta name="dtb:uid" content="d430b920-e684-11e1-aff1-0800200c9a66"/>
+        <meta name="dtb:uid" content="#{manifest.uuid}"/>
         <meta name="dtb:depth" content="2"/>
         <meta name="dtb:totalPageCount" content="0"/>
         <meta name="dtb:maxPageNumber" content="0"/>

data/lib/softcover/builders/mobi.rb CHANGED Viewed

@@ -4,21 +4,44 @@ module Softcover
       def build!(options={})
         Softcover::Builders::Epub.new.build!(options)
-        filename  = manifest.filename
-        filename += '-preview' if options[:preview]
-        command = "#{kindlegen} ebooks/#{filename}.epub"
-        # Because of the way kindlegen uses tempfiles, testing for the
-        # actual generation of the MOBI causes an error, so in tests
-        # we just return the command.
-        if options[:quiet] || options[:silent]
-          silence { Softcover.test? ? command : system(command) }
+        filename = mobi_filename(options)
+        command  = mobi_command(filename, options)
+        silent   = options[:silent] || Softcover.test?
+        if options[:quiet] || silent
+          silence { system(command) }
         else
-          Softcover.test? ? command : system(command)
+          system(command)
+        end
+        unless options[:kindlegen]
+          FileUtils.mv("ebooks/#{filename}.azw3", "ebooks/#{filename}.mobi")
+          puts "MOBI saved to ebooks/#{filename}.mobi" unless silent
+        end
+      end
+      # Returns the filename of the MOBI (preview if necessary).
+      def mobi_filename(options={})
+        options[:preview] ? manifest.filename + '-preview' : manifest.filename
+      end
+      # Returns the command for making a MOBI, based on the options.
+      def mobi_command(filename, options={})
+        if options[:kindlegen]
+          "#{kindlegen} ebooks/#{filename}.epub"
+        else
+          "#{calibre} ebooks/#{filename}.epub ebooks/#{filename}.azw3"
         end
       end
       private
+        def calibre
+          filename = `which ebook-convert`.chomp
+          url = 'http://calibre-ebook.com/'
+          message  = "Install Calibre (#{url}) and enable command line tools"
+          message += " (http://manual.calibre-ebook.com/cli/cli-index.html)"
+          @calibre ||= executable(filename, message)
+        end
         def kindlegen
           filename = `which kindlegen`.chomp
           url = 'http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211'

data/lib/softcover/builders/pdf.rb CHANGED Viewed

@@ -37,7 +37,6 @@ module Softcover
         polytex_filenames = manifest.pdf_chapter_filenames << book_filename
         polytex_filenames.each do |filename|
-          puts filename unless options[:quiet] || options[:silent]
           polytex = File.open(filename) { |f| f.read }
           latex   = Polytexnic::Pipeline.new(polytex).to_latex
           if filename == book_filename

data/lib/softcover/cli.rb CHANGED Viewed

@@ -6,7 +6,7 @@ module Softcover
     map "-v" => :version
-    desc "version", "Return the version number"
+    desc "version", "Return the version number (-v for short)"
     method_option :version, aliases: '-v',
                             desc: "Print version number", type: :boolean
     def version
@@ -41,6 +41,10 @@ module Softcover
         method_option :'find-overfull', aliases: '-f',
                                         desc: "Find overfull hboxes",
                                         type: :boolean
+      elsif format == 'mobi'
+        method_option :kindlegen, aliases: '-k',
+                                  desc: "Use kindlegen to build the MOBI",
+                                  type: :boolean
       end
       method_option :quiet, aliases: '-q',
                             desc: "Quiet output", type: :boolean

data/lib/softcover/commands/epub_validator.rb CHANGED Viewed

@@ -22,9 +22,8 @@ module Softcover
         def epubcheck
           filename = File.join(Dir.home, 'epubcheck-3.0', 'epubcheck-3.0.jar')
-          url = 'https://code.google.com/p/epubcheck/downloads/' +
-                'detail?name=epubcheck-3.0.zip'
-          message = "Put EpubCheck (#{url}) in your home directory"
+          url = 'https://github.com/IDPF/epubcheck/releases/download/v3.0/epubcheck-3.0.zip'
+          message = "Download EpubCheck 3.0 (#{url}) and unzip it in your home directory"
           @epubcheck ||= executable(filename, message).inspect
         end
     end

data/lib/softcover/template/gitignore CHANGED Viewed

@@ -30,4 +30,5 @@ screencasts/
 # Other miscellaneous files
 log/
+*.bak
 .DS_Store

data/lib/softcover/template/html/stylesheets/softcover.css CHANGED Viewed

@@ -18,6 +18,15 @@ body #book {
 #book h2 {
   font-size: 180%;
+  margin-top: 1.5em;
+}
+#book h3 {
+  margin-top: 1.5em;
+}
+#book h4 {
+  margin-top: 2em;
 }
 #book img.tex {
@@ -96,7 +105,7 @@ body #book {
   margin-top: 0.2em;
   width: 100%;
   white-space: pre;
-  font-family: Courier, monospace;
+  font-family: "Courier New", Courier, monospace;
   border: 1px solid #999;
   background: #eee;
   margin-bottom: 1em;
@@ -133,6 +142,11 @@ body #book {
   margin-top: -0.4em;
 }
+#book .code .highlight .lineno {
+  color: #666;
+  font-weight: normal;
+}
 #book .filepath {
   font-family: Courier, monospace;
   font-size: 80%;

data/lib/softcover/template/softcover.sty CHANGED Viewed

@@ -46,8 +46,9 @@
 \definecolor{darkblue}{rgb}{0,0.18,0.45}
 \definecolor{darkgreen}{rgb}{0,0.39,0}
 % Bizarrely, we need to define the ALL CAPS version of DARKGREEN to account
-% for some edge cases, whose nature remains myterious.
+% for some edge cases, whose nature remains mysterious.
 \definecolor{DARKGREEN}{rgb}{0,0.39,0}
+\definecolor{hilightyellow}{rgb}{1.0,1.0,0.8}
 \hypersetup{colorlinks,linkcolor=darkblue,urlcolor=blue}
 % Code environments

data/lib/softcover/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "0.6.7"
+  VERSION = "0.6.9"
 end

data/softcover.gemspec CHANGED Viewed

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency 'polytexnic', '~> 0.5'
+  gem.add_dependency 'polytexnic', '~> 0.6.9'
   gem.add_dependency 'msgpack', '~> 0.4.2'
   gem.add_dependency 'nokogiri', '~> 1.5.0'
   gem.add_dependency 'thor'

data/spec/builders/mobi_spec.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 require 'spec_helper'
 describe Softcover::Builders::Mobi do
-  context "for a PolyTeX book" do
+  describe "#build!" do
     before(:all) do
       generate_book
       @builder = Softcover::Builders::Mobi.new
@@ -10,37 +10,34 @@ describe Softcover::Builders::Mobi do
     end
     after(:all) { remove_book }
-    describe "#build!" do
-      it "should generate the EPUB" do
-        expect('ebooks/book.epub').to exist
-      end
+    it "should generate the MOBI" do
+      expect('ebooks/book.mobi').to exist
+    end
-      # Because of the way kindlegen uses tempfiles, testing for the
-      # actual generation of the MOBI causes an error, so we just
-      # check the command.
-      describe "MOBI generation" do
-        subject(:built) { @built }
-        it { should match /kindlegen/ }
-        it { should match /ebooks\/book\.epub/ }
+    describe "MOBI command" do
+      context "default" do
+        let(:command) { @builder.mobi_command(@builder.mobi_filename) }
+        it "should use Calibre's ebook-convert" do
+          expect(command).to include 'ebook-convert'
+        end
       end
-    end
-  end
-  context "for a Markdown book" do
-    before(:all) do
-      generate_book(markdown: true)
-      @builder = Softcover::Builders::Mobi.new
-      @built = @builder.build!
-      chdir_to_book
-    end
-    after(:all) { remove_book }
+      context "kindlegen" do
+        let(:command) do
+          @builder.mobi_command(@builder.mobi_filename, kindlegen: true)
+        end
+        it "should use Amazon.com's kindlegen" do
+          expect(command).to include 'kindlegen'
+        end
+      end
-    describe "#build!" do
-      describe "MOBI generation" do
-        subject(:built) { @built }
-        it { should match /kindlegen/ }
-        it { should match /ebooks\/book\.epub/ }
-        it { should_not match /Book.txt.epub/ }
+      context "preview" do
+        let(:filename) do
+          @builder.mobi_filename(preview: true)
+        end
+        it "should use Calibre's ebook-convert" do
+          expect(filename).to include 'book-preview'
+        end
       end
     end
   end

data/spec/builders/preview_spec.rb CHANGED Viewed

@@ -2,59 +2,40 @@ require 'spec_helper'
 describe Softcover::Builders::Preview do
-  context "for a PolyTeX book" do
-    before(:all) do
-      generate_book
-      @builder = Softcover::Builders::Preview.new
-      @builder.build!
-      chdir_to_book
+  before(:all) do
+    generate_book
+    @builder = Softcover::Builders::Preview.new
+    @builder.build!
+    chdir_to_book
+  end
+  after(:all) { remove_book }
+  describe "#build!" do
+    it "should build a PDF" do
+      expect('ebooks/book-preview.pdf').to exist
     end
-    after(:all) { remove_book }
-    describe "#build!" do
+    context "EPUB & MOBI books" do
+      it "should build an EPUB" do
+        expect('ebooks/book-preview.epub').to exist
+      end
-      it "should build a PDF" do
-        expect('ebooks/book-preview.pdf').to exist
+      it "should build an EPUB" do
+        expect('ebooks/book-preview.mobi').to exist
       end
-      context "EPUB & MOBI books" do
-        it "should build an EPUB" do
-          expect('ebooks/book-preview.epub').to exist
+      it "should include the right chapters" do
+        @builder.manifest.preview_chapters.each do |ch|
+          expect(File.join('epub', 'OEBPS', ch.fragment_name)).to exist
         end
-        #
-        # We don't test for MOBI because kindlegen doesn't work in tests.
-        #
-        it "should include the right chapters" do
-          @builder.manifest.preview_chapters.each do |ch|
-            expect(File.join('epub', 'OEBPS', ch.fragment_name)).to exist
-          end
-          nonpreview_chapters = @builder.manifest.chapters -
-                                @builder.manifest.preview_chapters
-          nonpreview_chapters.each do |ch|
-            expect(File.join('epub', 'OEBPS', ch.fragment_name)).not_to exist
-          end
+        nonpreview_chapters = @builder.manifest.chapters -
+                              @builder.manifest.preview_chapters
+        nonpreview_chapters.each do |ch|
+          expect(File.join('epub', 'OEBPS', ch.fragment_name)).not_to exist
         end
       end
     end
   end
-  context "for a Markdown book" do
-    before(:all) do
-      generate_book(markdown: true)
-      @builder = Softcover::Builders::Preview.new
-      @builder.build!
-      chdir_to_book
-    end
-    after(:all) { remove_book }
-    describe "#build!" do
-      it "should build a PDF" do
-        expect('ebooks/book-preview.pdf').to exist
-      end
-    end
-  end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.9
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.9
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -366,6 +366,8 @@ files:
 - .pull_requests/1384801823
 - .pull_requests/1385070261
 - .pull_requests/1385518404
+- .pull_requests/1385766008
+- .pull_requests/1385778329
 - .rspec
 - .ruby-gemset
 - .ruby-version