rubygems-update 2.6.9 → 2.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d1a4ca66cd03805742065a7bbad9c35422a5a83
-  data.tar.gz: 38e0d105858401e7ad579a0bf0cd7d35d518ea7e
+  metadata.gz: 8c92c832ef9ee468263f9ed601e77a1fe1544df8
+  data.tar.gz: e0564deb664a4c72dc115a15bc0eed6af67505fa
 SHA512:
-  metadata.gz: 264fa28a5d14c9cc66c27e7d53da86f75285f5d92d50b4d55e61c3e0c3b9b4449c6e76d6a15c072bb0e40e003807edda1c7c3383ae596a3450456151bcf5dc7f
-  data.tar.gz: c1bbb7c5cb00137913e9ae140c05d6fc430f6ffb5ebb5e88baddeafad58136de417a5457ea57100734c66e9475e51f099c93affbab9eeb2379ebdc684f62702b
+  metadata.gz: 5f309ad05bf0c71ec039b0624f4b55a3445bce516219d0bab7919ff3a789ee90bd039c2bbaed973320d80b9b3fd73dbb45995bfd5fee7e92f1ecdd3a34916192
+  data.tar.gz: 37c4f20bedf66dd0dd5ad5c0b434dad8cc96c0656362228c081f062a882d46d8c877d34ce0898412056c3143a52ccdcc094f4f9883f31338f3c8409b7b5f618e

data/History.txt

@@ -1,5 +1,12 @@
 # coding: UTF-8
 
+=== 2.6.10 / 2017-01-23
+
+Bug fixes:
+
+* Fix `require` calling the wrong `gem` method when it is overridden.
+  Pull request #1822 by Samuel Giddins.
+
 === 2.6.9 / 2017-01-20
 
 Bug fixes:

data/Manifest.txt

@@ -607,4 +607,6 @@ util/ci
 util/create_certs.rb
 util/create_encrypted_key.rb
 util/generate_spdx_license_list.rb
+util/patch_with_prs.rb
 util/update_bundled_ca_certificates.rb
+util/update_changelog.rb

data/lib/rubygems.rb

@@ -10,7 +10,7 @@ require 'rbconfig'
 require 'thread'
 
 module Gem
-  VERSION = "2.6.9"
+  VERSION = "2.6.10"
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/lib/rubygems/commands/setup_command.rb

@@ -47,7 +47,7 @@ class Gem::Commands::SetupCommand < Gem::Command
     end
 
     add_option '--[no-]document [TYPES]', Array,
-               'Generate documentation for RubyGems.',
+               'Generate documentation for RubyGems',
                'List the documentation types you wish to',
                'generate.  For example: rdoc,ri' do |value, options|
       options[:document] = case value

data/lib/rubygems/core_ext/kernel_require.rb

@@ -44,7 +44,7 @@ module Kernel
     spec = Gem.find_unresolved_default_spec(path)
     if spec
       Gem.remove_unresolved_default_spec(spec)
-      gem(spec.name)
+      Kernel.send(:gem, spec.name)
     end
 
     # If there are no unresolved deps, then we can use just try

data/lib/rubygems/specification.rb

@@ -2698,7 +2698,7 @@ class Gem::Specification < Gem::BasicSpecification
 
     unless specification_version.is_a?(Integer)
       raise Gem::InvalidSpecificationException,
-            'specification_version must be a Integer (did you mean version?)'
+            'specification_version must be an Integer (did you mean version?)'
     end
 
     case platform

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -163,7 +163,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     fetcher = Gem::RemoteFetcher.new nil
     @fetcher = fetcher
     def fetcher.request(uri, request_class, last_modified = nil)
-      raise SocketError, "tarded"
+      raise SocketError, "oops"
     end
 
     uri = 'http://gems.example.com/yaml'
@@ -171,7 +171,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       fetcher.fetch_size uri
     end
 
-    assert_equal "SocketError: tarded (#{uri})", e.message
+    assert_equal "SocketError: oops (#{uri})", e.message
   end
 
   def test_no_proxy

data/test/rubygems/test_gem_specification.rb

@@ -3080,7 +3080,7 @@ Did you mean 'Ruby'?
         end
       end
 
-      err = 'specification_version must be a Integer (did you mean version?)'
+      err = 'specification_version must be an Integer (did you mean version?)'
       assert_equal err, e.message
     end
   end

data/test/rubygems/test_require.rb

@@ -341,6 +341,31 @@ class TestGemRequire < Gem::TestCase
     Kernel::RUBYGEMS_ACTIVATION_MONITOR.exit
   end
 
+  def test_require_when_gem_defined
+    default_gem_spec = new_default_spec("default", "2.0.0.0",
+                                        nil, "default/gem.rb")
+    install_default_specs(default_gem_spec)
+    c = Class.new do
+      def self.gem(*args)
+        raise "received #gem with #{args.inspect}"
+      end
+    end
+    assert c.send(:require, "default/gem")
+    assert_equal %w(default-2.0.0.0), loaded_spec_names
+  end
+
+  def test_require_default_when_gem_defined
+    a = new_spec("a", "1", nil, "lib/a.rb")
+    install_specs a
+    c = Class.new do
+      def self.gem(*args)
+        raise "received #gem with #{args.inspect}"
+      end
+    end
+    assert c.send(:require, "a")
+    assert_equal %w(a-1), loaded_spec_names
+  end
+
   def silence_warnings
     old_verbose, $VERBOSE = $VERBOSE, false
     yield

