[rubygems/rubygems] util/rubocop -A --only Style/RedundantBegin
https://github.com/rubygems/rubygems/commit/b595d3cf0f
This commit is contained in:
parent
a532e9dc37
commit
72d09a568f
@ -1090,13 +1090,11 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
|
||||
require "bundler"
|
||||
begin
|
||||
Gem::DefaultUserInteraction.use_ui(ui) do
|
||||
begin
|
||||
Bundler.ui.silence do
|
||||
@gemdeps = Bundler.setup
|
||||
end
|
||||
ensure
|
||||
Gem::DefaultUserInteraction.ui.close
|
||||
Bundler.ui.silence do
|
||||
@gemdeps = Bundler.setup
|
||||
end
|
||||
ensure
|
||||
Gem::DefaultUserInteraction.ui.close
|
||||
end
|
||||
rescue Bundler::BundlerError => e
|
||||
warn e.message
|
||||
|
@ -429,12 +429,10 @@ class Gem::Command
|
||||
# True if the command handles the given argument list.
|
||||
|
||||
def handles?(args)
|
||||
begin
|
||||
parser.parse!(args.dup)
|
||||
return true
|
||||
rescue StandardError
|
||||
return false
|
||||
end
|
||||
parser.parse!(args.dup)
|
||||
return true
|
||||
rescue StandardError
|
||||
return false
|
||||
end
|
||||
|
||||
##
|
||||
|
@ -93,14 +93,12 @@ permission to.
|
||||
|
||||
def manage_owners(method, name, owners)
|
||||
owners.each do |owner|
|
||||
begin
|
||||
response = send_owner_request(method, name, owner)
|
||||
action = method == :delete ? "Removing" : "Adding"
|
||||
response = send_owner_request(method, name, owner)
|
||||
action = method == :delete ? "Removing" : "Adding"
|
||||
|
||||
with_response response, "#{action} #{owner}"
|
||||
rescue StandardError
|
||||
# ignore
|
||||
end
|
||||
with_response response, "#{action} #{owner}"
|
||||
rescue StandardError
|
||||
# ignore
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -95,12 +95,10 @@ command help for an example.
|
||||
|
||||
FileUtils.mkdir_p @options[:target] if @options[:target]
|
||||
|
||||
destination = begin
|
||||
if @options[:target]
|
||||
File.join @options[:target], spec_file
|
||||
else
|
||||
spec_file
|
||||
end
|
||||
destination = if @options[:target]
|
||||
File.join @options[:target], spec_file
|
||||
else
|
||||
spec_file
|
||||
end
|
||||
|
||||
File.open destination, "w" do |io|
|
||||
|
@ -162,13 +162,11 @@ class Gem::DependencyInstaller
|
||||
|
||||
specs = []
|
||||
tuples.each do |tup, source|
|
||||
begin
|
||||
spec = source.fetch_spec(tup)
|
||||
rescue Gem::RemoteFetcher::FetchError => e
|
||||
errors << Gem::SourceFetchProblem.new(source, e)
|
||||
else
|
||||
specs << [spec, source]
|
||||
end
|
||||
spec = source.fetch_spec(tup)
|
||||
rescue Gem::RemoteFetcher::FetchError => e
|
||||
errors << Gem::SourceFetchProblem.new(source, e)
|
||||
else
|
||||
specs << [spec, source]
|
||||
end
|
||||
|
||||
if @errors
|
||||
@ -294,11 +292,9 @@ class Gem::DependencyInstaller
|
||||
version = src.spec.version if version == Gem::Requirement.default
|
||||
elsif dep_or_name =~ /\.gem$/
|
||||
Dir[dep_or_name].each do |name|
|
||||
begin
|
||||
src = Gem::Source::SpecificFile.new name
|
||||
installer_set.add_local dep_or_name, src.spec, src
|
||||
rescue Gem::Package::FormatError
|
||||
end
|
||||
src = Gem::Source::SpecificFile.new name
|
||||
installer_set.add_local dep_or_name, src.spec, src
|
||||
rescue Gem::Package::FormatError
|
||||
end
|
||||
# else This is a dependency. InstallerSet handles this case
|
||||
end
|
||||
|
@ -58,10 +58,8 @@ class Gem::Resolver::ActivationRequest
|
||||
if @spec.respond_to? :sources
|
||||
exception = nil
|
||||
path = @spec.sources.find do |source|
|
||||
begin
|
||||
source.download full_spec, path
|
||||
rescue exception
|
||||
end
|
||||
source.download full_spec, path
|
||||
rescue exception
|
||||
end
|
||||
return path if path
|
||||
raise exception if exception
|
||||
|
@ -44,13 +44,11 @@ class Gem::Security::TrustDir
|
||||
glob = File.join @dir, "*.pem"
|
||||
|
||||
Dir[glob].each do |certificate_file|
|
||||
begin
|
||||
certificate = load_certificate certificate_file
|
||||
certificate = load_certificate certificate_file
|
||||
|
||||
yield certificate, certificate_file
|
||||
rescue OpenSSL::X509::CertificateError
|
||||
next # HACK: warn
|
||||
end
|
||||
yield certificate, certificate_file
|
||||
rescue OpenSSL::X509::CertificateError
|
||||
next # HACK: warn
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -38,36 +38,34 @@ class Gem::Source::Local < Gem::Source
|
||||
@specs = {}
|
||||
|
||||
Dir["*.gem"].each do |file|
|
||||
begin
|
||||
pkg = Gem::Package.new(file)
|
||||
rescue SystemCallError, Gem::Package::FormatError
|
||||
# ignore
|
||||
else
|
||||
tup = pkg.spec.name_tuple
|
||||
@specs[tup] = [File.expand_path(file), pkg]
|
||||
pkg = Gem::Package.new(file)
|
||||
rescue SystemCallError, Gem::Package::FormatError
|
||||
# ignore
|
||||
else
|
||||
tup = pkg.spec.name_tuple
|
||||
@specs[tup] = [File.expand_path(file), pkg]
|
||||
|
||||
case type
|
||||
when :released
|
||||
unless pkg.spec.version.prerelease?
|
||||
names << pkg.spec.name_tuple
|
||||
end
|
||||
when :prerelease
|
||||
if pkg.spec.version.prerelease?
|
||||
names << pkg.spec.name_tuple
|
||||
end
|
||||
when :latest
|
||||
tup = pkg.spec.name_tuple
|
||||
|
||||
cur = names.find {|x| x.name == tup.name }
|
||||
if !cur
|
||||
names << tup
|
||||
elsif cur.version < tup.version
|
||||
names.delete cur
|
||||
names << tup
|
||||
end
|
||||
else
|
||||
case type
|
||||
when :released
|
||||
unless pkg.spec.version.prerelease?
|
||||
names << pkg.spec.name_tuple
|
||||
end
|
||||
when :prerelease
|
||||
if pkg.spec.version.prerelease?
|
||||
names << pkg.spec.name_tuple
|
||||
end
|
||||
when :latest
|
||||
tup = pkg.spec.name_tuple
|
||||
|
||||
cur = names.find {|x| x.name == tup.name }
|
||||
if !cur
|
||||
names << tup
|
||||
elsif cur.version < tup.version
|
||||
names.delete cur
|
||||
names << tup
|
||||
end
|
||||
else
|
||||
names << pkg.spec.name_tuple
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -154,13 +154,11 @@ class Gem::SpecFetcher
|
||||
|
||||
specs = []
|
||||
tuples.each do |tup, source|
|
||||
begin
|
||||
spec = source.fetch_spec(tup)
|
||||
rescue Gem::RemoteFetcher::FetchError => e
|
||||
errors << Gem::SourceFetchProblem.new(source, e)
|
||||
else
|
||||
specs << [spec, source]
|
||||
end
|
||||
spec = source.fetch_spec(tup)
|
||||
rescue Gem::RemoteFetcher::FetchError => e
|
||||
errors << Gem::SourceFetchProblem.new(source, e)
|
||||
else
|
||||
specs << [spec, source]
|
||||
end
|
||||
|
||||
return [specs, errors]
|
||||
@ -214,34 +212,32 @@ class Gem::SpecFetcher
|
||||
list = {}
|
||||
|
||||
@sources.each_source do |source|
|
||||
begin
|
||||
names = case type
|
||||
when :latest
|
||||
tuples_for source, :latest
|
||||
when :released
|
||||
tuples_for source, :released
|
||||
when :complete
|
||||
names =
|
||||
tuples_for(source, :prerelease, true) +
|
||||
tuples_for(source, :released)
|
||||
names = case type
|
||||
when :latest
|
||||
tuples_for source, :latest
|
||||
when :released
|
||||
tuples_for source, :released
|
||||
when :complete
|
||||
names =
|
||||
tuples_for(source, :prerelease, true) +
|
||||
tuples_for(source, :released)
|
||||
|
||||
names.sort
|
||||
when :abs_latest
|
||||
names =
|
||||
tuples_for(source, :prerelease, true) +
|
||||
tuples_for(source, :latest)
|
||||
names.sort
|
||||
when :abs_latest
|
||||
names =
|
||||
tuples_for(source, :prerelease, true) +
|
||||
tuples_for(source, :latest)
|
||||
|
||||
names.sort
|
||||
when :prerelease
|
||||
tuples_for(source, :prerelease)
|
||||
else
|
||||
raise Gem::Exception, "Unknown type - :#{type}"
|
||||
end
|
||||
rescue Gem::RemoteFetcher::FetchError => e
|
||||
errors << Gem::SourceFetchProblem.new(source, e)
|
||||
else
|
||||
list[source] = names
|
||||
names.sort
|
||||
when :prerelease
|
||||
tuples_for(source, :prerelease)
|
||||
else
|
||||
raise Gem::Exception, "Unknown type - :#{type}"
|
||||
end
|
||||
rescue Gem::RemoteFetcher::FetchError => e
|
||||
errors << Gem::SourceFetchProblem.new(source, e)
|
||||
else
|
||||
list[source] = names
|
||||
end
|
||||
|
||||
[list, errors]
|
||||
|
@ -111,20 +111,18 @@ class Gem::StubSpecification < Gem::BasicSpecification
|
||||
saved_lineno = $.
|
||||
|
||||
Gem.open_file loaded_from, OPEN_MODE do |file|
|
||||
begin
|
||||
file.readline # discard encoding line
|
||||
stubline = file.readline.chomp
|
||||
if stubline.start_with?(PREFIX)
|
||||
extensions = if /\A#{PREFIX}/ =~ file.readline.chomp
|
||||
$'.split "\0"
|
||||
else
|
||||
StubLine::NO_EXTENSIONS
|
||||
end
|
||||
|
||||
@data = StubLine.new stubline, extensions
|
||||
file.readline # discard encoding line
|
||||
stubline = file.readline.chomp
|
||||
if stubline.start_with?(PREFIX)
|
||||
extensions = if /\A#{PREFIX}/ =~ file.readline.chomp
|
||||
$'.split "\0"
|
||||
else
|
||||
StubLine::NO_EXTENSIONS
|
||||
end
|
||||
rescue EOFError
|
||||
|
||||
@data = StubLine.new stubline, extensions
|
||||
end
|
||||
rescue EOFError
|
||||
end
|
||||
ensure
|
||||
$. = saved_lineno
|
||||
|
@ -270,7 +270,7 @@ class Gem::StreamUI
|
||||
when /^y/i then true
|
||||
when /^n/i then false
|
||||
when /^$/ then default
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return result
|
||||
|
@ -109,15 +109,13 @@ class Gem::Validator
|
||||
end
|
||||
|
||||
good.each do |entry, data|
|
||||
begin
|
||||
next unless data # HACK: `gem check -a mkrf`
|
||||
next unless data # HACK: `gem check -a mkrf`
|
||||
|
||||
source = File.join gem_directory, entry["path"]
|
||||
source = File.join gem_directory, entry["path"]
|
||||
|
||||
File.open source, Gem.binary_mode do |f|
|
||||
unless f.read == data
|
||||
errors[gem_name][entry["path"]] = "Modified from original"
|
||||
end
|
||||
File.open source, Gem.binary_mode do |f|
|
||||
unless f.read == data
|
||||
errors[gem_name][entry["path"]] = "Modified from original"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -117,32 +117,30 @@ class Gem::TestCase < Test::Unit::TestCase
|
||||
# https://github.com/seattlerb/minitest/blob/21d9e804b63c619f602f3f4ece6c71b48974707a/lib/minitest/assertions.rb#L546
|
||||
def capture_subprocess_io
|
||||
_synchronize do
|
||||
begin
|
||||
require "tempfile"
|
||||
require "tempfile"
|
||||
|
||||
captured_stdout = Tempfile.new("out")
|
||||
captured_stderr = Tempfile.new("err")
|
||||
captured_stdout = Tempfile.new("out")
|
||||
captured_stderr = Tempfile.new("err")
|
||||
|
||||
orig_stdout = $stdout.dup
|
||||
orig_stderr = $stderr.dup
|
||||
$stdout.reopen captured_stdout
|
||||
$stderr.reopen captured_stderr
|
||||
orig_stdout = $stdout.dup
|
||||
orig_stderr = $stderr.dup
|
||||
$stdout.reopen captured_stdout
|
||||
$stderr.reopen captured_stderr
|
||||
|
||||
yield
|
||||
yield
|
||||
|
||||
$stdout.rewind
|
||||
$stderr.rewind
|
||||
$stdout.rewind
|
||||
$stderr.rewind
|
||||
|
||||
return captured_stdout.read, captured_stderr.read
|
||||
ensure
|
||||
$stdout.reopen orig_stdout
|
||||
$stderr.reopen orig_stderr
|
||||
return captured_stdout.read, captured_stderr.read
|
||||
ensure
|
||||
$stdout.reopen orig_stdout
|
||||
$stderr.reopen orig_stderr
|
||||
|
||||
orig_stdout.close
|
||||
orig_stderr.close
|
||||
captured_stdout.close!
|
||||
captured_stderr.close!
|
||||
end
|
||||
orig_stdout.close
|
||||
orig_stderr.close
|
||||
captured_stdout.close!
|
||||
captured_stderr.close!
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -1159,14 +1159,12 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
|
||||
end
|
||||
server.ssl_context.tmp_dh_callback = proc { TEST_KEY_DH2048 }
|
||||
t = Thread.new do
|
||||
begin
|
||||
server.start
|
||||
rescue Exception => ex
|
||||
puts "ERROR during server thread: #{ex.message}"
|
||||
raise
|
||||
ensure
|
||||
server.shutdown
|
||||
end
|
||||
server.start
|
||||
rescue Exception => ex
|
||||
puts "ERROR during server thread: #{ex.message}"
|
||||
raise
|
||||
ensure
|
||||
server.shutdown
|
||||
end
|
||||
while server.status != :Running
|
||||
sleep 0.1
|
||||
@ -1213,13 +1211,11 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
|
||||
end
|
||||
end
|
||||
th = Thread.new do
|
||||
begin
|
||||
s.start
|
||||
rescue Exception => ex
|
||||
abort "ERROR during server thread: #{ex.message}"
|
||||
ensure
|
||||
s.shutdown
|
||||
end
|
||||
s.start
|
||||
rescue Exception => ex
|
||||
abort "ERROR during server thread: #{ex.message}"
|
||||
ensure
|
||||
s.shutdown
|
||||
end
|
||||
th[:server] = s
|
||||
th
|
||||
|
@ -145,25 +145,21 @@ class TestUpdateSuggestion < Gem::TestCase
|
||||
|
||||
def test_eglible_for_update_prevent_config
|
||||
with_eglible_environment(cmd: @cmd) do
|
||||
begin
|
||||
original_config = Gem.configuration[:prevent_update_suggestion]
|
||||
Gem.configuration[:prevent_update_suggestion] = true
|
||||
refute @cmd.eglible_for_update?
|
||||
ensure
|
||||
Gem.configuration[:prevent_update_suggestion] = original_config
|
||||
end
|
||||
original_config = Gem.configuration[:prevent_update_suggestion]
|
||||
Gem.configuration[:prevent_update_suggestion] = true
|
||||
refute @cmd.eglible_for_update?
|
||||
ensure
|
||||
Gem.configuration[:prevent_update_suggestion] = original_config
|
||||
end
|
||||
end
|
||||
|
||||
def test_eglible_for_update_prevent_env
|
||||
with_eglible_environment(cmd: @cmd) do
|
||||
begin
|
||||
original_env = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"]
|
||||
ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = "yes"
|
||||
refute @cmd.eglible_for_update?
|
||||
ensure
|
||||
ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = original_env
|
||||
end
|
||||
original_env = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"]
|
||||
ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = "yes"
|
||||
refute @cmd.eglible_for_update?
|
||||
ensure
|
||||
ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = original_env
|
||||
end
|
||||
end
|
||||
|
||||
@ -181,13 +177,11 @@ class TestUpdateSuggestion < Gem::TestCase
|
||||
|
||||
def test_eglible_for_update_disabled_update
|
||||
with_eglible_environment(cmd: @cmd) do
|
||||
begin
|
||||
original_disable = Gem.disable_system_update_message
|
||||
Gem.disable_system_update_message = "disabled"
|
||||
refute @cmd.eglible_for_update?
|
||||
ensure
|
||||
Gem.disable_system_update_message = original_disable
|
||||
end
|
||||
original_disable = Gem.disable_system_update_message
|
||||
Gem.disable_system_update_message = "disabled"
|
||||
refute @cmd.eglible_for_update?
|
||||
ensure
|
||||
Gem.disable_system_update_message = original_disable
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -91,12 +91,10 @@ class TestGemRequire < Gem::TestCase
|
||||
|
||||
def create_sync_thread
|
||||
Thread.new do
|
||||
begin
|
||||
yield
|
||||
ensure
|
||||
FILE_ENTERED_LATCH.release
|
||||
FILE_EXIT_LATCH.await
|
||||
end
|
||||
yield
|
||||
ensure
|
||||
FILE_ENTERED_LATCH.release
|
||||
FILE_EXIT_LATCH.await
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user