softcover 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7ce9f41281c15fc962d8293f9a901c1eb35884
-  data.tar.gz: ff5a37c76b189d32a884b57384fb41b132eba793
+  metadata.gz: 5d457ce733f778fdeb848d5f889b1686f11a09ff
+  data.tar.gz: b9d1886ffdde15e50488dd72e1b7e71c4a8d4ed1
 SHA512:
-  metadata.gz: f20bf7b1e862062896aa29477251a341c37c012a2dff95b5de36fd48cac204a795f090be0b24e4ed0a7dca9e1f11dcdeb9f8402cf3ee3b2de0377e2111102377
-  data.tar.gz: d5b92a4bb6f396ef5055861e605649b140f21299452b3ab84e6c92692c4ad926cbc87903b153ccd2d967580b1f19c219e60dc9a67b2b016be4eab13cf821a52b
+  metadata.gz: b4692af5acbc5ce82defe290f8ce7e54d86505ba0c88db0c7bca3ad09808c38c4a03310e2a236c8362192dc8bce3e87d4065298602ccb732021f3c4d1a5eb112
+  data.tar.gz: e1417a3e4130571624a9150968d128a57bd53647f2dabdf8d266e9206cbd9a744e840e2c9d2421141e305841ca9c458a06a7b04da723683d41543a546272bee5

data/lib/softcover/article_template/html/stylesheets/softcover.css

@@ -14,6 +14,7 @@ body #book {
   font-size: 230%;
   border-top: 2px solid #333;
   padding-top: 1em;
+  text-align: left;
 }
 
 #book h2 {
@@ -326,6 +327,15 @@ body #book {
   font-weight: bold;
 }
 
+#book ul.footnotes li {
+  line-height: 1.4;
+  margin-bottom: 1em;
+}
+
+#book ul.footnotes li p {
+  line-height: 1.4;
+}
+
 #book a.arrow {
   text-decoration: none;
 }

data/lib/softcover/builders/epub.rb

@@ -1,5 +1,4 @@
 module Softcover
-
   module EpubUtils
 
     # Returns the name of the cover file.
@@ -17,8 +16,13 @@ module Softcover
       return false
     end
 
-    def cover?
-      cover_img
+    # Returns true when producing a cover.
+    # We include a cover when not producing an Amazon-specific book
+    # as long as there's a cover image. (When uploading a book to
+    # Amazon KDP, the cover gets uploaded separately, so the MOBI file itself
+    # should have not have a cover.)
+    def cover?(options={})
+      !options[:amazon] && cover_img
     end
 
     def cover_img_path
@@ -141,7 +145,7 @@ module Softcover
         write_nav
         copy_image_files
         write_html(options)
-        write_contents
+        write_contents(options)
         create_style_files(options)
         make_epub(options)
         move_epub
@@ -194,8 +198,8 @@ module Softcover
 
       # Writes the content.opf file.
       # This is required by the EPUB standard.
-      def write_contents
-        File.write(path('epub/OEBPS/content.opf'), content_opf)
+      def write_contents(options={})
+        File.write(path('epub/OEBPS/content.opf'), content_opf(options))
       end
 
       # Returns the chapters to write.
@@ -211,7 +215,7 @@ module Softcover
         mkdir images_dir
         mkdir texmath_dir
 
-        File.write(path('epub/OEBPS/cover.html'), cover_page) if cover?
+        File.write(path('epub/OEBPS/cover.html'), cover_page) if cover?(options)
 
         pngs = []
         chapters.each_with_index do |chapter, i|
@@ -464,7 +468,7 @@ module Softcover
       end
 
       # Returns the content configuration file.
-      def content_opf
+      def content_opf(options={})
         man_ch = chapters.map do |chapter|
                    %(<item id="#{chapter.slug}" href="#{chapter.fragment_name}" media-type="application/xhtml+xml"/>)
                  end
@@ -486,7 +490,7 @@ module Softcover
                    %(<item id="#{id}" href="#{href}" media-type="image/#{ext}"/>)
                  end
         content_opf_template(manifest.title, manifest.copyright,
-                             manifest.author, manifest.uuid, cover_id,
+                             manifest.author, manifest.uuid, cover_id(options),
                              toc_ch, man_ch, images)
       end
 
@@ -506,8 +510,8 @@ module Softcover
 )
       end
 
-      def cover_id
-        cover? ? "img-#{cover_img.sub('.', '-')}" : nil
+      def cover_id(options)
+        cover?(options) ? "img-#{cover_img.sub('.', '-')}" : nil
       end
 
       # Returns the Table of Contents for the spine.

