upgrade SDoc
Kudos to @zzak for taking over SDoc and make it work with RDoc 4.
This commit is contained in:
parent
20a795f64d
commit
6049249c6c
2
Gemfile
2
Gemfile
|
@ -18,7 +18,7 @@ gem 'coffee-rails', '~> 4.0.0'
|
|||
gem 'uglifier', '>= 1.3.0', require: false
|
||||
|
||||
group :doc do
|
||||
gem 'sdoc'
|
||||
gem 'sdoc', '~> 0.4.0'
|
||||
gem 'redcarpet', '~> 2.2.2', platforms: :ruby
|
||||
gem 'w3c_validators'
|
||||
gem 'kindlerb'
|
||||
|
|
|
@ -22,10 +22,8 @@ gem 'jquery-rails'
|
|||
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
|
||||
gem 'turbolinks'
|
||||
|
||||
group :doc do
|
||||
# bundle exec rake doc:rails generates the API under doc/api.
|
||||
gem 'sdoc', require: false
|
||||
end
|
||||
# bundle exec rake doc:rails generates the API under doc/api.
|
||||
gem 'sdoc', '~> 0.4.0', group: :doc
|
||||
|
||||
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
|
||||
gem 'jbuilder', '~> 2.0'
|
||||
|
|
|
@ -71,16 +71,16 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.1.0)
|
||||
rdoc (3.12.2)
|
||||
rdoc (0.4.0)
|
||||
json (~> 1.4)
|
||||
sass (3.2.9)
|
||||
sass-rails (4.0.0)
|
||||
railties (>= 4.0.0.beta, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
sdoc (0.3.20)
|
||||
json (>= 1.1.3)
|
||||
rdoc (~> 3.10)
|
||||
sdoc (0.4.0)
|
||||
json (~> 1.8)
|
||||
rdoc (~> 4.0, < 5.0)
|
||||
sprockets (2.10.0)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
* The `Gemfile` of new applications depends on SDoc ~> 0.4.0.
|
||||
|
||||
*Xavier Noria*
|
||||
|
||||
* `test_help.rb` now automatically checks/maintains your test datbase
|
||||
schema. (Use `config.active_record.maintain_test_schema = false` to
|
||||
disable.)
|
||||
|
|
|
@ -352,7 +352,7 @@ module Rails
|
|||
|
||||
def sdoc_gemfile_entry
|
||||
comment = 'bundle exec rake doc:rails generates the API under doc/api.'
|
||||
GemfileEntry.new('sdoc', nil, comment, { group: :doc, require: false })
|
||||
GemfileEntry.new('sdoc', '~> 0.4.0', comment, group: :doc)
|
||||
end
|
||||
|
||||
def coffee_gemfile_entry
|
||||
|
|
|
@ -390,9 +390,9 @@ class AppGeneratorTest < Rails::Generators::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
def test_inclusion_of_lazy_loaded_sdoc
|
||||
def test_inclusion_of_doc
|
||||
run_generator
|
||||
assert_file 'Gemfile', /gem 'sdoc', \s+group: :doc, require: false/
|
||||
assert_file 'Gemfile', /gem 'sdoc',\s+'~> 0.4.0',\s+group: :doc/
|
||||
end
|
||||
|
||||
def test_template_from_dir_pwd
|
||||
|
|
Loading…
Reference in New Issue