asciidoctor-epub3 1.5.0.alpha.10 → 1.5.0.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db1c0f666f96e3a7506d02d7b2254b457f53357d8aec827e181260f34074cf4d
-  data.tar.gz: 39f647ab1aaa940bb0f71c7666e04d38ac6b239bc5e1c263149146d5b8b6dd68
+  metadata.gz: e6cfcebc3d7d9ef77b095587955fd682f7cfb5b245d03a10f7e7c8737f8c7092
+  data.tar.gz: db9e5bc0d12af5937f1628bc8313036fca1e50c04e324384e42d11f22922a021
 SHA512:
-  metadata.gz: 84708935a105312bf101367e9261460f19e827c3c5a5ea7ecfad8cad1dbd60554bc6e0772dfa6bef29ed9d40fc17ceafd718a32dab7d7b3e44a89f8cbccb4597
-  data.tar.gz: fe86150318b86702dda3a94da387f3f860e87b298629e85e9b953d17fd6ee969e6b48644b20d722e3fabe0af275e7e4460ed343d1d5e1628821e951f07c9ed11
+  metadata.gz: 5ec6e59577eab71f02cefa75d97a48e00516ec7d3aba4ff31122ba31d699de3b779995d2efa44a8016cf1a2f7003e66bad137dd424781fde1a1af1dc6a06621a
+  data.tar.gz: 9e409822739509a541afa965466d8574c1de853b3e057db4d810a134093129ac0e261e998f56540c1b8cdfcb1333a0c369fd1a7d3f70a7728552f94cd1f6f0cf

data/.yardopts

@@ -4,7 +4,7 @@
 --hide-api private
 --title "Asciidoctor EPUB3 API Docs"
 --output-dir apidoc
---exclude /core_ext(?:\.rb$|/)
+--exclude /ext(?:\.rb$|/)
 lib/**/*.rb
 -
 CHANGELOG.adoc

data/CHANGELOG.adoc

