rubygems-update 2.7.3 → 2.7.4.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc0054d823436dc260e3e3365622dc5bc173ed4855a2f22fdcaac219929b080e
-  data.tar.gz: 6257d0503e5ca25f0601bec2600de2599c1815014fd866ae040313ded19be794
+  metadata.gz: 63ff9e604a757363d9926d8ef215fbe51d795b9d93206eaaed9e4837f7591066
+  data.tar.gz: 2bf3a54bc891263ceecef4ac5376eb30019680610c477ee4bd35d7bd8e2f499e
 SHA512:
-  metadata.gz: 0041f39fec2a3abb43bf7eca6d3c82f883ca760fb2b4d9b4cc0539d9fa6f3a0f1d80bca636f49ab2960478c921d4b8513e135ae62893c592aa5760d8a2b9226d
-  data.tar.gz: 5a2e0146149449fd9bb43e57efc2d0835e36fddff60a07ff5714d1f9737efe087505ba9fc40d256d155621c131a94f8e487255e17d67c105b46ac86eb6276d2a
+  metadata.gz: 5fcfed1779678c1205d2b1f1d3b8db19dec0ac2fce2b012c01e9c11fcf141ba3f66a6f500a3849be680c3585d5c40e3142475043dd6d192b5d5b584f18f170fb
+  data.tar.gz: 4caae01296d1578aa96b937124b71af579ef494ab1fcd45781a8c16f3d751e8b3b8c70755b36f8351ff8afa063773dcef0e954b1c8287a8f65838600622fcbce

data/.travis.yml

@@ -18,9 +18,9 @@ rvm:
 - 1.9.3
 - 2.0.0
 - 2.1.10
-- 2.2.8
-- 2.3.5
-- 2.4.2
+- 2.2.9
+- 2.3.6
+- 2.4.3
 - ruby-head
 env:
   - "TEST_TOOL=rubygems YAML=syck"
@@ -38,11 +38,11 @@ matrix:
       env: "TEST_TOOL=rubygems YAML=syck"
     - rvm: 2.1.10
       env: "TEST_TOOL=rubygems YAML=syck"
-    - rvm: 2.2.7
+    - rvm: 2.2.9
       env: "TEST_TOOL=rubygems YAML=syck"
-    - rvm: 2.3.4
+    - rvm: 2.3.6
       env: "TEST_TOOL=rubygems YAML=syck"
-    - rvm: 2.4.1
+    - rvm: 2.4.3
       env: "TEST_TOOL=rubygems YAML=syck"
     - rvm: ruby-head
       env: "TEST_TOOL=rubygems YAML=syck"

data/lib/rubygems.rb

@@ -10,7 +10,7 @@ require 'rbconfig'
 require 'thread'
 
 module Gem
-  VERSION = "2.7.3"
+  VERSION = "2.7.4.pre1"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -161,7 +161,7 @@ module Gem
   # these are defined in Ruby 1.8.7, hence the need for this convoluted setup.
 
   READ_BINARY_ERRORS = begin
-    read_binary_errors = [Errno::EACCES, Errno::EROFS]
+    read_binary_errors = [Errno::EACCES, Errno::EROFS, Errno::ENOSYS]
     read_binary_errors << Errno::ENOTSUP if Errno.const_defined?(:ENOTSUP)
     read_binary_errors
   end.freeze
@@ -171,7 +171,7 @@ module Gem
   # these are defined in Ruby 1.8.7.
 
   WRITE_BINARY_ERRORS = begin
-    write_binary_errors = []
+    write_binary_errors = [Errno::ENOSYS]
     write_binary_errors << Errno::ENOTSUP if Errno.const_defined?(:ENOTSUP)
     write_binary_errors
   end.freeze

data/lib/rubygems/command.rb

@@ -300,7 +300,10 @@ class Gem::Command
 
     options[:build_args] = build_args
 
-    self.ui = Gem::SilentUI.new if options[:silent]
+    if options[:silent]
+      old_ui = self.ui
+      self.ui = ui = Gem::SilentUI.new
+    end
 
     if options[:help] then
       show_help
@@ -309,6 +312,11 @@ class Gem::Command
     else
       execute
     end
+  ensure
+    if ui
+      self.ui = old_ui
+      ui.close
+    end
   end
 
   ##