data/util/patch_with_prs.rb

@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path("../../lib", __FILE__)
+require "rubygems"
+require "optparse"
+
+def confirm(prompt = "")
+  loop do
+    print(prompt)
+    print(": ") unless prompt.empty?
+    break if $stdin.gets.strip == "y"
+  end
+rescue Interrupt
+  abort
+end
+
+def sh(*cmd)
+  return if system(*cmd)
+  raise "#{cmd} failed"
+end
+
+version = nil
+prs = []
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{__FILE__} [options]"
+
+  opts.on("--version=VERSION", "The version to release") do |v|
+    version = v
+  end
+end.parse!
+
+prs = ARGV.dup
+
+version ||= begin
+  version = Gem::Version.new(Gem::VERSION)
+  segments = version.segments
+  if segments.last.is_a?(String)
+    segments << "1"
+  else
+    segments[-1] += 1
+  end
+  segments.join(".")
+end
+
+confirm "You are about to release #{version}, currently #{Gem::VERSION}"
+
+branch = version.split(".", 3)[0, 2].join(".")
+sh("git", "checkout", branch)
+sh("git", "submodule", "update", "--init", "--recursive")
+
+commits = `git log --oneline origin/master --`.split("\n").map {|l| l.split(/\s/, 2) }.reverse
+commits.select! {|_sha, message| message =~ /(Auto merge of|Merge pull request) ##{Regexp.union(*prs)}/ }
+
+unless system("git", "cherry-pick", "-x", "-m", "1", *commits.map(&:first))
+  abort unless system("zsh")
+end
+
+sh(Gem.ruby, File.expand_path("../update_changelog.rb", __FILE__))
+
+version_file = "lib/rubygems.rb"
+version_contents = File.read(version_file)
+unless version_contents.sub!(/^(\s*VERSION = )(["'])#{Gem::Version::VERSION_PATTERN}\2/, "\\1#{version.to_s.dump}")
+  abort "failed to update #{version_file}, is it in the expected format?"
+end
+File.open(version_file, "w") {|f| f.write(version_contents) }
+
+confirm "Update changelog"
+sh("git", "commit", "-am", "Version #{version} with changelog")
+sh("rake", "release", "VERSION=#{version}")
+sh("git", "checkout", "master")
+sh("git", "pull")
+unless system("git", "merge", "v#{version}", "--no-edit")
+  abort unless system("zsh")
+end
+sh("git", "push")

data/util/update_changelog.rb

@@ -0,0 +1,67 @@
+#!/usr/bin/env ruby
+
+require 'json'
+require 'net/http'
+
+def access_token_query_string
+  @access_token_query_string ||= begin
+    token = ENV['GITHUB_API_TOKEN']
+    token ? "?access_token=#{token.strip}" : ''
+  end
+end
+
+def github_api(path)
+  base = 'https://api.github.com'
+  url = path.start_with?(base) ? path : base + path
+  url += access_token_query_string
+  uri = URI.parse(url)
+  return unless response = Net::HTTP.get_response(uri)
+  JSON.load(response.body)
+end
+
+def wrap(text, length, indent)
+  result = []
+  work = text.dup
+
+  while work.length > length
+    if work =~ /^(.{0,#{length}})[ \n]/o
+      result << $1
+      work.slice!(0, $&.length)
+    else
+      result << work.slice!(0, length)
+    end
+  end
+
+  result << work unless work.empty?
+  result = result.reduce(String.new) do |acc, elem|
+    acc << "\n" << ' ' * indent unless acc.empty?
+    acc << elem
+  end
+  result += "\n" unless result.end_with?("\n")
+  result
+end
+
+def sentence(text)
+  text = text[0].upcase + text[1..-1]
+  text.end_with?('.') ? text : text << '.'
+end
+
+branch = ARGV.shift || "HEAD"
+
+history = File.read(File.expand_path('../../History.txt', __FILE__))
+
+File.open(File.expand_path('../../ChangeLog', __FILE__), 'w') do |changelog|
+  commits = `git log --oneline v#{Gem::VERSION}..#{branch}`.split("\n")
+  prs = commits.reverse_each.map { |c| c =~ /(Auto merge of|Merge pull request) #(\d+)/ && $2 }.compact
+  prs.each do |pr|
+    next if history =~ /Pull\srequest\s##{pr}/m
+    details = github_api "/repos/rubygems/rubygems/pulls/#{pr}"
+    title, user = details.values_at('title', 'user')
+    user = github_api(user['url'])
+    name = user['name'] || user['login']
+    changelog << wrap(
+      ['*', sentence(title), sentence("Pull request ##{pr} by #{name}")].join(' '),
+      74, 2
+    )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.6.9
+  version: 2.6.10
 platform: ruby
 authors:
 - Jim Weirich
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -773,7 +773,9 @@ files:
 - util/create_certs.rb
 - util/create_encrypted_key.rb
 - util/generate_spdx_license_list.rb
+- util/patch_with_prs.rb
 - util/update_bundled_ca_certificates.rb
+- util/update_changelog.rb
 homepage: https://rubygems.org
 licenses:
 - Ruby
@@ -798,7 +800,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby