Commit graph

29857 commits

Author SHA1 Message Date
nagachika
28221e3584 merge revision(s) 39811: [Backport #8146]
* gc.c: Avoid unnecessary heap growth. patched by tmm1(Aman Gupta).
	  [Bug #8093] [ruby-core:53393]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-07 13:34:53 +00:00
nagachika
6c0822f0f5 merge revision(s) 39858: [Backport #8135]
* parse.y (simple_re_meta): escape all closing characters, not only
	  round parenthesis.  [ruby-core:53578] [Bug #8133]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-06 18:07:04 +00:00
nagachika
03e6d4eadb merge revision(s) 39812: [Backport #8147]
* gc.c: Improve accuracy of objspace_live_num() and
	  allocated/freed counters. patched by tmm1(Aman Gupta).
	  [Bug #8092] [ruby-core:53392]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-06 17:57:48 +00:00
nagachika
ff1bd2ba57 merge revision(s) 39785: [Backport #8108]
* array.c: fix rdoc. [ruby-core:53485] [ruby-trunk - Bug #8108]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-06 17:51:14 +00:00
nagachika
926d1cbf2f merge revision(s) 40090:
* ext/openssl/ossl_bn.c (ossl_bn_initialize): fix can't create from bn.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-04 15:56:00 +00:00
nagachika
d825fc8de6 merge revision(s) 39725: [Backport #8054]
* lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd
	  argument only if non-nil value is given.
	  [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by
	  mrkn.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-03 17:27:19 +00:00
nagachika
d393aa0893 merge revision(s) 39718: [Backport #8001] [Backport #8023]
* Merge Onigmo d4bad41e16e3eccd97ccce6f1f96712e557c4518.
	  fix lookbehind assertion fails with /m mode enabled. [Bug #8023]
	  fix \Z matches where it shouldn't. [Bug #8001]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-03 17:25:09 +00:00
nagachika
279b256dd0 merge revision(s) 39650: [Backport #8043]
* marshal.c (w_extended): check for prepended object.
	  [ruby-core:53206] [Bug #8043]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-03 17:11:47 +00:00
nagachika
a85a0ddf0a merge revision(s) 40069:
win32.c: missing break

	* win32/win32.c (constat_attr): fix missing break.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-02 20:25:04 +00:00
nagachika
525c60b4cd merge revision(s) 40048:
fix typo: s/@ca_cert/@cacert/

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-02 19:56:46 +00:00
nagachika
d04026a9e7 merge revision(s) 39806: [Backport #8118]
* vm_exec.c: Correct predefined macro name. This typo is introduced by
	  r36534 and should be backported to ruby_2_0_0.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-26 18:02:50 +00:00
nagachika
0ce7a947d5 merge revision(s) 39547: [Backport #7972] [Backport #7974]
* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
	  v5.13.3 [Bug#7972] [Bug#7974]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-26 17:59:06 +00:00
nagachika
5c2169d4c7 merge revision(s) 39509,39511: [Backport #7961]
* lib/rexml/document.rb: move entity_expansion_limit accessor to ...

	* lib/rexml/rexml.rb: ... here to make rexml/text independent from
	  REXML::Document. It causes circular require.

	* lib/rexml/document.rb (REXML::Document.entity_expansion_limit):
	  deprecated.

	* lib/rexml/document.rb (REXML::Document.entity_expansion_limit=):
	  deprecated.

	* lib/rexml/text.rb: add missing require "rexml/rexml" for
	  REXML.entity_expansion_limit.
	  Reported by Robert Ulejczyk. Thanks!!! [ruby-core:52895] [Bug #7961]

	* lib/rexml/document.rb: move entity_expansion_text_limit accessor to ...

	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):

	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit=):
	  REXML.entity_expansion_text_limit.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-26 17:54:43 +00:00
nagachika
4d45207c07 merge revision(s) 39739: [Backport #8081]
* object.c (Init_Object): remove Module#used, which has been
	  introduced in Ruby 2.0 by mistake.  [Bug #7916] [ruby-core:52719]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-26 17:51:32 +00:00
nagachika
8f96c40482 merge revision(s) 39677,39695: [Backport #8068]
* complex.c: described syntax of string form.

	* rational.c: ditto.

	* complex.c: edited rdoc.

	* rational.c: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 17:02:39 +00:00
nagachika
0d7d3a80dd merge revision(s) 39625,39626: [Backport #8008]
compile.c: calc in int

	* compile.c (iseq_compile_each): calculate argc as int, not as Fixnum.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 16:57:26 +00:00
nagachika
a41e107fd8 merge revision(s) 39632: [Backport #8013]
* lib/webrick/httpproxy.rb: Fix typos in HTTPProxyServer [Bug #8013]
	  Patch by Nobuhiro IMAI [ruby-core:53127]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 16:27:10 +00:00
nagachika
1154668521 merge revision(s) 39614: [Backport #8033]
configure.in: fix unexpand_shvar

	* configure.in (unexpand_shvar): remove guarding quotes at last.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 16:23:02 +00:00
nagachika
03ec1e8eb8 merge revision(s) 39627: [Backport #8008]
* compile.c (iseq_compile_each): pass keyword arguments to zsuper,
	  with current values.  [ruby-core:53114] [Bug #8008]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 16:10:40 +00:00
nagachika
8b5f0528a7 merge revision(s) 39595: [Backport #8014]
* ext/objspace/objspace.c (count_nodes): count also newly added nodes,
	  and fix key for unknown node.  patch by tmm1 (Aman Gupta) in
	  [ruby-core:53130] [Bug #8014]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 16:05:31 +00:00
nagachika
6ab0f648ba merge revision(s) 39601 and 39602(partially): [Backport #7983]
* class.c (rb_prepend_module): check redefinition of built-in optimized
	  methods.  [ruby-dev:47124] [Bug #7983]

	* vm.c (rb_vm_check_redefinition_by_prepend): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 16:01:49 +00:00
nagachika
b7880f1f7e merge revision(s) 39578: [Backport #8009]
* Makefile.in (miniruby, ruby): move MAINLIBC because linker arguments
	  must appear after object files with newer versions of gcc.  patch by
	  tmm1 (Aman Gupta) in [ruby-core:53121] [Bug #8009]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 15:52:07 +00:00
nagachika
a5e89ea4e7 merge revision(s) 39536: [Backport #7989]
* iseq.c (iseq_data_to_ary): fix condition.
	  r34303 introduces a bug to avoid all line information from
	  a result of ISeq#to_a. This is a regression problem from 2.0.0p0.

	* test/ruby/test_iseq.rb: add a test of lines after ISeq#to_a.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 15:47:22 +00:00
nagachika
876fb07fde merge revision(s) 39507,39508: [Backport #7963]
* tool/mkconfig.rb: reconstruct comma separated list values.  a
	  command line to Windows batch file is splitted not only by spaces
	  and equals sign but also by commas and semicolons.
	  command line to Windows batch file is split not only by spaces
	  and equal signs but also by commas and semicolons.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 15:42:06 +00:00
nagachika
63b6616798 merge revision(s) 39835: [Backport #8058]
* test/rubygems/test_gem_installer.rb (test_install_extension_flat):
	  use ruby in build directory in case ruby is not installed.
	  [ruby-core:53265] [Bug #8058]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 14:21:26 +00:00
nagachika
2aaa9ab940 merge revision(s) 39809,39834,39837: [Backport #8132]
* test/win32ole/test_err_in_callback.rb
	  (TestErrInCallBack#test_err_in_callback): shouldn't create a file in
	  source directory.

	* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup): use
	  relative path to get rid of "too long commandline" error.
	  the top of build directory.

	* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup):
	  allow using different root for source and build directories.
	  this may fixes a minor problem of r39834.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 14:17:59 +00:00
nagachika
7631f28cc9 merge revision(s) 39781,39783: [Backport #8080]
missing.h: build fix

	* include/ruby/missing.h: include time.h and sys/time.h iff needed,
  but excepct for sys/time.h on linux to get rid of glibc bug.
	* include/ruby/missing.h: removed __linux__. it's unnecessary.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 14:10:09 +00:00
nagachika
4346f5d699 merge revision(s) 39779: [Backport #8080]
Makefile.sub: fix mswin build

	* win32/Makefile.sub (config.h): fix mswin build, also VC has time.h
  and struct timeval.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 14:07:40 +00:00
nagachika
68a2dd548d merge revision(s) 39777: [Backport #8080]
mingw build fix

	* configure.in: struct timeval is defined in winsock2.h on mingw.

	* include/ruby/missing.h: include time.h for time_t, and sys/time.h
  for timeval and timespec.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 14:06:39 +00:00
nagachika
9b0861fb12 merge revision(s) 39200: [Backport #8080]
* configure.in: move OS specific header/function knowledge before
	  automatic header tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 14:03:40 +00:00
nagachika
c8755ba6d6 merge revision(s) 39174: [Backport #8080]
* configure.in: move header files check to the beginning of
	  "header and library section".
	  test rlim_t with sys/types.h and sys/time.h for MirOS BSD.
	  sys/types.h and sys/time.h is gurded by #ifdef and the above move
	  is required for this change.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 14:01:58 +00:00
nagachika
7d772fbde3 merge revision(s) 39198: [Backport #8080]
* configure.in: move the test for -march=i486 just after
	  RUBY_UNIVERSAL_ARCH/RUBY_DEFAULT_ARCH.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 13:57:38 +00:00
nagachika
78a2c1a93b merge revision(s) 39162,39163: [Backport #8080]
* configure.in: change CFLAGS temporally to test
	  ARCH_FLAG="-march=i486".


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 13:56:17 +00:00
nagachika
d4e0396719 merge revision(s) 39160: [Backport #8080]
* configure.in: don't define ARCH_FLAG="-march=i486" if it causes
	  compilation problem.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 13:54:43 +00:00
nagachika
7ff076d57b merge revision(s) 39775: [Backport #8080]
* thread.c: disabled _FORTIFY_SOURCE for avoid to hit glibc bug.
	  [Bug #8080] [ruby-core:53349]

	* test/ruby/test_io.rb (TestIO#test_io_select_with_many_files):
	  test for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 13:37:48 +00:00
nagachika
552817e561 merge revision(s) 39774: [Backport #8080]
* include/ruby/missing.h (__syscall): moved to...

	* io.c: here. because __syscall() is only used from io.c.

	* include/ruby/missing.h: move "#include <sys/type.h>" to ....

	* include/ruby/intern.h: here. because it was introduced for
	  fixing NFDBITS issue. [ruby-core:05179].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 13:36:23 +00:00
nagachika
ccb9fb0b26 merge revision(s) 39772,39773: [Backport #8080]
* configure.in: check struct timeval exist or not.

	* include/ruby/missing.h (struct timeval): check HAVE_STRUCT_TIMEVAL
	  properly. and don't include sys/time.h if struct timeval exist.

	* file.c: include sys/time.h explicitly.

	* random.c: ditto.

	* thread_pthread.c: ditto.

	* time.c: ditto.

	* ext/date/date_strftime.c: ditto.

	* include/ruby/missing.h (struct timespec): include <sys/time.h>


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 13:34:16 +00:00
nagachika
55f14b4551 merge revision(s) 39525: [Backport #8102]
configure.in: escape double-quotes

	* configure.in (unexpand_shvar): escape double-quotes in backquotes in
  double-quotes for some shells.  [Bug #7959]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-19 16:12:47 +00:00
nagachika
d32d8b33b7 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 15:13:08 +00:00
nagachika
cd1d342286 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 15:11:52 +00:00
nagachika
cae2f1eb8b 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 15:07:00 +00:00
nagachika
c071b47a22 merge revision(s) 39608: [Backport #7749]
* test/rubygems/test_require.rb:  Fix tests when 'a.rb' exists.
	  [ruby-trunk - Bug #7749]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 15:03:35 +00:00
nagachika
86ae4bc2d9 merge revision(s) 39607: [Backport #7713]
* lib/rubygems.rb:  Allow specification of directory permissions.
	  [ruby-trunk - Bug #7713]

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 15:02:50 +00:00
nagachika
3e3f03461b merge revision(s) 39606,39609: [Backport #8019]
* lib/rubygems/commands/query_command.rb:  Only fetch remote specs when
	  showing details.  [ruby-trunk - Bug #8019]  RubyGems bug #487

	* lib/rubygems/remote_fetcher.rb:  ditto.

	* lib/rubygems/security/policy.rb:  ditto.

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

	* lib/rubygems/security.rb:  Make OpenSSL optional for RubyGems.

	* lib/rubygems/commands/cert_command.rb:  ditto.

	* lib/rubygems/config_file.rb:  Display file with YAML error, not
	  ~/.gemrc

	* lib/rubygems/remote_fetcher.rb:  Only create gem subdirectories when
	  installing gems.

	* lib/rubygems/dependency_resolver.rb:  ditto.

	* lib/rubygems/test_utilities.rb:  ditto.

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

	* lib/rubygems/spec_fetcher.rb:  Only try to upgrade
	  http://rubygems.org to HTTPS

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

	* lib/rubygems.rb:  Update win_platform? check for JRuby compatibility.

	* test/rubygems/test_gem_installer.rb:  Update for Ruby 1.9.2
	  compatibility

	* test/rubygems/test_gem_spec_fetcher.rb:  Removed unused variable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 15:01:47 +00:00
nagachika
d1ce1051b9 merge revision(s) 39603: [Backport #7991]
for [Bug #7698]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 14:57:14 +00:00
nagachika
9a756111e3 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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 14:53:31 +00:00
nobu
64766e9db8 * properties.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 14:52:21 +00:00
nagachika
b2a8d8a8b4 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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 14:51:53 +00:00
nagachika
a4e52a1a85 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 14:28:56 +00:00
nagachika
b28cb4fa85 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17 14:27:00 +00:00