asciidoctor 2.0.4 → 2.0.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 24d8917dc8dad4c33e7cf89ec9956e44970aa150f1ab706cbd53e7df36f1097c
4
- data.tar.gz: 00d23a0e1534f5c51314ab890be5e4f4cacd07613220cdcc3f6c7f797cd40a67
3
+ metadata.gz: ec7900aac00c81a12784dcbb8b50fe83084e3d520c2c680779b259dbf9a6f8f1
4
+ data.tar.gz: 3b54226a56beb58044ce34b008affde322631ec524f865595c5a1be2ed02b16b
5
5
  SHA512:
6
- metadata.gz: b60f7bb9ce11278b39b6a7c6839c0a350220946a458eb10b7563b61270413ec84ae5480c71e008d39e746c1a5703e6e9a4a3c02592a71c12883c765c20d5c0fd
7
- data.tar.gz: 2510ab8398502b191c8f5be983350b517d35e3ec9245cb2e407d3ef4c95d5b1965c91073264fc316db59b6b874a7c4f4a8402ee4cd0c7ac1591afd54f6de68e1
6
+ metadata.gz: 96e57a742f978398f3152a057a865211441dcfad9daff9b1666f8360d663069d6b45e683e20873eafe3cde527c3cdde1a6cfe929aba0e1fb45db71a88064c8be
7
+ data.tar.gz: 8e798546816dc70277be8cd1a8766b124cddd931fd09a6c28e83d4737d248651e510fd81de5c516f303faf9a979d71bb41dd62c30b34916a9612449b6646d35c
data/CHANGELOG.adoc CHANGED
@@ -13,6 +13,16 @@ endif::[]
13
13
  This document provides a high-level view of the changes introduced in Asciidoctor by release.
14
14
  For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
15
15
 
