Backport #7991

backport r39542

Added by Hiroshi SHIBATA about 1 year ago. Updated about 1 year ago.

[ruby-dev:<unknown>]
Status:Closed
Priority:High
Assignee:Tomoyuki Chikanaga


Related issues

Related to ruby-trunk - Bug #7698: RubyGems 2.0 has an incompatibility about installation of... Closed 01/15/2013

Associated revisions

Revision 39786
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39542,39545: [Backport #7991]

* lib/rubygems/ext/builder.rb:  Fix incompatibilities when installing
  extensions.  Patch by Nobu.
  [ruby-trunk - Bug #7968] [ruby-trunk - Bug #7971]

* lib/rubygems/ext/ext_conf_builder.rb:  ditto.

* lib/rubygems/installer.rb:  ditto.

* test/rubygems/test_gem_ext_ext_conf_builder.rb:  Test for the above.

* test/rubygems/test_gem_installer.rb:  ditto.

* lib/rubygems/commands/sources_command.rb:  Prefer HTTPS over HTTP.

* lib/rubygems/defaults.rb:  ditto

* lib/rubygems/dependency_resolver.rb:  Ditto.

* lib/rubygems/source.rb:  ditto.

* lib/rubygems/spec_fetcher.rb:  ditto.

* lib/rubygems/specification.rb:  ditto.

* lib/rubygems/test_utilities.rb:  ditto.

* test/rubygems/test_gem.rb:  Test for the above.

* test/rubygems/test_gem_commands_sources_command.rb:  ditto.

* test/rubygems/test_gem_dependency_resolver_api_set.rb:  ditto.

* test/rubygems/test_gem_remote_fetcher.rb:  ditto.

* test/rubygems/test_gem_source.rb:  ditto.

* test/rubygems/test_gem_spec_fetcher.rb:  ditto.
  [ruby-trunk - Bug #7698] [ruby-trunk - Bug #7971]

Revision 39788
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39558: [Backport #7991]

* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
  revert use of temporary directory for build, to work some buggy
  extconf.rb which cannot build outside the source directory.
   [Bug #7698]

Revision 39789
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39559: [Backport #7991]

* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
  use RUBYOPT instead of -r option, and revert some tests.  [Bug #7698]

Revision 39790
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39560,39562,39572: [Backport #7991]

* lib/rubygems/ext/ext_conf_builder.rb
  (Gem::Ext::ExtConfBuilder.hack_for_obsolete_sytle_gems): remove
  circular dependencies for old style gems which locate extconf.rb on
  the toplevel.   [ruby-trunk - Bug #7698]
  (Gem::Ext::ExtConfBuilder.hack_for_obsolete_style_gems): remove

* lib/rubygems/ext/ext_conf_builder.rb
  (Gem::Ext::ExtConfBuilder.hack_for_obsolete_style_gems): remove
  circular dependencies in install-so too.  
  [Bug #7698]

Revision 39791
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39579: [Backport #7991]

* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
  fix for unusal cases again.  install to a temporary directory once
  and move instaled files to the destination directory, if it is same
  as the current directory.  [Bug #7698]

Revision 39792
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39590,39592: [Backport #7991]

* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
  clear DESTDIR so RUBYARCHDIR and RUBYLIBDIR are not be overrdden.
  [Bug #7698]

Revision 39793
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39533: [Backport #7991]

* lib/rubygems/available_set.rb:  Undent for style

* lib/rubygems/dependency_installer.rb:  Pick latest prerelease gem to
  install.  Fixes RubyGems bug #468.

* test/rubygems/test_gem_dependency_installer.rb:  Test for the above.

* lib/rubygems/dependency_installer.rb:  Don't display "Done installing
  documentation" if documentation will not be installed.

* lib/rubygems/rdoc.rb:  ditto

* lib/rubygems/dependency_list.rb:  Use Array#concat for Ruby 1.x
  performance.

* lib/rubygems/installer.rb:  Use formatted program name when comparing
  executables.  RubyGems pull request #471

* test/rubygems/test_gem_installer.rb:  Test for the above.

* lib/rubygems/package.rb:  Use more explicit feature check to work
  around JRuby bug #552

* lib/rubygems/ssl_certs/GeoTrust_Global_CA.pem:  Added GeoTrust root
  certificate.

* test/rubygems/test_gem_source_list.rb:  Use "example" instead of real
  hostname

Revision 39795
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39597: [Backport #7991]

* lib/rubygems.rb:  Bump version to 2.0.1 for upcoming bugfix release

* lib/rubygems/ext/ext_conf_builder.rb:  Restore ruby 1.8 compatibility
  for [Bug #9698]

* test/rubygems/test_gem_installer.rb:  Ditto.

* lib/rubygems/package.rb:  Restore ruby 1.8 compatibility.

* test/rubygems/test_gem_dependency_installer.rb:  Fix warnings

Revision 39796
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39603: [Backport #7991]
for [Bug #7698]

Revision 39800
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39621,39622: [Backport #7991]

* lib/rubygems/commands/setup_command.rb:  Install .pem files.

* test/rubygems/test_gem_commands_setup_command.rb:  Test for the
  above.

* lib/rubygems/spec_fetcher.rb:  Test HTTPS upgrade with URI::HTTPS,
  not URI::HTTP.  Fixes bug in automatic HTTPS upgrade.

* test/rubygems/test_gem_spec_fetcher.rb:  Test for the above.

* lib/rubygems.rb:  Version 2.0.2

* lib/rubygems/test_utilities.rb:  Ensure scheme and uri class match.

Revision 39801
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39696: [Backport #7991]

* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
  it is impossible to predict which file will be installed to where,
  by the arguments, so use intermediate destination directory always.
  [Bug #7698]

* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
  it is impossible to predict which file will be installed to where,
  by the arguments, so use intermediate destination directory always.
  [Bug #7698]

Revision 39802
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) 39731: [Backport #7991]

* lib/rubygems/commands/setup_command.rb:  Don't delete non-rubygems
  files when installing RubyGems.

* test/rubygems/test_gem_commands_setup_command.rb:  Test for the
  above.

* lib/rubygems/ext/ext_conf_builder.rb:  Use full path to siteconf.rb
  in case the extconf.rb changes directories (like memcached does).

* lib/rubygems/package.rb:  Remove double slash from path.

* test/rubygems/test_gem_package.rb:  Test for the above.

* test/rubygems/test_gem_package_old.rb:  ditto.

* lib/rubygems/source.rb:  Revert automatic HTTPS upgrade

* lib/rubygems/spec_fetcher.rb:  ditto.

* test/rubygems/test_gem_remote_fetcher.rb:  ditto.

* test/rubygems/test_gem_source.rb:  ditto.

* test/rubygems/test_gem_spec_fetcher.rb:  ditto.

History

#1 Updated by Tomoyuki Chikanaga about 1 year ago

  • Status changed from Open to Assigned

#2 Updated by Hiroshi SHIBATA about 1 year ago

related revision:

r39606, r39597, r39592, r39579, r39572, r39562, r39560, r39559, r39558

#3 Updated by Hiroshi SHIBATA about 1 year ago

related test changes:

r39609, r39608, r39607, r39597

#4 Updated by Tomoyuki Chikanaga about 1 year ago

and r39590.

#5 Updated by Tomoyuki Chikanaga about 1 year ago

Thank you shibata san.

I will treat r39606, r39609, r39608, r39607 as separate issues because they have their own ticket reference.

Thanks again.

#6 Updated by Tomoyuki Chikanaga about 1 year ago

... and r39696.

#7 Updated by Hiroshi SHIBATA about 1 year ago

r39622 and r39731

#8 Updated by Tomoyuki Chikanaga about 1 year ago

  • Status changed from Assigned to Closed
  • % Done changed from 0 to 100

This issue was solved with changeset r39786.
Hiroshi, thank you for reporting this issue.
Your contribution to Ruby is greatly appreciated.
May Ruby be with you.


merge revision(s) 39542,39545: [Backport #7991]

* lib/rubygems/ext/builder.rb:  Fix incompatibilities when installing
  extensions.  Patch by Nobu.
  [ruby-trunk - Bug #7968] [ruby-trunk - Bug #7971]

* lib/rubygems/ext/ext_conf_builder.rb:  ditto.

* lib/rubygems/installer.rb:  ditto.

* test/rubygems/test_gem_ext_ext_conf_builder.rb:  Test for the above.

* test/rubygems/test_gem_installer.rb:  ditto.

* lib/rubygems/commands/sources_command.rb:  Prefer HTTPS over HTTP.

* lib/rubygems/defaults.rb:  ditto

* lib/rubygems/dependency_resolver.rb:  Ditto.

* lib/rubygems/source.rb:  ditto.

* lib/rubygems/spec_fetcher.rb:  ditto.

* lib/rubygems/specification.rb:  ditto.

* lib/rubygems/test_utilities.rb:  ditto.

* test/rubygems/test_gem.rb:  Test for the above.

* test/rubygems/test_gem_commands_sources_command.rb:  ditto.

* test/rubygems/test_gem_dependency_resolver_api_set.rb:  ditto.

* test/rubygems/test_gem_remote_fetcher.rb:  ditto.

* test/rubygems/test_gem_source.rb:  ditto.

* test/rubygems/test_gem_spec_fetcher.rb:  ditto.
  [ruby-trunk - Bug #7698] [ruby-trunk - Bug #7971]

#9 Updated by Tomoyuki Chikanaga about 1 year ago

I'll add r39533 for clean merge.

Let's put revisions in order.

merged: r39533, r39542, r39545, r39558, r39559, r39560, r39562, r39572, r39579, r39590, r39592
will be merged: r39597, r39603, (with ref. #8019: r39606, r39609), (with ref. #7713: r39607), (with ref. #7749: r39608), r39621, r39622, r39696 and r39731

#10 Updated by Tomoyuki Chikanaga about 1 year ago

All related revisions are merged.

Please file a new ticket if there's missing revisions.

Also available in: Atom PDF