Skip to content

Commit

Permalink
Fix: has_rdoc has been deprecated (defaults to true) since rubygems 1…
Browse files Browse the repository at this point in the history
….3.3.
  • Loading branch information
dblock committed Aug 18, 2018
1 parent 9b0b8f2 commit b7ccff0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
1 change: 0 additions & 1 deletion gli.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec = Gem::Specification.new do |s|
s.executables = 'gli'
s.require_paths = ["lib"]

s.has_rdoc = true
s.extra_rdoc_files = ['README.rdoc', 'gli.rdoc']
s.rdoc_options << '--title' << 'Git Like Interface' << '--main' << 'README.rdoc'
s.bindir = 'bin'
Expand Down
7 changes: 3 additions & 4 deletions lib/gli/commands/scaffold.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def self.mk_gemspec(root_dir,dry_run,project_name)
file.puts <<EOS
# Ensure we require the local version and not one we might have installed already
require File.join([File.dirname(__FILE__),'lib','#{project_name}','version.rb'])
spec = Gem::Specification.new do |s|
spec = Gem::Specification.new do |s|
s.name = '#{project_name}'
s.version = #{project_name_as_module_name(project_name)}::VERSION
s.author = 'Your Name Here'
Expand All @@ -65,7 +65,6 @@ def self.mk_gemspec(root_dir,dry_run,project_name)
s.summary = 'A description of your project'
s.files = `git ls-files`.split("\n")
s.require_paths << 'lib'
s.has_rdoc = true
s.extra_rdoc_files = ['README.rdoc','#{project_name}.rdoc']
s.rdoc_options << '--title' << '#{project_name}' << '--main' << 'README.rdoc' << '-ri'
s.bindir = 'bin'
Expand Down Expand Up @@ -195,7 +194,7 @@ def test_the_truth
class Test::Unit::TestCase
# Add global extensions to the test case class here
end
EOS
end
Expand Down Expand Up @@ -314,7 +313,7 @@ def self.mk_binfile(root_dir,create_ext_dir,force,dry_run,project_name,commands)
c.action do |global_options,options,args|
# Your command logic here
# If you have any errors, just raise them
# raise "that command made no sense"
Expand Down
3 changes: 1 addition & 2 deletions test/apps/todo/todo.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ensure we require the local version and not one we might have installed already
require File.join([File.dirname(__FILE__),'lib','todo','version.rb'])
spec = Gem::Specification.new do |s|
spec = Gem::Specification.new do |s|
s.name = 'todo'
s.version = Todo::VERSION
s.author = 'Your Name Here'
Expand All @@ -13,7 +13,6 @@ spec = Gem::Specification.new do |s|
bin/todo
)
s.require_paths << 'lib'
s.has_rdoc = true
s.extra_rdoc_files = ['README.rdoc','todo.rdoc']
s.rdoc_options << '--title' << 'todo' << '--main' << 'README.rdoc' << '-ri'
s.bindir = 'bin'
Expand Down
3 changes: 1 addition & 2 deletions test/apps/todo_legacy/todo.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ensure we require the local version and not one we might have installed already
require File.join([File.dirname(__FILE__),'lib','todo','version.rb'])
spec = Gem::Specification.new do |s|
spec = Gem::Specification.new do |s|
s.name = 'todo'
s.version = Todo::VERSION
s.author = 'Your Name Here'
Expand All @@ -13,7 +13,6 @@ spec = Gem::Specification.new do |s|
bin/todo
)
s.require_paths << 'lib'
s.has_rdoc = true
s.extra_rdoc_files = ['README.rdoc','todo.rdoc']
s.rdoc_options << '--title' << 'todo' << '--main' << 'README.rdoc' << '-ri'
s.bindir = 'bin'
Expand Down

0 comments on commit b7ccff0

Please sign in to comment.