rubygems-update 2.5.1 → 2.5.2

data/lib/rubygems/exceptions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # TODO: the documentation in here is terrible.
 #
 # Each exception needs a brief description and the scenarios where it is
@@ -137,7 +138,7 @@ class Gem::ImpossibleDependenciesError < Gem::Exception
     requester  = requester ? requester.spec.full_name : 'The user'
     dependency = @request.dependency
 
-    message = "#{requester} requires #{dependency} but it conflicted:\n"
+    message = "#{requester} requires #{dependency} but it conflicted:\n".dup
 
     @conflicts.each do |_, conflict|
       message << conflict.explanation
@@ -267,4 +268,3 @@ end
 # Backwards compatible typo'd exception class for early RubyGems 2.0.x
 
 Gem::UnsatisfiableDepedencyError = Gem::UnsatisfiableDependencyError # :nodoc:
-

data/lib/rubygems/ext.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

data/lib/rubygems/ext/build_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Raised when there is an error while building extensions.
 

data/lib/rubygems/ext/builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

data/lib/rubygems/ext/cmake_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/command'
 
 class Gem::Ext::CmakeBuilder < Gem::Ext::Builder

data/lib/rubygems/ext/configure_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -11,9 +12,20 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
   FileEntry = FileUtils::Entry_ # :nodoc:
 
   def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
-    # relative path required as some versions of mktmpdir return an absolute
-    # path which breaks make if it includes a space in the name
-    tmp_dest = get_relative_path(Dir.mktmpdir(".gem.", "."))
+    tmp_dest = Dir.mktmpdir(".gem.", ".")
+
+    # Some versions of `mktmpdir` return absolute paths, which will break make
+    # if the paths contain spaces. However, on Ruby 1.9.x on Windows, relative
+    # paths cause all C extension builds to fail.
+    #
+    # As such, we convert to a relative path unless we are using Ruby 1.9.x on
+    # Windows. This means that when using Ruby 1.9.x on Windows, paths with
+    # spaces do not work.
+    #
+    # Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940
+    #
+    # TODO: Make this unconditional when rubygems no longer supports Ruby 1.9.x.
+    tmp_dest = get_relative_path(tmp_dest) unless Gem.win_platform? && RUBY_VERSION <= '2.0'
 
     t = nil
     Tempfile.open %w"siteconf .rb", "." do |siteconf|
@@ -80,4 +92,3 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
   end
 
 end
-

data/lib/rubygems/ext/rake_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

data/lib/rubygems/gem_runner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

data/lib/rubygems/gemcutter_utilities.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/remote_fetcher'
 
 ##
@@ -68,9 +69,14 @@ module Gem::GemcutterUtilities
       terminate_interaction 1 # TODO: question this
     end
 
-    if allowed_push_host and self.host != allowed_push_host
-      alert_error "#{self.host.inspect} is not allowed by the gemspec, which only allows #{allowed_push_host.inspect}"
-      terminate_interaction 1
+    if allowed_push_host
+      allowed_host_uri = URI.parse(allowed_push_host)
+      host_uri         = URI.parse(self.host)
+
+      unless (host_uri.scheme == allowed_host_uri.scheme) && (host_uri.host == allowed_host_uri.host)
+        alert_error "#{self.host.inspect} is not allowed by the gemspec, which only allows #{allowed_push_host.inspect}"
+        terminate_interaction 1
+      end
     end
 
     uri = URI.parse "#{self.host}/#{path}"

data/lib/rubygems/indexer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems'
 require 'rubygems/package'
 require 'time'

data/lib/rubygems/install_default_message.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems'
 require 'rubygems/user_interaction'
 

data/lib/rubygems/install_message.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems'
 require 'rubygems/user_interaction'
 

data/lib/rubygems/install_update_options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -173,6 +174,11 @@ module Gem::InstallUpdateOptions
                 "meet version requirements") do |value, options|
       options[:minimal_deps] = true
     end
+
+    add_option(:"Install/Update", "--[no-]post-install-message",
+                "Print post install message") do |value, options|
+      options[:post_install_message] = value
+    end
   end
 
   ##