@@ -5,6 +5,24 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 1.5.0.alpha.11 (2020-01-26) - @slonopotamus
+
+* drop unused dependencies: thread_safe, concurrent-ruby (#234)
+* add support for Unicode characters in chapter IDs (#217)
+* fix sample-book to be a valid book (#196)
+* don't insert quotation marks around quotes (#129)
+* require at least Asciidoctor 1.5.3 (#245)
+* remove Namo Reader font-icon quirk that produced invalid markup (#192)
+* fix the (in)famous `undefined method `to_ios'` when given a document that doesn't follow asciidoctor-epub3 rules (#7)
+* route messages through the logger (#176)
+* update EPUBCheck to 4.2.2.0 (#240)
+* handle invalid `revdate` gracefully (#14)
+* do not post-process EPUBCHECK env var, but use it as-is (#258)
+* disable Pygments on JRuby to prevent hanging (#253)
+* fix ENOENT error when trying to run EPUBcheck on JRuby on Windows (#256)
+* fix ENOENT error when running kindlegen on JRuby on Windows (#154)
+* set up CI for JRuby on Windows (#254)
+
 == 1.5.0.alpha.10 (2020-01-20) - @slonopotamus
 
 * fix deep xrefs between chapters when using Asciidoctor 2 (#210)

data/Gemfile

@@ -8,7 +8,7 @@ gemspec
 gem 'asciidoctor', ENV['ASCIIDOCTOR_VERSION'], require: false if ENV.key? 'ASCIIDOCTOR_VERSION'
 
 group :optional do
-  gem 'epubcheck-ruby', '4.1.1.0'
+  gem 'epubcheck-ruby', '4.2.2.0'
   gem 'kindlegen', (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.4.0') ? '3.0.3' : '3.0.5'
   gem 'pygments.rb', '1.2.1'
 end

data/LICENSE.adoc

@@ -1,3 +1,6 @@
+[[LICENSE]]
+= LICENSE
+
 .The MIT License
 ....
 Copyright (C) 2014-2019 OpenDevise Inc. and the Asciidoctor Project

data/NOTICE.adoc

@@ -1,3 +1,4 @@
+[[NOTICE]]
 = Asciidoctor EPUB3
 
 Copyright (C) 2014-2016 OpenDevise Inc. and the Asciidoctor Project.

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}: A _native_ EPUB3 converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v1.5.0.alpha.10, 2020-01-20
+v1.5.0.alpha.11, 2020-01-26
 // Settings:
 :experimental:
 :idprefix:
@@ -251,7 +251,7 @@ However, for the time being, the include directive fills this role.
 
 == Prerequisites
 
-All that's needed to use {project-name} is Ruby 2.3 or newer and a few Ruby gems, which we'll explain how to install in the next section.
+All that's needed to use {project-name} is Ruby 2.3 or newer and a few Ruby gems (including at least Asciidoctor 1.5.3), which we'll explain how to install in the next section.
 
 To check if you have Ruby available, use the `ruby` command to query the installed version:
 

data/asciidoctor-epub3.gemspec

@@ -36,8 +36,6 @@ An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 and KF8/M
   s.add_development_dependency 'rubocop', '~> 0.78.0'
   s.add_development_dependency 'rubocop-rspec', '~> 1.37.0'
 
-  s.add_runtime_dependency 'asciidoctor', '>= 1.5.0', '< 3.0.0'
-  s.add_runtime_dependency 'concurrent-ruby', '~> 1.1.0'
+  s.add_runtime_dependency 'asciidoctor', '>= 1.5.3', '< 3.0.0'
   s.add_runtime_dependency 'gepub', '~> 1.0.0'
-  s.add_runtime_dependency 'thread_safe', '~> 0.3.0'
 end

data/bin/asciidoctor-epub3

@@ -14,12 +14,7 @@ options = Asciidoctor::Cli::Options.new backend: 'epub3'
 unless ARGV != ['-v'] && (ARGV & ['-V', '--version']).empty?
   require_relative '../lib/asciidoctor-epub3/version'
   $stdout.write %(Asciidoctor EPUB3 #{Asciidoctor::Epub3::VERSION} using )
-  # NOTE the print_version method was added in Asciidoctor 1.5.2
-  if options.respond_to? :print_version
-    options.print_version
-  else
-    puts %(Asciidoctor #{::Asciidoctor::VERSION} [http://asciidoctor.org])
-  end
+  options.print_version
   exit 0
 end
 

data/data/styles/epub3.css

@@ -858,12 +858,6 @@ blockquote > p {
   line-height: 1.75;
 }
 
-/* hide explicit open quote for CSS3-enabled clients */
-blockquote span.open-quote:not(:empty) {
-  display: none;
-}
-
-/* NOTE if we mapped the font icon to "\201c", we could just style the .open-quote */
 blockquote > p:first-of-type::before {
   display: inline-block;
   color: #666665;

data/lib/asciidoctor-epub3.rb

@@ -3,5 +3,9 @@
 require 'asciidoctor'
 require 'asciidoctor/extensions'
 require 'gepub'
+require_relative 'asciidoctor-epub3/ext'
 require_relative 'asciidoctor-epub3/converter'
 require_relative 'asciidoctor-epub3/packager'
+
+# We need to be able to write files with unicode names. See https://github.com/asciidoctor/asciidoctor-epub3/issues/217
+::Zip.unicode_names = true

data/lib/asciidoctor-epub3/converter.rb

@@ -9,6 +9,7 @@ module Asciidoctor
     # EPUB3 or KF8 publication file.
     class Converter
       include ::Asciidoctor::Converter
+      include ::Asciidoctor::Logging
       include ::Asciidoctor::Writer
 
       register_for 'epub3'
@@ -27,7 +28,12 @@ module Asciidoctor
           @validate = node.attr? 'ebook-validate'
           @extract = node.attr? 'ebook-extract'
           @compress = node.attr 'ebook-compress'
-          Packager.new node, (node.references[:spine_items] || [node]), node.attributes['ebook-format'].to_sym
+          spine_items = node.references[:spine_items]
+          if spine_items.nil?
+            logger.error %(#{::File.basename node.document.attr('docfile')}: failed to find spine items, produced file will be invalid)
+            spine_items = []
+          end
+          Packager.new node, spine_items, node.attributes['ebook-format'].to_sym
           # converting an element from the spine document, such as an inline node in the doctitle
         elsif name.start_with? 'inline_'
           (@content_converter ||= ::Asciidoctor::Converter::Factory.default.create 'epub3-xhtml5').convert node, name
@@ -47,6 +53,7 @@ module Asciidoctor
     # content documents in an EPUB3 publication.
     class ContentConverter
       include ::Asciidoctor::Converter
+      include ::Asciidoctor::Logging
 
       register_for 'epub3-xhtml5'
 
@@ -76,9 +83,6 @@ module Asciidoctor
 
       ToHtmlSpecialCharsRx = /[#{ToHtmlSpecialCharsMap.keys.join}]/
 
-      OpenParagraphTagRx = /^<p>/
-      CloseParagraphTagRx = /<\/p>$/
-
       def initialize backend, opts
         super
         basebackend 'html'
@@ -92,7 +96,7 @@ module Asciidoctor
         if respond_to? name ||= node.node_name
           send name, node
         else
-          warn %(asciidoctor: WARNING: conversion missing in epub3 backend for #{name})
+          logger.warn %(conversion missing in epub3 backend for #{name})
         end
       end
 
@@ -128,7 +132,7 @@ module Asciidoctor
         # NOTE must run after content is resolved
         # TODO perhaps create dynamic CSS file?
         if @icon_names.empty?
-          icon_css_head = icon_css_scoped = ''
+          icon_css_head = ''
         else
           icon_defs = @icon_names.map {|name|
             %(.i-#{name}::before { content: "#{FontIconMap[name.tr('-', '_').to_sym]}"; })
@@ -136,11 +140,6 @@ module Asciidoctor
           icon_css_head = %(<style>
 #{icon_defs}
 </style>
-)
-          # NOTE Namo Pubtree requires icon CSS to be repeated inside <body> (or in a linked stylesheet); wrap in div to hide from Aldiko
-          icon_css_scoped = (node.attr? 'ebook-format', 'kf8') ? '' : %(<div style="display: none" aria-hidden="true"><style scoped="scoped">
-#{icon_defs}
-</style></div>
 )
         end
 
@@ -164,7 +163,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 </head>
 <body>
 <section class="chapter" title="#{doctitle_sanitized.gsub '"', '&quot;'}" epub:type="chapter" id="#{docid}">
-#{icon_css_scoped}<header>
+<header>
 <div class="chapter-header">
 #{byline}<h1 class="chapter-title">#{title}#{subtitle ? %(<small class="subtitle">#{subtitle_formatted}</small>) : ''}</h1>
 </div>
@@ -357,7 +356,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 
         footer_tag = footer_content.empty? ? '' : %(
 <footer>~ #{footer_content * ' '}</footer>)
-        content = ((convert_content node).strip.sub OpenParagraphTagRx, '<p><span class="open-quote">“</span>').sub CloseParagraphTagRx, '<span class="close-quote">”</span></p>'
+        content = (convert_content node).strip
         %(<div#{id_attr}#{class_attr}>
 <blockquote>
 #{content}#{footer_tag}
@@ -687,10 +686,10 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
               elsif (xreftext = refdoc.references[:ids][refdoc_refid])
                 text ||= xreftext
               else
-                warn %(asciidoctor: WARNING: #{::File.basename doc.attr('docfile')}: invalid reference to unknown anchor in #{refdoc_id} chapter: #{refdoc_refid})
+                logger.warn %(#{::File.basename doc.attr('docfile')}: invalid reference to unknown anchor in #{refdoc_id} chapter: #{refdoc_refid})
               end
             else
-              warn %(asciidoctor: WARNING: #{::File.basename doc.attr('docfile')}: invalid reference to anchor in unknown chapter: #{refdoc_id})
+              logger.warn %(#{::File.basename doc.attr('docfile')}: invalid reference to anchor in unknown chapter: #{refdoc_id})
             end
           else
             id_attr = (@xrefs_seen.add? refid) ? %( id="xref-#{refid}") : ''
@@ -706,7 +705,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
               text ||= xreftext
             else
               # FIXME: we get false negatives for reference to bibref when using Asciidoctor < 1.5.6
-              warn %(asciidoctor: WARNING: #{::File.basename doc.attr('docfile')}: invalid reference to unknown local anchor (or valid bibref): #{refid})
+              logger.warn %(#{::File.basename doc.attr('docfile')}: invalid reference to unknown local anchor (or valid bibref): #{refid})
             end
           end
           %(<a#{id_attr} href="#{target}" class="xref">#{text || "[#{refid}]"}</a>)
@@ -904,7 +903,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
             end
             id = %(#{pre}document#{sep}#{doc.object_id}) if synthetic
           end
-          warn %(asciidoctor: ERROR: chapter uses a reserved ID: #{id}) if !synthetic && (ReservedIds.include? id)
+          logger.error %(chapter uses a reserved ID: #{id}) if !synthetic && (ReservedIds.include? id)
           id
         end
       end
@@ -916,7 +915,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       if (document = @document).backend == 'epub3'
         document.attributes['spine'] = ''
         document.set_attribute 'listing-caption', 'Listing'
-        if !(defined? ::AsciidoctorJ) && (::Gem.try_activate 'pygments.rb')
+        if !(defined? ::JRuby) && (::Gem.try_activate 'pygments.rb')
           if document.set_attribute 'source-highlighter', 'pygments'
             document.set_attribute 'pygments-css', 'style'
             document.set_attribute 'pygments-style', 'bw'

data/lib/asciidoctor-epub3/ext.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require_relative 'ext/asciidoctor'
+require_relative 'ext/core'

data/lib/asciidoctor-epub3/ext/asciidoctor.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'asciidoctor/logging_shim' unless defined? Asciidoctor::Logging

data/lib/asciidoctor-epub3/ext/asciidoctor/logging_shim.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Asciidoctor
+  module Logging
+    class StubLogger
+      class << self
+        def debug message = nil
+          puts %(asciidoctor: DEBUG: #{message || (block_given? ? yield : '???')}) if $VERBOSE
+        end
+
+        def info message = nil
+          puts %(asciidoctor: INFO: #{message || (block_given? ? yield : '???')}) if $VERBOSE
+        end
+
+        def warn message = nil
+          ::Kernel.warn %(asciidoctor: WARNING: #{message || (block_given? ? yield : '???')})
+        end
+
+        def error message = nil
+          ::Kernel.warn %(asciidoctor: ERROR: #{message || (block_given? ? yield : '???')})
+        end
+
+        def fatal message = nil
+          ::Kernel.warn %(asciidoctor: FATAL: #{message || (block_given? ? yield : '???')})
+        end
+      end
+    end
+
+    def logger
+      StubLogger
+    end
+  end
+end

data/lib/asciidoctor-epub3/ext/core.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'core/string'

data/lib/asciidoctor-epub3/packager.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'core_ext/string'
 autoload :FileUtils, 'fileutils'
 autoload :Open3, 'open3'
-autoload :Shellwords, 'shellwords'
 
 module Asciidoctor
   module Epub3
     module GepubBuilderMixin
+      include ::Asciidoctor::Logging
       DATA_DIR = ::File.expand_path ::File.join(::File.dirname(__FILE__), '..', '..', 'data')
       SAMPLES_DIR = ::File.join DATA_DIR, 'samples'
       LF = ?\n
@@ -126,7 +125,7 @@ module Asciidoctor
         if (image_path = doc.attr 'front-cover-image')
           image_attrs = {}
           if (image_path.include? ':') && image_path =~ ImageMacroRx
-            warn %(asciidoctor: WARNING: deprecated block macro syntax detected in front-cover-image attribute) if image_path.start_with? 'image::'
+            logger.warn %(deprecated block macro syntax detected in front-cover-image attribute) if image_path.start_with? 'image::'
             image_path = %(#{imagesdir}#{$1})
             (::Asciidoctor::AttributeList.new $2).parse_into image_attrs, %w(alt width height) unless $2.empty?
           end
@@ -136,7 +135,7 @@ module Asciidoctor
               width, height = 1050, 1600
             end
           else
-            warn %(asciidoctor: ERROR: #{::File.basename doc.attr('docfile')}: front cover image not found or readable: #{::File.expand_path image_path, workdir})
+            logger.error %(#{::File.basename doc.attr('docfile')}: front cover image not found or readable: #{::File.expand_path image_path, workdir})
             image_path = nil
           end
         end
@@ -223,15 +222,16 @@ body > svg {
         docimagesdir = (doc.attr 'imagesdir', '.').chomp '/'
         docimagesdir = (docimagesdir == '.' ? nil : %(#{docimagesdir}/))
 
+        self_logger = logger
         workdir = (workdir = doc.attr 'docdir').nil_or_empty? ? '.' : workdir
         resources workdir: workdir do
           images.each do |image|
             if (image_path = image[:path]).start_with? %(#{docimagesdir}jacket/cover.)
-              warn %(asciidoctor: WARNING: image path is reserved for cover artwork: #{image_path}; skipping image found in content)
+              self_logger.warn %(image path is reserved for cover artwork: #{image_path}; skipping image found in content)
             elsif ::File.readable? image_path
               file image_path
             else
-              warn %(asciidoctor: ERROR: #{::File.basename image[:docfile]}: image not found or not readable: #{::File.expand_path image_path, workdir})
+              self_logger.error %(#{::File.basename image[:docfile]}: image not found or not readable: #{::File.expand_path image_path, workdir})
             end
           end
         end
@@ -247,6 +247,7 @@ body > svg {
           file %(#{imagesdir}headshots/default.jpg) => ::File.join(DATA_DIR, 'images/default-headshot.jpg')
         end
 
+        self_logger = logger
         workdir = (workdir = doc.attr 'docdir').nil_or_empty? ? '.' : workdir
         resources do
           usernames.each do |username|
@@ -254,7 +255,7 @@ body > svg {
             if ::File.readable? (resolved_avatar = (::File.join workdir, avatar))
               file avatar => resolved_avatar
             else
-              warn %(asciidoctor: ERROR: avatar for #{username} not found or readable: #{avatar}; falling back to default avatar)
+              self_logger.error %(avatar for #{username} not found or readable: #{avatar}; falling back to default avatar)
               file avatar => ::File.join(DATA_DIR, 'images/default-avatar.jpg')
             end
 
@@ -262,7 +263,7 @@ body > svg {
             if ::File.readable? (resolved_headshot = (::File.join workdir, headshot))
               file headshot => resolved_headshot
             elsif doc.attr? 'builder', 'editions'
-              warn %(asciidoctor: ERROR: headshot for #{username} not found or readable: #{headshot}; falling back to default headshot)
+              self_logger.error %(headshot for #{username} not found or readable: #{headshot}; falling back to default headshot)
               file headshot => ::File.join(DATA_DIR, 'images/default-headshot.jpg')
             end
           end
@@ -475,8 +476,8 @@ body > svg {
     end
 
     class Packager
-      KINDLEGEN = ENV['KINDLEGEN'] || 'kindlegen'
-      EPUBCHECK = ENV['EPUBCHECK'] || %(epubcheck#{::Gem.win_platform? ? '.bat' : '.sh'})
+      include ::Asciidoctor::Logging
+
       EpubExtensionRx = /\.epub$/i
       KindlegenCompression = ::Hash['0', '-c0', '1', '-c1', '2', '-c2', 'none', '-c0', 'standard', '-c1', 'huffdic', '-c2']
 
@@ -552,10 +553,14 @@ body > svg {
           contributors(*authors)
 
           if doc.attr? 'revdate'
-            # TODO: ensure this is a real date
-            date doc.attr('revdate')
+            begin
+              date doc.attr('revdate')
+            rescue ArgumentError => e
+              logger.error %(#{::File.basename doc.attr('docfile')}: failed to parse revdate: #{e}, using current time as a fallback)
+              date ::Time.now
+            end
           else
-            date ::Time.now.strftime('%Y-%m-%dT%H:%M:%SZ')
+            date ::Time.now
           end
 
           description doc.attr('description') if doc.attr? 'description'
@@ -583,7 +588,7 @@ body > svg {
 
         epub_file = fmt == :kf8 ? %(#{::Asciidoctor::Helpers.rootname target}-kf8.epub) : target
         builder.generate_epub epub_file
-        puts %(Wrote #{fmt.upcase} to #{epub_file}) if $VERBOSE
+        logger.debug %(Wrote #{fmt.upcase} to #{epub_file})
         if options[:extract]
           extract_dir = epub_file.sub EpubExtensionRx, ''
           ::FileUtils.remove_dir extract_dir if ::File.directory? extract_dir
@@ -599,7 +604,7 @@ body > svg {
               end
             end
           end
-          puts %(Extracted #{fmt.upcase} to #{extract_dir}) if $VERBOSE
+          logger.debug %(Extracted #{fmt.upcase} to #{extract_dir})
         end
 
         if fmt == :kf8
@@ -611,36 +616,67 @@ body > svg {
       end
 
       def distill_epub_to_mobi epub_file, target, compress
-        kindlegen_cmd = KINDLEGEN
-        unless ::File.executable? kindlegen_cmd
+        if !(kindlegen_cmd = ENV['kindlegen']).nil?
+          argv = [kindlegen_cmd]
+        else
           require 'kindlegen' unless defined? ::Kindlegen
-          kindlegen_cmd = ::Kindlegen.command
+          argv = [::Kindlegen.command.to_s]
         end
         mobi_file = ::File.basename target.sub(EpubExtensionRx, '.mobi')
         compress_flag = KindlegenCompression[compress ? (compress.empty? ? '1' : compress.to_s) : '0']
-        cmd = [kindlegen_cmd, '-dont_append_source', compress_flag, '-o', mobi_file, epub_file].compact
-        ::Open3.popen2e ::Shellwords.join(cmd) do |_input, output, _wait_thr|
-          output.each {|line| puts line } unless $VERBOSE.nil?
+        argv += ['-dont_append_source', compress_flag, '-o', mobi_file, epub_file].compact
+
+        # This duplicates Kindlegen.run, but we want to override executable
+        out, err, res = Open3.capture3(*argv) do |r|
+          r.force_encoding 'UTF-8' if windows? && r.respond_to?(:force_encoding)
+        end
+
+        out.each_line do |line|
+          logger.info line
+        end
+        err.each_line do |line|
+          log_line line
+        end
+
+        output_file = ::File.join ::File.dirname(epub_file), mobi_file
+        if res.success?
+          logger.debug %(Wrote MOBI to #{output_file})
+        else
+          logger.error %(kindlegen failed to write MOBI to #{output_file})
         end
-        puts %(Wrote MOBI to #{::File.join ::File.dirname(epub_file), mobi_file}) if $VERBOSE
       end
 
       def validate_epub epub_file
-        if ::File.executable? EPUBCHECK
-          argv = [EPUBCHECK]
+        if !(epubcheck = ENV['EPUBCHECK']).nil?
+          argv = [epubcheck]
         else
           argv = [::Gem.ruby, ::Gem.bin_path('epubcheck-ruby', 'epubcheck')]
         end
 
-        if $VERBOSE.nil?
-          argv << '-q'
-        else
-          argv << '-w'
+        argv += ['-w', epub_file]
+        out, err, res = Open3.capture3(*argv)
+
+        out.each_line do |line|
+          logger.info line
+        end
+        err.each_line do |line|
+          log_line line
         end
-        argv << epub_file
 
-        ::Open3.popen2e ::Shellwords.join(argv) do |_input, output, _wait_thr|
-          output.each {|line| puts line }
+        logger.error %(EPUB validation failed: #{epub_file}) unless res.success?
+      end
+
+      def log_line line
+        line = line.strip
+
+        if line =~ /^fatal/i
+          logger.fatal line
+        elsif line =~ /^error/i
+          logger.error line
+        elsif line =~ /^warning/i
+          logger.warn line
+        else
+          logger.info line
         end
       end
     end

data/lib/asciidoctor-epub3/spine_item_processor.rb

@@ -3,6 +3,8 @@
 module Asciidoctor
   module Epub3
     class SpineItemProcessor < Extensions::IncludeProcessor
+      include ::Asciidoctor::Logging
+
       def initialize document
         @document = document
       end
@@ -12,7 +14,7 @@ module Asciidoctor
         spine_doc = doc
         # TODO: allow URI value
         unless ::File.file? (include_file = (spine_doc.normalize_system_path target, reader.dir, nil, target_name: 'include file'))
-          warn %(asciidoctor: WARNING: #{reader.line_info}: include file not found: #{include_file})
+          logger.warn %(#{reader.line_info}: include file not found: #{include_file})
           return
         end
         inherited_attrs = spine_doc.attributes.dup

data/lib/asciidoctor-epub3/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Epub3
-    VERSION = '1.5.0.alpha.10'
+    VERSION = '1.5.0.alpha.11'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-epub3
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.10
+  version: 1.5.0.alpha.11
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,7 +73,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -83,24 +83,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: gepub
   requirement: !ruby/object:Gem::Requirement
@@ -115,20 +101,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: thread_safe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: 'An extension for Asciidoctor that converts AsciiDoc documents to EPUB3
   and KF8/MOBI (Kindle) e-book archives.
 
@@ -198,7 +170,11 @@ files:
 - data/styles/epub3.css
 - lib/asciidoctor-epub3.rb
 - lib/asciidoctor-epub3/converter.rb
-- lib/asciidoctor-epub3/core_ext/string.rb
+- lib/asciidoctor-epub3/ext.rb
+- lib/asciidoctor-epub3/ext/asciidoctor.rb
+- lib/asciidoctor-epub3/ext/asciidoctor/logging_shim.rb
+- lib/asciidoctor-epub3/ext/core.rb
+- lib/asciidoctor-epub3/ext/core/string.rb
 - lib/asciidoctor-epub3/font_icon_map.rb
 - lib/asciidoctor-epub3/packager.rb
 - lib/asciidoctor-epub3/spine_item_processor.rb