rubygems-update 3.2.0.rc.1 → 3.2.0.rc.2

data/test/rubygems/test_gem_doctor.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/doctor'
 
 class TestGemDoctor < Gem::TestCase
-
   def gem(name)
     spec = quick_gem name do |gem|
       gem.files = %W[lib/#{name}.rb Rakefile]
@@ -192,5 +191,4 @@ Removed file plugins/a_badly_named_file.rb
 
     assert doctor.gem_repository?, 'gems installed'
   end
-
 end

data/test/rubygems/test_gem_ext_builder.rb

@@ -4,7 +4,6 @@ require 'rubygems/ext'
 require 'rubygems/installer'
 
 class TestGemExtBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -48,7 +47,7 @@ install:
       Gem::Ext::Builder.make @dest_path, results
     end
 
-    results = results.join "\n"
+    results = results.join("\n").b
 
     assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$},   results
     assert_match %r{"DESTDIR=#{ENV['DESTDIR']}"$},         results
@@ -79,7 +78,7 @@ install:
       Gem::Ext::Builder.make @dest_path, results
     end
 
-    results = results.join "\n"
+    results = results.join("\n").b
 
     assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$},   results
     assert_match %r{"DESTDIR=#{ENV['DESTDIR']}"$},         results
@@ -134,7 +133,6 @@ install:
 
   def test_build_extensions_install_ext_only
     class << Gem
-
       alias orig_install_extension_in_lib install_extension_in_lib
 
       remove_method :install_extension_in_lib
@@ -142,7 +140,6 @@ install:
       def Gem.install_extension_in_lib
         false
       end
-
     end
 
     @spec.extensions << 'ext/extconf.rb'
@@ -179,11 +176,9 @@ install:
     refute_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
   ensure
     class << Gem
-
       remove_method :install_extension_in_lib
 
       alias install_extension_in_lib orig_install_extension_in_lib
-
     end
   end
 
@@ -317,5 +312,4 @@ install:
 
     assert_equal %w[--with-foo-dir=/nonexistent], builder.build_args
   end
-
 end unless Gem.java_platform?

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtCmakeBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -87,5 +86,4 @@ install (FILES test.txt DESTINATION bin)
     assert_contains_make_command '', output
     assert_contains_make_command 'install', output
   end
-
 end

data/test/rubygems/test_gem_ext_configure_builder.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtConfigureBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -83,5 +82,4 @@ class TestGemExtConfigureBuilder < Gem::TestCase
     assert_contains_make_command '', output[4]
     assert_contains_make_command 'install', output[7]
   end
-
 end

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -4,7 +4,6 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtExtConfBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -240,5 +239,4 @@ end
       RbConfig::CONFIG.delete 'configure_args'
     end
   end
-
 end

data/test/rubygems/test_gem_ext_rake_builder.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtRakeBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -91,5 +90,4 @@ class TestGemExtRakeBuilder < Gem::TestCase
       EO_MKRF
     end
   end
-
 end

data/test/rubygems/test_gem_gem_runner.rb

@@ -2,13 +2,13 @@
 require 'rubygems/test_case'
 
 class TestGemGemRunner < Gem::TestCase
-
   def setup
     super
 
     require 'rubygems/command'
     @orig_args = Gem::Command.build_args
     @orig_specific_extra_args = Gem::Command.specific_extra_args_hash.dup
+    @orig_extra_args = Gem::Command.extra_args.dup
 
     require 'rubygems/gem_runner'
     @runner = Gem::GemRunner.new
@@ -19,6 +19,7 @@ class TestGemGemRunner < Gem::TestCase
 
     Gem::Command.build_args = @orig_args
     Gem::Command.specific_extra_args_hash = @orig_specific_extra_args
+    Gem::Command.extra_args = @orig_extra_args
   end
 
   def test_do_configuration
@@ -108,5 +109,4 @@ class TestGemGemRunner < Gem::TestCase
 
     assert_empty @ui.error
   end
-
 end

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -5,7 +5,6 @@ require 'rubygems/command'
 require 'rubygems/gemcutter_utilities'
 
 class TestGemGemcutterUtilities < Gem::TestCase
-
   def setup
     super
 
