asciidoctor 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d8917dc8dad4c33e7cf89ec9956e44970aa150f1ab706cbd53e7df36f1097c
-  data.tar.gz: 00d23a0e1534f5c51314ab890be5e4f4cacd07613220cdcc3f6c7f797cd40a67
+  metadata.gz: ec7900aac00c81a12784dcbb8b50fe83084e3d520c2c680779b259dbf9a6f8f1
+  data.tar.gz: 3b54226a56beb58044ce34b008affde322631ec524f865595c5a1be2ed02b16b
 SHA512:
-  metadata.gz: b60f7bb9ce11278b39b6a7c6839c0a350220946a458eb10b7563b61270413ec84ae5480c71e008d39e746c1a5703e6e9a4a3c02592a71c12883c765c20d5c0fd
-  data.tar.gz: 2510ab8398502b191c8f5be983350b517d35e3ec9245cb2e407d3ef4c95d5b1965c91073264fc316db59b6b874a7c4f4a8402ee4cd0c7ac1591afd54f6de68e1
+  metadata.gz: 96e57a742f978398f3152a057a865211441dcfad9daff9b1666f8360d663069d6b45e683e20873eafe3cde527c3cdde1a6cfe929aba0e1fb45db71a88064c8be
+  data.tar.gz: 8e798546816dc70277be8cd1a8766b124cddd931fd09a6c28e83d4737d248651e510fd81de5c516f303faf9a979d71bb41dd62c30b34916a9612449b6646d35c

data/CHANGELOG.adoc

@@ -13,6 +13,16 @@ endif::[]
 This document provides a high-level view of the changes introduced in Asciidoctor by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 2.0.5 (2019-04-01) - @mojavelinux
+
+Bug Fixes::
+
+  * fix crash when source highlighter is Rouge and source language is not set on block (#3223)
+  * update CLI and SyntaxHighlighter to allow Asciidoctor to load cleanly on Ruby 2.0 - 2.2
+  * CLI should use $stdin instead of STDIN to be consistent with the use of $stdout
+  * mark encoding of stdio objects used in CLI as UTF-8 (#3225)
+  * make Asciidoctor::SyntaxHighlighter::Config.register_for method public as documented
+
 == 2.0.4 (2019-03-31) - @mojavelinux
 
 Bug Fixes::

data/README-de.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.4, 2019-03-31
+v2.0.5, 2019-04-01
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.4
+:release-version: 2.0.5
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-fr.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.4, 2019-03-31
+v2.0.5, 2019-04-01
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.4
+:release-version: 2.0.5
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-jp.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.4, 2019-03-31
+v2.0.5, 2019-04-01
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.4
+:release-version: 2.0.5
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-zh_CN.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.4, 2019-03-31
+v2.0.5, 2019-04-01
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.4
+:release-version: 2.0.5
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.4, 2019-03-31
+v2.0.5, 2019-04-01
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.4
+:release-version: 2.0.5
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/lib/asciidoctor/cli/invoker.rb

@@ -86,7 +86,8 @@ module Asciidoctor
         end
 
         if outfile == '-'
-          tofile = @out || $stdout
+          # NOTE set_encoding returns nil on JRuby 9.1
+          (tofile = @out) || ((tofile = $stdout).set_encoding UTF_8)
         elsif outfile
           opts[:mkdirs] = true
           tofile = outfile
@@ -97,7 +98,8 @@ module Asciidoctor
 
         if stdin
           # allows use of block to supply stdin, particularly useful for tests
-          input = block_given? ? yield : STDIN
+          # NOTE set_encoding returns nil on JRuby 9.1
+          block_given? ? (input = yield) : ((input = $stdin).set_encoding UTF_8, UTF_8)
           input_opts = opts.merge to_file: tofile
           if show_timings
             @documents << (::Asciidoctor.convert input, (input_opts.merge timings: (timings = Timings.new)))

data/lib/asciidoctor/cli/options.rb

@@ -36,7 +36,8 @@ module Asciidoctor
 
       def parse!(args)
         opts_parser = ::OptionParser.new do |opts|
-          opts.banner = <<~'EOS'
+          # NOTE don't use squiggly heredoc to maintain compatibility with Ruby < 2.3
+          opts.banner = <<-'EOS'.gsub '          ', ''
           Usage: asciidoctor [OPTION]... FILE...
           Translate the AsciiDoc source FILE or FILE(s) into the backend output format (e.g., HTML 5, DocBook 5, etc.)
           By default, the output is written to a file with the basename of the source file and the appropriate extension.

data/lib/asciidoctor/core_ext.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
-require_relative 'core_ext/float/truncate'
-require_relative 'core_ext/hash/merge'
-require_relative 'core_ext/match_data/names' if RUBY_ENGINE == 'opal'
 require_relative 'core_ext/nil_or_empty'
-require_relative 'core_ext/regexp/is_match'
+require_relative 'core_ext/hash/merge'
+if RUBY_ENGINE == 'opal'
+  require_relative 'core_ext/match_data/names'
+else
+  require_relative 'core_ext/float/truncate'
+  require_relative 'core_ext/regexp/is_match'
+end

data/lib/asciidoctor/core_ext/match_data/names.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# NOTE remove once implemented in Opal
+# NOTE remove once implemented in Opal; see https://github.com/opal/opal/issues/1964
 class MatchData
   def names
     []

data/lib/asciidoctor/syntax_highlighter.rb

@@ -95,13 +95,13 @@ module SyntaxHighlighter
 
   private_class_method def self.included into
     into.extend Config
-  end
+  end || :included
 
   module Config
     # Public: Statically register the current class in the registry for the specified names.
     #
     # Returns nothing.
-    private def register_for *names
+    def register_for *names
       SyntaxHighlighter.register self, *names
     end
   end
@@ -139,7 +139,9 @@ module SyntaxHighlighter
       end
     end
 
-    private def registry
+    private
+    
+    def registry
       raise ::NotImplementedError, %(#{Factory} subclass #{self.class} must implement the ##{__method__} method)
     end
   end
@@ -151,7 +153,9 @@ module SyntaxHighlighter
       @registry = seed_registry || {}
     end
 
-    private def registry
+    private
+    
+    def registry
       @registry
     end
   end

data/lib/asciidoctor/syntax_highlighter/rouge.rb

@@ -36,7 +36,7 @@ class SyntaxHighlighter::RougeAdapter < SyntaxHighlighter::Base
   end
 
   def format node, lang, opts
-    if (query_idx = lang.index '?')
+    if (query_idx = lang && (lang.index '?'))
       lang = lang.slice 0, query_idx
     end
     if opts[:css_mode] != :class && (@style = (style = opts[:style]) && (style_available? style) || DEFAULT_STYLE) &&

data/lib/asciidoctor/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Asciidoctor
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 2.0.4
-.\"      Date: 2019-03-31
+.\" Generator: Asciidoctor 2.0.5
+.\"      Date: 2019-04-01
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.4
+.\"    Source: Asciidoctor 2.0.5
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2019-03-31" "Asciidoctor 2.0.4" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2019-04-01" "Asciidoctor 2.0.5" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0

data/man/asciidoctor.adoc

@@ -2,7 +2,7 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 2.0.4
+:man source: Asciidoctor 2.0.5
 :page-layout: base
 
 == NAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath