mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
85d461456c
commit
73c8b1ea29
6 changed files with 17 additions and 17 deletions
|
@ -284,7 +284,7 @@ class Gem::Requirement
|
||||||
end
|
end
|
||||||
|
|
||||||
def sort_requirements! # :nodoc:
|
def sort_requirements! # :nodoc:
|
||||||
@requirements.sort! do |l, r|
|
@requirements.sort! do |l, r|
|
||||||
comp = l.last <=> r.last # first, sort by the requirement's version
|
comp = l.last <=> r.last # first, sort by the requirement's version
|
||||||
next comp unless comp == 0
|
next comp unless comp == 0
|
||||||
l.first <=> r.first # then, sort by the operator (for stability)
|
l.first <=> r.first # then, sort by the operator (for stability)
|
||||||
|
|
|
@ -245,13 +245,13 @@ open-ended dependency on #{dep} is not recommended
|
||||||
|
|
||||||
def validate_self_inclusion_in_files_list
|
def validate_self_inclusion_in_files_list
|
||||||
return unless files.include?(file_name)
|
return unless files.include?(file_name)
|
||||||
|
|
||||||
error "#{full_name} contains itself (#{file_name}), check your files list"
|
error "#{full_name} contains itself (#{file_name}), check your files list"
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate_specification_version
|
def validate_specification_version
|
||||||
return if specification_version.is_a?(Integer)
|
return if specification_version.is_a?(Integer)
|
||||||
|
|
||||||
error 'specification_version must be an Integer (did you mean version?)'
|
error 'specification_version must be an Integer (did you mean version?)'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -451,23 +451,23 @@ ERROR: Possible alternatives: non_existent_with_hint
|
||||||
specs = spec_fetcher do |fetcher|
|
specs = spec_fetcher do |fetcher|
|
||||||
fetcher.gem 'a', 2
|
fetcher.gem 'a', 2
|
||||||
end
|
end
|
||||||
|
|
||||||
Gem.done_installing(&Gem::RDoc.method(:generation_hook))
|
Gem.done_installing(&Gem::RDoc.method(:generation_hook))
|
||||||
|
|
||||||
@cmd.options[:document] = %w[rdoc ri]
|
@cmd.options[:document] = %w[rdoc ri]
|
||||||
@cmd.options[:domain] = :local
|
@cmd.options[:domain] = :local
|
||||||
@cmd.options[:install_dir] = 'whatever'
|
@cmd.options[:install_dir] = 'whatever'
|
||||||
|
|
||||||
a2 = specs['a-2']
|
a2 = specs['a-2']
|
||||||
FileUtils.mv a2.cache_file, @tempdir
|
FileUtils.mv a2.cache_file, @tempdir
|
||||||
|
|
||||||
@cmd.options[:args] = %w[a]
|
@cmd.options[:args] = %w[a]
|
||||||
|
|
||||||
use_ui @ui do
|
use_ui @ui do
|
||||||
# Don't use Dir.chdir with a block, it warnings a lot because
|
# Don't use Dir.chdir with a block, it warnings a lot because
|
||||||
# of a downstream Dir.chdir with a block
|
# of a downstream Dir.chdir with a block
|
||||||
old = Dir.getwd
|
old = Dir.getwd
|
||||||
|
|
||||||
begin
|
begin
|
||||||
Dir.chdir @tempdir
|
Dir.chdir @tempdir
|
||||||
assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
|
assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
|
||||||
|
@ -477,9 +477,9 @@ ERROR: Possible alternatives: non_existent_with_hint
|
||||||
Dir.chdir old
|
Dir.chdir old
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
wait_for_child_process_to_exit
|
wait_for_child_process_to_exit
|
||||||
|
|
||||||
assert_path_exists 'whatever/doc/a-2', 'documentation not installed'
|
assert_path_exists 'whatever/doc/a-2', 'documentation not installed'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ module TestGemCommandsQueryCommandSetup
|
||||||
@specs = add_gems_to_fetcher
|
@specs = add_gems_to_fetcher
|
||||||
@stub_ui = Gem::MockGemUi.new
|
@stub_ui = Gem::MockGemUi.new
|
||||||
@stub_fetcher = Gem::FakeFetcher.new
|
@stub_fetcher = Gem::FakeFetcher.new
|
||||||
|
|
||||||
@stub_fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
|
@stub_fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
|
||||||
raise Gem::RemoteFetcher::FetchError
|
raise Gem::RemoteFetcher::FetchError
|
||||||
end
|
end
|
||||||
|
|
|
@ -377,9 +377,9 @@ class TestGemServer < Gem::TestCase
|
||||||
assert_equal 200, @res.status
|
assert_equal 200, @res.status
|
||||||
assert_match 'xsshomepagegem 1', @res.body
|
assert_match 'xsshomepagegem 1', @res.body
|
||||||
|
|
||||||
# This verifies that the homepage for this spec is not displayed and is set to ".", because it's not a
|
# This verifies that the homepage for this spec is not displayed and is set to ".", because it's not a
|
||||||
# valid HTTP/HTTPS URL and could be unsafe in an HTML context. We would prefer to throw an exception here,
|
# valid HTTP/HTTPS URL and could be unsafe in an HTML context. We would prefer to throw an exception here,
|
||||||
# but spec.homepage is currently free form and not currently required to be a URL, this behavior may be
|
# but spec.homepage is currently free form and not currently required to be a URL, this behavior may be
|
||||||
# validated in future versions of Gem::Specification.
|
# validated in future versions of Gem::Specification.
|
||||||
#
|
#
|
||||||
# There are two variant we're checking here, one where rdoc is not present, and one where rdoc is present in the same regex:
|
# There are two variant we're checking here, one where rdoc is not present, and one where rdoc is present in the same regex:
|
||||||
|
@ -432,9 +432,9 @@ class TestGemServer < Gem::TestCase
|
||||||
assert_equal 200, @res.status
|
assert_equal 200, @res.status
|
||||||
assert_match 'invalidhomepagegem 1', @res.body
|
assert_match 'invalidhomepagegem 1', @res.body
|
||||||
|
|
||||||
# This verifies that the homepage for this spec is not displayed and is set to ".", because it's not a
|
# This verifies that the homepage for this spec is not displayed and is set to ".", because it's not a
|
||||||
# valid HTTP/HTTPS URL and could be unsafe in an HTML context. We would prefer to throw an exception here,
|
# valid HTTP/HTTPS URL and could be unsafe in an HTML context. We would prefer to throw an exception here,
|
||||||
# but spec.homepage is currently free form and not currently required to be a URL, this behavior may be
|
# but spec.homepage is currently free form and not currently required to be a URL, this behavior may be
|
||||||
# validated in future versions of Gem::Specification.
|
# validated in future versions of Gem::Specification.
|
||||||
#
|
#
|
||||||
# There are two variant we're checking here, one where rdoc is not present, and one where rdoc is present in the same regex:
|
# There are two variant we're checking here, one where rdoc is not present, and one where rdoc is present in the same regex:
|
||||||
|
|
|
@ -1184,7 +1184,7 @@ dependencies: []
|
||||||
gem = 'mingw'
|
gem = 'mingw'
|
||||||
v = '1.1.1'
|
v = '1.1.1'
|
||||||
platforms = ['x86-mingw32', 'x64-mingw32']
|
platforms = ['x86-mingw32', 'x64-mingw32']
|
||||||
|
|
||||||
#create specs
|
#create specs
|
||||||
platforms.each do |plat|
|
platforms.each do |plat|
|
||||||
spec = Gem::Specification.new(gem, v) { |s| s.platform = plat }
|
spec = Gem::Specification.new(gem, v) { |s| s.platform = plat }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue