Commit graph

29522 commits

Author SHA1 Message Date
knu
a3b2161c6d merge revision(s) r39290:
* lib/mkmf.rb: remove extra topdir in VPATH, which was in
	  win32/Makefile.sub for some reason and moved from there.
	  [ruby-dev:46998] [Bug #7864]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23 03:58:51 +00:00
mrkn
3ecab2256f merge revision(s) 39321:
* ext/bigdecimal/bigdecimal.gemspec: bump to 1.2.0.
	  [ruby-core:51777] [Bug #7761]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23 03:13:36 +00:00
marcandre
e748726a0b * Backport r39399 from trunk:
* NEWS: Specify that Proc#eql? was also removed

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23 00:15:35 +00:00
marcandre
c12f69cbb6 * backport r39410 from trunk
* doc/NEWS-*: Update NEWS from their respective branches

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-22 23:59:29 +00:00
marcandre
7c8a477416 * backport r39400-r39407 from trunk.
* NEWS: many additions

  * object.c: Add doc for Module.prepended

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-22 23:33:51 +00:00
drbrain
9f9c04262a Merge trunk revision: 39366
* lib/rubygems/installer.rb (build_extensions):  Create extension
  install destination before building extension.  Patch by Kenta Murata.
  [ruby-trunk - Bug #7897]
* test/rubygems/test_gem_installer.rb:  Test for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-22 21:09:09 +00:00
marcandre
c40038bf49 * NEWS: pending_interrupt? is both instance and singleton method
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-22 19:35:00 +00:00
svn
c9d00de53b * 2013-02-23
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39390 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-22 17:49:29 +00:00
marcandre
4b6e74a887 * NEWS: Add Thread#pending_interrupt? and Thread.handle_interrupt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-22 17:49:23 +00:00
usa
11d79c680f merge revision(s) 39384:
* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
	  new attribute to read/write entity expansion text limit.  the default
	  limit is 10Kb.

	* lib/rexml/text.rb (REXML::Text.unnormalize): check above attribute.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-22 10:22:20 +00:00
ko1
654a363229 revert duplicate ChangeLog.
r39308 was already merged.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-21 07:35:09 +00:00
ko1
901f44d1b1 merge revision(s) 39308:
* vm_eval.c (vm_call0_body): check interrupts after method dispatch
	  from C methods. [Bug #7878]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-21 07:23:51 +00:00
drbrain
79db75dc4e Merge trunk revision: 39327
* lib/rubygems/commands/update_command.rb:  Create the installer after
  options are processed.  [ruby-trunk - Bug #7779]
* test/rubygems/test_gem_commands_update_command.rb:  Test for the
  above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-20 20:07:57 +00:00
drbrain
bf2b8c8925 Merge trunk revision: 39324
* lib/rubygems/installer.rb:  Use gsub instead of gsub! to avoid
  altering @bin_dir.  Fixes tests on windows.  [ruby-trunk - Bug #7885]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-20 19:57:35 +00:00
marcandre
c22166a3c9 * NEWS: Floats are frozen too
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-20 18:16:48 +00:00
svn
a710cba50f * 2013-02-21
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-20 18:11:28 +00:00
marcandre
3d860badec * NEWS: Add that Fixnums and Bignums are frozen
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39340 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-20 18:11:20 +00:00
shyouhei
562c0ead2f merge revision(s) 39308:
* vm_eval.c (vm_call0_body): check interrupts after method dispatch
	  from C methods. [Bug #7878]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-20 08:12:39 +00:00
svn
71fc34636a * 2013-02-20
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-19 23:57:17 +00:00
drbrain
0558cc5272 Merge revision 39292:
* compar.c (rb_invcmp): compare by inversed comarison, with preventing
  from infinite recursion.  [ruby-core:52305] [Bug #7870]

* string.c (rb_str_cmp_m), time.c (time_cmp): get rid of infinite
  recursion.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-19 23:57:11 +00:00
nobu
855f97202a merge revision(s) 39267,39273,39294,39298,39313:
* configure.in: unexpand arch sitearch and exec_prefix values, so
	  directly specified bindir, libdir, rubyprefix, etc can be properly
	  substituted.  [ruby-core:52296] [Bug #7860]

	* configure.in (shvar_to_cpp): do not substitute exec_prefix itself
	  with RUBY_EXEC_PREFIX, which cause recursive definition.
	  [ruby-core:52296] [Bug #7860]

	* configure.in (unexpand_shvar): regularize a shell variable by
	  unexpanding shell variables in it.

	* configure.in (unexpand_shvar): regularize a shell variable by
	  unexpanding shell variables in it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-19 06:50:03 +00:00
drbrain
ccd431e2e0 * backport r39307 from trunk. [Bug #7880]
* lib/rubygems/installer.rb:  Fixed placement of executables with
  --user-install.  [ruby-trunk - Bug #7779]

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-19 05:09:18 +00:00
drbrain
463c1ad110 * lib/rdoc.rb: Update to release version of 4.0.0
* lib/rubygems.rb:  Update to release version of 2.0.0


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-19 05:06:36 +00:00
nobu
fc23f8c695 merge revision(s) 39201,39202:
* win32/Makefile.sub (config.status): site and vendor directories
	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]

	* configure.in (rubysitearchprefix): sitearchdir and vendorarchdir
	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-19 03:25:48 +00:00
svn
2e4dfbca26 * 2013-02-19
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-18 23:12:30 +00:00
ko1
885f2da83b * backport r39275 from trunk. [ruby-dev:46994] [Bug #7774]
* proc.c (rb_binding_new_with_cfp): create binding object even if
  the frame is IFUNC. But return a ruby-level binding to keep
  compatibility.
  This patch fix degradation introduced from r39067.
  [Bug #7774] [ruby-dev:46960]
* test/ruby/test_settracefunc.rb: add a test.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-18 23:12:25 +00:00
svn
6c10ebe226 * 2013-02-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-16 11:45:32 +00:00
ktsj
cd391985a1 * backport r39276 from trunk. [ruby-dev:46997] [Bug #7825]
* vm.c (rb_thread_mark): mark a working Proc of bmethod
  (a method defined by define_method) even if the method was removed.
  We could not trace working Proc object which represents the body
  of bmethod if the method was removed (alias/undef/overridden).
  Simply, it was mark miss.
  This patch by Kazuki Tsujimoto. [Bug #7825]

  NOTE: We can brush up this marking because we do not need to mark
  `me' on each living control frame. We need to mark `me's
  only if `me' was free'ed. This is future work after Ruby 2.0.0.

* test/ruby/test_method.rb: add a test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-16 11:45:27 +00:00
naruse
ddddf044b2 merge revision(s) 39232,39233,39238: [Backport #7831][Backport #7852]
* lib/net/http:  Do not handle Content-Encoding when the user sets
	  Accept-Encoding.  This allows users to handle Content-Encoding for
	  themselves.  This restores backwards-compatibility with Ruby 1.x.

	* lib/net/http/generic_request.rb:  ditto.

	* lib/net/http/response.rb:  ditto

	* test/net/http/test_http.rb:  Test for the above.

	* test/net/http/test_http_request.rb:  ditto.

	* test/net/http/test_httpresponse.rb:  ditto.
	  [ruby-trunk - Bug #7831]

	* lib/net/http.rb:  Removed OpenSSL dependency from Net::HTTP.

	* test/net/http/test_http.rb:  Remove Zlib dependency from tests.

	* test/net/http/test_http_request.rb:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-14 15:51:45 +00:00
zzak
aea2c7ca50 * Backport r39168 Warning about TracePoint events to 2.0.0
[ruby-core:52073] [Bug #7815]

* vm_trace.c: note about TracePoint events set


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-14 04:17:29 +00:00
drbrain
e256dca8b2 * Backport r39213 from trunk [ruby-trunk - Bug #7383]
* lib/rubygems.rb:  Return BINARY strings from Gem.gzip and Gem.gunzip.
  Fixes intermittent test failures.  RubyGems issue #450 by Jeremey
  Kemper.
* test/rubygems/test_gem.rb:  Test for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-13 22:07:59 +00:00
svn
9476346ef5 * 2013-02-14
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-13 22:02:47 +00:00
drbrain
ceff56c7f0 * Backport part of r39166 from trunk [ruby-trunk - Bug #7809]
* lib/rubygems/package.rb:  Include checksums.yaml.gz signatures for
  verification.
* test/rubygems/test_gem_package.rb:  Test for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-13 22:02:42 +00:00
naruse
0b0316f3c1 merge revision(s) 39210:
Suppress warnings: setting Encoding.default_external

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-13 06:35:56 +00:00
naruse
4f05e726f6 merge revision(s) 39209:
Get libc's path by ldd [Bug #7828] [ruby-core:52129]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-13 06:35:19 +00:00
naruse
b7b9aa6609 merge revision(s) 39208:
* ext/json: merge JSON 1.7.7.
	  This includes security fix. [CVE-2013-0269]
	  d0a62f3ced
	  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-13 06:34:48 +00:00
svn
88cc04cf42 * 2013-02-09
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-09 12:16:49 +00:00
ktsj
33be5d2dce * backport r39167 from trunk. [ruby-core:52059] [Bug #7812]
* BSDL: update copyright notice for 2013.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-09 12:16:44 +00:00
mame
eea39155eb Release branch of Ruby 2.0.0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 12:06:41 +00:00
akr
123a3a486c fix a revision number.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 11:28:03 +00:00
usa
450a515e95 * array.c (rb_ary_dup): reverted r39004. see [Bug #7768], and the
release manager finailly decided to revert it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 10:58:35 +00:00
nobu
98932f5150 eval.c: preserve errinfo
* eval.c (rb_ensure): preserve errinfo accross ensure proc before
  JUMP_TAG().  [ruby-core:52022] [Bug #7802]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 07:09:48 +00:00
nobu
49c5a3da6f envutil.rb: check termsig
* test/ruby/envutil.rb (assert_separately): check also terminating
  signal not only if core dumped.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 07:08:32 +00:00
drbrain
70fc27b7fa * lib/rdoc/generator/darkfish.rb: Set encoding on output template to
user-specified encoding.
* test/rdoc/test_rdoc_generator_darkfish.rb:  Test for above.

* lib/rdoc.rb:  Bump version


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 04:12:56 +00:00
drbrain
d2be12ef61 * lib/rubygems/security/policy.rb: Raise proper exceptions when
verifying unsigned gems (instead of crashing).
* test/rubygems/test_gem_security_policy.rb:  Tests for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 02:58:19 +00:00
nobu
16f6500cb2 make-snapshot: fix typo
* tool/make-snapshot (package): fix typo, liburyb, in fake
  config.status.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 02:09:32 +00:00
nobu
cc9a5a4089 make-snapshot: File.join
* tool/make-snapshot (package): use File.join to get rid of continuous
  slashes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 02:09:30 +00:00
nobu
b3cd19971b make-snapshot: rubyarchdir
* tool/make-snapshot (package): fake rubyarchdir too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 02:09:27 +00:00
drbrain
c5d1d12977 * test/rubygems/test_gem_dependency_installer.rb: Improve coverage of
--install-dir feature of gem install.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 01:58:59 +00:00
drbrain
8bb45796c8 * lib/rubygems/config_file.rb: Add missing require for
user_interaction.rb

* lib/rubygems/dependency_installer.rb:  Minor refactor for clarity.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 01:15:54 +00:00