ruby-changes:63052
From: Hiroshi <ko1@a...>
Date: Wed, 23 Sep 2020 21:08:23 +0900 (JST)
Subject: [ruby-changes:63052] 31a6eaabc1 (master): Manually merged from https://github.com/rubygems/rubygems/pull/2636
https://git.ruby-lang.org/ruby.git/commit/?id=31a6eaabc1 From 31a6eaabc165d8a222e176f2c809d90622d88ec2 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Wed, 23 Sep 2020 21:02:56 +0900 Subject: Manually merged from https://github.com/rubygems/rubygems/pull/2636 Enable Style/EmptyLinesAroundClassBody rubocop cop. diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 03f9063..23f7071 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -1185,6 +1185,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]} https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L1185 # methods, and then we switch over to `class << self` here. Pick one or the # other. class << self + ## # RubyGems distributors (like operating system package managers) can # disable RubyGems update by setting this to error message printed to @@ -1307,6 +1308,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]} https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L1308 def default_gem_load_paths @default_gem_load_paths ||= $LOAD_PATH[load_path_insert_index..-1] end + end ## diff --git a/lib/rubygems/available_set.rb b/lib/rubygems/available_set.rb index 80ef29d..48bf6da 100644 --- a/lib/rubygems/available_set.rb +++ b/lib/rubygems/available_set.rb @@ -1,5 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rubygems/available_set.rb#L1 # frozen_string_literal: true class Gem::AvailableSet + include Enumerable Tuple = Struct.new(:spec, :source) @@ -161,4 +162,5 @@ class Gem::AvailableSet https://github.com/ruby/ruby/blob/trunk/lib/rubygems/available_set.rb#L162 def inject_into_list(dep_list) @set.each {|t| dep_list.add t.spec } end + end diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb index 665b87f..ce07cdc 100644 --- a/lib/rubygems/basic_specification.rb +++ b/lib/rubygems/basic_specification.rb @@ -4,6 +4,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/rubygems/basic_specification.rb#L4 # used by both Specification and StubSpecification. class Gem::BasicSpecification + ## # Allows installation of extensions for git: gems. @@ -38,8 +39,10 @@ class Gem::BasicSpecification https://github.com/ruby/ruby/blob/trunk/lib/rubygems/basic_specification.rb#L39 end class << self + extend Gem::Deprecate rubygems_deprecate :default_specifications_dir, "Gem.default_specifications_dir" + end ## @@ -342,4 +345,5 @@ class Gem::BasicSpecification https://github.com/ruby/ruby/blob/trunk/lib/rubygems/basic_specification.rb#L345 false end end + end diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb index bf55ce3..cfbe34c 100644 --- a/lib/rubygems/command.rb +++ b/lib/rubygems/command.rb @@ -17,6 +17,7 @@ require_relative 'user_interaction' https://github.com/ruby/ruby/blob/trunk/lib/rubygems/command.rb#L17 # A very good example to look at is Gem::Commands::ContentsCommand class Gem::Command + include Gem::UserInteraction OptionParser.accept Symbol do |value| @@ -651,6 +652,7 @@ RubyGems is a package manager for Ruby. https://github.com/ruby/ruby/blob/trunk/lib/rubygems/command.rb#L652 HELP # :startdoc: + end ## diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb index 1dcb577..f18e777 100644 --- a/lib/rubygems/command_manager.rb +++ b/lib/rubygems/command_manager.rb @@ -32,6 +32,7 @@ require 'rubygems/text' https://github.com/ruby/ruby/blob/trunk/lib/rubygems/command_manager.rb#L32 # See Gem::Command for instructions on writing gem commands. class Gem::CommandManager + include Gem::Text include Gem::UserInteraction @@ -230,4 +231,5 @@ class Gem::CommandManager https://github.com/ruby/ruby/blob/trunk/lib/rubygems/command_manager.rb#L231 ui.backtrace e end end + end diff --git a/lib/rubygems/commands/build_command.rb b/lib/rubygems/commands/build_command.rb index decdca0..e2b5def 100644 --- a/lib/rubygems/commands/build_command.rb +++ b/lib/rubygems/commands/build_command.rb @@ -3,6 +3,7 @@ require 'rubygems/command' https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/build_command.rb#L3 require 'rubygems/package' class Gem::Commands::BuildCommand < Gem::Command + def initialize super 'build', 'Build a gem from a gemspec' @@ -107,4 +108,5 @@ Gems can be saved to a specified filename with the output option: https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/build_command.rb#L108 terminate_interaction 1 end end + end diff --git a/lib/rubygems/commands/cert_command.rb b/lib/rubygems/commands/cert_command.rb index e5355d3..5a093dd 100644 --- a/lib/rubygems/commands/cert_command.rb +++ b/lib/rubygems/commands/cert_command.rb @@ -3,6 +3,7 @@ require 'rubygems/command' https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/cert_command.rb#L3 require 'rubygems/security' class Gem::Commands::CertCommand < Gem::Command + def initialize super 'cert', 'Manage RubyGems certificates and signing settings', :add => [], :remove => [], :list => [], :build => [], :sign => [] @@ -311,4 +312,5 @@ For further reading on signing gems see `ri Gem::Security`. https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/cert_command.rb#L312 # It's simple, but is all we need email =~ /\A.+@.+\z/ end + end if defined?(OpenSSL::SSL) diff --git a/lib/rubygems/commands/check_command.rb b/lib/rubygems/commands/check_command.rb index 8b8eda5..7905b8a 100644 --- a/lib/rubygems/commands/check_command.rb +++ b/lib/rubygems/commands/check_command.rb @@ -5,6 +5,7 @@ require 'rubygems/validator' https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/check_command.rb#L5 require 'rubygems/doctor' class Gem::Commands::CheckCommand < Gem::Command + include Gem::VersionOption def initialize @@ -89,4 +90,5 @@ specifications and will clean up gems that have been partially uninstalled. https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/check_command.rb#L90 def usage # :nodoc: "#{program_name} [OPTIONS] [GEMNAME ...]" end + end diff --git a/lib/rubygems/commands/cleanup_command.rb b/lib/rubygems/commands/cleanup_command.rb index b9819a4..98cd203 100644 --- a/lib/rubygems/commands/cleanup_command.rb +++ b/lib/rubygems/commands/cleanup_command.rb @@ -4,6 +4,7 @@ require 'rubygems/dependency_list' https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/cleanup_command.rb#L4 require 'rubygems/uninstaller' class Gem::Commands::CleanupCommand < Gem::Command + def initialize super 'cleanup', 'Clean up old versions of installed gems', @@ -180,4 +181,5 @@ If no gems are named all gems in GEM_HOME are cleaned. https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/cleanup_command.rb#L181 # Restore path Gem::Uninstaller may have changed Gem.use_paths @original_home, *@original_path end + end diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb index f17aed6..d30b62d 100644 --- a/lib/rubygems/commands/contents_command.rb +++ b/lib/rubygems/commands/contents_command.rb @@ -3,6 +3,7 @@ require 'rubygems/command' https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/contents_command.rb#L3 require 'rubygems/version_option' class Gem::Commands::ContentsCommand < Gem::Command + include Gem::VersionOption def initialize @@ -185,4 +186,5 @@ prefix or only the files that are requireable. https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/contents_command.rb#L186 [i, File.join(i, "specifications")] end.flatten end + end diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb index e472d8f..bdb71ad 100644 --- a/lib/rubygems/commands/dependency_command.rb +++ b/lib/rubygems/commands/dependency_command.rb @@ -4,6 +4,7 @@ require 'rubygems/local_remote_options' https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/dependency_command.rb#L4 require 'rubygems/version_option' class Gem::Commands::DependencyCommand < Gem::Command + include Gem::LocalRemoteOptions include Gem::VersionOption @@ -214,4 +215,5 @@ use with other commands. https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/dependency_command.rb#L215 /\A#{Regexp.union(*args)}/ end end + end diff --git a/lib/rubygems/commands/environment_command.rb b/lib/rubygems/commands/environment_command.rb index 37429fb..3d6a7af 100644 --- a/lib/rubygems/commands/environment_command.rb +++ b/lib/rubygems/commands/environment_command.rb @@ -2,6 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/environment_command.rb#L2 require 'rubygems/command' class Gem::Commands::EnvironmentCommand < Gem::Command + def initialize super 'environment', 'Display information about the RubyGems environment' end @@ -171,4 +172,5 @@ lib/rubygems/defaults/operating_system.rb https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/environment_command.rb#L172 return nil end + end diff --git a/lib/rubygems/commands/fetch_command.rb b/lib/rubygems/commands/fetch_command.rb index 6a1b346..ab77a3b 100644 --- a/lib/rubygems/commands/fetch_command.rb +++ b/lib/rubygems/commands/fetch_command.rb @@ -4,6 +4,7 @@ require 'rubygems/local_remote_options' https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/fetch_command.rb#L4 require 'rubygems/version_option' class Gem::Commands::FetchCommand < Gem::Command + include Gem::LocalRemoteOptions include Gem::VersionOption @@ -72,4 +73,5 @@ then repackaging it. https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/fetch_command.rb#L73 say "Downloaded #{spec.full_name}" end end + end diff --git a/lib/rubygems/commands/generate_index_command.rb b/lib/rubygems/commands/generate_index_command.rb index 93e25ef..6dccdcb 100644 --- a/lib/rubygems/commands/generate_index_command.rb +++ b/lib/rubygem (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/