Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4c3fa761c356
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 11d23077118b
Choose a head ref
  • 5 commits
  • 148 files changed
  • 1 contributor

Commits on Dec 10, 2014

  1. Remove pathname.rb from sync, since we have a custom version.

    @headius
    headius committed Dec 10, 2014
    Copy the full SHA
    29ff03d View commit details

  2. Sole remaining diff with MRI stdlib.

    @headius
    headius committed Dec 10, 2014
    Copy the full SHA
    ac491ee View commit details

  3. Update to RubyGems 2.4.5.

    @headius
    headius committed Dec 10, 2014
    Copy the full SHA
    e9f5e96 View commit details

  4. Update to latest 2.0 stdlib (p598, r48636).

    @headius
    headius committed Dec 10, 2014
    Copy the full SHA
    5276ce0 View commit details

  5. Update patchlevel and revision for all modes.

    @headius
    headius committed Dec 10, 2014
    Copy the full SHA
    11d2307 View commit details
Showing with 8,460 additions and 2,222 deletions.
  1. +5 −5 default.build.properties
  2. +1 −0 lib/ruby/1.9/rexml/entity.rb
  3. +7 −2 lib/ruby/2.0/net/http.rb
  4. +1 −1 lib/ruby/2.0/rexml/document.rb
  5. +1 −0 lib/ruby/2.0/rexml/entity.rb
  6. +1 −1 lib/ruby/shared/gauntlet_rubygems.rb
  7. +147 −97 lib/ruby/shared/rubygems.rb
  8. +6 −3 lib/ruby/shared/rubygems/available_set.rb
  9. +159 −12 lib/ruby/shared/rubygems/basic_specification.rb
  10. +4 −1 lib/ruby/shared/rubygems/command.rb
  11. +2 −1 lib/ruby/shared/rubygems/command_manager.rb
  12. +11 −13 lib/ruby/shared/rubygems/commands/cert_command.rb
  13. +2 −2 lib/ruby/shared/rubygems/commands/cleanup_command.rb
  14. +27 −7 lib/ruby/shared/rubygems/commands/contents_command.rb
  15. +2 −2 lib/ruby/shared/rubygems/commands/dependency_command.rb
  16. +5 −2 lib/ruby/shared/rubygems/commands/environment_command.rb
  17. +1 −1 lib/ruby/shared/rubygems/commands/generate_index_command.rb
  18. +199 −20 lib/ruby/shared/rubygems/commands/help_command.rb
  19. +126 −19 lib/ruby/shared/rubygems/commands/install_command.rb
  20. +3 −9 lib/ruby/shared/rubygems/commands/list_command.rb
  21. +17 −15 lib/ruby/shared/rubygems/commands/mirror_command.rb
  22. +74 −0 lib/ruby/shared/rubygems/commands/open_command.rb
  23. +1 −1 lib/ruby/shared/rubygems/commands/outdated_command.rb
  24. +3 −1 lib/ruby/shared/rubygems/commands/owner_command.rb
  25. +29 −2 lib/ruby/shared/rubygems/commands/pristine_command.rb
  26. +9 −4 lib/ruby/shared/rubygems/commands/push_command.rb
  27. +33 −17 lib/ruby/shared/rubygems/commands/query_command.rb
  28. +5 −11 lib/ruby/shared/rubygems/commands/search_command.rb
  29. +9 −9 lib/ruby/shared/rubygems/commands/setup_command.rb
  30. +1 −1 lib/ruby/shared/rubygems/commands/specification_command.rb
  31. +14 −2 lib/ruby/shared/rubygems/commands/uninstall_command.rb
  32. +1 −1 lib/ruby/shared/rubygems/commands/unpack_command.rb
  33. +24 −15 lib/ruby/shared/rubygems/commands/update_command.rb
  34. +5 −8 lib/ruby/shared/rubygems/commands/which_command.rb
  35. +8 −13 lib/ruby/shared/rubygems/commands/yank_command.rb
  36. +6 −1 lib/ruby/shared/rubygems/compatibility.rb
  37. +17 −5 lib/ruby/shared/rubygems/config_file.rb
  38. +22 −2 lib/ruby/shared/rubygems/core_ext/kernel_gem.rb
  39. +13 −23 lib/ruby/shared/rubygems/core_ext/kernel_require.rb
  40. +48 −15 lib/ruby/shared/rubygems/defaults.rb
  41. +40 −19 lib/ruby/shared/rubygems/dependency.rb
  42. +85 −18 lib/ruby/shared/rubygems/dependency_installer.rb
  43. +1 −5 lib/ruby/shared/rubygems/dependency_list.rb
  44. +0 −254 lib/ruby/shared/rubygems/dependency_resolver.rb
  45. +0 −109 lib/ruby/shared/rubygems/dependency_resolver/activation_request.rb
  46. +0 −65 lib/ruby/shared/rubygems/dependency_resolver/api_set.rb
  47. +0 −39 lib/ruby/shared/rubygems/dependency_resolver/api_specification.rb
  48. +0 −18 lib/ruby/shared/rubygems/dependency_resolver/composed_set.rb
  49. +0 −85 lib/ruby/shared/rubygems/dependency_resolver/dependency_conflict.rb
  50. +0 −51 lib/ruby/shared/rubygems/dependency_resolver/dependency_request.rb
  51. +0 −64 lib/ruby/shared/rubygems/dependency_resolver/index_set.rb
  52. +0 −60 lib/ruby/shared/rubygems/dependency_resolver/index_specification.rb
  53. +0 −42 lib/ruby/shared/rubygems/dependency_resolver/installed_specification.rb
  54. +0 −154 lib/ruby/shared/rubygems/dependency_resolver/installer_set.rb
  55. +1 −1 lib/ruby/shared/rubygems/deprecate.rb
  56. +17 −11 lib/ruby/shared/rubygems/doctor.rb
  57. +51 −3 lib/ruby/shared/rubygems/errors.rb
  58. +84 −10 lib/ruby/shared/rubygems/exceptions.rb
  59. +1 −2 lib/ruby/shared/rubygems/ext.rb
  60. +6 −0 lib/ruby/shared/rubygems/ext/build_error.rb
  61. +51 −18 lib/ruby/shared/rubygems/ext/builder.rb
  62. +3 −1 lib/ruby/shared/rubygems/ext/cmake_builder.rb
  63. +1 −3 lib/ruby/shared/rubygems/ext/configure_builder.rb
  64. +27 −15 lib/ruby/shared/rubygems/ext/ext_conf_builder.rb
  65. +2 −5 lib/ruby/shared/rubygems/ext/rake_builder.rb
  66. +9 −2 lib/ruby/shared/rubygems/gemcutter_utilities.rb
  67. +1 −1 lib/ruby/shared/rubygems/indexer.rb
  68. +17 −0 lib/ruby/shared/rubygems/install_update_options.rb
  69. +69 −33 lib/ruby/shared/rubygems/installer.rb
  70. +2 −5 lib/ruby/shared/rubygems/installer_test_case.rb
  71. +2 −2 lib/ruby/shared/rubygems/local_remote_options.rb
  72. +4 −2 lib/ruby/shared/rubygems/name_tuple.rb
  73. +38 −16 lib/ruby/shared/rubygems/package.rb
  74. +33 −0 lib/ruby/shared/rubygems/package/file_source.rb
  75. +45 −0 lib/ruby/shared/rubygems/package/io_source.rb
  76. +7 −7 lib/ruby/shared/rubygems/package/old.rb
  77. +3 −0 lib/ruby/shared/rubygems/package/source.rb
  78. +1 −1 lib/ruby/shared/rubygems/package/tar_header.rb
  79. +2 −0 lib/ruby/shared/rubygems/package/tar_reader/entry.rb
  80. +9 −3 lib/ruby/shared/rubygems/package/tar_writer.rb
  81. +11 −2 lib/ruby/shared/rubygems/platform.rb
  82. +1 −1 lib/ruby/shared/rubygems/psych_additions.rb
  83. +3 −4 lib/ruby/shared/rubygems/rdoc.rb
  84. +89 −30 lib/ruby/shared/rubygems/remote_fetcher.rb
  85. +74 −96 lib/ruby/shared/rubygems/request.rb
  86. +83 −0 lib/ruby/shared/rubygems/request/connection_pools.rb
  87. +47 −0 lib/ruby/shared/rubygems/request/http_pool.rb
  88. +10 −0 lib/ruby/shared/rubygems/request/https_pool.rb
  89. +287 −57 lib/ruby/shared/rubygems/request_set.rb
  90. +773 −11 lib/ruby/shared/rubygems/request_set/gem_dependency_api.rb
  91. +650 −0 lib/ruby/shared/rubygems/request_set/lockfile.rb
  92. +61 −30 lib/ruby/shared/rubygems/requirement.rb
  93. +485 −0 lib/ruby/shared/rubygems/resolver.rb
  94. +172 −0 lib/ruby/shared/rubygems/resolver/activation_request.rb
  95. +125 −0 lib/ruby/shared/rubygems/resolver/api_set.rb
  96. +85 −0 lib/ruby/shared/rubygems/resolver/api_specification.rb
  97. +78 −0 lib/ruby/shared/rubygems/resolver/best_set.rb
  98. +66 −0 lib/ruby/shared/rubygems/resolver/composed_set.rb
  99. +160 −0 lib/ruby/shared/rubygems/resolver/conflict.rb
  100. +1 −4 lib/ruby/shared/rubygems/{dependency_resolver → resolver}/current_set.rb
  101. +116 −0 lib/ruby/shared/rubygems/resolver/dependency_request.rb
  102. +122 −0 lib/ruby/shared/rubygems/resolver/git_set.rb
  103. +59 −0 lib/ruby/shared/rubygems/resolver/git_specification.rb
  104. +80 −0 lib/ruby/shared/rubygems/resolver/index_set.rb
  105. +69 −0 lib/ruby/shared/rubygems/resolver/index_specification.rb
  106. +58 −0 lib/ruby/shared/rubygems/resolver/installed_specification.rb
  107. +224 −0 lib/ruby/shared/rubygems/resolver/installer_set.rb
  108. +41 −0 lib/ruby/shared/rubygems/resolver/local_specification.rb
  109. +84 −0 lib/ruby/shared/rubygems/resolver/lock_set.rb
  110. +84 −0 lib/ruby/shared/rubygems/resolver/lock_specification.rb
  111. +81 −0 lib/ruby/shared/rubygems/resolver/requirement_list.rb
  112. +56 −0 lib/ruby/shared/rubygems/resolver/set.rb
  113. +56 −0 lib/ruby/shared/rubygems/resolver/spec_specification.rb
  114. +110 −0 lib/ruby/shared/rubygems/resolver/specification.rb
  115. +44 −0 lib/ruby/shared/rubygems/resolver/stats.rb
  116. +87 −0 lib/ruby/shared/rubygems/resolver/vendor_set.rb
  117. +24 −0 lib/ruby/shared/rubygems/resolver/vendor_specification.rb
  118. +3 −3 lib/ruby/shared/rubygems/security.rb
  119. +1 −0 lib/ruby/shared/rubygems/security/policy.rb
  120. +16 −2 lib/ruby/shared/rubygems/security/trust_dir.rb
  121. +49 −6 lib/ruby/shared/rubygems/server.rb
  122. +91 −21 lib/ruby/shared/rubygems/source.rb
  123. +240 −0 lib/ruby/shared/rubygems/source/git.rb
  124. +13 −1 lib/ruby/shared/rubygems/source/installed.rb
  125. +14 −8 lib/ruby/shared/rubygems/source/local.rb
  126. +48 −0 lib/ruby/shared/rubygems/source/lock.rb
  127. +20 −4 lib/ruby/shared/rubygems/source/specific_file.rb
  128. +27 −0 lib/ruby/shared/rubygems/source/vendor.rb
  129. +74 −12 lib/ruby/shared/rubygems/source_list.rb
  130. +48 −18 lib/ruby/shared/rubygems/spec_fetcher.rb
  131. +358 −166 lib/ruby/shared/rubygems/specification.rb
  132. +25 −0 lib/ruby/shared/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem
  133. +30 −88 lib/ruby/shared/rubygems/ssl_certs/AddTrustExternalCARoot.pem
  134. +23 −0 lib/ruby/shared/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
  135. +79 −3 lib/ruby/shared/rubygems/stub_specification.rb
  136. +3 −3 lib/ruby/shared/rubygems/syck_hack.rb
  137. +304 −72 lib/ruby/shared/rubygems/test_case.rb
  138. +200 −0 lib/ruby/shared/rubygems/test_utilities.rb
  139. +15 −5 lib/ruby/shared/rubygems/text.rb
  140. +27 −12 lib/ruby/shared/rubygems/uninstaller.rb
  141. +20 −0 lib/ruby/shared/rubygems/uri_formatter.rb
  142. +211 −72 lib/ruby/shared/rubygems/user_interaction.rb
  143. +134 −0 lib/ruby/shared/rubygems/util.rb
  144. +4 −0 lib/ruby/shared/rubygems/util/list.rb
  145. +34 −0 lib/ruby/shared/rubygems/util/stringio.rb
  146. +6 −2 lib/ruby/shared/rubygems/validator.rb
  147. +26 −20 lib/ruby/shared/rubygems/version.rb
  148. +0 −1 tool/globals_1_9_3.rb
10 changes: 5 additions & 5 deletions default.build.properties
View file
Original file line number Diff line number Diff line change
@@ -83,17 +83,17 @@ install4j.executable=/Applications/install4j 4/bin/install4jc
version.ruby=1.8.7
version.ruby.major=1.8
version.ruby.minor=7
version.ruby.patchlevel=370
version.ruby.patchlevel=376

version.ruby1_9.major=1.9
version.ruby1_9=1.9.3
version.ruby1_9.patchlevel=392
version.ruby1_9.revision=39386
version.ruby1_9.patchlevel=551
version.ruby1_9.revision=48406

version.ruby2_0.major=2.0
version.ruby2_0=2.0.0
version.ruby2_0.patchlevel=195
version.ruby2_0.revision=40734
version.ruby2_0.patchlevel=598
version.ruby2_0.revision=48636

#joda.time.version=2.3
#jline.version=2.11
1 change: 1 addition & 0 deletions lib/ruby/1.9/rexml/entity.rb
View file
Original file line number Diff line number Diff line change
@@ -157,6 +157,7 @@ def value

# This is a set of entity constants -- the ones defined in the XML
# specification. These are +gt+, +lt+, +amp+, +quot+ and +apos+.
# CAUTION: these entities does not have parent and document
module EntityConst
# +>+
GT = Entity.new( 'gt', '>' )
9 changes: 7 additions & 2 deletions lib/ruby/2.0/net/http.rb
View file
Original file line number Diff line number Diff line change
@@ -916,7 +916,10 @@ def connect
@socket.write(buf)
HTTPResponse.read_new(@socket).value
end
s.session = @ssl_session if @ssl_session
if @ssl_session and
Time.now < @ssl_session.time + @ssl_session.timeout
s.session = @ssl_session if @ssl_session
end
# Server Name Indication (SNI) RFC 3546
s.hostname = @address if s.respond_to? :hostname=
Timeout.timeout(@open_timeout, Net::OpenTimeout) { s.connect }
@@ -1034,7 +1037,9 @@ def proxy_from_env?

