summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--lib/cgi/util.rb4
-rw-r--r--lib/csv.rb4
-rw-r--r--lib/drb/drb.rb2
-rw-r--r--lib/forwardable.rb4
-rw-r--r--lib/ipaddr.rb4
-rw-r--r--lib/net/imap.rb4
-rw-r--r--lib/rubygems/commands/pristine_command.rb2
-rw-r--r--lib/webrick/httpstatus.rb16
-rwxr-xr-xtest/csv/test_encodings.rb2
-rwxr-xr-xtest/csv/test_features.rb4
-rw-r--r--test/date/test_switch_hitter.rb2
-rw-r--r--test/drb/test_drb.rb2
-rw-r--r--test/openssl/test_asn1.rb2
-rw-r--r--test/openssl/test_engine.rb2
-rw-r--r--test/openssl/test_pkcs12.rb4
-rw-r--r--test/openssl/test_pkcs7.rb2
-rw-r--r--test/openssl/test_pkey_ec.rb2
-rw-r--r--test/openssl/test_ssl.rb14
-rw-r--r--test/rake/test_rake_top_level_functions.rb2
-rw-r--r--test/ripper/test_files.rb2
-rw-r--r--test/rubygems/test_gem_commands_cleanup_command.rb2
-rw-r--r--test/rubygems/test_gem_silent_ui.rb4
-rw-r--r--test/rubygems/test_gem_uninstaller.rb2
24 files changed, 45 insertions, 45 deletions
diff --git a/ChangeLog b/ChangeLog
index 194171f392..b93f9b92fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@ Tue Aug 21 10:52:08 2012 NAKAMURA Usaku <usa@ruby-lang.org>
Tue Aug 21 10:40:06 2012 Koichi Sasada <ko1@atdot.net>
- * test_continuation.rb (tracing_with_thread_set_trace_func):
+ * test_continuation.rb (tracing_with_thread_set_trace_func):
fix to use Thread#set_trace_func(nil), not set_trace_func(nil).
Tue Aug 21 09:32:41 2012 Ryan Davis <ryand-ruby@zenspider.com>
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb
index a2bd066fe2..f6c25a9550 100644
--- a/lib/cgi/util.rb
+++ b/lib/cgi/util.rb
@@ -91,7 +91,7 @@ class CGI
def CGI::escape_html(str)
escapeHTML(str)
end
-
+
# Synonym for CGI::unescapeHTML(str)
def CGI::unescape_html(str)
unescapeHTML(str)
@@ -145,7 +145,7 @@ class CGI
def CGI::escape_element(str)
escapeElement(str)
end
-
+
# Synonym for CGI::unescapeElement(str)
def CGI::unescape_element(str)
unescapeElement(str)
diff --git a/lib/csv.rb b/lib/csv.rb
index 45da2c9bd6..bd83a6de68 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -2342,8 +2342,8 @@ class CSV
private
- #
- # Returns the encoding of the internal IO object or the +default+ if the
+ #
+ # Returns the encoding of the internal IO object or the +default+ if the
# encoding cannot be determined.
#
def raw_encoding(default = Encoding::ASCII_8BIT)
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index bd148d5ad1..48e3537dfb 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1382,7 +1382,7 @@ module DRb
def alive?
@thread.alive?
end
-
+
def here?(uri)
@exported_uri.include?(uri)
end
diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index 2b71b904d0..7a42e914bc 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -177,7 +177,7 @@ module Forwardable
# Define +method+ as delegator instance method with an optional
# alias name +ali+. Method calls to +ali+ will be delegated to
- # +accessor.method+.
+ # +accessor.method+.
#
# class MyQueue
# extend Forwardable
@@ -185,7 +185,7 @@ module Forwardable
# def initialize
# @queue = []
# end
- #
+ #
# def_delegator :@queue, :push, :mypush
# end
#
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index b6bea19832..716ccaad40 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -392,7 +392,7 @@ class IPAddr
return self
end
- # Set current netmask to given mask.
+ # Set current netmask to given mask.
def mask!(mask)
if mask.kind_of?(String)
if mask =~ /^\d+$/
@@ -626,7 +626,7 @@ unless Socket.const_defined? "AF_INET6"
# Returns a +String+ based representation of a valid DNS hostname,
# IPv4 or IPv6 address.
- #
+ #
# IPSocket.getaddress 'localhost' #=> "::1"
# IPSocket.getaddress 'broadcasthost' #=> "255.255.255.255"
# IPSocket.getaddress 'www.ruby-lang.org' #=> "221.186.184.68"
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index d4336f7ec3..ab77be4fb9 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -299,7 +299,7 @@ module Net
def self.default_port
return PORT
end
-
+
# The default port for IMAPS connections, port 993
def self.default_tls_port
return SSL_PORT
@@ -1140,7 +1140,7 @@ module Net
@tagged_response_arrival.broadcast
@continuation_request_arrival.broadcast
if @idle_done_cond
- @idle_done_cond.signal
+ @idle_done_cond.signal
end
end
end
diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb
index 83e6cc7a67..e3771b7212 100644
--- a/lib/rubygems/commands/pristine_command.rb
+++ b/lib/rubygems/commands/pristine_command.rb
@@ -96,7 +96,7 @@ extensions.
# TODO use installer options
install_defaults = Gem::ConfigFile::PLATFORM_DEFAULTS['install']
installer_env_shebang = install_defaults.to_s['--env-shebang']
-
+
installer = Gem::Installer.new(gem,
:wrappers => true,
:force => true,
diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb
index 37a36faa94..afc8e75a47 100644
--- a/lib/webrick/httpstatus.rb
+++ b/lib/webrick/httpstatus.rb
@@ -27,13 +27,13 @@ module WEBrick
class << self
attr_reader :code, :reason_phrase # :nodoc:
end
-
+
# Returns the HTTP status code
def code() self::class::code end
-
+
# Returns the HTTP status description
def reason_phrase() self::class::reason_phrase end
-
+
alias to_i code # :nodoc:
end
@@ -146,31 +146,31 @@ module WEBrick
def info?(code)
code.to_i >= 100 and code.to_i < 200
end
-
+
##
# Is +code+ a successful status?
def success?(code)
code.to_i >= 200 and code.to_i < 300
end
-
+
##
# Is +code+ a redirection status?
def redirect?(code)
code.to_i >= 300 and code.to_i < 400
end
-
+
##
# Is +code+ an error status?
def error?(code)
code.to_i >= 400 and code.to_i < 600
end
-
+
##
# Is +code+ a client error status?
def client_error?(code)
code.to_i >= 400 and code.to_i < 500
end
-
+
##
# Is +code+ a server error status?
def server_error?(code)
diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb
index 5ff6d33821..85ed21a9d6 100755
--- a/test/csv/test_encodings.rb
+++ b/test/csv/test_encodings.rb
@@ -329,7 +329,7 @@ class TestCSV::Encodings < TestCSV
yield encoding
end
end
-
+
def no_warnings
old_verbose, $VERBOSE = $VERBOSE, nil
yield
diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb
index ded876abbe..698d92144d 100755
--- a/test/csv/test_features.rb
+++ b/test/csv/test_features.rb
@@ -274,13 +274,13 @@ class TestCSV::Features < TestCSV
assert(CSV::VERSION.frozen?)
assert_match(/\A\d\.\d\.\d\Z/, CSV::VERSION)
end
-
+
def test_accepts_comment_skip_lines_option
assert_nothing_raised(ArgumentError) do
CSV.new nil, :skip_lines => /\A\s*#/
end
end
-
+
def test_accepts_comment_defaults_to_nil
c = CSV.new nil
assert_equal c.skip_lines, nil
diff --git a/test/date/test_switch_hitter.rb b/test/date/test_switch_hitter.rb
index c8b00301e6..f16c7983a0 100644
--- a/test/date/test_switch_hitter.rb
+++ b/test/date/test_switch_hitter.rb
@@ -292,7 +292,7 @@ class TestSH < Test::Unit::TestCase
Date.today.strftime('%100000z')
end
assert_raise(Errno::ERANGE) do
- Date.new(1 << 10000).strftime('%Y')
+ Date.new(1 << 10000).strftime('%Y')
end
assert_equal('-3786825600', Date.new(1850).strftime('%s'))
assert_equal('-3786825600000', Date.new(1850).strftime('%Q'))
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
index dc9a47d221..5841687b38 100644
--- a/test/drb/test_drb.rb
+++ b/test/drb/test_drb.rb
@@ -310,7 +310,7 @@ class TestBug4409 < Test::Unit::TestCase
def teardown
@ext.stop_service if @ext
end
-
+
def test_bug4409
foo = @there.foo
assert(@there.foo?(foo))
diff --git a/test/openssl/test_asn1.rb b/test/openssl/test_asn1.rb
index 811fe387fa..e67a96a03a 100644
--- a/test/openssl/test_asn1.rb
+++ b/test/openssl/test_asn1.rb
@@ -200,7 +200,7 @@ class OpenSSL::TestASN1 < Test::Unit::TestCase
def test_encode_nil
m = OpenSSL::ASN1
- [
+ [
m::Boolean, m::Integer, m::BitString, m::OctetString,
m::ObjectId, m::Enumerated, m::UTF8String, m::UTCTime,
m::GeneralizedTime, m::Sequence, m::Set
diff --git a/test/openssl/test_engine.rb b/test/openssl/test_engine.rb
index 5b90054c8f..46a2948cbf 100644
--- a/test/openssl/test_engine.rb
+++ b/test/openssl/test_engine.rb
@@ -56,7 +56,7 @@ class OpenSSL::TestEngine < Test::Unit::TestCase
$stderr.reopen(err_back)
err_back.close
end
- end
+ end
private
diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb
index 64e7530700..9f12bc5dc8 100644
--- a/test/openssl/test_pkcs12.rb
+++ b/test/openssl/test_pkcs12.rb
@@ -16,7 +16,7 @@ module OpenSSL
["subjectKeyIdentifier","hash",false],
["authorityKeyIdentifier","keyid:always",false],
]
-
+
@cacert = issue_cert(ca, TEST_KEY_RSA2048, 1, now, now+3600, ca_exts,
nil, nil, OpenSSL::Digest::SHA1.new)
@@ -108,7 +108,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
assert_equal chain.size, decoded.ca_certs.size
assert_include_cert @cacert, decoded.ca_certs
assert_include_cert @inter_cacert, decoded.ca_certs
- assert_cert @mycert, decoded.certificate
+ assert_cert @mycert, decoded.certificate
assert_equal TEST_KEY_RSA1024.to_der, decoded.key.to_der
end
diff --git a/test/openssl/test_pkcs7.rb b/test/openssl/test_pkcs7.rb
index b17cbda0b2..4a6692a74c 100644
--- a/test/openssl/test_pkcs7.rb
+++ b/test/openssl/test_pkcs7.rb
@@ -146,7 +146,7 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase
assert_equal(3, recip[1].serial)
assert_equal(data, p7.decrypt(@rsa1024, @ee2_cert))
end
-
+
def test_graceful_parsing_failure #[ruby-core:43250]
contents = File.read(__FILE__)
assert_raise(ArgumentError) { OpenSSL::PKCS7.new(contents) }
diff --git a/test/openssl/test_pkey_ec.rb b/test/openssl/test_pkey_ec.rb
index 7b266a772b..f151335b6e 100644
--- a/test/openssl/test_pkey_ec.rb
+++ b/test/openssl/test_pkey_ec.rb
@@ -119,7 +119,7 @@ class OpenSSL::TestEC < Test::Unit::TestCase
assert_equal(a, b)
end
end
-
+
def test_read_private_key_der
ec = OpenSSL::TestUtils::TEST_KEY_EC_P256V1
der = ec.to_der
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 97a3a46169..b72e75ed41 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -412,7 +412,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
# SSL/TLS version that has been marked as forbidden, therefore either of
# these may be raised
FORBIDDEN_PROTOCOL_ERRORS = [OpenSSL::SSL::SSLError, Errno::ECONNRESET]
-
+
if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1
def test_forbid_ssl_v3_for_client
@@ -515,7 +515,7 @@ end
}
}
end
-
+
private
def start_server_version(version, ctx_proc=nil, server_proc=nil, &blk)
@@ -524,11 +524,11 @@ end
ctx_proc.call(ctx) if ctx_proc
}
start_server(
- PORT,
- OpenSSL::SSL::VERIFY_NONE,
- true,
- :ctx_proc => ctx_wrap,
- :server_proc => server_proc,
+ PORT,
+ OpenSSL::SSL::VERIFY_NONE,
+ true,
+ :ctx_proc => ctx_wrap,
+ :server_proc => server_proc,
&blk
)
end
diff --git a/test/rake/test_rake_top_level_functions.rb b/test/rake/test_rake_top_level_functions.rb
index 1ed1af02e3..4cc4b4cfdd 100644
--- a/test/rake/test_rake_top_level_functions.rb
+++ b/test/rake/test_rake_top_level_functions.rb
@@ -23,7 +23,7 @@ class TestRakeTopLevelFunctions < Rake::TestCase
def test_namespace
block = proc do end
- namespace("xyz", &block)
+ namespace("xyz", &block)
expected = [
[[:in_namespace, 'xyz'], block]
diff --git a/test/ripper/test_files.rb b/test/ripper/test_files.rb
index 072a52d86f..5bc09c3cb6 100644
--- a/test/ripper/test_files.rb
+++ b/test/ripper/test_files.rb
@@ -16,7 +16,7 @@ class TestRipper::Generic < Test::Unit::TestCase
SCANNER_EVENTS.each {|n| eval "def on_#{n}(*args) r = [:#{n}, *args]; r.inspect; Object.new end" }
end
- TEST_RATIO = 0.05 # testing all files needs too long time...
+ TEST_RATIO = 0.05 # testing all files needs too long time...
def capture_stderr
err = StringIO.new
diff --git a/test/rubygems/test_gem_commands_cleanup_command.rb b/test/rubygems/test_gem_commands_cleanup_command.rb
index 40c7b30539..5b94d55ceb 100644
--- a/test/rubygems/test_gem_commands_cleanup_command.rb
+++ b/test/rubygems/test_gem_commands_cleanup_command.rb
@@ -2,7 +2,7 @@ require 'rubygems/test_case'
require 'rubygems/commands/cleanup_command'
class TestGemCommandsCleanupCommand < Gem::TestCase
-
+
def setup
super
diff --git a/test/rubygems/test_gem_silent_ui.rb b/test/rubygems/test_gem_silent_ui.rb
index cf5b1cd6e0..1e25c007c2 100644
--- a/test/rubygems/test_gem_silent_ui.rb
+++ b/test/rubygems/test_gem_silent_ui.rb
@@ -49,7 +49,7 @@ class TestGemSilentUI < Gem::TestCase
assert_empty out, 'No output'
assert_empty err, 'No output'
-
+
out, err = capture_io do
use_ui @sui do
value = @sui.ask_yes_no 'Problem?', true
@@ -60,7 +60,7 @@ class TestGemSilentUI < Gem::TestCase
assert_empty err, 'No output'
assert value, 'Value is true'
-
+
out, err = capture_io do
use_ui @sui do
value = @sui.ask_yes_no 'Problem?', false
diff --git a/test/rubygems/test_gem_uninstaller.rb b/test/rubygems/test_gem_uninstaller.rb
index aecc4e3807..a65b9921bb 100644
--- a/test/rubygems/test_gem_uninstaller.rb
+++ b/test/rubygems/test_gem_uninstaller.rb
@@ -220,7 +220,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
def test_uninstall_selection_greater_than_one
util_make_gems
-
+
list = Gem::Specification.find_all_by_name('a')
uninstaller = Gem::Uninstaller.new('a')
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 03:49:25 +0000