diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-03-16 14:10:30 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-03-17 18:50:55 +0900 |
commit | 72d09a568f9f50ce7c41ef2999d272f77a207a8c (patch) | |
tree | aeb539d5e35ea0ad2ee7880f30d5095afdd7bf34 /lib | |
parent | a532e9dc37bb7ff2fb36966327f71a74163d9616 (diff) | |
download | ruby-72d09a568f9f50ce7c41ef2999d272f77a207a8c.tar.gz |
[rubygems/rubygems] util/rubocop -A --only Style/RedundantBegin
https://github.com/rubygems/rubygems/commit/b595d3cf0f
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rubygems.rb | 10 | ||||
-rw-r--r-- | lib/rubygems/command.rb | 10 | ||||
-rw-r--r-- | lib/rubygems/commands/owner_command.rb | 12 | ||||
-rw-r--r-- | lib/rubygems/commands/unpack_command.rb | 10 | ||||
-rw-r--r-- | lib/rubygems/dependency_installer.rb | 20 | ||||
-rw-r--r-- | lib/rubygems/resolver/activation_request.rb | 6 | ||||
-rw-r--r-- | lib/rubygems/security/trust_dir.rb | 10 | ||||
-rw-r--r-- | lib/rubygems/source/local.rb | 54 | ||||
-rw-r--r-- | lib/rubygems/spec_fetcher.rb | 64 | ||||
-rw-r--r-- | lib/rubygems/stub_specification.rb | 22 | ||||
-rw-r--r-- | lib/rubygems/user_interaction.rb | 2 | ||||
-rw-r--r-- | lib/rubygems/validator.rb | 12 |
12 files changed, 103 insertions, 129 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index d1d40429e7..db9c73c248 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -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 diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb index ab21013c2a..ce057af440 100644 --- a/lib/rubygems/command.rb +++ b/lib/rubygems/command.rb @@ -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 ## diff --git a/lib/rubygems/commands/owner_command.rb b/lib/rubygems/commands/owner_command.rb index 4751928682..cd60157911 100644 --- a/lib/rubygems/commands/owner_command.rb +++ b/lib/rubygems/commands/owner_command.rb @@ -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 diff --git a/lib/rubygems/commands/unpack_command.rb b/lib/rubygems/commands/unpack_command.rb index e48e36823c..314571dee6 100644 --- a/lib/rubygems/commands/unpack_command.rb +++ b/lib/rubygems/commands/unpack_command.rb @@ -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| diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb index 3c5ef763ff..faed8bc0b6 100644 --- a/lib/rubygems/dependency_installer.rb +++ b/lib/rubygems/dependency_installer.rb @@ -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 diff --git a/lib/rubygems/resolver/activation_request.rb b/lib/rubygems/resolver/activation_request.rb index 27877e0f4b..17625aea8f 100644 --- a/lib/rubygems/resolver/activation_request.rb +++ b/lib/rubygems/resolver/activation_request.rb @@ -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 diff --git a/lib/rubygems/security/trust_dir.rb b/lib/rubygems/security/trust_dir.rb index cb3943ab2b..f6748f5cb4 100644 --- a/lib/rubygems/security/trust_dir.rb +++ b/lib/rubygems/security/trust_dir.rb @@ -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 diff --git a/lib/rubygems/source/local.rb b/lib/rubygems/source/local.rb index 0f24bb7e53..fdbef38e89 100644 --- a/lib/rubygems/source/local.rb +++ b/lib/rubygems/source/local.rb @@ -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] - - 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 + 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 + names << pkg.spec.name_tuple end end diff --git a/lib/rubygems/spec_fetcher.rb b/lib/rubygems/spec_fetcher.rb index 23f2d982d6..ce58b24e7d 100644 --- a/lib/rubygems/spec_fetcher.rb +++ b/lib/rubygems/spec_fetcher.rb @@ -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.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 = 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 :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] diff --git a/lib/rubygems/stub_specification.rb b/lib/rubygems/stub_specification.rb index 4682cc94fd..2b65cd2a6f 100644 --- a/lib/rubygems/stub_specification.rb +++ b/lib/rubygems/stub_specification.rb @@ -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 diff --git a/lib/rubygems/user_interaction.rb b/lib/rubygems/user_interaction.rb index 116e8bbd5a..45b57ef33e 100644 --- a/lib/rubygems/user_interaction.rb +++ b/lib/rubygems/user_interaction.rb @@ -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 diff --git a/lib/rubygems/validator.rb b/lib/rubygems/validator.rb index 76a6d7909e..03fc6b0fc9 100644 --- a/lib/rubygems/validator.rb +++ b/lib/rubygems/validator.rb @@ -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 |