# The proxy URI determined from the environment for this connection.
def proxy_uri # :nodoc:
@proxy_uri ||= URI("http://#{address}:#{port}").find_proxy
@proxy_uri ||= URI::HTTP.new(
"http".freeze, nil, address, port, nil, nil, nil, nil, nil
).find_proxy
end

# The address of the proxy server, if one is configured.
2 changes: 1 addition & 1 deletion lib/ruby/2.0/rexml/document.rb
View file
Original file line number Diff line number Diff line change
@@ -281,7 +281,7 @@ def record_entity_expansion
def document
self
end

private
def build( source )
Parsers::TreeParser.new( source, self ).parse
1 change: 1 addition & 0 deletions lib/ruby/2.0/rexml/entity.rb
View file
Original file line number Diff line number Diff line change
@@ -157,6 +157,7 @@ def value

# This is a set of entity constants -- the ones defined in the XML
# specification. These are +gt+, +lt+, +amp+, +quot+ and +apos+.
# CAUTION: these entities does not have parent and document
module EntityConst
# +>+
GT = Entity.new( 'gt', '>' )
2 changes: 1 addition & 1 deletion lib/ruby/shared/gauntlet_rubygems.rb
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
# rvsh-0.4.5 : No such file or directory - bin/rvsh
# xen-0.1.2.1 : authors must be Array of Strings

class GemGauntlet < Gauntlet
class GemGauntlet < Gauntlet # :nodoc:
def run(name)
warn name

Loading