softcover 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8881f6f142a67ef79ee9fd3d0340c654b56e1f713f117ac6b9649ebb5b1975a7
-  data.tar.gz: 05b9d256af8d2a55bdb230a52deb044fcb3f0e826217a86fc6f5bf896b11cc73
+  metadata.gz: b938e75e9efbd6873229f59b4e829ea9d081718b2f8efd142bd871f459c0b837
+  data.tar.gz: 440f72dfa0a1cc6ddc81efc7b198bfb2ca88e762a3c7cbad2a02e3275ffe7fe7
 SHA512:
-  metadata.gz: d240132dfddb4de358645f6857fc7792e3aaa5fe75881c81fa27f7ef55f2a45d7f3cca319a822f2a322f9c21d4567a1a128256a5e8d4e500a80d239165b28135
-  data.tar.gz: 507a8fc7966d7f76af1074c398f6f767b958fb532741eec4e8c4f312a622e2186f4244b261fd1832f9b3da14c13fe3456deb190473629b50f813338fc98440df
+  metadata.gz: 5777f051935b1531a1a8d35f9ed4966f2725df59b3d4a626ca42fa7c46fac7f2b7a6d74129694a2d98dc8f483ec75beb999e93dd9fbc843f5ac053ed0fa3dc39
+  data.tar.gz: 91c271ffda5c34c4857e11a22c8ecb7229800b898b3afcadc08f554ff4d1094604d3877f59a3d8b5eedaa2c98bd6887d0754cc09fa535e15840f497967b92c24

data/.travis.yml

@@ -11,7 +11,7 @@ before_install:
   - sudo apt-get install -qq inkscape ghostscript
   - sudo -v && wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sudo sh
   - export PATH=$PATH:`echo ~`
-  - curl -O -L https://github.com/IDPF/epubcheck/releases/download/v4.0.2/epubcheck-4.0.2.zip && unzip epubcheck-4.0.2.zip -d ~
+  - curl -O -L https://github.com/IDPF/epubcheck/releases/download/v4.2.2/epubcheck-4.2.2.zip && unzip epubcheck-4.2.2.zip -d ~
   - wget https://softcover-static.s3.amazonaws.com/Bodoni%2072%20Smallcaps%20Book.ttf && sudo cp 'Bodoni 72 Smallcaps Book.ttf' /usr/share/fonts/truetype/bodoni-classic
   - sudo fc-cache -fsv
   #  - gem i softcover && softcover check # NOTE: enable to troubleshoot tex, gs, calibre, epubcheck, issus

data/Gemfile.lock

@@ -1,23 +1,22 @@
 PATH
   remote: .
   specs:
-    softcover (1.6.1)
+    softcover (1.7.0)
       activesupport (~> 4.2.3)
       async_sinatra (~> 1.1.0)
       coffee-script (>= 2.2.0)
       curb (>= 0.9.7)
       i18n (>= 0.7.0)
       kramdown (>= 1.6.0)
-      listen (~> 1.3.1)
+      listen (~> 3.2.1)
       maruku (~> 0.7.1)
       msgpack (~> 1.2.0)
       nokogiri (>= 1.6.0, < 2.0)
-      polytexnic (~> 1.5.15)
+      polytexnic (~> 1.6.0)
       pygments.rb (~> 1.2.1)
-      rb-fsevent (~> 0.9.3)
       rest-client (>= 1.8.0)
-      ruby-progressbar (~> 1.4.2)
-      sanitize (~> 4.6.3)
+      ruby-progressbar (~> 1.10)
+      sanitize (>= 4.6.3, < 5.3.0)
       sinatra (~> 1.4.4)
       sinatra-respond_to (~> 0.9.0)
       thin (~> 1.6.1)
@@ -26,7 +25,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -36,12 +35,12 @@ GEM
     async_sinatra (1.1.0)
       rack (>= 1.4.1)
       sinatra (>= 1.3.2)
-    coderay (1.1.2)
+    coderay (1.1.3)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -59,43 +58,43 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    ffi (1.12.2)
+    ffi (1.13.1)
     hashdiff (1.0.1)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (1.8.6)
-    kramdown (1.17.0)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
+    json (2.3.0)
+    kramdown (2.3.0)
+      rexml
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     maruku (0.7.3)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.2)
     msgpack (1.2.10)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     netrc (0.11.0)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (1.5.0)
-      nokogiri
-    polytexnic (1.5.15)
-      json (~> 1.8.1)
-      kramdown (~> 1.17)
+    nokogumbo (2.0.2)
+      nokogiri (~> 1.8, >= 1.8.4)
+    polytexnic (1.6.0)
+      json (~> 2.3.0)
+      kramdown (>= 1.17, < 3.0)
       msgpack (~> 1.2.0)
       nokogiri (~> 1.10.8)
       pygments.rb (~> 1.2.1)
