Skip to content

Commit 5833716

Browse files
committed
Merge branch 'prepare-to-release-rdoc5'
2 parents 99cbbed + 4336b6b commit 5833716

21 files changed

+31
-815
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ notifications:
66
email:
77
88
rvm:
9-
- 1.8.7
109
- 1.9.3
1110
- 2.0.0
1211
- 2.1.10

CONTRIBUTING.rdoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ issues:
2222

2323
== Developer Quick Start
2424

25-
RDoc uses hoe for development. To get ready to work on RDoc run:
25+
RDoc uses bundler for development. To get ready to work on RDoc run:
2626

27-
$ gem install hoe
27+
$ gem install bundler
28+
[...]
29+
$ bundle install
2830
[...]
2931
$ rake
3032
[...]
@@ -216,4 +218,3 @@ To register the parser with rdoc, add the markup type's name and class to the
216218
RDoc::Text::MARKUP_FORMAT hash like:
217219

218220
RDoc::Text::MARKUP_FORMAT['rdoc'] = RDoc::Markup
219-

History.rdoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
=== 4.2.3 / 2016-??-??
1+
=== 5.0.0 / 2016-??-??
2+
3+
* Major enhancements
4+
* Drop to support Ruby 1.8
25

36
* Bug fixes
47
* Ensure badge data is included in result of JsonIndex template.

Manifest.txt

Lines changed: 0 additions & 309 deletions
This file was deleted.

Rakefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ PARSER_FILES = %w[
1212
lib/rdoc/rd/block_parser.ry
1313
lib/rdoc/rd/inline_parser.ry
1414
lib/rdoc/markdown.kpeg
15-
lib/rdoc/markdown/literals_1_8.kpeg
16-
lib/rdoc/markdown/literals_1_9.kpeg
15+
lib/rdoc/markdown/literals.kpeg
1716
]
1817

1918
$rdoc_rakefile = true

bin/console

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env ruby
2+
3+
require "bundler/setup"
4+
require "rdoc"
5+
6+
require "irb"
7+
IRB.start

bin/setup

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
IFS=$'\n\t'
4+
set -vx
5+
6+
bundle install

bin/rdoc renamed to exe/rdoc

File renamed without changes.

bin/ri renamed to exe/ri

File renamed without changes.

lib/rdoc.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class Error < RuntimeError; end
6565
##
6666
# RDoc version you are using
6767

68-
VERSION = '4.2.3'
68+
VERSION = '5.0.0.beta1'
6969

7070
##
7171
# Method visibilities
@@ -185,4 +185,3 @@ def self.load_yaml
185185
autoload :Require, 'rdoc/require'
186186

187187
end
188-

0 commit comments

Comments
 (0)