Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ notifications:
email:
- [email protected]
rvm:
- 1.8.7
- 1.9.3
- 2.0.0
- 2.1.10
Expand Down
7 changes: 4 additions & 3 deletions CONTRIBUTING.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ issues:

== Developer Quick Start

RDoc uses hoe for development. To get ready to work on RDoc run:
RDoc uses bundler for development. To get ready to work on RDoc run:

$ gem install hoe
$ gem install bundler
[...]
$ bundle install
[...]
$ rake
[...]
Expand Down Expand Up @@ -216,4 +218,3 @@ To register the parser with rdoc, add the markup type's name and class to the
RDoc::Text::MARKUP_FORMAT hash like:

RDoc::Text::MARKUP_FORMAT['rdoc'] = RDoc::Markup

5 changes: 4 additions & 1 deletion History.rdoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
=== 4.2.3 / 2016-??-??
=== 5.0.0 / 2016-??-??

* Major enhancements
* Drop to support Ruby 1.8

* Bug fixes
* Ensure badge data is included in result of JsonIndex template.
Expand Down
309 changes: 0 additions & 309 deletions Manifest.txt

This file was deleted.

3 changes: 1 addition & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ PARSER_FILES = %w[
lib/rdoc/rd/block_parser.ry
lib/rdoc/rd/inline_parser.ry
lib/rdoc/markdown.kpeg
lib/rdoc/markdown/literals_1_8.kpeg
lib/rdoc/markdown/literals_1_9.kpeg
lib/rdoc/markdown/literals.kpeg
]

$rdoc_rakefile = true
Expand Down
7 changes: 7 additions & 0 deletions bin/console
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env ruby

require "bundler/setup"
require "rdoc"

require "irb"
IRB.start
6 changes: 6 additions & 0 deletions bin/setup
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -euo pipefail
IFS=$'\n\t'
set -vx

bundle install
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions lib/rdoc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class Error < RuntimeError; end
##
# RDoc version you are using

VERSION = '4.2.3'
VERSION = '5.0.0.beta1'

##
# Method visibilities
Expand Down Expand Up @@ -185,4 +185,3 @@ def self.load_yaml
autoload :Require, 'rdoc/require'

end

6 changes: 1 addition & 5 deletions lib/rdoc/markdown.kpeg
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,7 @@
require 'rdoc/markup/to_joined_paragraph'
require 'rdoc/markdown/entities'

if RUBY_VERSION > '1.9' then
require 'rdoc/markdown/literals_1_9'
else
require 'rdoc/markdown/literals_1_8'
end
require 'rdoc/markdown/literals'

##
# Supported extensions
Expand Down
File renamed without changes.
Loading