diff options
Diffstat (limited to 'lib/bundler')
| -rw-r--r-- | lib/bundler/lazy_specification.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/ruby_version.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/rubygems_ext.rb | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb index ad8191c55f..c9b161dc0e 100644 --- a/lib/bundler/lazy_specification.rb +++ b/lib/bundler/lazy_specification.rb @@ -122,7 +122,7 @@ module Bundler end def to_s - @__to_s ||= if platform == Gem::Platform::RUBY + @to_s ||= if platform == Gem::Platform::RUBY "#{name} (#{version})" else "#{name} (#{version}-#{platform})" diff --git a/lib/bundler/ruby_version.rb b/lib/bundler/ruby_version.rb index b6bd24e41c..b5396abb6e 100644 --- a/lib/bundler/ruby_version.rb +++ b/lib/bundler/ruby_version.rb @@ -107,7 +107,7 @@ module Bundler ruby_engine_version = RUBY_ENGINE == "ruby" ? ruby_version : RUBY_ENGINE_VERSION.dup patchlevel = RUBY_PATCHLEVEL.to_s - @ruby_version ||= RubyVersion.new(ruby_version, patchlevel, ruby_engine, ruby_engine_version) + @system ||= RubyVersion.new(ruby_version, patchlevel, ruby_engine, ruby_engine_version) end private diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index d298a17672..b96edd5e2d 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -66,7 +66,9 @@ module Gem alias_method :rg_extension_dir, :extension_dir def extension_dir - @bundler_extension_dir ||= if source.respond_to?(:extension_dir_name) + # following instance variable is already used in original method + # and that is the reason to prefix it with bundler_ and add rubocop exception + @bundler_extension_dir ||= if source.respond_to?(:extension_dir_name) # rubocop:disable Naming/MemoizedInstanceVariableName unique_extension_dir = [source.extension_dir_name, File.basename(full_gem_path)].uniq.join("-") File.expand_path(File.join(extensions_dir, unique_extension_dir)) else @@ -221,9 +223,9 @@ module Gem protected def _requirements_sorted? - return @_are_requirements_sorted if defined?(@_are_requirements_sorted) + return @_requirements_sorted if defined?(@_requirements_sorted) strings = as_list - @_are_requirements_sorted = strings == strings.sort + @_requirements_sorted = strings == strings.sort end def _with_sorted_requirements |