From 145433d9a54856ec633220755f089a7e78fb28ce Mon Sep 17 00:00:00 2001 From: hsbt Date: Tue, 22 Dec 2015 12:08:13 +0000 Subject: [PATCH] * lib/rdoc.rb: bump version to 4.2.1. It contains following fixes. https://github.com/rdoc/rdoc/pull/340 https://github.com/rdoc/rdoc/pull/341 https://github.com/rdoc/rdoc/pull/367 https://github.com/rdoc/rdoc/pull/368 * lib/rdoc/*: ditto. * test/rdoc/*: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ lib/rdoc.rb | 4 +++- lib/rdoc/generator/json_index.rb | 4 ++-- lib/rdoc/rdoc.gemspec | 2 +- lib/rdoc/servlet.rb | 1 - lib/rdoc/text.rb | 2 ++ test/rdoc/test_rdoc_markup_to_html.rb | 1 - test/rdoc/test_rdoc_servlet.rb | 1 - 8 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0da9270da6580..b20a6fba47a72f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Dec 22 21:08:05 2015 SHIBATA Hiroshi + + * lib/rdoc.rb: bump version to 4.2.1. It contains following fixes. + https://github.com/rdoc/rdoc/pull/340 + https://github.com/rdoc/rdoc/pull/341 + https://github.com/rdoc/rdoc/pull/367 + https://github.com/rdoc/rdoc/pull/368 + * lib/rdoc/*: ditto. + * test/rdoc/*: ditto. + Tue Dec 22 20:25:33 2015 SHIBATA Hiroshi * ext/psych/lib/psych.rb: bump version to 2.0.17 diff --git a/lib/rdoc.rb b/lib/rdoc.rb index bdd3b06e2a82bb..d6e26114c04774 100644 --- a/lib/rdoc.rb +++ b/lib/rdoc.rb @@ -65,7 +65,7 @@ class Error < RuntimeError; end ## # RDoc version you are using - VERSION = '4.2.0' + VERSION = '4.2.1' ## # Method visibilities @@ -110,6 +110,8 @@ class Error < RuntimeError; end def self.load_yaml begin gem 'psych' + rescue NameError => e # --disable-gems + raise unless e.name == :gem rescue Gem::LoadError end diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb index 90c68f91a1fff7..624a2e512ee901 100644 --- a/lib/rdoc/generator/json_index.rb +++ b/lib/rdoc/generator/json_index.rb @@ -176,7 +176,7 @@ def generate_gzipped Zlib::GzipWriter.open(outfile) do |gz| gz.mtime = File.mtime(search_index_file) - gz.orig_name = search_index_file.to_s + gz.orig_name = search_index_file.basename.to_s gz.write search_index gz.close end @@ -194,7 +194,7 @@ def generate_gzipped Zlib::GzipWriter.open(outfile) do |gz| gz.mtime = File.mtime(dest) - gz.orig_name = dest.to_s + gz.orig_name = dest.basename.to_s gz.write data gz.close end diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec index 7ca7eb3e63c553..e1631e2cc1db40 100644 --- a/lib/rdoc/rdoc.gemspec +++ b/lib/rdoc/rdoc.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "rdoc" - s.version = "4.2.0" + s.version = "4.2.1" s.summary = "This rdoc is bundled with Ruby" s.executables = ["rdoc", "ri"] s.files = ["rdoc.rb", "rdoc/alias.rb", "rdoc/anon_class.rb", "rdoc/any_method.rb", "rdoc/attr.rb", "rdoc/class_module.rb", "rdoc/code_object.rb", "rdoc/code_objects.rb", "rdoc/comment.rb", "rdoc/constant.rb", "rdoc/context.rb", "rdoc/context/section.rb", "rdoc/cross_reference.rb", "rdoc/encoding.rb", "rdoc/erb_partial.rb", "rdoc/erbio.rb", "rdoc/extend.rb", "rdoc/generator.rb", "rdoc/generator/darkfish.rb", "rdoc/generator/json_index.rb", "rdoc/generator/markup.rb", "rdoc/generator/pot.rb", "rdoc/generator/pot/message_extractor.rb", "rdoc/generator/pot/po.rb", "rdoc/generator/pot/po_entry.rb", "rdoc/generator/ri.rb", "rdoc/ghost_method.rb", "rdoc/i18n.rb", "rdoc/i18n/locale.rb", "rdoc/i18n/text.rb", "rdoc/include.rb", "rdoc/known_classes.rb", "rdoc/markdown.rb", "rdoc/markdown/entities.rb", "rdoc/markdown/literals_1_9.rb", "rdoc/markup.rb", "rdoc/markup/attr_changer.rb", "rdoc/markup/attr_span.rb", "rdoc/markup/attribute_manager.rb", "rdoc/markup/attributes.rb", "rdoc/markup/blank_line.rb", "rdoc/markup/block_quote.rb", "rdoc/markup/document.rb", "rdoc/markup/formatter.rb", "rdoc/markup/formatter_test_case.rb", "rdoc/markup/hard_break.rb", "rdoc/markup/heading.rb", "rdoc/markup/include.rb", "rdoc/markup/indented_paragraph.rb", "rdoc/markup/inline.rb", "rdoc/markup/list.rb", "rdoc/markup/list_item.rb", "rdoc/markup/paragraph.rb", "rdoc/markup/parser.rb", "rdoc/markup/pre_process.rb", "rdoc/markup/raw.rb", "rdoc/markup/rule.rb", "rdoc/markup/special.rb", "rdoc/markup/text_formatter_test_case.rb", "rdoc/markup/to_ansi.rb", "rdoc/markup/to_bs.rb", "rdoc/markup/to_html.rb", "rdoc/markup/to_html_crossref.rb", "rdoc/markup/to_html_snippet.rb", "rdoc/markup/to_joined_paragraph.rb", "rdoc/markup/to_label.rb", "rdoc/markup/to_markdown.rb", "rdoc/markup/to_rdoc.rb", "rdoc/markup/to_table_of_contents.rb", "rdoc/markup/to_test.rb", "rdoc/markup/to_tt_only.rb", "rdoc/markup/verbatim.rb", "rdoc/meta_method.rb", "rdoc/method_attr.rb", "rdoc/mixin.rb", "rdoc/normal_class.rb", "rdoc/normal_module.rb", "rdoc/options.rb", "rdoc/parser.rb", "rdoc/parser/c.rb", "rdoc/parser/changelog.rb", "rdoc/parser/markdown.rb", "rdoc/parser/rd.rb", "rdoc/parser/ruby.rb", "rdoc/parser/ruby_tools.rb", "rdoc/parser/simple.rb", "rdoc/parser/text.rb", "rdoc/rd.rb", "rdoc/rd/block_parser.rb", "rdoc/rd/inline.rb", "rdoc/rd/inline_parser.rb", "rdoc/rdoc.rb", "rdoc/require.rb", "rdoc/ri.rb", "rdoc/ri/driver.rb", "rdoc/ri/formatter.rb", "rdoc/ri/paths.rb", "rdoc/ri/store.rb", "rdoc/ri/task.rb", "rdoc/ruby_lex.rb", "rdoc/ruby_token.rb", "rdoc/rubygems_hook.rb", "rdoc/servlet.rb", "rdoc/single_class.rb", "rdoc/stats.rb", "rdoc/stats/normal.rb", "rdoc/stats/quiet.rb", "rdoc/stats/verbose.rb", "rdoc/store.rb", "rdoc/task.rb", "rdoc/test_case.rb", "rdoc/text.rb", "rdoc/token_stream.rb", "rdoc/tom_doc.rb", "rdoc/top_level.rb"] diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb index 952be255dbd12d..0da87dba922f18 100644 --- a/lib/rdoc/servlet.rb +++ b/lib/rdoc/servlet.rb @@ -440,4 +440,3 @@ def store_for source_name end end - diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb index 71a35de101fe80..b40c89806a6e34 100644 --- a/lib/rdoc/text.rb +++ b/lib/rdoc/text.rb @@ -11,6 +11,8 @@ begin gem 'json' +rescue NameError => e # --disable-gems + raise unless e.name == :gem rescue Gem::LoadError end diff --git a/test/rdoc/test_rdoc_markup_to_html.rb b/test/rdoc/test_rdoc_markup_to_html.rb index 1c7c879980b90a..2e5b4b9300f005 100644 --- a/test/rdoc/test_rdoc_markup_to_html.rb +++ b/test/rdoc/test_rdoc_markup_to_html.rb @@ -620,7 +620,6 @@ def test_parseable_eh 'def x() end', 'def x; end', 'class C; end', - 'class C end', "module M end", 'a # => blah', 'x { |y| nil }', diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb index 1ea0de7a267206..37ce1481146585 100644 --- a/test/rdoc/test_rdoc_servlet.rb +++ b/test/rdoc/test_rdoc_servlet.rb @@ -533,4 +533,3 @@ def touch_extra_cache_path end end -