summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <[email protected]>2023-03-16 11:58:13 +0900
committerHiroshi SHIBATA <[email protected]>2023-03-17 18:50:55 +0900
commit9ffd73523db3c80237bd26099c9e11f9f6e3a444 (patch)
tree54fefdb647f110fc1d278aebf3cbe43a6ee6af4e
parent583fbc627c2ad69457e37fc909f7aaf889d53483 (diff)
[rubygems/rubygems] util/rubocop -A --only Layout/EmptyLinesAroundExceptionHandlingKeywords
https://github.com/rubygems/rubygems/commit/ad1fe68d97
-rw-r--r--lib/rubygems/commands/cert_command.rb1
-rw-r--r--lib/rubygems/dependency_installer.rb1
-rw-r--r--lib/rubygems/request.rb1
-rw-r--r--lib/rubygems/request_set/gem_dependency_api.rb3
-rw-r--r--test/rubygems/test_gem_command.rb1
-rw-r--r--test/rubygems/test_gem_commands_environment_command.rb2
-rw-r--r--test/rubygems/test_gem_ext_ext_conf_builder.rb1
-rw-r--r--test/rubygems/test_gem_installer.rb1
-rw-r--r--test/rubygems/test_gem_request_connection_pools.rb1
-rw-r--r--test/rubygems/test_gem_request_set_gem_dependency_api.rb1
-rw-r--r--test/rubygems/test_gem_specification.rb1
11 files changed, 0 insertions, 14 deletions
diff --git a/lib/rubygems/commands/cert_command.rb b/lib/rubygems/commands/cert_command.rb
index 17b1d11b19..391b1d94f7 100644
--- a/lib/rubygems/commands/cert_command.rb
+++ b/lib/rubygems/commands/cert_command.rb
@@ -262,7 +262,6 @@ For further reading on signing gems see `ri Gem::Security`.
key = File.read key_file
passphrase = ENV["GEM_PRIVATE_KEY_PASSPHRASE"]
options[:key] = OpenSSL::PKey.read key, passphrase
-
rescue Errno::ENOENT
alert_error \
"--private-key not specified and ~/.gem/gem-private_key.pem does not exist"
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb
index 1009376b90..941a5bda4c 100644
--- a/lib/rubygems/dependency_installer.rb
+++ b/lib/rubygems/dependency_installer.rb
@@ -178,7 +178,6 @@ class Gem::DependencyInstaller
end
set << specs
-
rescue Gem::RemoteFetcher::FetchError => e
# FIX if there is a problem talking to the network, we either need to always tell
# the user (no really_verbose) or fail hard, not silently tell them that we just
diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb
index c3ea46e0eb..d900d52452 100644
--- a/lib/rubygems/request.rb
+++ b/lib/rubygems/request.rb
@@ -223,7 +223,6 @@ class Gem::Request
end
verbose "#{response.code} #{response.message}"
-
rescue Net::HTTPBadResponse
verbose "bad response"
diff --git a/lib/rubygems/request_set/gem_dependency_api.rb b/lib/rubygems/request_set/gem_dependency_api.rb
index 0681f8802a..dd2b526016 100644
--- a/lib/rubygems/request_set/gem_dependency_api.rb
+++ b/lib/rubygems/request_set/gem_dependency_api.rb
@@ -592,7 +592,6 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
@current_repository = repository
yield
-
ensure
@current_repository = nil
end
@@ -684,7 +683,6 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
@current_groups = groups
yield
-
ensure
@current_groups = nil
end
@@ -759,7 +757,6 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
@current_platforms = platforms
yield
-
ensure
@current_platforms = nil
end
diff --git a/test/rubygems/test_gem_command.rb b/test/rubygems/test_gem_command.rb
index 414c7858c6..89330b5b77 100644
--- a/test/rubygems/test_gem_command.rb
+++ b/test/rubygems/test_gem_command.rb
@@ -68,7 +68,6 @@ class TestGemCommand < Gem::TestCase
Gem::Command.extra_args = "--awesome=true --verbose"
assert_equal %w[--awesome=true --verbose], Gem::Command.extra_args
-
ensure
Gem::Command.extra_args = extra_args
$; = separator
diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb
index 91ed774cb6..90dea9378e 100644
--- a/test/rubygems/test_gem_commands_environment_command.rb
+++ b/test/rubygems/test_gem_commands_environment_command.rb
@@ -48,7 +48,6 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
assert_match %r{- /bin$}, @ui.output
assert_empty @ui.error
-
ensure
Gem.sources.replace orig_sources
ENV["PATH"] = orig_path
@@ -125,7 +124,6 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
assert_equal "http://gems.example.com\n", @ui.output
assert_equal "", @ui.error
-
ensure
Gem.sources.replace orig_sources
end
diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb
index e6b980a96b..8e0d188ab6 100644
--- a/test/rubygems/test_gem_ext_ext_conf_builder.rb
+++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb
@@ -218,7 +218,6 @@ end
RbConfig::CONFIG["configure_args"] = args if args
yield
-
ensure
if configure_args
RbConfig::CONFIG["configure_args"] = configure_args
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index a40bd5e3f6..de47d1d193 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -361,7 +361,6 @@ gem 'other', version
end
assert_equal "", @ui.error
-
ensure
ENV["PATH"] = old_path
end
diff --git a/test/rubygems/test_gem_request_connection_pools.rb b/test/rubygems/test_gem_request_connection_pools.rb
index 964d5c961f..488f0f56f9 100644
--- a/test/rubygems/test_gem_request_connection_pools.rb
+++ b/test/rubygems/test_gem_request_connection_pools.rb
@@ -127,7 +127,6 @@ class TestGemRequestConnectionPool < Gem::TestCase
net_http_args = pools.send :net_http_args, URI("http://example"), @proxy
assert_equal ["example", 80, nil, nil], net_http_args
-
ensure
ENV["no_proxy"] = orig_no_proxy
end
diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
index 0338147f46..bbdcaf9731 100644
--- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb
+++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
@@ -362,7 +362,6 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
assert_empty @set.dependencies
end
-
ensure
Gem.win_platform = win_platform
end
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index 863bc47d4d..319597b45f 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -810,7 +810,6 @@ dependencies: []
@a2.files.clear
assert_equal @a2, spec
-
ensure
$SAFE = 0
end