-    pry (0.13.0)
+    pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.3)
+    public_suffix (4.0.5)
     pygments.rb (1.2.1)
       multi_json (>= 1.0.0)
     rack (1.6.13)
@@ -104,16 +103,15 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (13.0.1)
-    rb-fsevent (0.9.8)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rb-kqueue (0.2.5)
-      ffi (>= 0.5.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rexml (3.2.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -122,13 +120,13 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    ruby-prof (1.3.1)
-    ruby-progressbar (1.4.2)
+    ruby-prof (1.4.1)
+    ruby-progressbar (1.10.1)
     safe_yaml (1.0.4)
-    sanitize (4.6.6)
+    sanitize (5.2.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -150,9 +148,9 @@ GEM
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tins (1.24.1)
+    tins (1.25.0)
       sync
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext

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

@@ -434,7 +434,7 @@ body #book {
   color: red;
 }
 
-#book .sc {
+#book .smallcaps {
   font-variant: small-caps;
 }
 

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

@@ -434,7 +434,7 @@ body #book {
   color: red;
 }
 
-#book .sc {
+#book .smallcaps {
   font-variant: small-caps;
 }
 

data/lib/softcover/builder.rb

@@ -31,25 +31,10 @@ module Softcover
       def ensure_style_file_locations
         styles_dir = Softcover::Directories::STYLES
         mkdir styles_dir
-        fix_custom_include
         files = Dir.glob('*.sty')
         FileUtils.mv(files, styles_dir)
       end
 
-      # Fixes the custom include.
-      # The template includes the custom style file as an example
-      # of file inclusion. Unfortunately, the location of 'custom.sty', has
-      # changed, which will result in older templates spontaneously breaking.
-      def fix_custom_include
-        first_chapter = File.join('chapters', 'a_chapter.tex')
-        if File.exist?(first_chapter)
-          text = File.read(first_chapter)
-          text.gsub!('<<(custom.sty',
-                     "<<(#{Softcover::Directories::STYLES}/custom.sty" )
-          File.write(first_chapter, text)
-        end
-      end
-
       # Writes out the PolyTeXnic commands from polytexnic.
       def write_polytexnic_commands_file
         Polytexnic.write_polytexnic_style_file(styles_dir)
@@ -83,4 +68,4 @@ module Softcover
       end
 
   end
-end
+end

data/lib/softcover/builders/epub.rb

@@ -100,7 +100,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="#{uuid}"/>
+        <meta name="dtb:uid" content="urn:uuid:#{uuid}"/>
         <meta name="dtb:depth" content="2"/>
         <meta name="dtb:totalPageCount" content="0"/>
         <meta name="dtb:maxPageNumber" content="0"/>

data/lib/softcover/commands/check.rb

@@ -81,9 +81,9 @@ module Softcover
         when :zip
           "Install zip (e.g., apt-get install zip)"
         when :epubcheck
-          url  = 'https://github.com/IDPF/epubcheck/releases/download/v4.0.2/epubcheck-4.0.2.zip'
-          message  = "EpubCheck 4.0.2 (#{url})\n"
-          message += "      ∟ Unzip and place epubcheck-4.0.2/ in a directory on your path"
+          url  = 'https://github.com/w3c/epubcheck/releases/download/v4.2.2/epubcheck-4.2.2.zip'
+          message  = "EpubCheck 4.2.2 (#{url})\n"
+          message += "      ∟ Unzip and place epubcheck-4.2.2/ in a directory on your path"
         when :inkscape
           message  = "Inkscape (https://inkscape.org/)"
         when :python2

data/lib/softcover/commands/epub_validator.rb

@@ -10,7 +10,7 @@ module Softcover
         epub = path("ebooks/#{manifest.filename}.epub")
         if File.exist?(epub)
           puts "Validating EPUB..."
-          system("#{java} -jar #{epubcheck} #{epub}")
+          system("#{java} -jar #{epubcheck} --locale en -w #{epub}")
         else
           puts "File '#{epub}' not found"
           puts "Run 'softcover build:epub' to generate"

data/lib/softcover/commands/server.rb

@@ -11,16 +11,14 @@ module Softcover::Commands::Server
     return if defined?(@no_listener) && @no_listener
     server_pid = Process.pid
     filter_regex = /(\.md|\.tex|custom\.sty|custom\.css|Book\.txt|book\.yml)$/