data/lib/rubygems/installer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -212,7 +213,13 @@ class Gem::Installer
       next unless io.gets =~ /This file was generated by RubyGems/
 
       ruby_executable = true
-      existing = io.read.slice(/^gem (['"])(.*?)(\1),/, 2)
+      existing = io.read.slice(%r{
+          ^(
+            gem \s |
+            load \s Gem\.bin_path\(
+          )
+          (['"])(.*?)(\2),
+        }x, 3)
     end
 
     return if spec.name == existing
@@ -220,7 +227,7 @@ class Gem::Installer
     # somebody has written to RubyGems' directory, overwrite, too bad
     return if Gem.default_bindir != @bin_dir and not ruby_executable
 
-    question = "#{spec.name}'s executable \"#{filename}\" conflicts with "
+    question = "#{spec.name}'s executable \"#{filename}\" conflicts with ".dup
 
     if ruby_executable then
       question << existing
@@ -296,7 +303,7 @@ class Gem::Installer
       write_cache_file
     end
 
-    say spec.post_install_message unless spec.post_install_message.nil?
+    say spec.post_install_message if options[:post_install_message] && !spec.post_install_message.nil?
 
     Gem::Installer.install_lock.synchronize { Gem::Specification.reset }
 
@@ -626,7 +633,8 @@ class Gem::Installer
       :bin_dir      => nil,
       :env_shebang  => false,
       :force        => false,
-      :only_install_dir => false
+      :only_install_dir => false,
+      :post_install_message => true
     }.merge options
 
     @env_shebang         = options[:env_shebang]
@@ -711,7 +719,6 @@ if ARGV.first
   end
 end
 
-gem '#{spec.name}', version
 load Gem.bin_path('#{spec.name}', '#{bin_file_name}', version)
 TEXT
   end

data/lib/rubygems/installer_test_case.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/installer'
 

data/lib/rubygems/local_remote_options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -23,7 +24,7 @@ module Gem::LocalRemoteOptions
         raise OptionParser::InvalidArgument, value
       end
 
-      unless ['http', 'https', 'file'].include?(uri.scheme)
+      unless ['http', 'https', 'file', 's3'].include?(uri.scheme)
          raise OptionParser::InvalidArgument, value
       end
 

data/lib/rubygems/mock_gem_ui.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'stringio'
 require 'rubygems/user_interaction'
 

data/lib/rubygems/name_tuple.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 #
 # Represents a gem of name +name+ at +version+ of +platform+. These
@@ -53,7 +54,7 @@ class Gem::NameTuple
       "#{@name}-#{@version}"
     else
       "#{@name}-#{@version}-#{@platform}"
-    end.untaint
+    end.dup.untaint
   end
 
   ##

data/lib/rubygems/package.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # -*- coding: utf-8 -*-
 #--
 # Copyright (C) 2004 Mauricio Julio Fernández Pradier
@@ -58,7 +59,7 @@ class Gem::Package
       if source
         @path = source.path
 
-        message << " in #{path}" if path
+        message = message + " in #{path}" if path
       end
 
       super message
@@ -382,7 +383,7 @@ EOM
           FileUtils.chmod entry.header.mode, destination
         end if entry.file?
 
-        File.symlink(install_location(entry.header.linkname, destination_dir), destination) if entry.symlink?
+        File.symlink(entry.header.linkname, destination) if entry.symlink?
 
         verbose destination
       end

data/lib/rubygems/package/digest_io.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # IO wrapper that creates digests of contents written to the IO it wraps.
 

data/lib/rubygems/package/file_source.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The primary source of gems is a file on disk, including all usages
 # internal to rubygems.

data/lib/rubygems/package/io_source.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Supports reading and writing gems from/to a generic IO object.  This is
 # useful for other applications built on top of rubygems, such as

data/lib/rubygems/package/old.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -63,7 +64,7 @@ class Gem::Package::Old < Gem::Package
 
         destination = install_location full_name, destination_dir
 
-        file_data = ''
+        file_data = String.new
 
         read_until_dashes io do |line|
           file_data << line
@@ -94,7 +95,7 @@ class Gem::Package::Old < Gem::Package
   # Reads the file list section from the old-format gem +io+
 
   def file_list io # :nodoc:
-    header = ''
+    header = String.new
 
     read_until_dashes io do |line|
       header << line
@@ -134,7 +135,7 @@ class Gem::Package::Old < Gem::Package
 
     return @spec if @spec
 
-    yaml = ''
+    yaml = String.new
 
     @gem.with_read_io do |io|
       skip_ruby io
@@ -175,4 +176,3 @@ class Gem::Package::Old < Gem::Package
   end
 
 end
-

data/lib/rubygems/package/source.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Gem::Package::Source # :nodoc:
 end
 

data/lib/rubygems/package/tar_header.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # -*- coding: utf-8 -*-
 #--
 # Copyright (C) 2004 Mauricio Julio Fernández Pradier

data/lib/rubygems/package/tar_reader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # -*- coding: utf-8 -*-
 #--
 # Copyright (C) 2004 Mauricio Julio Fernández Pradier

data/lib/rubygems/package/tar_reader/entry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # -*- coding: utf-8 -*-
 #++
 # Copyright (C) 2004 Mauricio Julio Fernández Pradier

data/lib/rubygems/package/tar_test_case.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/package'
 

data/lib/rubygems/package/tar_writer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # -*- coding: utf-8 -*-
 #--
 # Copyright (C) 2004 Mauricio Julio Fernández Pradier

data/lib/rubygems/package_task.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2003, 2004 Jim Weirich, 2009 Eric Hodel
 #
 # Permission is hereby granted, free of charge, to any person obtaining

data/lib/rubygems/path_support.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 #
 # Gem::PathSupport facilitates the GEM_HOME and GEM_PATH environment settings
@@ -58,6 +59,9 @@ class Gem::PathSupport
         gem_path = gpaths.dup
       else
         gem_path = gpaths.split(Gem.path_separator)
+        if gpaths.end_with?(Gem.path_separator)
+          gem_path += default_path
+        end
       end
 
       if File::ALT_SEPARATOR then
@@ -68,13 +72,19 @@ class Gem::PathSupport
 
       gem_path << @home
     else
-      gem_path = Gem.default_path + [@home]
-
-      if defined?(APPLE_GEM_HOME)
-        gem_path << APPLE_GEM_HOME
-      end
+      gem_path = default_path
     end
 
     @path = gem_path.uniq
   end
+
+  # Return the default Gem path
+  def default_path
+    gem_path = Gem.default_path + [@home]
+
+    if defined?(APPLE_GEM_HOME)
+      gem_path << APPLE_GEM_HOME
+    end
+    gem_path
+  end
 end

data/lib/rubygems/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rubygems/deprecate"
 
 ##

data/lib/rubygems/psych_additions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This exists just to satisfy bugs in marshal'd gemspecs that
 # contain a reference to YAML::PrivateType. We prune these out
 # in Specification._load, but if we don't have the constant, Marshal

data/lib/rubygems/psych_tree.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Gem
   if defined? ::Psych::Visitors
     class NoAliasYAMLTree < Psych::Visitors::YAMLTree

data/lib/rubygems/rdoc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems'
 require 'rubygems/user_interaction'
 require 'fileutils'

data/lib/rubygems/remote_fetcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems'
 require 'rubygems/request'
 require 'rubygems/uri_formatter'

data/lib/rubygems/request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'net/http'
 require 'thread'
 require 'time'
@@ -155,7 +156,7 @@ class Gem::Request
           if Net::HTTPOK === incomplete_response
             reporter.fetch(file_name, incomplete_response.content_length)
             downloaded = 0
-            data = ''
+            data = String.new
 
             incomplete_response.read_body do |segment|
               data << segment
@@ -222,7 +223,7 @@ class Gem::Request
   end
 
   def user_agent
-    ua = "RubyGems/#{Gem::VERSION} #{Gem::Platform.local}"
+    ua = "RubyGems/#{Gem::VERSION} #{Gem::Platform.local}".dup
 
     ruby_version = RUBY_VERSION
     ruby_version += 'dev' if RUBY_PATCHLEVEL == -1