rubygems-update 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c9ce26cced47021965b48083bad67e6a3446f38
-  data.tar.gz: 43eddecbadeaaed4281749dbf511a0a4ff624e11
+  metadata.gz: 55828383c26eb529d41e882bc3bf284931fd84d1
+  data.tar.gz: a64439fc94a099fb4342ebb47e4361835d0b326f
 SHA512:
-  metadata.gz: afa7d31465c734e950668041ec7a5222aa5157ff20537f5cf6ecbfb26379738007702424fb7772b6f46ad9e8ae36f789f85762fb739bb6b3f1412d3c2010a4d6
-  data.tar.gz: fedcc37e374bcc683b8a660cd335e72c06dced37f668555fb984448f54a975e589001635e1d3bf3a1fe865897b59312eddd07938094d79df70046841645903f2
+  metadata.gz: 703c84109f6bab51f52d97cfda5dbed84401bd1284c0b8c387d5c1bbded19911060989f56b0927a2cf8200bc678fd7464e1f39150b68767c0bfc8181a7753cb3
+  data.tar.gz: 58a92fc46f3852195fc1dd2c437b0043245ed6ba3a2af7baf8fe0bee39d9532d88ea711fb8bcd4fa5b9c6f305f16fd34627edec685f42178b232a2fa2a7ca45b

data.tar.gz.sig

@@ -1 +1,2 @@
-g/�)l����9VF��kG<Iu�Z�9 ��F���
vƽ=�Ms?F�Vc�~|ns�[Uj�cZ_����=�q`(�<�+�Dx�5b	/����t���zVĔSJ���>�`�ċ{'a�vJ/$��HnR����ڿ�C�UC����F�#0� ��Gl��y��t���8�F_��<c����$z��u =�����x'�6u2ؖ�@Xc���~@W	�ܵ��'z�R��9ȔjY�-Ț$ʲ��ߵ:�W�Ee>26
+�f3�{��E�F�U9��������=ᔝ�aF�
+�N��!_j\�vp�C�����qOkd�7|s',n�i��ʓ#�̽]�B�V*O�=�5��UPb$���n2�����X��_0����~RӇ�9�|X�"`�MJ���"��D�O���%����3sS�X��`�C��B_mW~2,6ȃ���X®���	S��[܋�4�^*F��z�	�rCÏB��f�&�x~�����x�.b�

data/.autotest

@@ -37,6 +37,7 @@ class Autotest
   def path_to_classname s
     classname = old_path_to_classname(s.sub(/test.rubygems.test_/, ""))
     classname = classname.gsub('Rdoc', 'RDoc')
+    classname = classname.gsub('Api', 'API')
 
     classname
   end

data/History.txt

@@ -1,5 +1,37 @@
 # coding: UTF-8
 
+=== 2.0.2 / 2013-03-06
+
+* Bug fixes:
+  * SSL Certificates are now installed properly.  Fixes #491 by hemanth.hm
+  * Fixed HTTP to HTTPS upgrade for rubygems.org.
+
+=== 2.0.1 / 2013-03-05
+
+* Bug fixes:
+  * HTTPS URLs are preferred over HTTP URLs.  RubyGems will now attempt to
+    upgrade any HTTP source to HTTPS.  Credit to Alex Gaynor.
+  * Lazily load RubyGems.org API credentials to avoid failure during
+    RubyGems installation.  Bug #465 by Isaac Sanders.
+  * RubyGems now picks the latest prerelease to install.  Fixes bug #468 by
+    Santiago Pastorino.
+  * Improved detection of missing Zlib::GzipReader encoding support.  Works
+    around JRuby-only bug #472 by Matt Beedle.
+  * "Done installing documentation" is no longer displayed when documentation
+    generation is disabled.  Fixes bug #469 by Jeff Sandberg
+  * The existing executable check now respects --format-executable.  Pull
+    request #471 by Jeremy Evans.
+  * RubyGems no longer creates gem subdirectories when fetching gems.  Fixes
+    #482 by Loren Segal.
+  * RubyGems does not require OpenSSL like RubyGems 1.8, but still prefers it.
+    Fixes #481 by André Arko.
+  * RubyGems only fetches specs for list, search and query commands when
+    needed like RubyGems 1.x.  Fixes bug #487 by bitbuerster, Ruby bug #8019
+    by Ike Miller.
+  * Allow specification of mode for gem subdirectory creation.
+    Ruby bug #7713 by nobu
+  * Fix tests when an 'a.rb' exists.  Ruby bug #7749 by nobu.
+
 === 2.0.0 / 2013-02-24
 
 RubyGems 2.0 includes several new features and many breaking changes.  Some of

data/Manifest.txt

@@ -107,6 +107,7 @@ lib/rubygems/specification.rb
 lib/rubygems/ssl_certs/.document
 lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem
 lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem
+lib/rubygems/ssl_certs/GeoTrust_Global_CA.pem
 lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
 lib/rubygems/syck_hack.rb
 lib/rubygems/test_case.rb
@@ -204,6 +205,7 @@ test/rubygems/test_gem_dependency.rb
 test/rubygems/test_gem_dependency_installer.rb
 test/rubygems/test_gem_dependency_list.rb
 test/rubygems/test_gem_dependency_resolver.rb
+test/rubygems/test_gem_dependency_resolver_api_set.rb
 test/rubygems/test_gem_doctor.rb
 test/rubygems/test_gem_ext_cmake_builder.rb
 test/rubygems/test_gem_ext_configure_builder.rb

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.0.0'
+  VERSION = '2.0.2'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -375,20 +375,28 @@ module Gem
   end
 
   ##
-  # Quietly ensure the named Gem directory contains all the proper
+  # Quietly ensure the Gem directory +dir+ contains all the proper
   # subdirectories.  If we can't create a directory due to a permission
   # problem, then we will silently continue.
+  #
+  # If +mode+ is given, missing directories are created with this mode.
+  #
+  # World-writable directories will never be created.
 
-  def self.ensure_gem_subdirectories dir = Gem.dir
+  def self.ensure_gem_subdirectories dir = Gem.dir, mode = nil
     old_umask = File.umask
     File.umask old_umask | 002
 
     require 'fileutils'
 
+    options = {}
+
+    options[:mode] = mode if mode
+
     REPOSITORY_SUBDIRECTORIES.each do |name|
       subdir = File.join dir, name
       next if File.exist? subdir
-      FileUtils.mkdir_p subdir rescue nil # in case of perms issues -- lame
+      FileUtils.mkdir_p subdir, options rescue nil
     end
   ensure
     File.umask old_umask
@@ -895,7 +903,8 @@ module Gem
 
   def self.win_platform?
     if @@win_platform.nil? then
-      @@win_platform = !!WIN_PATTERNS.find { |r| RUBY_PLATFORM =~ r }
+      ruby_platform = RbConfig::CONFIG['host_os']
+      @@win_platform = !!WIN_PATTERNS.find { |r| ruby_platform =~ r }
     end
 
     @@win_platform

data/lib/rubygems/available_set.rb

@@ -1,95 +1,93 @@
-module Gem
-  class AvailableSet
-    Tuple = Struct.new(:spec, :source)
+class Gem::AvailableSet
+  Tuple = Struct.new(:spec, :source)
 
-    def initialize
-      @set = []
-      @sorted = nil
-    end
+  def initialize
+    @set = []
+    @sorted = nil
+  end
 
-    attr_reader :set
+  attr_reader :set
 
-    def add(spec, source)
-      @set << Tuple.new(spec, source)
-      @sorted = nil
-      self
-    end
+  def add(spec, source)
+    @set << Tuple.new(spec, source)
+    @sorted = nil
+    self
+  end
 
-    def <<(o)
-      case o
-      when AvailableSet
-        s = o.set
-      when Array
-        s = o.map do |sp,so|
-          if !sp.kind_of?(Specification) or !so.kind_of?(Source)
-            raise TypeError, "Array must be in [[spec, source], ...] form"
-          end
-
-          Tuple.new(sp,so)
+  def <<(o)
+    case o
+    when Gem::AvailableSet
+      s = o.set
+    when Array
+      s = o.map do |sp,so|
+        if !sp.kind_of?(Gem::Specification) or !so.kind_of?(Gem::Source)
+          raise TypeError, "Array must be in [[spec, source], ...] form"
         end
-      else
-        raise TypeError, "Must be an AvailableSet"
+
+        Tuple.new(sp,so)
       end
+    else
+      raise TypeError, "must be a Gem::AvailableSet"
+    end
 
-      @set += s
-      @sorted = nil
+    @set += s
+    @sorted = nil
 
-      self
-    end
+    self
+  end
 
-    def empty?
-      @set.empty?
-    end
+  def empty?
+    @set.empty?
+  end
 
-    def all_specs
-      @set.map { |t| t.spec }
-    end
+  def all_specs
+    @set.map { |t| t.spec }
+  end
 
-    def match_platform!
-      @set.reject! { |t| !Gem::Platform.match(t.spec.platform) }
-      @sorted = nil
-      self
-    end
+  def match_platform!
+    @set.reject! { |t| !Gem::Platform.match(t.spec.platform) }
+    @sorted = nil
+    self
+  end
 
-    def sorted
-      @sorted ||= @set.sort do |a,b|
-        i = b.spec <=> a.spec
-        i != 0 ? i : (a.source <=> b.source)
-      end
+  def sorted
+    @sorted ||= @set.sort do |a,b|
+      i = b.spec <=> a.spec
+      i != 0 ? i : (a.source <=> b.source)
     end
+  end
 
-    def size
-      @set.size
-    end
+  def size
+    @set.size
+  end
 
-    def source_for(spec)
-      f = @set.find { |t| t.spec == spec }
-      f.source
-    end
+  def source_for(spec)
+    f = @set.find { |t| t.spec == spec }
+    f.source
+  end
 
-    def pick_best!
-      return self if empty?
+  def pick_best!
+    return self if empty?
 
-      @set = [sorted.first]
-      @sorted = nil
-      self
-    end
+    @set = [sorted.first]
+    @sorted = nil
+    self
+  end
 
-    def remove_installed!(dep)
-      @set.reject! do |t|
-        # already locally installed
-        Gem::Specification.any? do |installed_spec|
-          dep.name == installed_spec.name and
-            dep.requirement.satisfied_by? installed_spec.version
-        end
+  def remove_installed!(dep)
+    @set.reject! do |t|
+      # already locally installed
+      Gem::Specification.any? do |installed_spec|
+        dep.name == installed_spec.name and
+          dep.requirement.satisfied_by? installed_spec.version
       end
-
-      @sorted = nil
-      self
     end
 
-    def inject_into_list(dep_list)
-      @set.each { |t| dep_list.add t.spec }
-    end
+    @sorted = nil
+    self
+  end
+
+  def inject_into_list(dep_list)
+    @set.each { |t| dep_list.add t.spec }
   end
 end

data/lib/rubygems/commands/cert_command.rb

@@ -1,5 +1,6 @@
 require 'rubygems/command'
 require 'rubygems/security'
+require 'openssl'
 
 class Gem::Commands::CertCommand < Gem::Command
 

data/lib/rubygems/commands/query_command.rb

@@ -192,9 +192,13 @@ class Gem::Commands::QueryCommand < Gem::Command
     end
   end
 
-  def entry_details entry, spec, specs, platforms
+  def entry_details entry, detail_tuple, specs, platforms
     return unless options[:details]
 
+    name_tuple, spec = detail_tuple
+
+    spec = spec.fetch_spec name_tuple unless Gem::Specification === spec
+
     entry << "\n"
 
     spec_platforms   entry, platforms
@@ -228,19 +232,15 @@ class Gem::Commands::QueryCommand < Gem::Command
 
   def make_entry entry_tuples, platforms
     detail_tuple = entry_tuples.first
-    name_tuple, latest_spec = detail_tuple
-
-    latest_spec = latest_spec.fetch_spec name_tuple unless
-      Gem::Specification === latest_spec
 
     name_tuples, specs = entry_tuples.flatten.partition do |item|
       Gem::NameTuple === item
     end
 
-    entry = [latest_spec.name]
+    entry = [name_tuples.first.name]
 
     entry_versions entry, name_tuples, platforms
-    entry_details  entry, latest_spec, specs, platforms
+    entry_details  entry, detail_tuple, specs, platforms
 
     entry.join
   end

data/lib/rubygems/commands/setup_command.rb

@@ -77,6 +77,8 @@ class Gem::Commands::SetupCommand < Gem::Command
 
       options[:document].uniq!
     end
+
+    @verbose = nil
   end
 
   def check_ruby_version
@@ -279,18 +281,27 @@ TEXT
     end
   end
 
+  def install_file file, dest_dir
+    dest_file = File.join dest_dir, file
+    dest_dir = File.dirname dest_file
+    mkdir_p dest_dir unless File.directory? dest_dir
+
+    install file, dest_file, :mode => 0644
+  end
+
   def install_lib(lib_dir)
     say "Installing RubyGems" if @verbose
 
     lib_files = rb_files_in 'lib'
+    pem_files = pem_files_in 'lib'
 
     Dir.chdir 'lib' do
       lib_files.each do |lib_file|
-        dest_file = File.join lib_dir, lib_file
-        dest_dir = File.dirname dest_file
-        mkdir_p dest_dir unless File.directory? dest_dir
+        install_file lib_file, lib_dir
+      end
 
-        install lib_file, dest_file, :mode => 0644
+      pem_files.each do |pem_file|
+        install_file pem_file, lib_dir
       end
     end
   end
@@ -381,6 +392,12 @@ TEXT
     [lib_dir, bin_dir]
   end
 
+  def pem_files_in dir
+    Dir.chdir dir do
+      Dir[File.join('**', '*pem')]
+    end
+  end
+
   def rb_files_in dir
     Dir.chdir dir do
       Dir[File.join('**', '*rb')]

data/lib/rubygems/commands/sources_command.rb

@@ -65,6 +65,19 @@ class Gem::Commands::SourcesCommand < Gem::Command
     end
 
     if source_uri = options[:add] then
+      uri = URI source_uri
+
+      if uri.scheme and uri.scheme.downcase == 'http' and
+         uri.host.downcase == 'rubygems.org' then
+        question = <<-QUESTION.chomp
+https://rubygems.org is recommended for security over #{uri}
+
+Do you want to add this insecure source?
+        QUESTION
+
+        terminate_interaction 1 unless ask_yes_no question
+      end
+
       source = Gem::Source.new source_uri
 
       begin

data/lib/rubygems/config_file.rb

@@ -126,16 +126,6 @@ class Gem::ConfigFile
 
   attr_accessor :update_sources
 
-  ##
-  # API key for RubyGems.org
-
-  attr_reader :rubygems_api_key
-
-  ##
-  # Hash of RubyGems.org and alternate API keys
-
-  attr_reader :api_keys
-
   ##
   # True if we want to force specification of gem server when pushing a gem
 
@@ -221,12 +211,22 @@ class Gem::ConfigFile
     @ssl_verify_mode  = @hash[:ssl_verify_mode]  if @hash.key? :ssl_verify_mode
     @ssl_ca_cert      = @hash[:ssl_ca_cert]      if @hash.key? :ssl_ca_cert
 
-    load_api_keys
+    @api_keys         = nil
+    @rubygems_api_key = nil
 
     Gem.sources = @hash[:sources] if @hash.key? :sources
     handle_arguments arg_list
   end
 
+  ##
+  # Hash of RubyGems.org and alternate API keys
+
+  def api_keys
+    load_api_keys unless @api_keys
+
+    @api_keys
+  end
+
   ##
   # Checks the permissions of the credentials file.  If they are not 0600 an
   # error message is displayed and RubyGems aborts.
@@ -273,11 +273,24 @@ if you believe they were disclosed to a third party.
                 end
 
     if @api_keys.key? :rubygems_api_key then
-      @rubygems_api_key = @api_keys[:rubygems_api_key]
-      @api_keys[:rubygems] = @api_keys.delete :rubygems_api_key unless @api_keys.key? :rubygems
+      @rubygems_api_key    = @api_keys[:rubygems_api_key]
+      @api_keys[:rubygems] = @api_keys.delete :rubygems_api_key unless
+        @api_keys.key? :rubygems
     end
   end
 
+  ##
+  # Returns the RubyGems.org API key
+
+  def rubygems_api_key
+    load_api_keys unless @rubygems_api_key
+
+    @rubygems_api_key
+  end
+
+  ##
+  # Sets the RubyGems.org API key to +api_key+
+
   def rubygems_api_key= api_key
     check_credentials_permissions
 
@@ -304,14 +317,14 @@ if you believe they were disclosed to a third party.
     begin
       content = YAML.load(File.read(filename))
       unless content.kind_of? Hash
-        warn "Failed to load #{config_file_name} because it doesn't contain valid YAML hash"
+        warn "Failed to load #{filename} because it doesn't contain valid YAML hash"
         return {}
       end
       return content
     rescue ArgumentError
-      warn "Failed to load #{config_file_name}"
+      warn "Failed to load #{filename}"
     rescue Errno::EACCES
-      warn "Failed to load #{config_file_name} due to permissions problem."
+      warn "Failed to load #{filename} due to permissions problem."
     end
 
     {}