data/lib/softcover/builders/mobi.rb

@@ -24,7 +24,7 @@ module Softcover
       # Returns the command for making a MOBI, based on the options.
       def mobi_command(filename, options={})
         silent = options[:silent] || Softcover.test?
-        if options[:kindlegen]
+        if options[:kindlegen] || options[:amazon]
           cmd = "#{kindlegen} ebooks/#{filename}.epub"
         else
           cmd = "#{calibre} ebooks/#{filename}.epub ebooks/#{filename}.mobi" +

data/lib/softcover/builders/preview.rb

@@ -3,6 +3,10 @@ module Softcover
     class Preview < Builder
 
       def build!
+        if article?
+          $stderr.puts "Previews not supported for articles"
+          exit(1)
+        end
         # Recall that MOBI generation makes an EPUB as a side-effect.
         Softcover::Builders::Mobi.new.build!(preview: true)
         Softcover::Builders::Pdf.new.build!(preview: true)

data/lib/softcover/cli.rb

@@ -48,6 +48,8 @@ module Softcover
         method_option :kindlegen, aliases: '-k',
                                   desc: "Use KindleGen to build the MOBI",
                                   type: :boolean
+        method_option :amazon, aliases: '-a',
+                               desc: "Build for Amazon KDP", type: :boolean
       end
       method_option :quiet, aliases: '-q',
                             desc: "Quiet output", type: :boolean

data/lib/softcover/commands/deployment.rb

@@ -5,7 +5,7 @@ module Softcover
       extend self
 
       # Deploy a book by building and publishing it.
-      # The deploy steps can be customized using `.poly-publish`
+      # The deploy steps can be customized using `.softcover-publish`
       # in the book project's home directory.
       def deploy!
         if File.exist?('.softcover-deploy') && !custom_commands.empty?
@@ -17,8 +17,12 @@ module Softcover
 
       # Returns the default commands.
       def default_commands
-        commands(['softcover build:all', 'softcover build:preview',
-                  'softcover publish'])
+        if article?
+          commands(['softcover build:all', 'softcover publish'])
+        else
+          commands(['softcover build:all', 'softcover build:preview',
+                    'softcover publish'])
+        end
       end
 
       # Returns custom commands (if any).

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/softcover.gemspec

@@ -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', '~> 1.1.3'
+  gem.add_dependency 'polytexnic', '~> 1.1.6'
   gem.add_dependency 'msgpack', '~> 0.4.2'
   gem.add_dependency 'nokogiri', '~> 1.6.0'
   gem.add_dependency 'thor', '~> 0.18.1'

data/spec/builders/epub_spec.rb

@@ -291,4 +291,9 @@ describe "article validation" do
     output = `softcover epub:validate`
     expect(output).to match(/No errors or warnings/)
   end
+
+  it "should description" do
+    commands = Softcover::Commands::Deployment.default_commands
+    expect(commands).not_to include('preview')
+  end
 end

data/spec/builders/mobi_spec.rb

@@ -46,6 +46,15 @@ describe Softcover::Builders::Mobi do
         end
       end
 
+      context "amazon" do
+        let(:command) do
+          @builder.mobi_command(@builder.mobi_filename, amazon: true)
+        end
+        it "should use Amazon.com's kindlegen" do
+          expect(command).to include 'kindlegen'
+        end
+      end
+
       context "preview" do
         let(:filename) do
           @builder.mobi_filename(preview: true)

data/spec/cli_spec.rb

@@ -33,6 +33,20 @@ describe Softcover::CLI do
     it { should include 'f, [--find-overfull]' }
   end
 
+  context "softcover build:epub options" do
+    subject { `softcover help build:epub` }
+    it { should include '-q, [--quiet]' }
+    it { should include '-s, [--silent]' }
+  end
+
+  context "softcover build:mobi options" do
+    subject { `softcover help build:mobi` }
+    it { should include '-q, [--quiet]' }
+    it { should include '-s, [--silent]' }
+    it { should include '-k, [--kindlegen]' }
+    it { should include '-a, [--amazon]' }
+  end
+
   context "softcover new options" do
     subject { `softcover help new` }
     it { should include '-p, [--polytex]' }

data/spec/commands/deployment_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Softcover::Commands::Deployment do
 
   describe "default commands" do
+    before { Softcover::Commands::Deployment.stub(:article?).and_return(false) }
     subject { Softcover::Commands::Deployment.default_commands }
 
     it { should match /softcover build:all/ }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement