From d9e6315177be2a1264213a1e7cb215312a23384a Mon Sep 17 00:00:00 2001 From: David Rodríguez Date: Thu, 22 Aug 2019 17:36:29 +0200 Subject: [rubygems/rubygems] Bump rubocop to 0.74.0 and fix new offenses https://github.com/rubygems/rubygems/commit/d4fc383497 --- lib/rubygems/basic_specification.rb | 4 ++-- lib/rubygems/dependency.rb | 4 ++-- lib/rubygems/dependency_installer.rb | 10 +++++----- lib/rubygems/ext/builder.rb | 2 +- lib/rubygems/installer.rb | 2 +- lib/rubygems/specification.rb | 8 ++++---- lib/rubygems/version.rb | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'lib/rubygems') diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb index 86abc4d10e..347f8c3318 100644 --- a/lib/rubygems/basic_specification.rb +++ b/lib/rubygems/basic_specification.rb @@ -206,8 +206,8 @@ class Gem::BasicSpecification def internal_init # :nodoc: @extension_dir = nil - @full_gem_path = nil - @gem_dir = nil + @full_gem_path = nil + @gem_dir = nil @ignored = nil end diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb index 3c91392cdd..a033603f5c 100644 --- a/lib/rubygems/dependency.rb +++ b/lib/rubygems/dependency.rb @@ -140,7 +140,7 @@ class Gem::Dependency if defined?(@version_requirement) && @version_requirement version = @version_requirement.instance_variable_get :@version - @version_requirement = nil + @version_requirement = nil @version_requirements = Gem::Requirement.new version end @@ -266,7 +266,7 @@ class Gem::Dependency end default = Gem::Requirement.default - self_req = self.requirement + self_req = self.requirement other_req = other.requirement return self.class.new name, self_req if other_req == default diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb index a5738ca925..6d45688888 100644 --- a/lib/rubygems/dependency_installer.rb +++ b/lib/rubygems/dependency_installer.rb @@ -88,14 +88,14 @@ class Gem::DependencyInstaller @wrappers = options[:wrappers] @build_args = options[:build_args] @build_docs_in_background = options[:build_docs_in_background] - @install_as_default = options[:install_as_default] - @dir_mode = options[:dir_mode] - @data_mode = options[:data_mode] - @prog_mode = options[:prog_mode] + @install_as_default = options[:install_as_default] + @dir_mode = options[:dir_mode] + @data_mode = options[:data_mode] + @prog_mode = options[:prog_mode] # Indicates that we should not try to update any deps unless # we absolutely must. - @minimal_deps = options[:minimal_deps] + @minimal_deps = options[:minimal_deps] @available = nil @installed_gems = [] diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb index 3fd0a8704e..d91ecd25de 100644 --- a/lib/rubygems/ext/builder.rb +++ b/lib/rubygems/ext/builder.rb @@ -108,7 +108,7 @@ class Gem::Ext::Builder @build_args = build_args @gem_dir = spec.full_gem_path - @ran_rake = false + @ran_rake = false end ## diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index 9481bd2b81..a40deefc5a 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -698,7 +698,7 @@ class Gem::Installer @development = options[:development] @build_root = options[:build_root] - @build_args = options[:build_args] || Gem::Command.build_args + @build_args = options[:build_args] || Gem::Command.build_args unless @build_root.nil? require 'pathname' diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index 5aceb8d643..c023e4f4aa 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -190,8 +190,8 @@ class Gem::Specification < Gem::BasicSpecification # Sentinel object to represent "not found" stubs NOT_FOUND = Struct.new(:to_spec, :this).new # :nodoc: - @@spec_with_requirable_file = {} - @@active_stub_with_requirable_file = {} + @@spec_with_requirable_file = {} + @@active_stub_with_requirable_file = {} ###################################################################### # :section: Required gemspec attributes @@ -1230,8 +1230,8 @@ class Gem::Specification < Gem::BasicSpecification @@all = nil @@stubs = nil @@stubs_by_name = {} - @@spec_with_requirable_file = {} - @@active_stub_with_requirable_file = {} + @@spec_with_requirable_file = {} + @@active_stub_with_requirable_file = {} _clear_load_cache unresolved = unresolved_deps unless unresolved.empty? diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb index 86a23509d6..619f327968 100644 --- a/lib/rubygems/version.rb +++ b/lib/rubygems/version.rb @@ -392,7 +392,7 @@ class Gem::Version def _split_segments string_start = _segments.index {|s| s.is_a?(String) } - string_segments = segments + string_segments = segments numeric_segments = string_segments.slice!(0, string_start || string_segments.size) return numeric_segments, string_segments end -- cgit v1.2.3