From 5537adf719a37a30b17d39111cc03700f353aa2d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 4 Jan 2021 10:09:05 +0900 Subject: Track RubyGems master(3.3.0.dev) branch at 55634a8af18a52df86c4275d70fa1179118bcc20 --- lib/rubygems.rb | 2 +- lib/rubygems/command_manager.rb | 2 +- lib/rubygems/commands/install_command.rb | 7 +- lib/rubygems/commands/setup_command.rb | 78 +++++---------------- lib/rubygems/commands/update_command.rb | 13 ++-- lib/rubygems/exceptions.rb | 25 +++++++ lib/rubygems/ext/builder.rb | 14 ++-- lib/rubygems/ext/cmake_builder.rb | 3 +- lib/rubygems/ext/configure_builder.rb | 3 +- lib/rubygems/install_update_options.rb | 13 +++- lib/rubygems/remote_fetcher.rb | 4 +- lib/rubygems/resolver/best_set.rb | 2 +- lib/rubygems/resolver/index_specification.rb | 5 +- lib/rubygems/source.rb | 4 +- lib/rubygems/test_case.rb | 22 ++++-- lib/rubygems/text.rb | 41 +++++------ lib/rubygems/unknown_command_spell_checker.rb | 21 ++++++ .../data/null-required-rubygems-version.gemspec.rz | Bin 0 -> 421 bytes test/rubygems/test_config.rb | 4 +- test/rubygems/test_gem_command_manager.rb | 18 ++++- test/rubygems/test_gem_commands_setup_command.rb | 58 ++++++--------- test/rubygems/test_gem_commands_update_command.rb | 4 +- test/rubygems/test_gem_dependency_installer.rb | 74 +++++++------------ test/rubygems/test_gem_ext_builder.rb | 12 ++-- test/rubygems/test_gem_ext_cmake_builder.rb | 6 +- test/rubygems/test_gem_ext_configure_builder.rb | 4 +- test/rubygems/test_gem_remote_fetcher.rb | 2 +- test/rubygems/test_gem_requirement.rb | 1 - test/rubygems/test_gem_resolver_best_set.rb | 23 ++++++ test/rubygems/test_gem_specification.rb | 4 +- test/rubygems/test_gem_text.rb | 6 ++ 31 files changed, 258 insertions(+), 217 deletions(-) create mode 100644 lib/rubygems/unknown_command_spell_checker.rb create mode 100644 test/rubygems/data/null-required-rubygems-version.gemspec.rz diff --git a/lib/rubygems.rb b/lib/rubygems.rb index fe52d72cc3..3f2184b504 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -8,7 +8,7 @@ require 'rbconfig' module Gem - VERSION = "3.2.3".freeze + VERSION = "3.3.0.dev".freeze end # Must be first since it unloads the prelude from 1.9.2 diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb index 97e52544ca..2409550882 100644 --- a/lib/rubygems/command_manager.rb +++ b/lib/rubygems/command_manager.rb @@ -188,7 +188,7 @@ class Gem::CommandManager raise Gem::CommandLineError, "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]" elsif possibilities.empty? - raise Gem::CommandLineError, "Unknown command #{cmd_name}" + raise Gem::UnknownCommandError.new(cmd_name) end self[possibilities.first] diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb index 70825b88fd..a528ea087e 100644 --- a/lib/rubygems/commands/install_command.rb +++ b/lib/rubygems/commands/install_command.rb @@ -27,6 +27,8 @@ class Gem::Commands::InstallCommand < Gem::Command :without_groups => [], }) + defaults.merge!(install_update_options) + super 'install', 'Install a gem into the local repository', defaults add_install_update_options @@ -43,8 +45,9 @@ class Gem::Commands::InstallCommand < Gem::Command end def defaults_str # :nodoc: - "--both --version '#{Gem::Requirement.default}' --document --no-force\n" + - "--install-dir #{Gem.dir} --lock" + "--both --version '#{Gem::Requirement.default}' --no-force\n" + + "--install-dir #{Gem.dir} --lock\n" + + install_update_defaults_str end def description # :nodoc: diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb index 22b1371a1f..47e215c149 100644 --- a/lib/rubygems/commands/setup_command.rb +++ b/lib/rubygems/commands/setup_command.rb @@ -6,8 +6,8 @@ require 'rubygems/command' # RubyGems checkout or tarball. class Gem::Commands::SetupCommand < Gem::Command - HISTORY_HEADER = /^===\s*[\d.a-zA-Z]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze - VERSION_MATCHER = /^===\s*([\d.a-zA-Z]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze + HISTORY_HEADER = /^#\s*[\d.a-zA-Z]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze + VERSION_MATCHER = /^#\s*([\d.a-zA-Z]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze ENV_PATHS = %w[/usr/bin/env /bin/env].freeze @@ -167,19 +167,18 @@ By default, this RubyGems will install gem as: extend MakeDirs lib_dir, bin_dir = make_destination_dirs install_destdir - man_dir = make_man_dir install_destdir + man_dir = generate_default_man_dir install_destdir install_lib lib_dir - install_man man_dir - install_executables bin_dir remove_old_bin_files bin_dir remove_old_lib_files lib_dir - remove_old_man_files man_dir + # Can be removed one we drop support for bundler 2.2.3 (the last version installing man files to man_dir) + remove_old_man_files man_dir if man_dir && File.exist?(man_dir) install_default_bundler_gem bin_dir @@ -330,21 +329,6 @@ By default, this RubyGems will install gem as: end end - def install_man(man_dir) - mans = { 'Bundler' => 'bundler/man' } - mans.each do |tool, path| - say "Installing #{tool} manpages" if @verbose - - bundler_man1_files = bundler_man1_files_in(path) - bundler_man5_files = bundler_man5_files_in(path) - - Dir.chdir path do - install_file_list(bundler_man1_files, "#{man_dir}/man1") - install_file_list(bundler_man5_files, "#{man_dir}/man5") - end - end - end - def install_rdoc gem_doc_dir = File.join Gem.dir, 'doc' rubygems_name = "rubygems-#{Gem::VERSION}" @@ -391,9 +375,7 @@ By default, this RubyGems will install gem as: specs_dir = File.join(options[:destdir], specs_dir) unless Gem.win_platform? mkdir_p specs_dir, :mode => 0755 - bundler_spec = Gem::Specification.load("bundler/bundler.gemspec") - bundler_spec.files = Dir.chdir("bundler") { Dir["{*.md,{lib,exe,man}/**/*}"] } - bundler_spec.executables -= %w[bundler bundle_ruby] + bundler_spec = Dir.chdir("bundler") { Gem::Specification.load("bundler.gemspec") } # Remove bundler-*.gemspec in default specification directory. Dir.entries(specs_dir). @@ -455,19 +437,12 @@ By default, this RubyGems will install gem as: return lib_dir, bin_dir end - def make_man_dir(install_destdir) - man_dir = generate_default_man_dir(install_destdir) - - mkdir_p man_dir, :mode => 0755 - - return man_dir - end - def generate_default_man_dir(install_destdir) prefix = options[:prefix] if prefix.empty? man_dir = RbConfig::CONFIG['mandir'] + return unless man_dir else man_dir = File.join prefix, 'man' end @@ -518,20 +493,6 @@ By default, this RubyGems will install gem as: end end - # for installation of bundler as default gems - def bundler_man1_files_in(dir) - Dir.chdir dir do - Dir['bundle*.1'] - end - end - - # for installation of bundler as default gems - def bundler_man5_files_in(dir) - Dir.chdir dir do - Dir['gemfile.5'] - end - end - def remove_old_bin_files(bin_dir) old_bin_files = { 'gem_mirror' => 'gem mirror', @@ -585,33 +546,26 @@ abort "#{deprecation_message}" end end - def remove_old_man_files(man_dir) - man_dirs = { man_dir => "bundler/man" } - man_dirs.each do |old_man_dir, new_man_dir| - man1_files = bundler_man1_files_in(new_man_dir) - - old_man1_dir = "#{old_man_dir}/man1" - old_man1_files = bundler_man1_files_in(old_man1_dir) - old_man1_files += Dir.chdir(old_man1_dir) { Dir["bundle*.1.{txt,ronn}"] } + def remove_old_man_files(old_man_dir) + old_man1_dir = "#{old_man_dir}/man1" - man1_to_remove = old_man1_files - man1_files + if File.exist?(old_man1_dir) + man1_to_remove = Dir.chdir(old_man1_dir) { Dir["bundle*.1{,.txt,.ronn}"] } remove_file_list(man1_to_remove, old_man1_dir) + end - man5_files = bundler_man5_files_in(new_man_dir) - - old_man5_dir = "#{old_man_dir}/man5" - old_man5_files = bundler_man5_files_in(old_man5_dir) - old_man5_files += Dir.chdir(old_man5_dir) { Dir["gemfile.5.{txt,ronn}"] } + old_man5_dir = "#{old_man_dir}/man5" - man5_to_remove = old_man5_files - man5_files + if File.exist?(old_man5_dir) + man5_to_remove = Dir.chdir(old_man5_dir) { Dir["gemfile.5{,.txt,.ronn}"] } remove_file_list(man5_to_remove, old_man5_dir) end end def show_release_notes - release_notes = File.join Dir.pwd, 'History.txt' + release_notes = File.join Dir.pwd, 'CHANGELOG.md' release_notes = if File.exist? release_notes diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb index fcc52c293e..41770d9805 100644 --- a/lib/rubygems/commands/update_command.rb +++ b/lib/rubygems/commands/update_command.rb @@ -19,9 +19,13 @@ class Gem::Commands::UpdateCommand < Gem::Command attr_reader :updated # :nodoc: def initialize - super 'update', 'Update installed gems to the latest version', - :document => %w[rdoc ri], - :force => false + options = { + :force => false, + } + + options.merge!(install_update_options) + + super 'update', 'Update installed gems to the latest version', options add_install_update_options @@ -51,7 +55,8 @@ class Gem::Commands::UpdateCommand < Gem::Command end def defaults_str # :nodoc: - "--document --no-force --install-dir #{Gem.dir}" + "--no-force --install-dir #{Gem.dir}\n" + + install_update_defaults_str end def description # :nodoc: diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb index 804863f693..55755ddfba 100644 --- a/lib/rubygems/exceptions.rb +++ b/lib/rubygems/exceptions.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'rubygems/deprecate' +require 'rubygems/unknown_command_spell_checker' ## # Base exception class for RubyGems. All exception raised by RubyGems are a @@ -9,6 +10,30 @@ class Gem::Exception < RuntimeError; end class Gem::CommandLineError < Gem::Exception; end +class Gem::UnknownCommandError < Gem::Exception + attr_reader :unknown_command + + def initialize(unknown_command) + self.class.attach_correctable + + @unknown_command = unknown_command + super("Unknown command #{unknown_command}") + end + + def self.attach_correctable + return if defined?(@attached) + + if defined?(DidYouMean::SPELL_CHECKERS) && defined?(DidYouMean::Correctable) + DidYouMean::SPELL_CHECKERS['Gem::UnknownCommandError'] = + Gem::UnknownCommandSpellChecker + + prepend DidYouMean::Correctable + end + + @attached = true + end +end + class Gem::DependencyError < Gem::Exception; end class Gem::DependencyRemovalException < Gem::Exception; end diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb index f6de6a50d7..e089b3d57a 100644 --- a/lib/rubygems/ext/builder.rb +++ b/lib/rubygems/ext/builder.rb @@ -29,7 +29,7 @@ class Gem::Ext::Builder make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make' end - destdir = '"DESTDIR=%s"' % ENV['DESTDIR'] + destdir = 'DESTDIR=%s' % ENV['DESTDIR'] ['clean', '', 'install'].each do |target| # Pass DESTDIR via command line to override what's in MAKEFLAGS @@ -37,7 +37,7 @@ class Gem::Ext::Builder make_program, destdir, target, - ].join(' ').rstrip + ].reject(&:empty?) begin run(cmd, results, "make #{target}".rstrip, make_dir) rescue Gem::InstallError @@ -56,19 +56,21 @@ class Gem::Ext::Builder p(command) end results << "current directory: #{dir}" - results << (command.respond_to?(:shelljoin) ? command.shelljoin : command) + results << command.shelljoin require "open3" # Set $SOURCE_DATE_EPOCH for the subprocess. env = {'SOURCE_DATE_EPOCH' => Gem.source_date_epoch_string} - output, status = Open3.capture2e(env, *command, :chdir => dir) + output, status = begin + Open3.capture2e(env, *command, :chdir => dir) + rescue => error + raise Gem::InstallError, "#{command_name || class_name} failed#{error.message}" + end if verbose puts output else results << output end - rescue => error - raise Gem::InstallError, "#{command_name || class_name} failed#{error.message}" ensure ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps end diff --git a/lib/rubygems/ext/cmake_builder.rb b/lib/rubygems/ext/cmake_builder.rb index 2efec91f15..269e876cfa 100644 --- a/lib/rubygems/ext/cmake_builder.rb +++ b/lib/rubygems/ext/cmake_builder.rb @@ -4,8 +4,7 @@ require_relative '../command' class Gem::Ext::CmakeBuilder < Gem::Ext::Builder def self.build(extension, dest_path, results, args=[], lib_dir=nil, cmake_dir=Dir.pwd) unless File.exist?(File.join(cmake_dir, 'Makefile')) - cmd = "cmake . -DCMAKE_INSTALL_PREFIX=#{dest_path}" - cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty? + cmd = ["cmake", ".", "-DCMAKE_INSTALL_PREFIX=#{dest_path}", *Gem::Command.build_args] run cmd, results, class_name, cmake_dir end diff --git a/lib/rubygems/ext/configure_builder.rb b/lib/rubygems/ext/configure_builder.rb index 36a758989b..eb2f9fce61 100644 --- a/lib/rubygems/ext/configure_builder.rb +++ b/lib/rubygems/ext/configure_builder.rb @@ -8,8 +8,7 @@ class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder def self.build(extension, dest_path, results, args=[], lib_dir=nil, configure_dir=Dir.pwd) unless File.exist?(File.join(configure_dir, 'Makefile')) - cmd = "sh ./configure --prefix=#{dest_path}" - cmd << " #{args.join ' '}" unless args.empty? + cmd = ["sh", "./configure", "--prefix=#{dest_path}", *args] run cmd, results, class_name, configure_dir end diff --git a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb index ef1ad1edcb..54a3950b64 100644 --- a/lib/rubygems/install_update_options.rb +++ b/lib/rubygems/install_update_options.rb @@ -181,10 +181,19 @@ module Gem::InstallUpdateOptions end ## - # Default options for the gem install command. + # Default options for the gem install and update commands. + + def install_update_options + { + :document => %w[ri], + } + end + + ## + # Default description for the gem install and update commands. def install_update_defaults_str - '--document=rdoc,ri --wrappers' + '--document=ri' end end diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb index 285c80a95f..53e840978c 100644 --- a/lib/rubygems/remote_fetcher.rb +++ b/lib/rubygems/remote_fetcher.rb @@ -26,13 +26,15 @@ class Gem::RemoteFetcher ## # The URI which was being accessed when the exception happened. - attr_accessor :uri + attr_accessor :uri, :original_uri def initialize(message, uri) super message uri = parse_uri(uri) + @original_uri = uri.dup + uri.password = 'REDACTED' if uri.respond_to?(:password) && uri.password @uri = uri.to_s diff --git a/lib/rubygems/resolver/best_set.rb b/lib/rubygems/resolver/best_set.rb index b6a46a9403..300ea8015c 100644 --- a/lib/rubygems/resolver/best_set.rb +++ b/lib/rubygems/resolver/best_set.rb @@ -58,7 +58,7 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet # The calling method must retry the exception to repeat the lookup. def replace_failed_api_set(error) # :nodoc: - uri = error.uri + uri = error.original_uri uri = URI uri unless URI === uri uri = uri + "." diff --git a/lib/rubygems/resolver/index_specification.rb b/lib/rubygems/resolver/index_specification.rb index 45ff130a14..2aa6b419ba 100644 --- a/lib/rubygems/resolver/index_specification.rb +++ b/lib/rubygems/resolver/index_specification.rb @@ -43,9 +43,12 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification ## # The required_rubygems_version constraint for this specification # + # A fallback is included because the original version of the specification + # API didn't include that field, so some marshalled specs in the index have it + # set to +nil+. def required_rubygems_version - spec.required_rubygems_version + spec.required_rubygems_version || Gem::Requirement.default end def ==(other) diff --git a/lib/rubygems/source.rb b/lib/rubygems/source.rb index 4ae84cf532..37e03cdfae 100644 --- a/lib/rubygems/source.rb +++ b/lib/rubygems/source.rb @@ -35,6 +35,7 @@ class Gem::Source end @uri = uri + @update_cache = nil end ## @@ -118,7 +119,8 @@ class Gem::Source # Returns true when it is possible and safe to update the cache directory. def update_cache? - @update_cache ||= + return @update_cache unless @update_cache.nil? + @update_cache = begin File.stat(Gem.user_home).uid == Process.uid rescue Errno::ENOENT diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index a8261ef5c2..83a3c446a7 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -26,7 +26,20 @@ begin rescue LoadError end -require 'bundler' +if File.exist?(bundler_gemspec) + require_relative '../../bundler/lib/bundler' +else + require 'bundler' +end + +# Enable server plugin needed for bisection +if ENV["RG_BISECT_SERVER_PLUGIN"] + require ENV["RG_BISECT_SERVER_PLUGIN"] + + Minitest.extensions << "server" +end + +ENV["MT_NO_PLUGINS"] = "true" require 'minitest/autorun' @@ -250,16 +263,16 @@ class Gem::TestCase < Minitest::Test def assert_contains_make_command(target, output, msg = nil) if output.match(/\n/) msg = message(msg) do - 'Expected output containing make command "%s": %s' % [ + "Expected output containing make command \"%s\", but was \n\nBEGIN_OF_OUTPUT\n%sEND_OF_OUTPUT" % [ ('%s %s' % [make_command, target]).rstrip, - output.inspect, + output, ] end else msg = message(msg) do 'Expected make command "%s": %s' % [ ('%s %s' % [make_command, target]).rstrip, - output.inspect, + output, ] end end @@ -298,6 +311,7 @@ class Gem::TestCase < Minitest::Test ENV['XDG_CONFIG_HOME'] = nil ENV['XDG_DATA_HOME'] = nil ENV['SOURCE_DATE_EPOCH'] = nil + ENV['BUNDLER_VERSION'] = nil ENV["TMPDIR"] = @tmp @current_dir = Dir.pwd diff --git a/lib/rubygems/text.rb b/lib/rubygems/text.rb index 667811192d..acf25a0bcd 100644 --- a/lib/rubygems/text.rb +++ b/lib/rubygems/text.rb @@ -49,37 +49,38 @@ module Gem::Text end end - # This code is based directly on the Text gem implementation # Returns a value representing the "cost" of transforming str1 into str2 + # Vendored version of DidYouMean::Levenshtein.distance from the ruby/did_you_mean gem @ 1.4.0 + # https://git.io/JJgZI def levenshtein_distance(str1, str2) - s = str1 - t = str2 - n = s.length - m = t.length - - return m if (0 == n) - return n if (0 == m) + n = str1.length + m = str2.length + return m if n.zero? + return n if m.zero? d = (0..m).to_a x = nil - str1.each_char.each_with_index do |char1,i| - e = i + 1 + # to avoid duplicating an enumerable object, create it outside of the loop + str2_codepoints = str2.codepoints - str2.each_char.each_with_index do |char2,j| - cost = (char1 == char2) ? 0 : 1 + str1.each_codepoint.with_index(1) do |char1, i| + j = 0 + while j < m + cost = (char1 == str2_codepoints[j]) ? 0 : 1 x = min3( - d[j + 1] + 1, # insertion - e + 1, # deletion - d[j] + cost # substitution - ) - d[j] = e - e = x + d[j + 1] + 1, # insertion + i + 1, # deletion + d[j] + cost # substitution + ) + d[j] = i + i = x + + j += 1 end - d[m] = x end - return x + x end end diff --git a/lib/rubygems/unknown_command_spell_checker.rb b/lib/rubygems/unknown_command_spell_checker.rb new file mode 100644 index 0000000000..ee5c2fbe04 --- /dev/null +++ b/lib/rubygems/unknown_command_spell_checker.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class Gem::UnknownCommandSpellChecker + attr_reader :error + + def initialize(error) + @error = error + end + + def corrections + @corrections ||= + spell_checker.correct(error.unknown_command).map(&:inspect) + end + + private + + def spell_checker + dictionary = Gem::CommandManager.instance.command_names + DidYouMean::SpellChecker.new(dictionary: dictionary) + end +end diff --git a/test/rubygems/data/null-required-rubygems-version.gemspec.rz b/test/rubygems/data/null-required-rubygems-version.gemspec.rz new file mode 100644 index 0000000000..db3d0af084 Binary files /dev/null and b/test/rubygems/data/null-required-rubygems-version.gemspec.rz differ diff --git a/test/rubygems/test_config.rb b/test/rubygems/test_config.rb index 015e2b1d8a..692d8af1ab 100644 --- a/test/rubygems/test_config.rb +++ b/test/rubygems/test_config.rb @@ -12,14 +12,14 @@ class TestConfig < Gem::TestCase end def test_good_rake_path_is_escaped - path = Gem::TestCase.class_eval('@@good_rake') + path = Gem::TestCase.class_variable_get(:@@good_rake) ruby, rake = path.shellsplit assert_equal(Gem.ruby, ruby) assert_match(/\/good_rake.rb\z/, rake) end def test_bad_rake_path_is_escaped - path = Gem::TestCase.class_eval('@@bad_rake') + path = Gem::TestCase.class_variable_get(:@@bad_rake) ruby, rake = path.shellsplit assert_equal(Gem.ruby, ruby) assert_match(/\/bad_rake.rb\z/, rake) diff --git a/test/rubygems/test_gem_command_manager.rb b/test/rubygems/test_gem_command_manager.rb index d4471b0b63..05a5d08fe7 100644 --- a/test/rubygems/test_gem_command_manager.rb +++ b/test/rubygems/test_gem_command_manager.rb @@ -50,13 +50,27 @@ class TestGemCommandManager < Gem::TestCase end def test_find_command_unknown - e = assert_raises Gem::CommandLineError do + e = assert_raises Gem::UnknownCommandError do @command_manager.find_command 'xyz' end assert_equal 'Unknown command xyz', e.message end + def test_find_command_unknown_suggestions + e = assert_raises Gem::UnknownCommandError do + @command_manager.find_command 'pish' + end + + message = 'Unknown command pish'.dup + + if RUBY_VERSION >= "2.4" && defined?(DidYouMean::SPELL_CHECKERS) && defined?(DidYouMean::Correctable) + message << "\nDid you mean? \"push\"" + end + + assert_equal message, e.message + end + def test_run_interrupt old_load_path = $:.dup $: << File.expand_path("test/rubygems", PROJECT_DIR) @@ -265,7 +279,7 @@ class TestGemCommandManager < Gem::TestCase #check defaults @command_manager.process_args %w[update] - assert_includes check_options[:document], 'rdoc' + assert_includes check_options[:document], 'ri' #check settings check_options = nil diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index afdc5d0979..29850c9074 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -24,14 +24,15 @@ class TestGemCommandsSetupCommand < Gem::TestCase lib/rubygems/test_case.rb lib/rubygems/ssl_certs/rubygems.org/foo.pem bundler/exe/bundle + bundler/exe/bundler bundler/lib/bundler.rb bundler/lib/bundler/b.rb + bundler/bin/bundler/man/bundle-b.1 bundler/lib/bundler/man/bundle-b.1.ronn + bundler/lib/bundler/man/gemfile.5 bundler/lib/bundler/man/gemfile.5.ronn bundler/lib/bundler/templates/.circleci/config.yml bundler/lib/bundler/templates/.travis.yml - bundler/man/bundle-b.1 - bundler/man/gemfile.5 ] create_dummy_files(filelist) @@ -41,7 +42,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase gemspec.name = "bundler" gemspec.version = BUNDLER_VERS gemspec.bindir = "exe" - gemspec.executables = ["bundle"] + gemspec.executables = ["bundle", "bundler"] File.open 'bundler/bundler.gemspec', 'w' do |io| io.puts gemspec.to_ruby @@ -135,6 +136,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase exec_line = out.shift until exec_line == "RubyGems installed the following executables:" assert_equal "\t#{default_gem_bin_path}", out.shift assert_equal "\t#{default_bundle_bin_path}", out.shift + assert_equal "\t#{default_bundler_bin_path}", out.shift end def test_env_shebang_flag @@ -152,6 +154,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase bin_env = win_platform? ? "" : %w[/usr/bin/env /bin/env].find {|f| File.executable?(f) } + " " assert_match %r{\A#!\s*#{bin_env}#{ruby_exec}}, File.read(default_gem_bin_path) assert_match %r{\A#!\s*#{bin_env}#{ruby_exec}}, File.read(default_bundle_bin_path) + assert_match %r{\A#!\s*#{bin_env}#{ruby_exec}}, File.read(default_bundler_bin_path) assert_match %r{\A#!\s*#{bin_env}#{ruby_exec}}, File.read(gem_bin_path) end @@ -160,16 +163,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase @cmd.files_in('lib').sort end - def test_bundler_man1_files_in - assert_equal %w[bundle-b.1], - @cmd.bundler_man1_files_in('bundler/man').sort - end - - def test_bundler_man5_files_in - assert_equal %w[gemfile.5], - @cmd.bundler_man5_files_in('bundler/man').sort - end - def test_install_lib @cmd.extend FileUtils @@ -187,19 +180,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase end end - def test_install_man - @cmd.extend FileUtils - - Dir.mktmpdir 'man' do |dir| - @cmd.install_man dir - - assert_path_exists File.join("#{dir}/man1", 'bundle-b.1') - refute_path_exists File.join("#{dir}/man1", 'bundle-b.1.ronn') - assert_path_exists File.join("#{dir}/man5", 'gemfile.5') - refute_path_exists File.join("#{dir}/man5", 'gemfile.5.ronn') - end - end - def test_install_default_bundler_gem @cmd.extend FileUtils @@ -308,8 +288,8 @@ class TestGemCommandsSetupCommand < Gem::TestCase gemfile_5_ronn = File.join man, 'man5', 'gemfile.5.ronn' gemfile_5_txt = File.join man, 'man5', 'gemfile.5.txt' - files_that_go = [bundle_b_1_txt, bundle_b_1_ronn, gemfile_5_txt, gemfile_5_ronn] - files_that_stay = [ruby_1, bundle_b_1, gemfile_5] + files_that_go = [bundle_b_1, bundle_b_1_txt, bundle_b_1_ronn, gemfile_5, gemfile_5_txt, gemfile_5_ronn] + files_that_stay = [ruby_1] create_dummy_files(files_that_go + files_that_stay) @@ -326,22 +306,22 @@ class TestGemCommandsSetupCommand < Gem::TestCase @cmd.options[:previous_version] = Gem::Version.new '2.0.2' - File.open 'History.txt', 'w' do |io| + File.open 'CHANGELOG.md', 'w' do |io| io.puts <<-HISTORY_TXT -=== #{Gem::VERSION} / 2013-03-26 +# #{Gem::VERSION} / 2013-03-26 -* Bug fixes: +## Bug fixes: * Fixed release note display for LANG=C when installing rubygems * π is tasty -=== 2.0.2 / 2013-03-06 +# 2.0.2 / 2013-03-06 -* Bug fixes: +## Bug fixes: * Other bugs fixed -=== 2.0.1 / 2013-03-05 +# 2.0.1 / 2013-03-05 -* Bug fixes: +## Bug fixes: * Yet more bugs fixed HISTORY_TXT end @@ -351,9 +331,9 @@ class TestGemCommandsSetupCommand < Gem::TestCase end expected = <<-EXPECTED -=== #{Gem::VERSION} / 2013-03-26 +# #{Gem::VERSION} / 2013-03-26 -* Bug fixes: +## Bug fixes: * Fixed release note display for LANG=C when installing rubygems * π is tasty @@ -410,4 +390,8 @@ class TestGemCommandsSetupCommand < Gem::TestCase def default_bundle_bin_path File.join @install_dir, 'bin', 'bundle' end + + def default_bundler_bin_path + File.join @install_dir, 'bin', 'bundler' + end end unless Gem.java_platform? diff --git a/test/rubygems/test_gem_commands_update_command.rb b/test/rubygems/test_gem_commands_update_command.rb index 749e9bee20..13cc10c298 100644 --- a/test/rubygems/test_gem_commands_update_command.rb +++ b/test/rubygems/test_gem_commands_update_command.rb @@ -552,7 +552,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase expected = { :args => [], - :document => %w[rdoc ri], + :document => %w[ri], :force => false, :system => true, } @@ -571,7 +571,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase expected = { :args => [], - :document => %w[rdoc ri], + :document => %w[ri], :force => false, :system => "1.3.7", } diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb index fe8a74c750..85dba54675 100644 --- a/test/rubygems/test_gem_dependency_installer.rb +++ b/test/rubygems/test_gem_dependency_installer.rb @@ -946,6 +946,31 @@ class TestGemDependencyInstaller < Gem::TestCase assert_equal %w[d-2], inst.installed_gems.map {|s| s.full_name } end + def test_install_legacy_spec_with_nil_required_rubygems_version + path = File.expand_path "../data/null-required-rubygems-version.gemspec.rz", __FILE__ + spec = Marshal.load Gem.read_binary(path) + def spec.validate(*args); end + + util_build_gem spec + + cache_file = File.join @tempdir, 'gems', "#{spec.original_name}.gem" + FileUtils.mkdir_p File.dirname cache_file + FileUtils.mv spec.cache_file, cache_file + + util_setup_spec_fetcher spec + + data = Gem.read_binary(cache_file) + + @fetcher.data['http://gems.example.com/gems/activesupport-1.0.0.gem'] = data + + dep = Gem::Dependency.new 'activesupport' + + inst = Gem::DependencyInstaller.new + inst.install dep + + assert_equal %w[activesupport-1.0.0], Gem::Specification.map(&:full_name) + end + def test_find_gems_gems_with_sources util_setup_gems @@ -1102,21 +1127,6 @@ class TestGemDependencyInstaller < Gem::TestCase assert_equal %w[a-1], requests end - def util_write_a1_bin - write_file File.join('gems', 'a-1', 'bin', 'a_bin') do |fp| - fp.puts "#!/usr/bin/ruby" - end - end - - def util_setup_c1_pre - @c1_pre, @c1_pre_gem = util_spec 'c', '1.a' do |s| - s.add_dependency 'a', '1.a' - s.add_dependency 'b', '1' - end - - util_reset_gems - end - def util_setup_d @d1, @d1_gem = util_gem 'd', '1' @d2, @d2_gem = util_gem 'd', '2' @@ -1124,43 +1134,13 @@ class TestGemDependencyInstaller < Gem::TestCase util_reset_gems end - def util_setup_wxyz - @x1_m, @x1_m_gem = util_spec 'x', '1' do |s| - s.platform = Gem::Platform.new %w[cpu my_platform 1] - end - - @x1_o, @x1_o_gem = util_spec 'x', '1' do |s| - s.platform = Gem::Platform.new %w[cpu other_platform 1] - end - - @w1, @w1_gem = util_spec 'w', '1', 'x' => nil - - @y1, @y1_gem = util_spec 'y', '1' - @y1_1_p, @y1_1_p_gem = util_spec 'y', '1.1' do |s| - s.platform = Gem::Platform.new %w[cpu my_platform 1] - end - - @z1, @z1_gem = util_spec 'z', '1', 'y' => nil - - util_reset_gems - end - def util_reset_gems @a1 ||= nil @b1 ||= nil @a1_pre ||= nil - @c1_pre ||= nil @d1 ||= nil @d2 ||= nil - @w1 ||= nil - @x1_m ||= nil - @x1_o ||= nil - @y1 ||= nil - @y1_1_p ||= nil - @z1 ||= nil - - util_setup_spec_fetcher(*[@a1, @a1_pre, @b1, @c1_pre, - @d1, @d2, @x1_m, @x1_o, @w1, @y1, - @y1_1_p, @z1].compact) + + util_setup_spec_fetcher(*[@a1, @a1_pre, @b1, @d1, @d2].compact) end end diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb index 6e6bf89f9c..0fe650b8a5 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -47,9 +47,9 @@ install: results = results.join("\n").b - assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$}, results - assert_match %r{"DESTDIR=#{ENV['DESTDIR']}"$}, results - assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" install$}, results + assert_match %r{DESTDIR\\=#{ENV['DESTDIR']} clean$}, results + assert_match %r{DESTDIR\\=#{ENV['DESTDIR']}$}, results + assert_match %r{DESTDIR\\=#{ENV['DESTDIR']} install$}, results if /nmake/ !~ results assert_match %r{^clean: destination$}, results @@ -76,9 +76,9 @@ install: results = results.join("\n").b - assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$}, results - assert_match %r{"DESTDIR=#{ENV['DESTDIR']}"$}, results - assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" install$}, results + assert_match %r{DESTDIR\\=#{ENV['DESTDIR']} clean$}, results + assert_match %r{DESTDIR\\=#{ENV['DESTDIR']}$}, results + assert_match %r{DESTDIR\\=#{ENV['DESTDIR']} install$}, results end def test_build_extensions diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb index e347359679..dffe4a7fb3 100644 --- a/test/rubygems/test_gem_ext_cmake_builder.rb +++ b/test/rubygems/test_gem_ext_cmake_builder.rb @@ -40,8 +40,7 @@ install (FILES test.txt DESTINATION bin) output = output.join "\n" - assert_match \ - %r{^cmake \. -DCMAKE_INSTALL_PREFIX=#{Regexp.escape @dest_path}}, output + assert_match %r{^cmake \. -DCMAKE_INSTALL_PREFIX\\=#{Regexp.escape @dest_path}}, output assert_match %r{#{Regexp.escape @ext}}, output assert_contains_make_command '', output assert_contains_make_command 'install', output @@ -58,11 +57,10 @@ install (FILES test.txt DESTINATION bin) output = output.join "\n" shell_error_msg = %r{(CMake Error: .*)} - sh_prefix_cmake = "cmake . -DCMAKE_INSTALL_PREFIX=" assert_match 'cmake failed', error.message - assert_match %r{^#{sh_prefix_cmake}#{Regexp.escape @dest_path}}, output + assert_match %r{^cmake . -DCMAKE_INSTALL_PREFIX\\=#{Regexp.escape @dest_path}}, output assert_match %r{#{shell_error_msg}}, output end diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb index a74f5ce055..6b11b0c2ab 100644 --- a/test/rubygems/test_gem_ext_configure_builder.rb +++ b/test/rubygems/test_gem_ext_configure_builder.rb @@ -28,7 +28,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext assert_match(/^current directory:/, output.shift) - assert_equal "sh ./configure --prefix=#{@dest_path}", output.shift + assert_equal "sh ./configure --prefix\\=#{@dest_path}", output.shift assert_equal "", output.shift assert_match(/^current directory:/, output.shift) assert_contains_make_command 'clean', output.shift @@ -50,7 +50,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase end shell_error_msg = %r{(\./configure: .*)|((?:[Cc]an't|cannot) open '?\./configure'?(?:: No such file or directory)?)} - sh_prefix_configure = "sh ./configure --prefix=" + sh_prefix_configure = "sh ./configure --prefix\\=" assert_match 'configure failed', error.message diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb index 371998497b..1c88e8d3e8 100644 --- a/test/rubygems/test_gem_remote_fetcher.rb +++ b/test/rubygems/test_gem_remote_fetcher.rb @@ -205,7 +205,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg== @test_data end - raise Gem::RemoteFetcher::FetchError.new("haha!", nil) + raise Gem::RemoteFetcher::FetchError.new("haha!", '') end end diff --git a/test/rubygems/test_gem_requirement.rb b/test/rubygems/test_gem_requirement.rb index 20127a1e15..670defe330 100644 --- a/test/rubygems/test_gem_requirement.rb +++ b/test/rubygems/test_gem_requirement.rb @@ -253,7 +253,6 @@ class TestGemRequirement < Gem::TestCase assert_satisfied_by "1.0.0.0", "= 1.0" assert_satisfied_by "10.3.2", "!= 9.3.4" assert_satisfied_by "10.3.2", "> 9.3.2" - assert_satisfied_by "10.3.2", "> 9.3.2" assert_satisfied_by " 9.3.2", ">= 9.3.2" assert_satisfied_by "9.3.2 ", ">= 9.3.2" assert_satisfied_by "", "= 0" diff --git a/test/rubygems/test_gem_resolver_best_set.rb b/test/rubygems/test_gem_resolver_best_set.rb index 657ad33387..019ca70499 100644 --- a/test/rubygems/test_gem_resolver_best_set.rb +++ b/test/rubygems/test_gem_resolver_best_set.rb @@ -132,4 +132,27 @@ class TestGemResolverBestSet < Gem::TestCase assert_equal error, e end + + def test_replace_failed_api_set_uri_with_credentials + set = @DR::BestSet.new + + api_uri = URI(@gem_repo) + './info/' + api_uri.user = 'user' + api_uri.password = 'pass' + api_set = Gem::Resolver::APISet.new api_uri + + set.sets << api_set + + error_uri = api_uri + 'a' + + error = Gem::RemoteFetcher::FetchError.new 'bogus', error_uri + + set.replace_failed_api_set error + + assert_equal 1, set.sets.size + + refute_includes set.sets, api_set + + assert_kind_of Gem::Resolver::IndexSet, set.sets.first + end end diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb index 76072184bd..374d58d38f 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -1200,10 +1200,8 @@ dependencies: [] Gem.platforms = orig_platform end - DATA_PATH = File.expand_path "../data", __FILE__ - def test_handles_private_null_type - path = File.join DATA_PATH, "null-type.gemspec.rz" + path = File.expand_path "../data/null-type.gemspec.rz", __FILE__ data = Marshal.load Gem::Util.inflate(Gem.read_binary(path)) diff --git a/test/rubygems/test_gem_text.rb b/test/rubygems/test_gem_text.rb index d8e4b75f3a..d9f024f1e6 100644 --- a/test/rubygems/test_gem_text.rb +++ b/test/rubygems/test_gem_text.rb @@ -83,6 +83,12 @@ Without the wrapping, the text might not look good in the RSS feed. assert_equal 7, levenshtein_distance("zentest", "xxxxxxx") end + def test_levenshtein_distance_all + assert_equal 6, levenshtein_distance("algorithm", "altruistic") + assert_equal 3, levenshtein_distance("saturday", "sunday") + assert_equal 3, levenshtein_distance("kitten", "sitting") + end + def test_truncate_text assert_equal "abc", truncate_text("abc", "desc") assert_equal "Truncating desc to 2 characters:\nab", truncate_text("abc", "desc", 2) -- cgit v1.2.3