data/lib/rubygems/commands/setup_command.rb

@@ -359,6 +359,8 @@ By default, this RubyGems will install gem as:
     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]
+
+    # Remove bundler-*.gemspec in default specification directory.
     Dir.entries(Gem::Specification.default_specifications_dir).
       select {|gs| gs.start_with?("bundler-") }.
       each {|gs| File.delete(File.join(Gem::Specification.default_specifications_dir, gs)) }
@@ -368,9 +370,16 @@ By default, this RubyGems will install gem as:
 
     bundler_spec = Gem::Specification.load(default_spec_path)
 
+    # Remove gemspec that was same version of vendored bundler.
+    normal_gemspec = File.join(Gem.default_dir, "specifications", "bundler-#{bundler_spec.version}.gemspec")
+    if File.file? normal_gemspec
+      File.delete normal_gemspec
+    end
+
+    # Remove gem files that were same version of vendored bundler.
     if File.directory? bundler_spec.gems_dir
       Dir.entries(bundler_spec.gems_dir).
-        select {|default_gem| File.basename(default_gem).match(/^bundler-#{Gem::Version::VERSION_PATTERN}$/) }.
+        select {|default_gem| File.basename(default_gem) == "bundler-#{bundler_spec.version}" }.
         each {|default_gem| rm_r File.join(bundler_spec.gems_dir, default_gem) }
     end
 

data/test/rubygems/test_gem_commands_setup_command.rb

@@ -6,6 +6,8 @@ require 'rubygems/commands/setup_command'
 
 class TestGemCommandsSetupCommand < Gem::TestCase
 
+  BUNDLER_VERS = `gem list -e bundler`[/([^() ]+)\)\Z/, 1] || "1.16.0"
+
   def setup
     super
 
@@ -41,10 +43,16 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     end
 
     open(File.join(Gem::Specification.default_specifications_dir, "bundler-1.15.4.gemspec"), 'w') do |io|
-      io.puts '# bundler'
+      gemspec.version = "1.15.4"
+      io.puts gemspec.to_ruby
     end
 
     FileUtils.mkdir_p File.join(Gem.default_dir, "specifications")
+
+    open(File.join(Gem.default_dir, "specifications", "bundler-#{BUNDLER_VERS}.gemspec"), 'w') do |io|
+      io.puts '# bundler-1.16.1'
+    end
+
     open(File.join(Gem.default_dir, "specifications", "bundler-audit-1.0.0.gemspec"), 'w') do |io|
       io.puts '# bundler-audit'
     end
@@ -133,13 +141,25 @@ class TestGemCommandsSetupCommand < Gem::TestCase
 
     default_dir = Gem::Specification.default_specifications_dir
 
+    # expect to remove other versions of bundler gemspecs on default specification directory.
     refute_path_exists File.join(default_dir, "bundler-1.15.4.gemspec")
-    refute_path_exists 'default/gems/bundler-1.15.4'
-
-    assert_path_exists File.join(default_dir, "bundler-1.16.0.gemspec")
-    assert_path_exists 'default/gems/bundler-1.16.0'
+    assert_path_exists File.join(default_dir, "bundler-#{BUNDLER_VERS}.gemspec")
 
+    # expect to not remove bundler-* gemspecs.
     assert_path_exists File.join(Gem.default_dir, "specifications", "bundler-audit-1.0.0.gemspec")
+
+    # expect to remove normal gem that was same version. because it's promoted default gems.
+    refute_path_exists File.join(Gem.default_dir, "specifications", "bundler-#{BUNDLER_VERS}.gemspec")
+
+    # expect to install default gems. It location was `site_ruby` direcotry on real world.
+    assert_path_exists "default/gems/bundler-#{BUNDLER_VERS}"
+
+    # expect to not remove other versions of bundler on `site_ruby`
+    assert_path_exists 'default/gems/bundler-1.15.4'
+
+    # TODO: We need to assert to remove same version of bundler on gem_dir direcotry(It's not site_ruby dir)
+
+    # expect to not remove bundler-* direcotyr.
     assert_path_exists 'default/gems/bundler-audit-1.0.0'
   end if Gem::USE_BUNDLER_FOR_GEMDEPS
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.4.pre1
 platform: ruby
 authors:
 - Jim Weirich
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -803,7 +803,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: ''