@@ -262,5 +261,4 @@ class TestGemGemcutterUtilities < Gem::TestCase
       @cmd.verify_api_key :missing
     end
   end
-
 end

data/test/rubygems/test_gem_impossible_dependencies_error.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemImpossibleDependenciesError < Gem::TestCase
-
   def test_message_conflict
     request = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
 
@@ -57,5 +56,4 @@ rye-0.9.8 requires net-ssh (>= 2.0.13) but it conflicted:
 
     assert_equal expected, error.message
   end
-
 end

data/test/rubygems/test_gem_indexer.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/indexer'
 
 class TestGemIndexer < Gem::TestCase
-
   def setup
     super
 
@@ -355,5 +354,4 @@ class TestGemIndexer < Gem::TestCase
     file = File.join dir, name
     refute File.exist?(file), "#{file} exists"
   end
-
 end

data/test/rubygems/test_gem_install_update_options.rb

@@ -5,7 +5,6 @@ require 'rubygems/command'
 require 'rubygems/dependency_installer'
 
 class TestGemInstallUpdateOptions < Gem::InstallerTestCase
-
   def setup
     super
 
@@ -193,5 +192,4 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
     assert_equal true, @cmd.options[:post_install_message]
   end
-
 end

data/test/rubygems/test_gem_installer.rb

@@ -2,7 +2,6 @@
 require 'rubygems/installer_test_case'
 
 class TestGemInstaller < Gem::InstallerTestCase
-
   def setup
     super
     common_installer_setup
@@ -197,7 +196,7 @@ gem 'other', version
     bin_dir = installer.bin_dir
 
     if Gem.win_platform?
-      bin_dir = bin_dir.downcase.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
+      bin_dir = bin_dir.downcase
     end
 
     orig_PATH, ENV['PATH'] =
@@ -208,6 +207,16 @@ gem 'other', version
     end
 
     assert_empty @ui.error
+
+    return unless win_platform?
+
+    ENV['PATH'] = [orig_PATH, bin_dir.tr(File::SEPARATOR, File::ALT_SEPARATOR)].join(File::PATH_SEPARATOR)
+
+    use_ui @ui do
+      installer.check_that_user_bin_dir_is_in_path
+    end
+
+    assert_empty @ui.error
   ensure
     ENV['PATH'] = orig_PATH
   end
@@ -240,7 +249,7 @@ gem 'other', version
     expected = installer.bin_dir
 
     if Gem.win_platform?
-      expected = expected.downcase.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
+      expected = expected.downcase
     end
 
     assert_match expected, @ui.error
@@ -767,6 +776,28 @@ gem 'other', version
     assert File.exist?(plugin_path), 'plugin not written to install_dir'
   end
 
+  def test_generate_plugins_with_user_install
+    spec = quick_gem 'a' do |s|
+      write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
+        io.write "puts __FILE__"
+      end
+
+      s.files += %w[lib/rubygems_plugin.rb]
+    end
+
+    util_build_gem spec
+
+    File.chmod(0555, Gem.plugindir)
+    system_path = File.join(Gem.plugindir, 'a_plugin.rb')
+    user_path = File.join(Gem.plugindir(Gem.user_dir), 'a_plugin.rb')
+    installer = util_installer spec, Gem.dir, :user
+
+    assert_equal spec, installer.install
+
+    assert !File.exist?(system_path), 'plugin not written to user plugins_dir'
+    assert File.exist?(user_path), 'plugin not written to user plugins_dir'
+  end
+
   def test_keeps_plugins_up_to_date
     # NOTE: version a-2 is already installed by setup hooks
 
@@ -2190,5 +2221,4 @@ gem 'other', version
   def mask
     0100755
   end
-
 end

data/test/rubygems/test_gem_local_remote_options.rb

@@ -4,7 +4,6 @@ require 'rubygems/local_remote_options'
 require 'rubygems/command'
 
 class TestGemLocalRemoteOptions < Gem::TestCase
-
   def setup
     super
 
@@ -130,5 +129,4 @@ class TestGemLocalRemoteOptions < Gem::TestCase
 
     assert_equal [@gem_repo], Gem.sources
   end
-
 end