-    @listener = Listen.to('.')
-    @listener.filter(filter_regex)
-
-    @listener.change do |modified|
+    @listener = Listen.to('.', only: filter_regex, ignore: /html\//) do |modified|
       first_modified = modified.try(:first)
       unless first_modified =~ ignore_regex
         rebuild first_modified
         Process.kill("HUP", server_pid)
       end
     end
+
     @listener.start
   end
 
@@ -65,3 +63,15 @@ module Softcover::Commands::Server
     start_server port, bind
   end
 end
+
+# Listen >=2.8 patch to silence duplicate directory errors. USE AT YOUR OWN RISK
+require 'listen/record/symlink_detector'
+module Listen
+  class Record
+    class SymlinkDetector
+      def _fail(_, _)
+        fail Error, "Don't watch locally-symlinked directory twice"
+      end
+    end
+  end
+end

data/lib/softcover/utils.rb

@@ -260,7 +260,7 @@ module Softcover::Utils
       get_filename(:'ebook-convert')
     when :epubcheck
       # Finds EpubCheck anywhere on the path.
-      version_4 = path('epubcheck-4.0.2/epubcheck.jar')
+      version_4 = path('epubcheck-4.2.2/epubcheck.jar')
       first_path(version_4) || get_filename(:'epubcheck') || ""
     when :inkscape
       default = '/Applications/Inkscape.app/Contents/MacOS/inkscape'
@@ -275,7 +275,7 @@ module Softcover::Utils
         ""
       end
     when :python2
-      python = get_filename(:python)
+      python = get_filename(:python2)
       # Python 2 stupidly outputs the version number to STDERR instead of STDOUT.
       require 'open3'
       stdout, stderr, status = Open3.capture3("#{python} --version")

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 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.5.15'
+  gem.add_dependency 'polytexnic', '~> 1.6.0'
   gem.add_dependency 'msgpack', '~> 1.2.0'
   gem.add_dependency 'nokogiri', '>= 1.6.0', '< 2.0'
   gem.add_dependency 'thor', '>= 0.18.1', '< 2.0'
@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'i18n', '>= 0.7.0'
   gem.add_dependency 'rest-client', '>= 1.8.0'
   gem.add_dependency 'curb', '>= 0.9.7'
-  gem.add_dependency 'ruby-progressbar', '~> 1.4.2'
+  gem.add_dependency 'ruby-progressbar', '~> 1.10'
   gem.add_dependency 'maruku', '~> 0.7.1'
   gem.add_dependency 'pygments.rb', '~> 1.2.1'
   gem.add_dependency 'kramdown', '>= 1.6.0'
@@ -36,7 +36,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'async_sinatra', '~> 1.1.0'
   gem.add_dependency 'sinatra-respond_to', '~> 0.9.0'
   gem.add_dependency 'coffee-script', '>= 2.2.0'
-  gem.add_dependency 'listen', '~> 1.3.1'
-  gem.add_dependency 'rb-fsevent', '~> 0.9.3'
-  gem.add_dependency 'sanitize', '~> 4.6.3'
+  gem.add_dependency 'listen', '~> 3.2.1'
+  gem.add_dependency 'sanitize', '>= 4.6.3', '< 5.3.0'
 end

data/spec/commands/epub_validator_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Softcover::Commands::EpubValidator do
+  context 'epub file exists' do
+    before(:all) do
+      remove_book
+      chdir_to_fixtures
+      silence { `softcover new book --polytex` }
+      chdir_to_book
+      silence { `softcover build:epub` }
+    end
+
+    after(:all) { remove_book }
+
+    subject { silence { Softcover::Commands::EpubValidator.validate! }  }
+    it { should be_true }
+  end
+
+  context 'epub file not exists' do
+    before(:all) do
+      remove_book
+      chdir_to_fixtures
+      silence { `softcover new book --polytex` }
+      chdir_to_book
+    end
+
+    after(:all) { remove_book }
+
+    it 'should raise SystemExit error' do
+      expect { silence { Softcover::Commands::EpubValidator.validate! } }.to raise_error(SystemExit)
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.15
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.15
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
@@ -267,42 +267,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.6.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.6.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.3.0
 description: Command-line interface for softcover.io
 email:
 - michael@softcover.io
@@ -593,6 +585,7 @@ files:
 - spec/commands/build_spec.rb
 - spec/commands/check_spec.rb
 - spec/commands/deployment_spec.rb
+- spec/commands/epub_validator_spec.rb
 - spec/commands/generator_spec.rb
 - spec/commands/opener_spec.rb
 - spec/commands/publisher_spec.rb
@@ -645,6 +638,7 @@ test_files:
 - spec/commands/build_spec.rb
 - spec/commands/check_spec.rb
 - spec/commands/deployment_spec.rb
+- spec/commands/epub_validator_spec.rb
 - spec/commands/generator_spec.rb
 - spec/commands/opener_spec.rb
 - spec/commands/publisher_spec.rb