summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <[email protected]>2023-03-16 13:28:31 +0900
committerHiroshi SHIBATA <[email protected]>2023-03-17 18:50:55 +0900
commit03b82d1865db32da8d69e91881675d9d6153872f (patch)
treeee0831a7e200d4949d0ec4581881e005fd998635
parentd2cebb4e31b95b2bd02e5dec1c990c28f0f83bf4 (diff)
[rubygems/rubygems] util/rubocop -A --only Style/SingleLineMethods
https://github.com/rubygems/rubygems/commit/fa2e835ed2
Diffstat
-rw-r--r--lib/rubygems/basic_specification.rb8
-rw-r--r--lib/rubygems/request.rb9
-rw-r--r--test/rubygems/test_gem_dependency.rb9
-rw-r--r--test/rubygems/test_gem_package.rb43
-rw-r--r--test/rubygems/test_gem_remote_fetcher.rb8
-rw-r--r--test/rubygems/test_gem_request.rb5
-rw-r--r--test/rubygems/test_gem_security_policy.rb12
-rw-r--r--test/rubygems/test_gem_specification.rb22
-rw-r--r--test/rubygems/test_require.rb4
9 files changed, 92 insertions, 28 deletions
diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb
index 4dba9a4e45..e33c2bc915 100644
--- a/lib/rubygems/basic_specification.rb
+++ b/lib/rubygems/basic_specification.rb
@@ -323,11 +323,15 @@ class Gem::BasicSpecification
raise NotImplementedError
end
- def this; self; end
+ def this
+ self
+ end
private
- def have_extensions?; !extensions.empty?; end
+ def have_extensions?
+ !extensions.empty?
+ end
def have_file?(file, suffixes)
return true if raw_require_paths.any? do |path|
diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb
index d900d52452..1eeaa416fc 100644
--- a/lib/rubygems/request.rb
+++ b/lib/rubygems/request.rb
@@ -35,8 +35,13 @@ class Gem::Request
@connection_pool = pool
end
- def proxy_uri; @connection_pool.proxy_uri; end
- def cert_files; @connection_pool.cert_files; end
+ def proxy_uri
+ @connection_pool.proxy_uri
+ end
+
+ def cert_files
+ @connection_pool.cert_files
+ end
def self.get_cert_files
pattern = File.expand_path("./ssl_certs/*/*.pem", __dir__)
diff --git a/test/rubygems/test_gem_dependency.rb b/test/rubygems/test_gem_dependency.rb
index be05fe1c73..059b3fd821 100644
--- a/test/rubygems/test_gem_dependency.rb
+++ b/test/rubygems/test_gem_dependency.rb
@@ -105,8 +105,13 @@ class TestGemDependency < Gem::TestCase
def test_equals_tilde_object
o = Object.new
- def o.name; "a" end
- def o.version; "0" end
+ def o.name
+ "a"
+ end
+
+ def o.version
+ "0"
+ end
assert_match dep("a"), o
end
diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb
index 2f0b8a9276..aa80550b41 100644
--- a/test/rubygems/test_gem_package.rb
+++ b/test/rubygems/test_gem_package.rb
@@ -811,7 +811,9 @@ class TestGemPackage < Gem::Package::TarTestCase
def test_load_spec
entry = StringIO.new Gem::Util.gzip @spec.to_yaml
- def entry.full_name() "metadata.gz" end
+ def entry.full_name()
+ "metadata.gz"
+ end
package = Gem::Package.new "nonexistent.gem"
@@ -1051,10 +1053,21 @@ class TestGemPackage < Gem::Package::TarTestCase
# write bogus data.tar.gz to foil signature
bogus_data = Gem::Util.gzip "hello"
fake_signer = Class.new do
- def digest_name; "SHA512"; end
- def digest_algorithm; OpenSSL::Digest(:SHA512).new; end
- def key; "key"; end
- def sign(*); "fake_sig"; end
+ def digest_name
+ "SHA512"
+ end
+
+ def digest_algorithm
+ OpenSSL::Digest(:SHA512).new
+ end
+
+ def key
+ "key"
+ end
+
+ def sign(*)
+ "fake_sig"
+ end
end
gem.add_file_signed "data2.tar.gz", 0444, fake_signer.new do |io|
io.write bogus_data
@@ -1098,7 +1111,9 @@ class TestGemPackage < Gem::Package::TarTestCase
def test_verify_entry
entry = Object.new
- def entry.full_name() raise ArgumentError, "whatever" end
+ def entry.full_name()
+ raise ArgumentError, "whatever"
+ end
package = Gem::Package.new @gem
@@ -1125,11 +1140,15 @@ class TestGemPackage < Gem::Package::TarTestCase
$good_name = vm
entry = Object.new
- def entry.full_name() $good_name end
+ def entry.full_name()
+ $good_name
+ end
package = Gem::Package.new(@gem)
package.instance_variable_set(:@files, [])
- def package.load_spec(entry) $spec_loaded = true end
+ def package.load_spec(entry)
+ $spec_loaded = true
+ end
package.verify_entry(entry)
@@ -1142,11 +1161,15 @@ class TestGemPackage < Gem::Package::TarTestCase
$bad_name = vm
entry = Object.new
- def entry.full_name() $bad_name end
+ def entry.full_name()
+ $bad_name
+ end
package = Gem::Package.new(@gem)
package.instance_variable_set(:@files, [])
- def package.load_spec(entry) $spec_loaded = true end
+ def package.load_spec(entry)
+ $spec_loaded = true
+ end
package.verify_entry(entry)
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index 5e3340a32f..22d64923d6 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -656,7 +656,9 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
res
else
res = Net::HTTPOK.new nil, 200, nil
- def res.body() "real_path" end
+ def res.body()
+ "real_path"
+ end
res
end
end
@@ -719,7 +721,9 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
def fetcher.request(uri, request_class, last_modified = nil)
$fetched_uri = uri
res = Net::HTTPOK.new nil, 200, nil
- def res.body() "success" end
+ def res.body()
+ "success"
+ end
res
end
diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb
index a3fd11c27e..8f29fc7406 100644
--- a/test/rubygems/test_gem_request.rb
+++ b/test/rubygems/test_gem_request.rb
@@ -521,7 +521,10 @@ ERROR: Certificate is an invalid CA certificate
class Conn
attr_accessor :payload
- def new(*args); self; end
+ def new(*args)
+ self
+ end
+
def use_ssl=(bool); end
def verify_callback=(setting); end
def verify_mode=(setting); end
diff --git a/test/rubygems/test_gem_security_policy.rb b/test/rubygems/test_gem_security_policy.rb
index 9217f5a818..82eb317499 100644
--- a/test/rubygems/test_gem_security_policy.rb
+++ b/test/rubygems/test_gem_security_policy.rb
@@ -452,7 +452,9 @@ class TestGemSecurityPolicy < Gem::TestCase
package.checksums[Gem::Security::DIGEST_NAME] = {}
s = StringIO.new metadata_gz
- def s.full_name() "metadata.gz" end
+ def s.full_name()
+ "metadata.gz"
+ end
digests = package.digest s
metadata_gz_digest = digests[Gem::Security::DIGEST_NAME]["metadata.gz"]
@@ -475,7 +477,9 @@ class TestGemSecurityPolicy < Gem::TestCase
package.checksums[Gem::Security::DIGEST_NAME] = {}
s = StringIO.new metadata_gz
- def s.full_name() "metadata.gz" end
+ def s.full_name()
+ "metadata.gz"
+ end
digests = package.digest s
digests[Gem::Security::DIGEST_NAME]["data.tar.gz"] = @digest.hexdigest "hello"
@@ -504,7 +508,9 @@ class TestGemSecurityPolicy < Gem::TestCase
package.checksums[Gem::Security::DIGEST_NAME] = {}
s = StringIO.new metadata_gz
- def s.full_name() "metadata.gz" end
+ def s.full_name()
+ "metadata.gz"
+ end
digests = package.digest s
digests[Gem::Security::DIGEST_NAME]["data.tar.gz"] = @digest.hexdigest "hello"
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index 1194ff9727..6776368dc2 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -804,7 +804,8 @@ dependencies: []
end
full_path.taint
- loader = Thread.new { $SAFE = 1; Gem::Specification.load full_path }
+ loader = Thread.new { $SAFE = 1
+ Gem::Specification.load full_path }
spec = loader.value
@a2.files.clear
@@ -2510,10 +2511,21 @@ end
end
end
- def x(s); s.gsub(/xxx/, ""); end
- def w; x "WARxxxNING"; end
- def t; x "TOxxxDO"; end
- def f; x "FxxxIXME"; end
+ def x(s)
+ s.gsub(/xxx/, "")
+ end
+
+ def w
+ x "WARxxxNING"
+ end
+
+ def t
+ x "TOxxxDO"
+ end
+
+ def f
+ x "FxxxIXME"
+ end
def test_validate_authors
util_setup_validate
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index 0eee4676b5..1f63859959 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -542,7 +542,9 @@ class TestGemRequire < Gem::TestCase
silence_warnings do
class << ::Gem
alias_method :old_try_activate, :try_activate
- def try_activate(*); raise "raised from try_activate"; end
+ def try_activate(*)
+ raise "raised from try_activate"
+ end
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-20 11:50:26 +0000