Commit graph

5168 commits

Author SHA1 Message Date
nagachika
3eb0620c2a merge revision(s) r45953,r45961: [Backport #9767]
* lib/test/unit/parallel.rb: fix test-all parallel failure if a test
	  is skipped after raise.
	  DL::TestFunc#test_sinf is skipped after raise on mingw ruby.
	  But it causes Mashal.load failure due to undefined class/module
	  DL::DLError when doing test-all parallel and test-all doesn't
	  complete. We create new MiniTest::Skip object to avoid Mashal.load
	  failure.
	  [ruby-core:62133] [Bug #9767]

	* test/testunit/test_parallel.rb (TestParallel): add a test.

	* test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
	  But it causes Marshal.load failure due to undefined class/module
	  complete. We create new MiniTest::Skip object to avoid Marshal.load


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-23 14:53:36 +00:00
nagachika
b22467dab1 merge revision(s) r45720: [Backport #9571]
* lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to
	  ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the
	  directory is not an empty directory, rmdir() shall fail and set
	  errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST.
	  [Bug #9571] [ruby-dev:48017]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-23 14:03:41 +00:00
nagachika
61754d1a6a merge revision(s) r45144: [Backport #9544]
* lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which
	  security.mac.portacl.port_high is changed.
	  See mac_portacl(4) for details.
	  Reported by Jakub Szafranski.  [ruby-core:60917] [Bug #9544]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-23 13:44:14 +00:00
nagachika
feea0a9e82 merge revision(s) r46780: [Backport #9499]
* lib/matrix.rb: Fix sign for cross_product [#9499]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-11 14:08:51 +00:00
nagachika
1fe220dc0b merge revision(s) r45344: [Backport #9543]
* lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-06 13:57:45 +00:00
nagachika
e363464b86 merge revision(s) r45786: [Backport #9738]
* lib/rinda/tuplespace.rb: fix document. [ruby-core:62003][Bug #9738]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-03 15:41:30 +00:00
nagachika
bdab29b10a merge revision(s) r46457,r46458: [Backport #9949]
* lib/net/ftp.rb (gets, readline): read lines without LF properly.
	  [ruby-core:63205] [Bug #9949]

	* test/net/ftp/test_buffered_socket.rb: related test.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 18:08:43 +00:00
nagachika
dfba910f74 merge revision(s) r46331: [Backport #9885]
* lib/net/imap.rb (body_type_1part): Gmail IMAP reports a body
	  type as "MIXED" followed immediately by params
	  [ruby-core:62864] [Bug #9885]
	  Patch by @rayners (David Raynes). [Fixes GH-622] 
	  https://github.com/ruby/ruby/pull/622


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 18:01:18 +00:00
nagachika
b18ab01b09 merge revision(s) r46598: [Backport #9991]
* lib/webrick/utils.rb (create_listeners): Close socket objects.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-28 16:41:52 +00:00
nagachika
12ac28e2a5 merge revision(s) r46182: [Backport #9872]
* lib/net/ftp.rb (transfercmd): Close TCP server socket even if an
	  exception occur.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-23 15:19:51 +00:00
nagachika
b3cbe25173 merge revision(s) r46060: [Backport #9627]
* net/protocol.rb (using_each_crlf_line): fix SMTP dot-stuffing
	  for messages not ending with a new-line.
	  [ruby-core:61441] [Bug #9627] [fix GH-616]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-22 16:53:59 +00:00
nagachika
7ebed66e59 merge revision(s) r45604: [Backport #9748]
* lib/fileutils.rb (FileUtils#copy_entry): update rdoc about
	  preserve option and permissions, following r31123.
	  [ruby-core:62065] [Bug #9748]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-27 16:05:13 +00:00
nagachika
909291085c merge revision(s) r45529: [Backport #8182]
* lib/xmlrpc/client.rb (do_rpc): don't check body length.
	  If HTTP content-encoding is used, the length may be different.
	  [Bug #8182] [ruby-core:53811]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-27 15:26:28 +00:00
nagachika
a9006d3af0 merge revision(s) r45374: [Backport #8405]
* lib/csv.rb: Fixed a broken regular expression that was causing
	  CSV to miss escaping some special meaning characters when used
	  in parsing.
	  Reported by David Unric
	  [ruby-core:54986] [Bug #8405]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-15 15:28:16 +00:00
naruse
76ddadeb1a merge revision(s) 44637: [Backport #9385]
* lib/open-uri.rb: Make proxy disabling working again.
	  Fixed by Christophe Philemotte.   [ruby-core:59650] [Bug #9385]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 08:54:43 +00:00
naruse
a9a6a643f8 merge revision(s) 44696: [Backport #9429]
* lib/racc/rdoc/grammar.en.rdoc: [DOC] Correct grammar and typos
	  Patch by Giorgos Tsiftsis [Bug #9429] [ci skip]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 06:11:15 +00:00
naruse
b1073f8917 merge revision(s) 44878,44879: [Backport #9483]
* ext/ripper/lib/ripper/lexer.rb: [DOC] use lower case version of core
	  classes when referring to return value, since we aren't directly
	  talking about the class. Patch by Jonathan Jackson [Bug #9483]

	* lib/open-uri.rb: [DOC] use lower case version of core classes, same
	  as commit r44878, based on patch by Jonathan Jackson [Bug #9483]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 06:06:55 +00:00
naruse
d3452b5727 merge revision(s) 44642: [Backport #9093]
* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated
	  string.
	  Patch by Ryan Brunner.  [ruby-core:58220] [Bug #9093]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 06:01:44 +00:00
naruse
361c2fe9bb merge revision(s) 44586: [Backport #9152]
* lib/xmlrpc/client.rb: [DOC] Remove note about SSL package on RAA
	  Since RAA has been deprecated, and the SSL package has been replaced
	  with net/https this statement is entirely false and should be
	  deleted. [Bug #9152]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 05:46:06 +00:00
naruse
f5731cb968 merge revision(s) 44585: [Backport #9268]
* lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis
	  Fixes the following bugs: [Bug #9152] [Bug #9268] [Bug #9394]

	* lib/open-uri.rb: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 05:39:58 +00:00
naruse
96cfe6614a merge revision(s) 44880: [Backport #9477]
* lib/resolv.rb: Ignore name servers which cause EAFNOSUPPORT on
	  socket creation.
	  Reported by Bjoern Rennhak.  [ruby-core:60442] [Bug #9477]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 05:20:38 +00:00
naruse
9598582957 merge revision(s) 44884: [Backport #9498]
* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder): Raise
	  DecodeError if no data before the limit.
	  Reported by Will Bryant.  [ruby-core:60557] [Bug #9498]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 05:14:42 +00:00
naruse
562f916fbd merge revision(s) 44469: [Backport #9329]
* lib/mkmf.rb (RbConfig): expand RUBY_SO_NAME for extensions
	  backward compatibility.  [ruby-core:59426] [Bug #9329]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-21 14:14:26 +00:00
naruse
14a3402357 merge revision(s) 44312,44318: [Backport #9273]
* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
	  consider encodings in hosts file.  [ruby-core:59239] [Bug #9273]

	* lib/resolv.rb (Resolv::Config.parse_resolv_conf): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-21 09:08:45 +00:00
naruse
f851d5dea6 merge revision(s) 44494:
* lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
	  ipv4_multicast_ttl option for portability.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-20 03:25:08 +00:00
naruse
879ac9dec2 merge revision(s) 44492: [Backport #9351]
* lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
	  ipv4_multicast_loop option for portability.  Patch by Jeremy Evans.
	  [ruby-trunk - Bug #9351]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-18 23:07:51 +00:00
naruse
9b9d3bac4d * lib/rubygems: RubyGems 2.2.2 which contains the following bug fixes:
http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.2.2+%2F+2014-02-05
  https://bugs.ruby-lang.org/issues/9489


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-06 02:59:36 +00:00
naruse
c00e288936 merge revision(s) 44517,44518,44519,44523: [Backport #9354]
* lib/timeout.rb (Timeout#timeout): when a custom exception is given,
	  no instance is needed to be caught, so defer creating new instance
	  until it is raised.  [ruby-core:59511] [Bug #9354]

	* lib/timeout.rb (Timeout#timeout): should not rescue ordinarily
	  raised ExitException, which should not be thrown.

	* lib/timeout.rb (Timeout::ExitException.catch): set @thread only if
	  it ought to be caught.

	* lib/timeout.rb (Timeout::ExitException.catch): pass arguments
	  for new instance.

	* lib/timeout.rb (Timeout::ExitException#exception): fallback to
	  Timeout::Error if couldn't throw.  [ruby-dev:47872] [Bug #9380]

	* lib/timeout.rb (Timeout#timeout): initialize ExitException with
	  message for the fallback case.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 12:43:19 +00:00
naruse
3da0a0cead merge revision(s) 44630,44631: [Backport #9403]
* lib/delegate.rb (Delegator): keep source information methods
	  which start and end with '__'.  [ruby-core:58572] [Bug #9155]
	  which start and end with '__'.  [ruby-core:59718] [Bug #9403]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-02 13:46:46 +00:00
naruse
8f87be4e22 Revert r44778 #9375
It breaks test-all if all tests are in a single process


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-01 08:19:06 +00:00
naruse
3efb494a21 merge revision(s) 44515: [Backport #9375]
* lib/rubygems:  Update to RubyGems master 21e409d / RubyGems 2.2.1.
	  See http://rubygems.rubyforge.org/rubygems-update/History_txt.html
	  for a list of bug fixes.

	* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-31 09:17:42 +00:00
naruse
8680f4f8de merge revision(s) 44333: [Backport #9282]
* lib/rubygems/commands/install_command.rb:  Restore gem install
	  --ignore-dependencies for remote gems

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-23 07:13:17 +00:00
naruse
b6a2e6aa51 merge revision(s) 44332: [Backport #9281]
* lib/rdoc.rb:  Set RDoc to release version.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-22 10:25:26 +00:00
naruse
b730f63382 merge revision(s) 44331: [Backport #9280]
* lib/rubygems.rb:  Set RubyGems to release version.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-22 10:22:40 +00:00
naruse
fb1d4fa888 merge revision(s) 44330: [Backport #9279]
* lib/rubygems.rb (module Gem):  Fix comment for
	  Gem::load_path_insert_index.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-22 10:22:18 +00:00
drbrain
37e4a8d39d * lib/rubygems: Update to RubyGems master 03d6ae7. Changes include:
* Fixed typos.

  * Relaxed Gem.ruby test for ruby packagers that do not use `ruby`.

* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-19 22:09:19 +00:00
a_matsuda
6bd1988668 * lib/rexml/entity.rb: [DOC] Fix typo
s/matchs/matches/
[ci skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-19 07:58:36 +00:00
drbrain
f8bcd57cb7 * lib/rubygems: Update to RubyGems master af60443. Changes include:
* Improved speed of `gem install --ignore-dependencies`.

  * Open read-write for exclusive flock.  [ruby-trunk - Bug #9257]

  * Remove specification before install to prevent infinite loop.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-19 03:05:37 +00:00
a_matsuda
0e04af5263 * lib/test/unit/assertions.rb: [DOC] Fix typo
s/maye be/may be/
[ci skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-18 04:20:25 +00:00
drbrain
228ad3d799 * lib/rubygems: Update to RubyGems master d8f12e2. This increases the
speed of `gem install --ignore-dependencies` which helps bundler
  tests.
* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-18 01:02:58 +00:00
a_matsuda
d103d3a94d * lib/e2mmap.rb: Fix typo in an error message
s/registerd/registered/

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-17 11:20:10 +00:00
drbrain
e80f2c118a * lib/rubygems: Update to RubyGems master 1c5f4b3. Allows rubygems
repackagers to disable backward-compatible shared gem directory
  behavior.
* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-16 20:18:29 +00:00
a_matsuda
82eef27f46 * lib/shell/filter.rb: [DOC] Fix typo
s/exection/execution/
[ci skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-15 02:09:41 +00:00
drbrain
6c9a3cb681 * lib/rubygems/basic_specification.rb (class Gem): Revert r44213, it
causes SystemStackError for bundler


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-15 00:51:37 +00:00
drbrain
23201ab1c4 * lib/rdoc: Update to RDoc master 263a9e5. This improves the
accessibility of the search box.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-14 22:09:35 +00:00
drbrain
e6147745d5 * lib/rubygems/basic_specification.rb: Update to RubyGems master
9c718fe.  Removes code duplication.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-14 20:28:45 +00:00
a_matsuda
4618b7f200 [DOC] Fix output of Shellwords.escape() by @anatol [Fixes GH-483]
* lib/shellwords.rb:  Fix output of Shellwords.escape()
https://github.com/ruby/ruby/pull/483
[ci-skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-14 18:26:59 +00:00
a_matsuda
65b9ee0838 * lib/debug.rb: [DOC] Fix typo
s/useage/usage/
[ci skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-14 14:48:36 +00:00
a_matsuda
adb1ee65b7 [DOC] Correct a couple of typos in comments by @dvsuresh [Fixes GH-482]
* doc/ChangeLog-YARV:  Correct a typo in comment
* lib/rubygems/specification.rb:  ditto.
* test/rexml/data/tutorial.xml:  ditto.
* test/ruby/test_settracefunc.rb:  ditto.
* tool/instruction.rb:  ditto.

https://github.com/ruby/ruby/pull/482
[ci-skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-14 10:54:54 +00:00
nobu
95ed081663 logger.rb: fix extra log ratation
* lib/logger.rb (lock_shift_log): no need to rotate the log file
  if it has been rotated by another process.  based on the patch
  by no6v (Nobuhiro IMAI) in [ruby-core:58620].  [Bug #9133]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-14 05:43:01 +00:00