data/test/rubygems/test_gem_name_tuple.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/name_tuple'
 
 class TestGemNameTuple < Gem::TestCase
-
   def test_full_name
     n = Gem::NameTuple.new "a", Gem::Version.new(0), "ruby"
     assert_equal "a-0", n.full_name
@@ -40,5 +39,4 @@ class TestGemNameTuple < Gem::TestCase
 
     assert_equal 1, a_p.<=>(a)
   end
-
 end

data/test/rubygems/test_gem_package.rb

@@ -4,7 +4,6 @@ require 'rubygems/package/tar_test_case'
 require 'digest'
 
 class TestGemPackage < Gem::Package::TarTestCase
-
   def setup
     super
 
@@ -92,15 +91,12 @@ class TestGemPackage < Gem::Package::TarTestCase
       'SHA512' => {
         'metadata.gz' => metadata_sha512,
         'data.tar.gz' => Digest::SHA512.hexdigest(tar),
-      }
-    }
-
-    if defined?(OpenSSL::Digest)
-      expected['SHA256'] = {
+      },
+      'SHA256' => {
         'metadata.gz' => metadata_sha256,
         'data.tar.gz' => Digest::SHA256.hexdigest(tar),
       }
-    end
+    }
 
     assert_equal expected, YAML.load(checksums)
   end
@@ -1069,11 +1065,22 @@ class TestGemPackage < Gem::Package::TarTestCase
 
     package = Gem::Package.new @gem
 
-    e = assert_raises Gem::Package::FormatError do
-      package.verify_entry entry
+    _, err = use_ui @ui do
+      e = nil
+
+      out_err = capture_io do
+        e = assert_raises ArgumentError do
+          package.verify_entry entry
+        end
+      end
+
+      assert_equal "whatever", e.message
+      assert_equal "full_name", e.backtrace_locations.first.label
+
+      out_err
     end
 
-    assert_equal "package is corrupt, exception while verifying: whatever (ArgumentError) in #{@gem}", e.message
+    assert_equal "Exception while verifying #{@gem}\n", err
 
     valid_metadata = ["metadata", "metadata.gz"]
     valid_metadata.each do |vm|
@@ -1162,5 +1169,4 @@ class TestGemPackage < Gem::Package::TarTestCase
 
     StringIO.new tgz_io.string
   end
-
 end

data/test/rubygems/test_gem_package_old.rb

@@ -5,7 +5,6 @@ unless Gem.java_platform? # jruby can't require the simple_gem file
   require 'rubygems/simple_gem'
 
   class TestGemPackageOld < Gem::TestCase
-
     def setup
       super
 
@@ -87,6 +86,5 @@ unless Gem.java_platform? # jruby can't require the simple_gem file
                    'and cannot be verified',
                    e.message
     end
-
   end
 end

data/test/rubygems/test_gem_package_tar_header.rb

@@ -3,7 +3,6 @@ require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
 class TestGemPackageTarHeader < Gem::Package::TarTestCase
-
   def setup
     super
 
@@ -223,5 +222,4 @@ Access_Points_09202018.csv
     assert_equal 0, tar_header.uid
     assert_equal 0, tar_header.gid
   end
-
 end

data/test/rubygems/test_gem_package_tar_reader.rb

@@ -3,7 +3,6 @@ require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
 class TestGemPackageTarReader < Gem::Package::TarTestCase
-
   def test_each_entry
     tar = tar_dir_header "foo", "bar", 0, Time.now
     tar << tar_file_header("bar", "baz", 0, 0, Time.now)
@@ -85,5 +84,4 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
   ensure
     io.close!
   end
-
 end

data/test/rubygems/test_gem_package_tar_reader_entry.rb

@@ -3,7 +3,6 @@ require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
 class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
-
   def setup
     super
 
@@ -150,5 +149,4 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
     assert_equal char, @entry.getc
   end
-
 end

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -4,7 +4,6 @@ require 'rubygems/package/tar_writer'
 require 'minitest/mock'
 
 class TestGemPackageTarWriter < Gem::Package::TarTestCase
-
   def setup
     super
 
@@ -330,5 +329,4 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
     end
     assert_includes exception.message, name
   end
-
 end