16
+ == 2.0.5 (2019-04-01) - @mojavelinux
17
+
18
+ Bug Fixes::
19
+
20
+ * fix crash when source highlighter is Rouge and source language is not set on block (#3223)
21
+ * update CLI and SyntaxHighlighter to allow Asciidoctor to load cleanly on Ruby 2.0 - 2.2
22
+ * CLI should use $stdin instead of STDIN to be consistent with the use of $stdout
23
+ * mark encoding of stdio objects used in CLI as UTF-8 (#3225)
24
+ * make Asciidoctor::SyntaxHighlighter::Config.register_for method public as documented
25
+
16
26
  == 2.0.4 (2019-03-31) - @mojavelinux
17
27
 
18
28
  Bug Fixes::
data/README-de.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.4, 2019-03-31
3
+ v2.0.5, 2019-04-01
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
17
17
  :warning-caption: :warning:
18
18
  endif::[]
19
19
  // Variables:
20
- :release-version: 2.0.4
20
+ :release-version: 2.0.5
21
21
  // URIs:
22
22
  :uri-org: https://github.com/asciidoctor
23
23
  :uri-repo: {uri-org}/asciidoctor
data/README-fr.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.4, 2019-03-31
3
+ v2.0.5, 2019-04-01
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
17
17
  :warning-caption: :warning:
18
18
  endif::[]
19
19
  // Variables:
20
- :release-version: 2.0.4
20
+ :release-version: 2.0.5
21
21
  // URIs:
22
22
  :uri-org: https://github.com/asciidoctor
23
23
  :uri-repo: {uri-org}/asciidoctor
data/README-jp.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.4, 2019-03-31
3
+ v2.0.5, 2019-04-01
4
4
  // settings:
5
5
  :page-layout: base
6
6
  :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
18
18
  :warning-caption: :warning:
19
19
  endif::[]
20
20
  // Variables:
21
- :release-version: 2.0.4
21
+ :release-version: 2.0.5
22
22
  // URIs:
23
23
  :uri-org: https://github.com/asciidoctor
24
24
  :uri-repo: {uri-org}/asciidoctor
data/README-zh_CN.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.4, 2019-03-31
3
+ v2.0.5, 2019-04-01
4
4
  // settings:
5
5
  :page-layout: base
6
6
  :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
18
18
  :warning-caption: :warning:
19
19
  endif::[]
20
20
  // Variables:
21
- :release-version: 2.0.4
21
+ :release-version: 2.0.5
22
22
  // URIs:
23
23
  :uri-org: https://github.com/asciidoctor
24
24
  :uri-repo: {uri-org}/asciidoctor
data/README.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.4, 2019-03-31
3
+ v2.0.5, 2019-04-01
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
17
17
  :warning-caption: :warning:
18
18
  endif::[]
19
19
  // Variables:
20
- :release-version: 2.0.4
20
+ :release-version: 2.0.5
21
21
  // URIs:
22
22
  :uri-org: https://github.com/asciidoctor
23
23
  :uri-repo: {uri-org}/asciidoctor
@@ -86,7 +86,8 @@ module Asciidoctor
86
86
  end
87
87
 
88
88
  if outfile == '-'
89
- tofile = @out || $stdout
89
+ # NOTE set_encoding returns nil on JRuby 9.1
90
+ (tofile = @out) || ((tofile = $stdout).set_encoding UTF_8)
90
91
  elsif outfile
91
92
  opts[:mkdirs] = true
92
93
  tofile = outfile
@@ -97,7 +98,8 @@ module Asciidoctor
97
98
 
98
99
  if stdin
99
100
  # allows use of block to supply stdin, particularly useful for tests
100
- input = block_given? ? yield : STDIN
101
+ # NOTE set_encoding returns nil on JRuby 9.1
102
+ block_given? ? (input = yield) : ((input = $stdin).set_encoding UTF_8, UTF_8)
101
103
  input_opts = opts.merge to_file: tofile
102
104
  if show_timings
103
105
  @documents << (::Asciidoctor.convert input, (input_opts.merge timings: (timings = Timings.new)))
@@ -36,7 +36,8 @@ module Asciidoctor
36
36
 
37
37
  def parse!(args)
38
38
  opts_parser = ::OptionParser.new do |opts|
39
- opts.banner = <<~'EOS'
39
+ # NOTE don't use squiggly heredoc to maintain compatibility with Ruby < 2.3
40
+ opts.banner = <<-'EOS'.gsub ' ', ''
40
41
  Usage: asciidoctor [OPTION]... FILE...
41
42
  Translate the AsciiDoc source FILE or FILE(s) into the backend output format (e.g., HTML 5, DocBook 5, etc.)
42
43
  By default, the output is written to a file with the basename of the source file and the appropriate extension.
@@ -1,6 +1,9 @@
1
1
  # frozen_string_literal: true
2
- require_relative 'core_ext/float/truncate'
3
- require_relative 'core_ext/hash/merge'
4
- require_relative 'core_ext/match_data/names' if RUBY_ENGINE == 'opal'
5
2
  require_relative 'core_ext/nil_or_empty'
6
- require_relative 'core_ext/regexp/is_match'
3
+ require_relative 'core_ext/hash/merge'
4
+ if RUBY_ENGINE == 'opal'
5
+ require_relative 'core_ext/match_data/names'
6
+ else
7
+ require_relative 'core_ext/float/truncate'
8
+ require_relative 'core_ext/regexp/is_match'
9
+ end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
- # NOTE remove once implemented in Opal
2
+ # NOTE remove once implemented in Opal; see https://github.com/opal/opal/issues/1964
3
3
  class MatchData
4
4
  def names
5
5
  []
@@ -95,13 +95,13 @@ module SyntaxHighlighter
95
95
 
96
96
  private_class_method def self.included into
97
97
  into.extend Config
98
- end
98
+ end || :included
99
99
 
100
100
  module Config
101
101
  # Public: Statically register the current class in the registry for the specified names.
102
102
  #
103
103
  # Returns nothing.
104
- private def register_for *names
104
+ def register_for *names
105
105
  SyntaxHighlighter.register self, *names
106
106
  end
107
107
  end
@@ -139,7 +139,9 @@ module SyntaxHighlighter
139
139
  end
140
140
  end
141
141
 
142
- private def registry
142
+ private
143
+
144
+ def registry
143
145
  raise ::NotImplementedError, %(#{Factory} subclass #{self.class} must implement the ##{__method__} method)
144
146
  end
145
147
  end
@@ -151,7 +153,9 @@ module SyntaxHighlighter
151
153
  @registry = seed_registry || {}
152
154
  end
153
155
 
154
- private def registry
156
+ private
157
+
158
+ def registry
155
159
  @registry
156
160
  end
157
161
  end
@@ -36,7 +36,7 @@ class SyntaxHighlighter::RougeAdapter < SyntaxHighlighter::Base
36
36
  end
37
37
 
38
38
  def format node, lang, opts
39
- if (query_idx = lang.index '?')
39
+ if (query_idx = lang && (lang.index '?'))
40
40
  lang = lang.slice 0, query_idx
41
41
  end
42
42
  if opts[:css_mode] != :class && (@style = (style = opts[:style]) && (style_available? style) || DEFAULT_STYLE) &&
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Asciidoctor
3
- VERSION = '2.0.4'
3
+ VERSION = '2.0.5'
4
4
  end
data/man/asciidoctor.1 CHANGED
@@ -1,13 +1,13 @@
1
1
  '\" t
2
2
  .\" Title: asciidoctor
3
3
  .\" Author: Dan Allen, Sarah White, Ryan Waldron
4
- .\" Generator: Asciidoctor 2.0.4
5
- .\" Date: 2019-03-31
4
+ .\" Generator: Asciidoctor 2.0.5
5
+ .\" Date: 2019-04-01
6
6
  .\" Manual: Asciidoctor Manual
7
- .\" Source: Asciidoctor 2.0.4
7
+ .\" Source: Asciidoctor 2.0.5
8
8
  .\" Language: English
9
9
  .\"
10
- .TH "ASCIIDOCTOR" "1" "2019-03-31" "Asciidoctor 2.0.4" "Asciidoctor Manual"
10
+ .TH "ASCIIDOCTOR" "1" "2019-04-01" "Asciidoctor 2.0.5" "Asciidoctor Manual"
11
11
  .ie \n(.g .ds Aq \(aq
12
12
  .el .ds Aq '
13
13
  .ss \n[.ss] 0
data/man/asciidoctor.adoc CHANGED
@@ -2,7 +2,7 @@
2
2
  Dan Allen; Sarah White; Ryan Waldron
3
3
  :doctype: manpage
4
4
  :man manual: Asciidoctor Manual
5
- :man source: Asciidoctor 2.0.4
5
+ :man source: Asciidoctor 2.0.5
6
6
  :page-layout: base
7
7
 
8
8
  == NAME
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: asciidoctor
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.4
4
+ version: 2.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dan Allen
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2019-03-31 00:00:00.000000000 Z
16
+ date: 2019-04-01 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: asciimath