PageRenderTime 68ms CodeModel.GetById 21ms RepoModel.GetById 0ms app.codeStats 0ms

/patches/ruby/2.1.0/railsexpress/01-current-2.1.1-fixes.patch

http://github.com/skaes/rvm-patchsets
Patch | 4227 lines | 3895 code | 332 blank | 0 comment | 0 complexity | 5cc9064f0dee3da79ab793c6a21b40bb MD5 | raw file
    

  1. diff --git a/ChangeLog b/ChangeLog
    2. 

  2. index 0349f7c..66ef0e4 100644
    3. 

  3. --- a/ChangeLog
    4. 

  4. +++ b/ChangeLog
    5. 

  5. @@ -1,3 +1,216 @@
    6. 

  6. +Thu Feb 6 08:23:28 2014  Eric Wong  <e@80x24.org>
    7. 

  7. +
    8. 

  8. +	* ext/thread/thread.c (rb_szqueue_max_set): use correct queue and
    9. 

  9. +	  limit wakeups.  [Bug #9343][ruby-core:60517]
    10. 

  10. +	* test/thread/test_queue.rb (test_sized_queue_assign_max):
    11. 

  11. +	  test for bug
    12. 

  12. +
    13. 

  13. +Thu Feb  6 11:27:39 2014  Eric Hodel  <drbrain@segment7.net>
    14. 

  14. +
    15. 

  15. +	* lib/rubygems: RubyGems 2.2.2 which contains the following bug fixes:
    16. 

  16. +	  http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.2.2+%2F+2014-02-05
    17. 

  17. +	  https://bugs.ruby-lang.org/issues/9489
    18. 

  18. +
    19. 

  19. +Thu Feb  6 11:23:59 2014  Koichi Sasada  <ko1@atdot.net>
    20. 

  20. +
    21. 

  21. +	* gc.c (ruby_gc_set_params): if RUBY_GC_OLDMALLOC_LIMIT is provided,
    22. 

  22. +	  then set objspace->rgengc.oldmalloc_increase_limit.
    23. 

  23. +	  Without this fix, the env variable RUBY_GC_OLDMALLOC_LIMIT
    24. 

  24. +	  does not work.
    25. 

  25. +
    26. 

  26. +	* gc.c (get_envparam_int): accept a value equals to lowerbounds.
    27. 

  27. +
    28. 

  28. +	* gc.c (get_envparam_double): ditto.
    29. 

  29. +
    30. 

  30. +Wed Feb  5 23:57:05 2014  Charlie Somerville  <charliesome@ruby-lang.org>
    31. 

  31. +
    32. 

  32. +	* ext/thread/thread.c (rb_szqueue_push): check GET_SZQUEUE_WAITERS
    33. 

  33. +	  instead of GET_QUEUE_WAITERS to prevent deadlock. Patch by Eric Wong.
    34. 

  34. +	  [Bug #9302] [ruby-core:59324]
    35. 

  35. +
    36. 

  36. +	* test/thread/test_queue.rb: add test
    37. 

  37. +
    38. 

  38. +Wed Feb  5 23:43:30 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
    39. 

  39. +
    40. 

  40. +	* hash.c (rb_objid_hash): should return `long'.  brushup r44534.
    41. 

  41. +
    42. 

  42. +	* object.c (rb_obj_hash): follow above change.
    43. 

  43. +
    44. 

  44. +Wed Feb  5 23:43:30 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
    45. 

  45. +
    46. 

  46. +	* hash.c (rb_any_hash): should treat the return value of rb_objid_hash()
    47. 

  47. +	  as `long', because ruby assumes the hash value of the object id of
    48. 

  48. +	  an object is `long'.
    49. 

  49. +	  this fixes test failures on mswin64 introduced at r44525.
    50. 

  50. +
    51. 

  51. +Wed Feb  5 23:43:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    52. 

  52. +
    53. 

  53. +	* hash.c (rb_objid_hash): return hash value from object ID with a
    54. 

  54. +	  salt, extract from rb_any_hash().
    55. 

  55. +
    56. 

  56. +	* object.c (rb_obj_hash): return same value as rb_any_hash().
    57. 

  57. +	  fix r44125.  [ruby-core:59638] [Bug #9381]
    58. 

  58. +
    59. 

  59. +Wed Feb  5 22:28:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    60. 

  60. +
    61. 

  61. +	* vm_insnhelper.c (vm_search_super_method): allow bound method from a
    62. 

  62. +	  module, yet another method transplanting.
    63. 

  63. +
    64. 

  64. +Wed Feb  5 22:28:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    65. 

  65. +
    66. 

  66. +	* vm_insnhelper.c (vm_search_super_method): when super called in a
    67. 

  67. +	  bound UnboundMethod generated from a module, no superclass is
    68. 

  68. +	  found since the current defined class is the module, then call
    69. 

  69. +	  method_missing in that case.  [ruby-core:59619] [Bug #9377]
    70. 

  70. +
    71. 

  71. +Wed Feb  5 21:57:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    72. 

  72. +
    73. 

  73. +	* ext/socket/socket.c (rsock_syserr_fail_host_port): add errno
    74. 

  74. +	  argument version anduse rb_syserr_fail_str() instead of
    75. 

  75. +	  rb_sys_fail_str() with restoring errno.
    76. 

  76. +
    77. 

  77. +	* ext/socket/socket.c (rsock_syserr_fail_path): ditto, and
    78. 

  78. +	  rb_syserr_fail().
    79. 

  79. +
    80. 

  80. +	* ext/socket/socket.c (rsock_sys_fail_sockaddr): ditto, use
    81. 

  81. +	  rsock_syserr_fail_raddrinfo().
    82. 

  82. +
    83. 

  83. +	* ext/socket/socket.c (rsock_sys_fail_raddrinfo): ditto.
    84. 

  84. +
    85. 

  85. +	* ext/socket/socket.c (setup_domain_and_type): ditto.
    86. 

  86. +
    87. 

  87. +Wed Feb  5 21:57:40 2014  Eric Wong  <normalperson@yhbt.net>
    88. 

  88. +
    89. 

  89. +	* ext/socket/socket.c (rsock_sys_fail_host_port): save and restore errno
    90. 

  90. +	  before calling rb_sys_fail_str to prevent [BUG] errno == 0.
    91. 

  91. +	  Patch by Eric Wong. [ruby-core:59498] [Bug #9352]
    92. 

  92. +
    93. 

  93. +	* ext/socket/socket.c (rsock_sys_fail_path): ditto
    94. 

  94. +	* ext/socket/socket.c (rsock_sys_fail_sockaddr): ditto
    95. 

  95. +	* ext/socket/socket.c (rsock_sys_fail_raddrinfo): ditto
    96. 

  96. +	* ext/socket/socket.c (rsock_sys_fail_raddrinfo_or_sockaddr): ditto
    97. 

  97. +
    98. 

  98. +Wed Feb  5 21:12:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    99. 

  99. +
    100. 

  100. +	* lib/timeout.rb (Timeout::ExitException.catch): pass arguments
    101. 

  101. +	  for new instance.
    102. 

  102. +
    103. 

  103. +	* lib/timeout.rb (Timeout::ExitException#exception): fallback to
    104. 

  104. +	  Timeout::Error if couldn't throw.  [ruby-dev:47872] [Bug #9380]
    105. 

  105. +
    106. 

  106. +	* lib/timeout.rb (Timeout#timeout): initialize ExitException with
    107. 

  107. +	  message for the fallback case.
    108. 

  108. +
    109. 

  109. +Wed Feb  5 21:12:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    110. 

  110. +
    111. 

  111. +	* lib/timeout.rb (Timeout#timeout): should not rescue ordinarily
    112. 

  112. +	  raised ExitException, which should not be thrown.
    113. 

  113. +
    114. 

  114. +	* lib/timeout.rb (Timeout::ExitException.catch): set @thread only if
    115. 

  115. +	  it ought to be caught.
    116. 

  116. +
    117. 

  117. +	* lib/timeout.rb (Timeout#timeout): when a custom exception is given,
    118. 

  118. +	  no instance is needed to be caught, so defer creating new instance
    119. 

  119. +	  until it is raised.  [ruby-core:59511] [Bug #9354]
    120. 

  120. +
    121. 

  121. +Wed Feb  5 17:55:28 2014  Aman Gupta <ruby@tmm1.net>
    122. 

  122. +
    123. 

  123. +	* array.c (ary_add_hash): Fix consistency issue between Array#uniq and
    124. 

  124. +	  Array#uniq! [Bug #9340] [ruby-core:59457]
    125. 

  125. +	* test/ruby/test_array.rb (class TestArray): regression test for above.
    126. 

  126. +
    127. 

  127. +Wed Feb  5 11:48:42 2014  Charlie Somerville  <charliesome@ruby-lang.org>
    128. 

  128. +
    129. 

  129. +	* struct.c (rb_struct_set): return assigned value from setter method
    130. 

  130. +	  rather than struct object. [Bug #9353] [ruby-core:59509]
    131. 

  131. +
    132. 

  132. +	* test/ruby/test_struct.rb (test_setter_method_returns_value): add test
    133. 

  133. +
    134. 

  134. +Wed Feb  5 11:13:21 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    135. 

  135. +
    136. 

  136. +	* string.c (rb_str_modify_expand): enable capacity and disable
    137. 

  137. +	  assocation with packed objects when setting capa, so that
    138. 

  138. +	  pack("p") string fails to unpack properly after modified.
    139. 

  139. +
    140. 

  140. +Sun Feb  2 22:39:28 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    141. 

  141. +
    142. 

  142. +	* lib/delegate.rb (Delegator): keep source information methods
    143. 

  143. +	  which start and end with '__'.  [ruby-core:59718] [Bug #9403]
    144. 

  144. +
    145. 

  145. +Fri Jan 31 12:10:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    146. 

  146. +
    147. 

  147. +	* proc.c (mnew_from_me): keep iclass as-is, to make inheritance
    148. 

  148. +	  chain consistent.  [ruby-core:59358] [Bug #9315]
    149. 

  149. +
    150. 

  150. +	* proc.c (method_owner): return the original defined_class from
    151. 

  151. +	  prepended iclass, instead.
    152. 

  152. +
    153. 

  153. +Fri Jan 31 12:05:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    154. 

  154. +
    155. 

  155. +	* configure.in: let mingw do something black-magic, and check if
    156. 

  156. +	  _gmtime64_s() is available actually.
    157. 

  157. +
    158. 

  158. +	* win32/win32.c (gmtime_s, localtime_s): use _gmtime64_s() and
    159. 

  159. +	  _localtime64_s() if available, not depending on very confusing
    160. 

  160. +	  mingw variants macros.  based on the patch by phasis68 (Heesob
    161. 

  161. +	  Park) at [ruby-core:58764].  [ruby-core:58391] [Bug #9119]
    162. 

  162. +
    163. 

  163. +Thu Jan 30 15:02:35 2014  Shugo Maeda  <shugo@ruby-lang.org>
    164. 

  164. +
    165. 

  165. +	* configure.in: use $@ instead of $(.TARGET) because .TARGET is not
    166. 

  166. +	  supported by GNU make.
    167. 

  167. +
    168. 

  168. +Mon Jan 27 16:49:52 2014  Kenta Murata  <mrkn@mrkn.jp>
    169. 

  169. +
    170. 

  170. +	* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): Add an additional
    171. 

  171. +	  digit for the quotient to be compatible with bigdecimal 1.2.1 and
    172. 

  172. +	  the former.  [ruby-core:59365] [#9316] [#9305]
    173. 

  173. +
    174. 

  174. +	* test/bigdecimal/test_bigdecimal.rb: tests for the above change.
    175. 

  175. +
    176. 

  176. +	* ext/bigdecimal/bigdecimal.gemspec: bigdecimal version 1.2.4.
    177. 

  177. +
    178. 

  178. +Mon Jan 27 16:45:34 2014  Yamashita Yuu  <yamashita@geishatokyo.com>
    179. 

  179. +
    180. 

  180. +	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant
    181. 

  181. +	  `OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined.  The
    182. 

  182. +	  `SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest
    183. 

  183. +	  snapshot of OpenSSL 1.0.1.  [Fixes GH-488]
    184. 

  184. +
    185. 

  185. +Thu Jan 23 10:37:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    186. 

  186. +
    187. 

  187. +	* hash.c (HAS_EXTRA_STATES): warn extra states only when something
    188. 

  188. +	  differ.  [ruby-core:59254] [Bug #9275]
    189. 

  189. +
    190. 

  190. +Thu Jan  9 14:05:24 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
    191. 

  191. +
    192. 

  192. +	* win32/{setup.mak,Makefile.sub}: update fake.rb like
    193. 

  193. +	  template/fake.rb.in.
    194. 

  194. +
    195. 

  195. +Thu Jan  9 14:05:24 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
    196. 

  196. +
    197. 

  197. +	* win32/Makefile.sub (fake.rb): should depend on version.h because
    198. 

  198. +	  if RUBY_VERSION is updated, fake.rb need to say the new version
    199. 

  199. +	  to avoid install error in rbconfig.rb.
    200. 

  200. +
    201. 

  201. +Thu Jan  9 08:21:00 2014  Aman Gupta <ruby@tmm1.net>
    202. 

  202. +
    203. 

  203. +	* test/net/imap/cacert.pem: generate new CA cert, since the last one
    204. 

  204. +	  expired. [Bug #9341] [ruby-core:59459]
    205. 

  205. +	* test/net/imap/server.crt: new server cert signed with updated CA.
    206. 

  206. +	* test/net/imap/Makefile: add `make regen_certs` to automate this
    207. 

  207. +	  process.
    208. 

  208. +
    209. 

  209. +Thu Dec 26 03:28:11 2013  Koichi Sasada  <ko1@atdot.net>
    210. 

  210. +
    211. 

  211. +	* vm_insnhelper.c (argument_error): insert dummy frame to make
    212. 

  212. +	  a backtrace object intead of modify backtrace string array.
    213. 

  213. +	  [Bug #9295]
    214. 

  214. +
    215. 

  215. +	* test/ruby/test_backtrace.rb: add a test for this patch.
    216. 

  216. +	  fix test to compare a result of Exception#backtrace with
    217. 

  217. +	  a result of Exception#backtrace_locations.
    218. 

  218. +
    219. 

  219.  Wed Dec 25 16:58:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
    220. 

  220.  
    221. 

  221.  	* proc.c (rb_mod_define_method): consider visibility only if self
    222. 

  222. diff --git a/NEWS b/NEWS
    223. 

  223. index 59251a4..afd15fa 100644
    224. 

  224. --- a/NEWS
    225. 

  225. +++ b/NEWS
    226. 

  226. @@ -114,6 +114,7 @@ with all sufficient information, see the ChangeLog file.
    227. 

  227.      * Process.clock_getres
    228. 

  228.  
    229. 

  229.  * String
    230. 

  230. +  * "literal".freeze is now optimized to return the same object
    231. 

  231.    * New methods:
    232. 

  232.      * String#scrub and String#scrub! verify and fix invalid byte sequence.
    233. 

  233.        If you want to use this function with older Ruby,
    234. 

  234. @@ -133,6 +134,10 @@ with all sufficient information, see the ChangeLog file.
    235. 

  235.  
    236. 

  236.  === Core classes compatibility issues (excluding feature bug fixes)
    237. 

  237.  
    238. 

  238. +* Dir
    239. 

  239. +  * incompatible changes:
    240. 

  240. +    * Dir#glob returns composed characters (previously Apple Modofied UTF-8).
    241. 

  241. +
    242. 

  242.  * Hash
    243. 

  243.    * incompatible changes:
    244. 

  244.      * Hash#reject will return plain Hash object in the future versions, that
    245. 

  245. @@ -250,7 +255,7 @@ String
    246. 

  246.  * REXML::Parsers::SAX2Parser
    247. 

  247.    * Fixes wrong number of arguments of entitydecl event. Document of the event
    248. 

  248.      says "an array of the entity declaration" but implementation passes two
    249. 

  249. -    or more arguments. It is an implementation bug but it breaks backword
    250. 

  250. +    or more arguments. It is an implementation bug but it breaks backward
    251. 

  251.      compatibility.
    252. 

  252.  
    253. 

  253.  * REXML::Parsers::StreamParser
    254. 

  254. @@ -271,6 +276,8 @@ String
    255. 

  255.      * Improved, iterative resolver (compared to RubyGems 2.1 and earlier)
    256. 

  256.      * Support for a sharing a GEM_HOME across ruby platforms and versions
    257. 

  257.  
    258. 

  258. +  * Updated to 2.2.2.  Fixes some minor bugs and performance regressions.
    259. 

  259. +
    260. 

  260.      For a complete list of enhancements and bug fixes see:
    261. 

  261.      https://github.com/rubygems/rubygems/tree/master/History.txt
    262. 

  262.  
    263. 

  263. diff --git a/array.c b/array.c
    264. 

  264. index 45713c5..ff77a3e 100644
    265. 

  265. --- a/array.c
    266. 

  266. +++ b/array.c
    267. 

  267. @@ -3904,7 +3904,9 @@ ary_add_hash(VALUE hash, VALUE ary)
    268. 

  268.  
    269. 

  269.      for (i=0; i<RARRAY_LEN(ary); i++) {
    270. 

  270.  	VALUE elt = RARRAY_AREF(ary, i);
    271. 

  271. -	rb_hash_aset(hash, elt, elt);
    272. 

  272. +	if (rb_hash_lookup2(hash, elt, Qundef) == Qundef) {
    273. 

  273. +	    rb_hash_aset(hash, elt, elt);
    274. 

  274. +	}
    275. 

  275.      }
    276. 

  276.      return hash;
    277. 

  277.  }
    278. 

  278. diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
    279. 

  279. index 4282bc6..0a7cb0a 100644
    280. 

  280. --- a/bootstraptest/test_method.rb
    281. 

  281. +++ b/bootstraptest/test_method.rb
    282. 

  282. @@ -957,8 +957,8 @@ assert_equal 'ok', %q{
    283. 

  283.  
    284. 

  284.  assert_normal_exit %q{
    285. 

  285.    begin
    286. 

  286. -    Process.setrlimit(Process::RLIMIT_STACK, 4_202_496)
    287. 

  287. -    # FreeBSD fails this less than 4M + 8K bytes.
    288. 

  288. +    Process.setrlimit(Process::RLIMIT_STACK, 4_206_592)
    289. 

  289. +    # FreeBSD SEGVs this less than 4M + 12K bytes.
    290. 

  290.    rescue Exception
    291. 

  291.      exit
    292. 

  292.    end
    293. 

  293. diff --git a/configure.in b/configure.in
    294. 

  294. index ea14b94..84f176d 100644
    295. 

  295. --- a/configure.in
    296. 

  296. +++ b/configure.in
    297. 

  297. @@ -888,6 +888,7 @@ AC_ARG_WITH(winnt-ver,
    298. 

  298.  AS_CASE(["$target_os"],
    299. 

  299.  [mingw*], [
    300. 

  300.    RUBY_APPEND_OPTION(CPPFLAGS, -D_WIN32_WINNT=$with_winnt_ver)
    301. 

  301. +  RUBY_APPEND_OPTION(CPPFLAGS, -D__MINGW_USE_VC2005_COMPAT)
    302. 

  302.  ])
    303. 

  303.  
    304. 

  304.  AS_CASE(["$target_os"],
    305. 

  305. @@ -1040,6 +1041,7 @@ main()
    306. 

  306.  		if test x"$ac_cv_type_NET_LUID" = xyes; then
    307. 

  307.  		    AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
    308. 

  308.  		fi
    309. 

  309. +		AC_CHECK_FUNCS(_gmtime64_s)
    310. 

  310.  		AC_LIBOBJ([langinfo])
    311. 

  311.  		],
    312. 

  312.  [os2-emx*], [	LIBS="-lm $LIBS"
    313. 

  313. @@ -2656,7 +2658,7 @@ if test "$with_dln_a_out" != yes; then
    314. 

  314.  			: ${LDSHARED='$(CC) -shared'}
    315. 

  315.  			if test "$rb_cv_binary_elf" = yes; then
    316. 

  316.  			    LDFLAGS="$LDFLAGS -rdynamic"
    317. 

  317. -			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
    318. 

  318. +			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
    319. 

  319.  			else
    320. 

  320.  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
    321. 

  321.  			fi
    322. 

  322. diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
    323. 

  323. index e0b7c01..8537817 100644
    324. 

  324. --- a/ext/bigdecimal/bigdecimal.c
    325. 

  325. +++ b/ext/bigdecimal/bigdecimal.c
    326. 

  326. @@ -1221,8 +1221,10 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
    327. 

  327.  
    328. 

  328.      *div = b;
    329. 

  329.      mx = a->Prec + vabs(a->exponent);
    330. 

  330. -    if (mx<b->Prec + vabs(b->exponent)) mx = b->Prec + vabs(b->exponent);
    331. 

  331. -    mx =(mx + 1) * VpBaseFig();
    332. 

  332. +    if (mx < b->Prec + vabs(b->exponent)) mx = b->Prec + vabs(b->exponent);
    333. 

  333. +    mx++; /* NOTE: An additional digit is needed for the compatibility to
    334. 

  334. +                   the version 1.2.1 and the former.  */
    335. 

  335. +    mx = (mx + 1) * VpBaseFig();
    336. 

  336.      GUARD_OBJ((*c), VpCreateRbObject(mx, "#0"));
    337. 

  337.      GUARD_OBJ((*res), VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
    338. 

  338.      VpDivd(*c, *res, a, b);
    339. 

  339. diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
    340. 

  340. index 676e05b..7be9d72 100644
    341. 

  341. --- a/ext/bigdecimal/bigdecimal.gemspec
    342. 

  342. +++ b/ext/bigdecimal/bigdecimal.gemspec
    343. 

  343. @@ -1,5 +1,5 @@
    344. 

  344.  # -*- ruby -*-
    345. 

  345. -_VERSION = "1.2.3"
    346. 

  346. +_VERSION = "1.2.4"
    347. 

  347.  date = %w$Date::                           $[1]
    348. 

  348.  
    349. 

  349.  Gem::Specification.new do |s|
    350. 

  350. diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
    351. 

  351. index ec71350..206470c 100644
    352. 

  352. --- a/ext/openssl/ossl_ssl.c
    353. 

  353. +++ b/ext/openssl/ossl_ssl.c
    354. 

  354. @@ -2229,7 +2229,9 @@ Init_ossl_ssl()
    355. 

  355.      ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
    356. 

  356.      ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
    357. 

  357.      ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
    358. 

  358. +#if defined(SSL_OP_MSIE_SSLV2_RSA_PADDING)
    359. 

  359.      ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
    360. 

  360. +#endif
    361. 

  361.      ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
    362. 

  362.      ossl_ssl_def_const(OP_TLS_D5_BUG);
    363. 

  363.      ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);
    364. 

  364. diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
    365. 

  365. index 97c02fc..c74fb32 100644
    366. 

  366. --- a/ext/socket/rubysocket.h
    367. 

  367. +++ b/ext/socket/rubysocket.h
    368. 

  368. @@ -374,6 +374,12 @@ void rsock_init_sockopt(void);
    369. 

  369.  void rsock_init_sockifaddr(void);
    370. 

  370.  void rsock_init_socket_init(void);
    371. 

  371.  
    372. 

  372. +NORETURN(void rsock_syserr_fail_host_port(int err, const char *, VALUE, VALUE));
    373. 

  373. +NORETURN(void rsock_syserr_fail_path(int err, const char *, VALUE));
    374. 

  374. +NORETURN(void rsock_syserr_fail_sockaddr(int err, const char *mesg, struct sockaddr *addr, socklen_t len));
    375. 

  375. +NORETURN(void rsock_syserr_fail_raddrinfo(int err, const char *mesg, VALUE rai));
    376. 

  376. +NORETURN(void rsock_syserr_fail_raddrinfo_or_sockaddr(int err, const char *mesg, VALUE addr, VALUE rai));
    377. 

  377. +
    378. 

  378.  NORETURN(void rsock_sys_fail_host_port(const char *, VALUE, VALUE));
    379. 

  379.  NORETURN(void rsock_sys_fail_path(const char *, VALUE));
    380. 

  380.  NORETURN(void rsock_sys_fail_sockaddr(const char *, struct sockaddr *addr, socklen_t len));
    381. 

  381. diff --git a/ext/socket/socket.c b/ext/socket/socket.c
    382. 

  382. index 5fd7465..c7fc5b7 100644
    383. 

  383. --- a/ext/socket/socket.c
    384. 

  384. +++ b/ext/socket/socket.c
    385. 

  385. @@ -15,6 +15,12 @@ static VALUE sock_s_unpack_sockaddr_in(VALUE, VALUE);
    386. 

  386.  void
    387. 

  387.  rsock_sys_fail_host_port(const char *mesg, VALUE host, VALUE port)
    388. 

  388.  {
    389. 

  389. +    rsock_syserr_fail_host_port(errno, mesg, host, port);
    390. 

  390. +}
    391. 

  391. +
    392. 

  392. +void
    393. 

  393. +rsock_syserr_fail_host_port(int err, const char *mesg, VALUE host, VALUE port)
    394. 

  394. +{
    395. 

  395.      VALUE message;
    396. 

  396.  
    397. 

  397.      port = rb_String(port);
    398. 

  398. @@ -22,13 +28,20 @@ rsock_sys_fail_host_port(const char *mesg, VALUE host, VALUE port)
    399. 

  399.      message = rb_sprintf("%s for \"%s\" port %s",
    400. 

  400.  	    mesg, StringValueCStr(host), StringValueCStr(port));
    401. 

  401.  
    402. 

  402. -    rb_sys_fail_str(message);
    403. 

  403. +    rb_syserr_fail_str(err, message);
    404. 

  404.  }
    405. 

  405.  
    406. 

  406.  void
    407. 

  407.  rsock_sys_fail_path(const char *mesg, VALUE path)
    408. 

  408.  {
    409. 

  409. +    rsock_syserr_fail_path(errno, mesg, path);
    410. 

  410. +}
    411. 

  411. +
    412. 

  412. +void
    413. 

  413. +rsock_syserr_fail_path(int err, const char *mesg, VALUE path)
    414. 

  414. +{
    415. 

  415.      VALUE message;
    416. 

  416. +
    417. 

  417.      if (RB_TYPE_P(path, T_STRING)) {
    418. 

  418.          if (memchr(RSTRING_PTR(path), '\0', RSTRING_LEN(path))) {
    419. 

  419.              path = rb_str_inspect(path);
    420. 

  420. @@ -39,45 +52,64 @@ rsock_sys_fail_path(const char *mesg, VALUE path)
    421. 

  421.              message = rb_sprintf("%s for \"%s\"", mesg,
    422. 

  422.                      StringValueCStr(path));
    423. 

  423.          }
    424. 

  424. -        rb_sys_fail_str(message);
    425. 

  425. +	rb_syserr_fail_str(err, message);
    426. 

  426.      }
    427. 

  427.      else {
    428. 

  428. -        rb_sys_fail(mesg);
    429. 

  429. +	rb_syserr_fail(err, mesg);
    430. 

  430.      }
    431. 

  431.  }
    432. 

  432.  
    433. 

  433.  void
    434. 

  434.  rsock_sys_fail_sockaddr(const char *mesg, struct sockaddr *addr, socklen_t len)
    435. 

  435.  {
    436. 

  436. +    rsock_syserr_fail_sockaddr(errno, mesg, addr, len);
    437. 

  437. +}
    438. 

  438. +
    439. 

  439. +void
    440. 

  440. +rsock_syserr_fail_sockaddr(int err, const char *mesg, struct sockaddr *addr, socklen_t len)
    441. 

  441. +{
    442. 

  442.      VALUE rai;
    443. 

  443.  
    444. 

  444.      rai = rsock_addrinfo_new(addr, len, PF_UNSPEC, 0, 0, Qnil, Qnil);
    445. 

  445.  
    446. 

  446. -    rsock_sys_fail_raddrinfo(mesg, rai);
    447. 

  447. +    rsock_syserr_fail_raddrinfo(err, mesg, rai);
    448. 

  448.  }
    449. 

  449.  
    450. 

  450.  void
    451. 

  451.  rsock_sys_fail_raddrinfo(const char *mesg, VALUE rai)
    452. 

  452.  {
    453. 

  453. +    rsock_syserr_fail_raddrinfo(errno, mesg, rai);
    454. 

  454. +}
    455. 

  455. +
    456. 

  456. +void
    457. 

  457. +rsock_syserr_fail_raddrinfo(int err, const char *mesg, VALUE rai)
    458. 

  458. +{
    459. 

  459.      VALUE str, message;
    460. 

  460.  
    461. 

  461.      str = rsock_addrinfo_inspect_sockaddr(rai);
    462. 

  462.      message = rb_sprintf("%s for %s", mesg, StringValueCStr(str));
    463. 

  463.  
    464. 

  464. -    rb_sys_fail_str(message);
    465. 

  465. +    rb_syserr_fail_str(err, message);
    466. 

  466.  }
    467. 

  467.  
    468. 

  468.  void
    469. 

  469.  rsock_sys_fail_raddrinfo_or_sockaddr(const char *mesg, VALUE addr, VALUE rai)
    470. 

  470.  {
    471. 

  471. +    rsock_syserr_fail_raddrinfo_or_sockaddr(errno, mesg, addr, rai);
    472. 

  472. +}
    473. 

  473. +
    474. 

  474. +void
    475. 

  475. +rsock_syserr_fail_raddrinfo_or_sockaddr(int err, const char *mesg, VALUE addr, VALUE rai)
    476. 

  476. +{
    477. 

  477.      if (NIL_P(rai)) {
    478. 

  478.          StringValue(addr);
    479. 

  479. -        rsock_sys_fail_sockaddr(mesg,
    480. 

  480. +
    481. 

  481. +	rsock_syserr_fail_sockaddr(err, mesg,
    482. 

  482.              (struct sockaddr *)RSTRING_PTR(addr),
    483. 

  483.              (socklen_t)RSTRING_LEN(addr)); /* overflow should be checked already */
    484. 

  484.      }
    485. 

  485.      else
    486. 

  486. -        rsock_sys_fail_raddrinfo(mesg, rai);
    487. 

  487. +	rsock_syserr_fail_raddrinfo(err, mesg, rai);
    488. 

  488.  }
    489. 

  489.  
    490. 

  490.  static void
    491. 

  491. diff --git a/ext/thread/thread.c b/ext/thread/thread.c
    492. 

  492. index b8be5d8..a8f675c 100644
    493. 

  493. --- a/ext/thread/thread.c
    494. 

  494. +++ b/ext/thread/thread.c
    495. 

  495. @@ -437,7 +437,7 @@ rb_szqueue_max_set(VALUE self, VALUE vmax)
    496. 

  496.  	diff = max - GET_SZQUEUE_ULONGMAX(self);
    497. 

  497.      }
    498. 

  498.      RSTRUCT_SET(self, SZQUEUE_MAX, vmax);
    499. 

  499. -    while (diff > 0 && !NIL_P(t = rb_ary_shift(GET_QUEUE_QUE(self)))) {
    500. 

  500. +    while (diff-- > 0 && !NIL_P(t = rb_ary_shift(GET_SZQUEUE_WAITERS(self)))) {
    501. 

  501.  	rb_thread_wakeup_alive(t);
    502. 

  502.      }
    503. 

  503.      return vmax;
    504. 

  504. @@ -459,7 +459,7 @@ static VALUE
    505. 

  505.  rb_szqueue_push(VALUE self, VALUE obj)
    506. 

  506.  {
    507. 

  507.      struct waiting_delete args;
    508. 

  508. -    args.waiting = GET_QUEUE_WAITERS(self);
    509. 

  509. +    args.waiting = GET_SZQUEUE_WAITERS(self);
    510. 

  510.      args.th      = rb_thread_current();
    511. 

  511.  
    512. 

  512.      while (queue_length(self) >= GET_SZQUEUE_ULONGMAX(self)) {
    513. 

  513. diff --git a/gc.c b/gc.c
    514. 

  514. index 19e942d..e51b727 100644
    515. 

  515. --- a/gc.c
    516. 

  516. +++ b/gc.c
    517. 

  517. @@ -2916,7 +2916,9 @@ gc_before_sweep(rb_objspace_t *objspace)
    518. 

  518.  	    }
    519. 

  519.  	}
    520. 

  520.  
    521. 

  521. -	if (0) fprintf(stderr, "%d\t%d\t%u\t%u\t%d\n", (int)rb_gc_count(), objspace->rgengc.need_major_gc,
    522. 

  522. +	if (0) fprintf(stderr, "%d\t%d\t%u\t%u\t%d\n",
    523. 

  523. +		       (int)rb_gc_count(),
    524. 

  524. +		       (int)objspace->rgengc.need_major_gc,
    525. 

  525.  		       (unsigned int)objspace->rgengc.oldmalloc_increase,
    526. 

  526.  		       (unsigned int)objspace->rgengc.oldmalloc_increase_limit,
    527. 

  527.  		       (unsigned int)gc_params.oldmalloc_limit_max);
    528. 

  528. @@ -5647,7 +5649,7 @@ get_envparam_int(const char *name, unsigned int *default_value, int lower_bound)
    529. 

  529.  
    530. 

  530.      if (ptr != NULL) {
    531. 

  531.  	val = atoi(ptr);
    532. 

  532. -	if (val > lower_bound) {
    533. 

  533. +	if (val >= lower_bound) {
    534. 

  534.  	    if (RTEST(ruby_verbose)) fprintf(stderr, "%s=%d (%d)\n", name, val, *default_value);
    535. 

  535.  	    *default_value = val;
    536. 

  536.  	    return 1;
    537. 

  537. @@ -5667,7 +5669,7 @@ get_envparam_double(const char *name, double *default_value, double lower_bound)
    538. 

  538.  
    539. 

  539.      if (ptr != NULL) {
    540. 

  540.  	val = strtod(ptr, NULL);
    541. 

  541. -	if (val > lower_bound) {
    542. 

  542. +	if (val >= lower_bound) {
    543. 

  543.  	    if (RTEST(ruby_verbose)) fprintf(stderr, "%s=%f (%f)\n", name, val, *default_value);
    544. 

  544.  	    *default_value = val;
    545. 

  545.  	    return 1;
    546. 

  546. @@ -5746,7 +5748,10 @@ ruby_gc_set_params(int safe_level)
    547. 

  547.      get_envparam_double("RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR", &gc_params.malloc_limit_growth_factor, 1.0);
    548. 

  548.  
    549. 

  549.  #ifdef RGENGC_ESTIMATE_OLDMALLOC
    550. 

  550. -    get_envparam_int("RUBY_GC_OLDMALLOC_LIMIT", &gc_params.oldmalloc_limit_min, 0);
    551. 

  551. +    if (get_envparam_int("RUBY_GC_OLDMALLOC_LIMIT", &gc_params.oldmalloc_limit_min, 0)) {
    552. 

  552. +	rb_objspace_t *objspace = &rb_objspace;
    553. 

  553. +	objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min;
    554. 

  554. +    }
    555. 

  555.      get_envparam_int("RUBY_GC_OLDMALLOC_LIMIT_MAX", &gc_params.oldmalloc_limit_max, 0);
    556. 

  556.      get_envparam_double("RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR", &gc_params.oldmalloc_limit_growth_factor, 1.0);
    557. 

  557.  #endif
    558. 

  558. diff --git a/hash.c b/hash.c
    559. 

  559. index 1fa40b1..1c285c2 100644
    560. 

  560. --- a/hash.c
    561. 

  561. +++ b/hash.c
    562. 

  562. @@ -27,12 +27,24 @@
    563. 

  563.  # endif
    564. 

  564.  #endif
    565. 

  565.  
    566. 

  566. -#define HAS_MISC_ATTRIBUTES(hash, klass) ( \
    567. 

  567. -    (klass = rb_obj_class(hash)) != rb_cHash || \
    568. 

  568. -    (klass = 0, \
    569. 

  569. -     FL_TEST((hash), FL_EXIVAR|FL_TAINT|HASH_PROC_DEFAULT) ||	\
    570. 

  570. -     !NIL_P(RHASH_IFNONE(hash))))
    571. 

  571. -#define HASH_REJECT_COPY_MISC_ATTRIBUTES 1
    572. 

  572. +#define HAS_EXTRA_STATES(hash, klass) ( \
    573. 

  573. +    ((klass = has_extra_methods(rb_obj_class(hash))) != 0) || \
    574. 

  574. +    FL_TEST((hash), FL_EXIVAR|FL_TAINT|HASH_PROC_DEFAULT) || \
    575. 

  575. +    !NIL_P(RHASH_IFNONE(hash)))
    576. 

  576. +#define HASH_REJECT_COPY_EXTRA_STATES 1
    577. 

  577. +
    578. 

  578. +static VALUE
    579. 

  579. +has_extra_methods(VALUE klass)
    580. 

  580. +{
    581. 

  581. +    const VALUE base = rb_cHash;
    582. 

  582. +    VALUE c = klass;
    583. 

  583. +    while (c != base) {
    584. 

  584. +	st_table *mtbl = RCLASS_M_TBL(c);
    585. 

  585. +	if (mtbl && mtbl->num_entries) return klass;
    586. 

  586. +	c = RCLASS_SUPER(c);
    587. 

  587. +    }
    588. 

  588. +    return 0;
    589. 

  589. +}
    590. 

  590.  
    591. 

  591.  static VALUE rb_hash_s_try_convert(VALUE, VALUE);
    592. 

  592.  
    593. 

  593. @@ -111,6 +123,8 @@ rb_hash(VALUE obj)
    594. 

  594.      return hval;
    595. 

  595.  }
    596. 

  596.  
    597. 

  597. +long rb_objid_hash(st_index_t index);
    598. 

  598. +
    599. 

  599.  static st_index_t
    600. 

  600.  rb_any_hash(VALUE a)
    601. 

  601.  {
    602. 

  602. @@ -119,9 +133,7 @@ rb_any_hash(VALUE a)
    603. 

  603.  
    604. 

  604.      if (SPECIAL_CONST_P(a)) {
    605. 

  605.  	if (a == Qundef) return 0;
    606. 

  606. -	hnum = rb_hash_start((st_index_t)a);
    607. 

  607. -	hnum = rb_hash_uint(hnum, (st_index_t)rb_any_hash);
    608. 

  608. -	hnum = rb_hash_end(hnum);
    609. 

  609. +	hnum = rb_objid_hash((st_index_t)a);
    610. 

  610.      }
    611. 

  611.      else if (BUILTIN_TYPE(a) == T_STRING) {
    612. 

  612.  	hnum = rb_str_hash(a);
    613. 

  613. @@ -134,6 +146,15 @@ rb_any_hash(VALUE a)
    614. 

  614.      return (st_index_t)RSHIFT(hnum, 1);
    615. 

  615.  }
    616. 

  616.  
    617. 

  617. +long
    618. 

  618. +rb_objid_hash(st_index_t index)
    619. 

  619. +{
    620. 

  620. +    st_index_t hnum = rb_hash_start(index);
    621. 

  621. +    hnum = rb_hash_uint(hnum, (st_index_t)rb_any_hash);
    622. 

  622. +    hnum = rb_hash_end(hnum);
    623. 

  623. +    return hnum;
    624. 

  624. +}
    625. 

  625. +
    626. 

  626.  static const struct st_hash_type objhash = {
    627. 

  627.      rb_any_cmp,
    628. 

  628.      rb_any_hash,
    629. 

  629. @@ -1133,11 +1154,11 @@ rb_hash_reject(VALUE hash)
    630. 

  630.      RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
    631. 

  631.      if (RTEST(ruby_verbose)) {
    632. 

  632.  	VALUE klass;
    633. 

  633. -	if (HAS_MISC_ATTRIBUTES(hash, klass)) {
    634. 

  634. -#if HASH_REJECT_COPY_MISC_ATTRIBUTES
    635. 

  635. -	    rb_warn("copying unguaranteed attributes: %+"PRIsVALUE, hash);
    636. 

  636. -	    rb_warn("following atributes will not be copied in the future version:");
    637. 

  637. -	    if (klass != rb_cHash) {
    638. 

  638. +	if (HAS_EXTRA_STATES(hash, klass)) {
    639. 

  639. +#if HASH_REJECT_COPY_EXTRA_STATES
    640. 

  640. +	    rb_warn("copying extra states: %+"PRIsVALUE, hash);
    641. 

  641. +	    rb_warn("following states will not be copied in the future version:");
    642. 

  642. +	    if (klass) {
    643. 

  643.  		rb_warn("  subclass: %+"PRIsVALUE, klass);
    644. 

  644.  	    }
    645. 

  645.  	    if (FL_TEST(hash, FL_EXIVAR)) {
    646. 

  646. @@ -1153,8 +1174,7 @@ rb_hash_reject(VALUE hash)
    647. 

  647.  	    else if (!NIL_P(RHASH_IFNONE(hash)))
    648. 

  648.  		rb_warn("  default value: %+"PRIsVALUE, RHASH_IFNONE(hash));
    649. 

  649.  #else
    650. 

  650. -	    rb_warn("unguaranteed attributes are not copied: %+"PRIsVALUE, hash);
    651. 

  651. -	    rb_warn("following atributes are ignored now:");
    652. 

  652. +	    rb_warn("extra states are no longer copied: %+"PRIsVALUE, hash);
    653. 

  653.  #endif
    654. 

  654.  	}
    655. 

  655.      }
    656. 

  656. diff --git a/lib/delegate.rb b/lib/delegate.rb
    657. 

  657. index c33f7e4..d790229 100644
    658. 

  658. --- a/lib/delegate.rb
    659. 

  659. +++ b/lib/delegate.rb
    660. 

  660. @@ -48,7 +48,7 @@ class Delegator < BasicObject
    661. 

  661.        undef_method m
    662. 

  662.      end
    663. 

  663.      private_instance_methods.each do |m|
    664. 

  664. -      if /\Ablock_given\?\z|iterator\?\z|\A__raise__\z/ =~ m
    665. 

  665. +      if /\Ablock_given\?\z|iterator\?\z|\A__.*__\z/ =~ m
    666. 

  666.          next
    667. 

  667.        end
    668. 

  668.        undef_method m
    669. 

  669. diff --git a/lib/rubygems.rb b/lib/rubygems.rb
    670. 

  670. index 73c4846..456273e 100644
    671. 

  671. --- a/lib/rubygems.rb
    672. 

  672. +++ b/lib/rubygems.rb
    673. 

  673. @@ -8,7 +8,7 @@
    674. 

  674.  require 'rbconfig'
    675. 

  675.  
    676. 

  676.  module Gem
    677. 

  677. -  VERSION = '2.2.0'
    678. 

  678. +  VERSION = '2.2.2'
    679. 

  679.  end
    680. 

  680.  
    681. 

  681.  # Must be first since it unloads the prelude from 1.9.2
    682. 

  682. @@ -572,7 +572,7 @@ module Gem
    683. 

  683.    # gem's paths are inserted before site lib directory by default.
    684. 

  684.  
    685. 

  685.    def self.load_path_insert_index
    686. 

  686. -    index = $LOAD_PATH.index ConfigMap[:sitelibdir]
    687. 

  687. +    index = $LOAD_PATH.index RbConfig::CONFIG['sitelibdir']
    688. 

  688.  
    689. 

  689.      index
    690. 

  690.    end
    691. 

  691. @@ -743,8 +743,8 @@ module Gem
    692. 

  692.    def self.prefix
    693. 

  693.      prefix = File.dirname RUBYGEMS_DIR
    694. 

  694.  
    695. 

  695. -    if prefix != File.expand_path(ConfigMap[:sitelibdir]) and
    696. 

  696. -       prefix != File.expand_path(ConfigMap[:libdir]) and
    697. 

  697. +    if prefix != File.expand_path(RbConfig::CONFIG['sitelibdir']) and
    698. 

  698. +       prefix != File.expand_path(RbConfig::CONFIG['libdir']) and
    699. 

  699.         'lib' == File.basename(RUBYGEMS_DIR) then
    700. 

  700.        prefix
    701. 

  701.      end
    702. 

  702. @@ -765,6 +765,10 @@ module Gem
    703. 

  703.        f.flock(File::LOCK_EX)
    704. 

  704.        f.read
    705. 

  705.      end
    706. 

  706. +  rescue Errno::EACCES
    707. 

  707. +    open path, 'rb' do |f|
    708. 

  708. +      f.read
    709. 

  709. +    end
    710. 

  710.    end
    711. 

  711.  
    712. 

  712.    ##
    713. 

  713. @@ -772,8 +776,8 @@ module Gem
    714. 

  714.  
    715. 

  715.    def self.ruby
    716. 

  716.      if @ruby.nil? then
    717. 

  717. -      @ruby = File.join(ConfigMap[:bindir],
    718. 

  718. -                        "#{ConfigMap[:ruby_install_name]}#{ConfigMap[:EXEEXT]}")
    719. 

  719. +      @ruby = File.join(RbConfig::CONFIG['bindir'],
    720. 

  720. +                        "#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}")
    721. 

  721.  
    722. 

  722.        @ruby = "\"#{@ruby}\"" if @ruby =~ /\s/
    723. 

  723.      end
    724. 

  724. @@ -785,8 +789,7 @@ module Gem
    725. 

  725.    # Returns a String containing the API compatibility version of Ruby
    726. 

  726.  
    727. 

  727.    def self.ruby_api_version
    728. 

  728. -    @ruby_api_version ||=
    729. 

  729. -      "#{ConfigMap[:MAJOR]}.#{ConfigMap[:MINOR]}.#{ConfigMap[:TEENY]}"
    730. 

  730. +    @ruby_api_version ||= RbConfig::CONFIG['ruby_version'].dup
    731. 

  731.    end
    732. 

  732.  
    733. 

  733.    ##
    734. 

  734. diff --git a/lib/rubygems/available_set.rb b/lib/rubygems/available_set.rb
    735. 

  735. index d8655af..fabdd6e 100644
    736. 

  736. --- a/lib/rubygems/available_set.rb
    737. 

  737. +++ b/lib/rubygems/available_set.rb
    738. 

  738. @@ -4,9 +4,12 @@ class Gem::AvailableSet
    739. 

  739.  
    740. 

  740.    Tuple = Struct.new(:spec, :source)
    741. 

  741.  
    742. 

  742. +  attr_accessor :remote # :nodoc:
    743. 

  743. +
    744. 

  744.    def initialize
    745. 

  745.      @set = []
    746. 

  746.      @sorted = nil
    747. 

  747. +    @remote = true
    748. 

  748.    end
    749. 

  749.  
    750. 

  750.    attr_reader :set
    751. 

  751. diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb
    752. 

  752. index a52377f..470a6eb 100644
    753. 

  753. --- a/lib/rubygems/basic_specification.rb
    754. 

  754. +++ b/lib/rubygems/basic_specification.rb
    755. 

  755. @@ -207,6 +207,24 @@ class Gem::BasicSpecification
    756. 

  756.    end
    757. 

  757.  
    758. 

  758.    ##
    759. 

  759. +  # Returns the paths to the source files for use with analysis and
    760. 

  760. +  # documentation tools.  These paths are relative to full_gem_path.
    761. 

  761. +
    762. 

  762. +  def source_paths
    763. 

  763. +    paths = raw_require_paths.dup
    764. 

  764. +
    765. 

  765. +    if @extensions then
    766. 

  766. +      ext_dirs = @extensions.map do |extension|
    767. 

  767. +        extension.split(File::SEPARATOR, 2).first
    768. 

  768. +      end.uniq
    769. 

  769. +
    770. 

  770. +      paths.concat ext_dirs
    771. 

  771. +    end
    772. 

  772. +
    773. 

  773. +    paths.uniq
    774. 

  774. +  end
    775. 

  775. +
    776. 

  776. +  ##
    777. 

  777.    # Return a Gem::Specification from this gem
    778. 

  778.  
    779. 

  779.    def to_spec
    780. 

  780. diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb
    781. 

  781. index 9721884..603f1d0 100644
    782. 

  782. --- a/lib/rubygems/commands/contents_command.rb
    783. 

  783. +++ b/lib/rubygems/commands/contents_command.rb
    784. 

  784. @@ -94,11 +94,11 @@ prefix or only the files that are requireable.
    785. 

  785.      spec.files.sort.map do |file|
    786. 

  786.        case file
    787. 

  787.        when /\A#{spec.bindir}\//
    788. 

  788. -        [Gem::ConfigMap[:bindir], $POSTMATCH]
    789. 

  789. +        [RbConfig::CONFIG['bindir'], $POSTMATCH]
    790. 

  790.        when /\.so\z/
    791. 

  791. -        [Gem::ConfigMap[:archdir], file]
    792. 

  792. +        [RbConfig::CONFIG['archdir'], file]
    793. 

  793.        else
    794. 

  794. -        [Gem::ConfigMap[:rubylibdir], file]
    795. 

  795. +        [RbConfig::CONFIG['rubylibdir'], file]
    796. 

  796.        end
    797. 

  797.      end
    798. 

  798.    end
    799. 

  799. diff --git a/lib/rubygems/commands/generate_index_command.rb b/lib/rubygems/commands/generate_index_command.rb
    800. 

  800. index a7db013..ca6f694 100644
    801. 

  801. --- a/lib/rubygems/commands/generate_index_command.rb
    802. 

  802. +++ b/lib/rubygems/commands/generate_index_command.rb
    803. 

  803. @@ -62,7 +62,7 @@ Marshal::MINOR_VERSION constants.  It is used to ensure compatibility.
    804. 

  804.    end
    805. 

  805.  
    806. 

  806.    def execute
    807. 

  807. -    # This is always true becasue it's the only way now.
    808. 

  808. +    # This is always true because it's the only way now.
    809. 

  809.      options[:build_modern] = true
    810. 

  810.  
    811. 

  811.      if not File.exist?(options[:directory]) or
    812. 

  812. diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
    813. 

  813. index 4485eb1..8219eef 100644
    814. 

  814. --- a/lib/rubygems/commands/install_command.rb
    815. 

  815. +++ b/lib/rubygems/commands/install_command.rb
    816. 

  816. @@ -228,7 +228,18 @@ to write the specification by hand.  For example:
    817. 

  817.    def install_gem_without_dependencies name, req # :nodoc:
    818. 

  818.      gem = nil
    819. 

  819.  
    820. 

  820. -    if remote? then
    821. 

  821. +    if local? then
    822. 

  822. +      if name =~ /\.gem$/ and File.file? name then
    823. 

  823. +        source = Gem::Source::SpecificFile.new name
    824. 

  824. +        spec = source.spec
    825. 

  825. +      else
    826. 

  826. +        source = Gem::Source::Local.new
    827. 

  827. +        spec = source.find_gem name, req
    828. 

  828. +      end
    829. 

  829. +      gem = source.download spec if spec
    830. 

  830. +    end
    831. 

  831. +
    832. 

  832. +    if remote? and not gem then
    833. 

  833.        dependency = Gem::Dependency.new name, req
    834. 

  834.        dependency.prerelease = options[:prerelease]
    835. 

  835.  
    836. 

  836. @@ -236,13 +247,6 @@ to write the specification by hand.  For example:
    837. 

  837.        gem = fetcher.download_to_cache dependency
    838. 

  838.      end
    839. 

  839.  
    840. 

  840. -    if local? and not gem then
    841. 

  841. -      source = Gem::Source::Local.new
    842. 

  842. -      spec = source.find_gem name, req
    843. 

  843. -
    844. 

  844. -      gem = source.download spec
    845. 

  845. -    end
    846. 

  846. -
    847. 

  847.      inst = Gem::Installer.new gem, options
    848. 

  848.      inst.install
    849. 

  849.  
    850. 

  850. diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb
    851. 

  851. index face77f..681db0d 100644
    852. 

  852. --- a/lib/rubygems/commands/setup_command.rb
    853. 

  853. +++ b/lib/rubygems/commands/setup_command.rb
    854. 

  854. @@ -13,7 +13,7 @@ class Gem::Commands::SetupCommand < Gem::Command
    855. 

  855.  
    856. 

  856.      super 'setup', 'Install RubyGems',
    857. 

  857.            :format_executable => true, :document => %w[ri],
    858. 

  858. -          :site_or_vendor => :sitelibdir,
    859. 

  859. +          :site_or_vendor => 'sitelibdir',
    860. 

  860.            :destdir => '', :prefix => '', :previous_version => ''
    861. 

  861.  
    862. 

  862.      add_option '--previous-version=VERSION',
    863. 

  863. @@ -36,7 +36,7 @@ class Gem::Commands::SetupCommand < Gem::Command
    864. 

  864.  
    865. 

  865.      add_option '--[no-]vendor',
    866. 

  866.                 'Install into vendorlibdir not sitelibdir' do |vendor, options|
    867. 

  867. -      options[:site_or_vendor] = vendor ? :vendorlibdir : :sitelibdir
    868. 

  868. +      options[:site_or_vendor] = vendor ? 'vendorlibdir' : 'sitelibdir'
    869. 

  869.      end
    870. 

  870.  
    871. 

  871.      add_option '--[no-]format-executable',
    872. 

  872. @@ -343,19 +343,19 @@ TEXT
    873. 

  873.      site_or_vendor = options[:site_or_vendor]
    874. 

  874.  
    875. 

  875.      if prefix.empty? then
    876. 

  876. -      lib_dir = Gem::ConfigMap[site_or_vendor]
    877. 

  877. -      bin_dir = Gem::ConfigMap[:bindir]
    878. 

  878. +      lib_dir = RbConfig::CONFIG[site_or_vendor]
    879. 

  879. +      bin_dir = RbConfig::CONFIG['bindir']
    880. 

  880.      else
    881. 

  881.        # Apple installed RubyGems into libdir, and RubyGems <= 1.1.0 gets
    882. 

  882.        # confused about installation location, so switch back to
    883. 

  883.        # sitelibdir/vendorlibdir.
    884. 

  884.        if defined?(APPLE_GEM_HOME) and
    885. 

  885.          # just in case Apple and RubyGems don't get this patched up proper.
    886. 

  886. -        (prefix == Gem::ConfigMap[:libdir] or
    887. 

  887. +        (prefix == RbConfig::CONFIG['libdir'] or
    888. 

  888.           # this one is important
    889. 

  889. -         prefix == File.join(Gem::ConfigMap[:libdir], 'ruby')) then
    890. 

  890. -         lib_dir = Gem::ConfigMap[site_or_vendor]
    891. 

  891. -         bin_dir = Gem::ConfigMap[:bindir]
    892. 

  892. +         prefix == File.join(RbConfig::CONFIG['libdir'], 'ruby')) then
    893. 

  893. +         lib_dir = RbConfig::CONFIG[site_or_vendor]
    894. 

  894. +         bin_dir = RbConfig::CONFIG['bindir']
    895. 

  895.        else
    896. 

  896.          lib_dir = File.join prefix, 'lib'
    897. 

  897.          bin_dir = File.join prefix, 'bin'
    898. 

  898. diff --git a/lib/rubygems/compatibility.rb b/lib/rubygems/compatibility.rb
    899. 

  899. index 5e8618f..d06ade1 100644
    900. 

  900. --- a/lib/rubygems/compatibility.rb
    901. 

  901. +++ b/lib/rubygems/compatibility.rb
    902. 

  902. @@ -33,6 +33,8 @@ end
    903. 

  903.  module Gem
    904. 

  904.    RubyGemsVersion = VERSION
    905. 

  905.  
    906. 

  906. +  # TODO remove at RubyGems 3
    907. 

  907. +
    908. 

  908.    RbConfigPriorities = %w[
    909. 

  909.      MAJOR
    910. 

  910.      MINOR
    911. 

  911. @@ -45,7 +47,7 @@ module Gem
    912. 

  912.    unless defined?(ConfigMap)
    913. 

  913.      ##
    914. 

  914.      # Configuration settings from ::RbConfig
    915. 

  915. -    ConfigMap = Hash.new do |cm, key|
    916. 

  916. +    ConfigMap = Hash.new do |cm, key| # TODO remove at RubyGems 3
    917. 

  917.        cm[key] = RbConfig::CONFIG[key.to_s]
    918. 

  918.      end
    919. 

  919.    else
    920. 

  920. diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
    921. 

  921. index 1acae9b..cf14017 100644
    922. 

  922. --- a/lib/rubygems/config_file.rb
    923. 

  923. +++ b/lib/rubygems/config_file.rb
    924. 

  924. @@ -137,9 +137,10 @@ class Gem::ConfigFile
    925. 

  925.    attr_reader :ssl_verify_mode
    926. 

  926.  
    927. 

  927.    ##
    928. 

  928. -  # Path name of directory or file of openssl CA certificate, used for remote https connection
    929. 

  929. +  # Path name of directory or file of openssl CA certificate, used for remote
    930. 

  930. +  # https connection
    931. 

  931.  
    932. 

  932. -  attr_reader :ssl_ca_cert
    933. 

  933. +  attr_accessor :ssl_ca_cert
    934. 

  934.  
    935. 

  935.    ##
    936. 

  936.    # Path name of directory or file of openssl client certificate, used for remote https connection with client authentication
    937. 

  937. diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
    938. 

  938. index 715c0b7..6924f48 100644
    939. 

  939. --- a/lib/rubygems/defaults.rb
    940. 

  940. +++ b/lib/rubygems/defaults.rb
    941. 

  941. @@ -29,22 +29,22 @@ module Gem
    942. 

  942.    def self.default_dir
    943. 

  943.      path = if defined? RUBY_FRAMEWORK_VERSION then
    944. 

  944.               [
    945. 

  945. -               File.dirname(ConfigMap[:sitedir]),
    946. 

  946. +               File.dirname(RbConfig::CONFIG['sitedir']),
    947. 

  947.                 'Gems',
    948. 

  948. -               ConfigMap[:ruby_version]
    949. 

  949. +               RbConfig::CONFIG['ruby_version']
    950. 

  950.               ]
    951. 

  951. -           elsif ConfigMap[:rubylibprefix] then
    952. 

  952. +           elsif RbConfig::CONFIG['rubylibprefix'] then
    953. 

  953.               [
    954. 

  954. -              ConfigMap[:rubylibprefix],
    955. 

  955. +              RbConfig::CONFIG['rubylibprefix'],
    956. 

  956.                'gems',
    957. 

  957. -              ConfigMap[:ruby_version]
    958. 

  958. +              RbConfig::CONFIG['ruby_version']
    959. 

  959.               ]
    960. 

  960.             else
    961. 

  961.               [
    962. 

  962. -               ConfigMap[:libdir],
    963. 

  963. +               RbConfig::CONFIG['libdir'],
    964. 

  964.                 ruby_engine,
    965. 

  965.                 'gems',
    966. 

  966. -               ConfigMap[:ruby_version]
    967. 

  967. +               RbConfig::CONFIG['ruby_version']
    968. 

  968.               ]
    969. 

  969.             end
    970. 

  970.  
    971. 

  971. @@ -74,7 +74,7 @@ module Gem
    972. 

  972.  
    973. 

  973.    def self.user_dir
    974. 

  974.      parts = [Gem.user_home, '.gem', ruby_engine]
    975. 

  975. -    parts << ConfigMap[:ruby_version] unless ConfigMap[:ruby_version].empty?
    976. 

  976. +    parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
    977. 

  977.      File.join parts
    978. 

  978.    end
    979. 

  979.  
    980. 

  980. @@ -100,7 +100,7 @@ module Gem
    981. 

  981.    # Deduce Ruby's --program-prefix and --program-suffix from its install name
    982. 

  982.  
    983. 

  983.    def self.default_exec_format
    984. 

  984. -    exec_format = ConfigMap[:ruby_install_name].sub('ruby', '%s') rescue '%s'
    985. 

  985. +    exec_format = RbConfig::CONFIG['ruby_install_name'].sub('ruby', '%s') rescue '%s'
    986. 

  986.  
    987. 

  987.      unless exec_format =~ /%s/ then
    988. 

  988.        raise Gem::Exception,
    989. 

  989. @@ -117,7 +117,7 @@ module Gem
    990. 

  990.      if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
    991. 

  991.        '/usr/bin'
    992. 

  992.      else # generic install
    993. 

  993. -      ConfigMap[:bindir]
    994. 

  994. +      RbConfig::CONFIG['bindir']
    995. 

  995.      end
    996. 

  996.    end
    997. 

  997.  
    998. 

  998. diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb
    999. 

  999. index b7babf6..da6994a 100644
    1000. 

  1000. --- a/lib/rubygems/dependency_installer.rb
    1001. 

  1001. +++ b/lib/rubygems/dependency_installer.rb
    1002. 

  1002. @@ -419,6 +419,7 @@ class Gem::DependencyInstaller
    1003. 

  1003.  
    1004. 

  1004.      request_set = as.to_request_set install_development_deps
    1005. 

  1005.      request_set.soft_missing = @force
    1006. 

  1006. +    request_set.remote = false unless consider_remote?
    1007. 

  1007.  
    1008. 

  1008.      installer_set = Gem::Resolver::InstallerSet.new @domain
    1009. 

  1009.      installer_set.always_install.concat request_set.always_install
    1010. 

  1010. diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb
    1011. 

  1011. index 274d6a5..e19360d 100644
    1012. 

  1012. --- a/lib/rubygems/deprecate.rb
    1013. 

  1013. +++ b/lib/rubygems/deprecate.rb
    1014. 

  1014. @@ -50,7 +50,7 @@ module Gem::Deprecate
    1015. 

  1015.      class_eval {
    1016. 

  1016.        old = "_deprecated_#{name}"
    1017. 

  1017.        alias_method old, name
    1018. 

  1018. -      define_method name do |*args, &block| # TODO: really works on 1.8.7?
    1019. 

  1019. +      define_method name do |*args, &block|
    1020. 

  1020.          klass = self.kind_of? Module
    1021. 

  1021.          target = klass ? "#{self}." : "#{self.class}#"
    1022. 

  1022.          msg = [ "NOTE: #{target}#{name} is deprecated",
    1023. 

  1023. diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
    1024. 

  1024. index 402aa96..990fd18 100644
    1025. 

  1025. --- a/lib/rubygems/ext/ext_conf_builder.rb
    1026. 

  1026. +++ b/lib/rubygems/ext/ext_conf_builder.rb
    1027. 

  1027. @@ -34,7 +34,11 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
    1028. 

  1028.          ENV["RUBYOPT"] = ["-r#{siteconf_path}", rubyopt].compact.join(' ')
    1029. 

  1029.          cmd = [Gem.ruby, File.basename(extension), *args].join ' '
    1030. 

  1030.  
    1031. 

  1031. -        run cmd, results
    1032. 

  1032. +        begin
    1033. 

  1033. +          run cmd, results
    1034. 

  1034. +        ensure
    1035. 

  1035. +          FileUtils.mv 'mkmf.log', dest_path if File.exist? 'mkmf.log'
    1036. 

  1036. +        end
    1037. 

  1037.  
    1038. 

  1038.          ENV["DESTDIR"] = nil
    1039. 

  1039.          ENV["RUBYOPT"] = rubyopt
    1040. 

  1040. diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
    1041. 

  1041. index f8eb2c2..c809816 100644
    1042. 

  1042. --- a/lib/rubygems/installer.rb
    1043. 

  1043. +++ b/lib/rubygems/installer.rb
    1044. 

  1044. @@ -480,7 +480,7 @@ class Gem::Installer
    1045. 

  1045.    #
    1046. 

  1046.  
    1047. 

  1047.    def shebang(bin_file_name)
    1048. 

  1048. -    ruby_name = Gem::ConfigMap[:ruby_install_name] if @env_shebang
    1049. 

  1049. +    ruby_name = RbConfig::CONFIG['ruby_install_name'] if @env_shebang
    1050. 

  1050.      path = File.join gem_dir, spec.bindir, bin_file_name
    1051. 

  1051.      first_line = File.open(path, "rb") {|file| file.gets}
    1052. 

  1052.  
    1053. 

  1053. @@ -493,7 +493,7 @@ class Gem::Installer
    1054. 

  1054.  
    1055. 

  1055.      if which = Gem.configuration[:custom_shebang]
    1056. 

  1056.        # replace bin_file_name with "ruby" to avoid endless loops
    1057. 

  1057. -      which = which.gsub(/ #{bin_file_name}$/," #{Gem::ConfigMap[:ruby_install_name]}")
    1058. 

  1058. +      which = which.gsub(/ #{bin_file_name}$/," #{RbConfig::CONFIG['ruby_install_name']}")
    1059. 

  1059.  
    1060. 

  1060.        which = which.gsub(/\$(\w+)/) do
    1061. 

  1061.          case $1
    1062. 

  1062. @@ -641,7 +641,7 @@ version = "#{Gem::Requirement.default}"
    1063. 

  1063.  if ARGV.first
    1064. 

  1064.    str = ARGV.first
    1065. 

  1065.    str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
    1066. 

  1066. -  if str =~ /\\A_(.*)_\\z/
    1067. 

  1067. +  if str =~ /\\A_(.*)_\\z/ and Gem::Version.correct?($1) then
    1068. 

  1068.      version = $1
    1069. 

  1069.      ARGV.shift
    1070. 

  1070.    end
    1071. 

  1071. diff --git a/lib/rubygems/package/tar_header.rb b/lib/rubygems/package/tar_header.rb
    1072. 

  1072. index 28da1db..f9ab13a 100644
    1073. 

  1073. --- a/lib/rubygems/package/tar_header.rb
    1074. 

  1074. +++ b/lib/rubygems/package/tar_header.rb
    1075. 

  1075. @@ -134,7 +134,7 @@ class Gem::Package::TarHeader
    1076. 

  1076.      vals[:gid] ||= 0
    1077. 

  1077.      vals[:mtime] ||= 0
    1078. 

  1078.      vals[:checksum] ||= ""
    1079. 

  1079. -    vals[:typeflag] ||= "0"
    1080. 

  1080. +    vals[:typeflag] = "0" if vals[:typeflag].nil? || vals[:typeflag].empty?
    1081. 

  1081.      vals[:magic] ||= "ustar"
    1082. 

  1082.      vals[:version] ||= "00"
    1083. 

  1083.      vals[:uname] ||= "wheel"
    1084. 

  1084. diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb
    1085. 

  1085. index e050959..1bcd754 100644
    1086. 

  1086. --- a/lib/rubygems/platform.rb
    1087. 

  1087. +++ b/lib/rubygems/platform.rb
    1088. 

  1088. @@ -16,7 +16,7 @@ class Gem::Platform
    1089. 

  1089.    attr_accessor :version
    1090. 

  1090.  
    1091. 

  1091.    def self.local
    1092. 

  1092. -    arch = Gem::ConfigMap[:arch]
    1093. 

  1093. +    arch = RbConfig::CONFIG['arch']
    1094. 

  1094.      arch = "#{arch}_60" if arch =~ /mswin32$/
    1095. 

  1095.      @local ||= new(arch)
    1096. 

  1096.    end
    1097. 

  1097. diff --git a/lib/rubygems/rdoc.rb b/lib/rubygems/rdoc.rb
    1098. 

  1098. index 52249dc..633bd89 100644
    1099. 

  1099. --- a/lib/rubygems/rdoc.rb
    1100. 

  1100. +++ b/lib/rubygems/rdoc.rb
    1101. 

  1101. @@ -193,7 +193,7 @@ class Gem::RDoc # :nodoc: all
    1102. 

  1102.      ::RDoc::Parser::C.reset
    1103. 

  1103.  
    1104. 

  1104.      args = @spec.rdoc_options
    1105. 

  1105. -    args.concat @spec.require_paths
    1106. 

  1106. +    args.concat @spec.source_paths
    1107. 

  1107.      args.concat @spec.extra_rdoc_files
    1108. 

  1108.  
    1109. 

  1109.      case config_args = Gem.configuration[:rdoc]
    1110. 

  1110. diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb
    1111. 

  1111. index e32c024..58991ca 100644
    1112. 

  1112. --- a/lib/rubygems/remote_fetcher.rb
    1113. 

  1113. +++ b/lib/rubygems/remote_fetcher.rb
    1114. 

  1114. @@ -131,11 +131,19 @@ class Gem::RemoteFetcher
    1115. 

  1115.  
    1116. 

  1116.      FileUtils.mkdir_p cache_dir rescue nil unless File.exist? cache_dir
    1117. 

  1117.  
    1118. 

  1118. -   # Always escape URI's to deal with potential spaces and such
    1119. 

  1119. -    unless URI::Generic === source_uri
    1120. 

  1120. -      source_uri = URI.parse(URI.const_defined?(:DEFAULT_PARSER) ?
    1121. 

  1121. -                             URI::DEFAULT_PARSER.escape(source_uri.to_s) :
    1122. 

  1122. -                             URI.escape(source_uri.to_s))
    1123. 

  1123. +    # Always escape URI's to deal with potential spaces and such
    1124. 

  1124. +    # It should also be considered that source_uri may already be
    1125. 

  1125. +    # a valid URI with escaped characters. e.g. "{DESede}" is encoded
    1126. 

  1126. +    # as "%7BDESede%7D". If this is escaped again the percentage
    1127. 

  1127. +    # symbols will be escaped.
    1128. 

  1128. +    unless source_uri.is_a?(URI::Generic)
    1129. 

  1129. +      begin
    1130. 

  1130. +        source_uri = URI.parse(source_uri)
    1131. 

  1131. +      rescue
    1132. 

  1132. +        source_uri = URI.parse(URI.const_defined?(:DEFAULT_PARSER) ?
    1133. 

  1133. +                               URI::DEFAULT_PARSER.escape(source_uri.to_s) :
    1134. 

  1134. +                               URI.escape(source_uri.to_s))
    1135. 

  1135. +      end
    1136. 

  1136.      end
    1137. 

  1137.  
    1138. 

  1138.      scheme = source_uri.scheme
    1139. 

  1139. @@ -285,20 +293,20 @@ class Gem::RemoteFetcher
    1140. 

  1140.    def cache_update_path uri, path = nil, update = true
    1141. 

  1141.      mtime = path && File.stat(path).mtime rescue nil
    1142. 

  1142.  
    1143. 

  1143. -    if mtime && Net::HTTPNotModified === fetch_path(uri, mtime, true)
    1144. 

  1144. -      Gem.read_binary(path)
    1145. 

  1145. -    else
    1146. 

  1146. -      data = fetch_path(uri)
    1147. 

  1147. +    data = fetch_path(uri, mtime)
    1148. 

  1148.  
    1149. 

  1149. -      if update and path then
    1150. 

  1150. -        open(path, 'wb') do |io|
    1151. 

  1151. -          io.flock(File::LOCK_EX)
    1152. 

  1152. -          io.write data
    1153. 

  1153. -        end
    1154. 

  1154. -      end
    1155. 

  1155. +    if data == nil # indicates the server returned 304 Not Modified
    1156. 

  1156. +      return Gem.read_binary(path)
    1157. 

  1157. +    end
    1158. 

  1158.  
    1159. 

  1159. -      data
    1160. 

  1160. +    if update and path
    1161. 

  1161. +      open(path, 'wb') do |io|
    1162. 

  1162. +        io.flock(File::LOCK_EX)
    1163. 

  1163. +        io.write data
    1164. 

  1164. +      end
    1165. 

  1165.      end
    1166. 

  1166. +
    1167. 

  1167. +    data
    1168. 

  1168.    end
    1169. 

  1169.  
    1170. 

  1170.    ##
    1171. 

  1171. diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb
    1172. 

  1172. index e870763..d2f076f 100644
    1173. 

  1173. --- a/lib/rubygems/request.rb
    1174. 

  1174. +++ b/lib/rubygems/request.rb
    1175. 

  1175. @@ -48,15 +48,14 @@ class Gem::Request
    1176. 

  1176.        connection.key = OpenSSL::PKey::RSA.new pem
    1177. 

  1177.      end
    1178. 

  1178.  
    1179. 

  1179. +    store.set_default_paths
    1180. 

  1180. +    add_rubygems_trusted_certs(store)
    1181. 

  1181.      if Gem.configuration.ssl_ca_cert
    1182. 

  1182.        if File.directory? Gem.configuration.ssl_ca_cert
    1183. 

  1183.          store.add_path Gem.configuration.ssl_ca_cert
    1184. 

  1184.        else
    1185. 

  1185.          store.add_file Gem.configuration.ssl_ca_cert
    1186. 

  1186.        end
    1187. 

  1187. -    else
    1188. 

  1188. -      store.set_default_paths
    1189. 

  1189. -      add_rubygems_trusted_certs(store)
    1190. 

  1190.      end
    1191. 

  1191.      connection.cert_store = store
    1192. 

  1192.    rescue LoadError => e
    1193. 

  1193. @@ -106,7 +105,8 @@ class Gem::Request
    1194. 

  1194.      request = @request_class.new @uri.request_uri
    1195. 

  1195.  
    1196. 

  1196.      unless @uri.nil? || @uri.user.nil? || @uri.user.empty? then
    1197. 

  1197. -      request.basic_auth @uri.user, @uri.password
    1198. 

  1198. +      request.basic_auth Gem::UriFormatter.new(@uri.user).unescape,
    1199. 

  1199. +                         Gem::UriFormatter.new(@uri.password).unescape
    1200. 

  1200.      end
    1201. 

  1201.  
    1202. 

  1202.      request.add_field 'User-Agent', @user_agent
    1203. 

  1203. diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb
    1204. 

  1204. index aa3f27c..fb54e34 100644
    1205. 

  1205. --- a/lib/rubygems/request_set.rb
    1206. 

  1206. +++ b/lib/rubygems/request_set.rb
    1207. 

  1207. @@ -39,6 +39,11 @@ class Gem::RequestSet
    1208. 

  1208.    attr_accessor :ignore_dependencies
    1209. 

  1209.  
    1210. 

  1210.    ##
    1211. 

  1211. +  # When false no remote sets are used for resolving gems.
    1212. 

  1212. +
    1213. 

  1213. +  attr_accessor :remote
    1214. 

  1214. +
    1215. 

  1215. +  ##
    1216. 

  1216.    # Sets used for resolution
    1217. 

  1217.  
    1218. 

  1218.    attr_reader :sets # :nodoc:
    1219. 

  1219. @@ -71,6 +76,7 @@ class Gem::RequestSet
    1220. 

  1220.      @git_set             = nil
    1221. 

  1221.      @ignore_dependencies = false
    1222. 

  1222.      @install_dir         = Gem.dir
    1223. 

  1223. +    @remote              = true
    1224. 

  1224.      @requests            = []
    1225. 

  1225.      @sets                = []
    1226. 

  1226.      @soft_missing        = false
    1227. 

  1227. @@ -150,6 +156,7 @@ class Gem::RequestSet
    1228. 

  1228.      gemdeps = options[:gemdeps]
    1229. 

  1229.  
    1230. 

  1230.      @install_dir = options[:install_dir] || Gem.dir
    1231. 

  1231. +    @remote      = options[:domain] != :local
    1232. 

  1232.  
    1233. 

  1233.      load_gemdeps gemdeps, options[:without_groups]
    1234. 

  1234.  
    1235. 

  1235. @@ -235,6 +242,7 @@ class Gem::RequestSet
    1236. 

  1236.      @sets << @vendor_set
    1237. 

  1237.  
    1238. 

  1238.      set = Gem::Resolver.compose_sets(*@sets)
    1239. 

  1239. +    set.remote = @remote
    1240. 

  1240.  
    1241. 

  1241.      resolver = Gem::Resolver.new @dependencies, set
    1242. 

  1242.      resolver.development         = @development
    1243. 

  1243. diff --git a/lib/rubygems/request_set/lockfile.rb b/lib/rubygems/request_set/lockfile.rb
    1244. 

  1244. index 522caf1..0433d2a 100644
    1245. 

  1245. --- a/lib/rubygems/request_set/lockfile.rb
    1246. 

  1246. +++ b/lib/rubygems/request_set/lockfile.rb
    1247. 

  1247. @@ -303,7 +303,12 @@ class Gem::RequestSet::Lockfile
    1248. 

  1248.          type, data, = get [:text, :requirement]
    1249. 

  1249.  
    1250. 

  1250.          if type == :text and column == 4 then
    1251. 

  1251. -          last_spec = set.add name, data, Gem::Platform::RUBY
    1252. 

  1252. +          version, platform = data.split '-', 2
    1253. 

  1253. +
    1254. 

  1254. +          platform =
    1255. 

  1255. +            platform ? Gem::Platform.new(platform) : Gem::Platform::RUBY
    1256. 

  1256. +
    1257. 

  1257. +          last_spec = set.add name, version, platform
    1258. 

  1258.          else
    1259. 

  1259.            dependency = parse_dependency name, data
    1260. 

  1260.  
    1261. 

  1261. diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb
    1262. 

  1262. index d455e03..65e92bb 100644
    1263. 

  1263. --- a/lib/rubygems/resolver.rb
    1264. 

  1264. +++ b/lib/rubygems/resolver.rb
    1265. 

  1265. @@ -59,6 +59,8 @@ class Gem::Resolver
    1266. 

  1266.  
    1267. 

  1267.      sets = sets.map do |set|
    1268. 

  1268.        case set
    1269. 

  1269. +      when Gem::Resolver::BestSet then
    1270. 

  1270. +        set
    1271. 

  1271.        when Gem::Resolver::ComposedSet then
    1272. 

  1272.          set.sets
    1273. 

  1273.        else
    1274. 

  1274. @@ -179,27 +181,6 @@ class Gem::Resolver
    1275. 

  1275.    end
    1276. 

  1276.  
    1277. 

  1277.    ##
    1278. 

  1278. -  # Finds the State in +states+ that matches the +conflict+ so that we can try
    1279. 

  1279. -  # other possible sets.
    1280. 

  1280. -  #
    1281. 

  1281. -  # If no good candidate is found, the first state is tried.
    1282. 

  1282. -
    1283. 

  1283. -  def find_conflict_state conflict, states # :nodoc:
    1284. 

  1284. -    until states.empty? do
    1285. 

  1285. -      state = states.pop
    1286. 

  1286. -
    1287. 

  1287. -      explain :consider, state.dep, conflict.failed_dep
    1288. 

  1288. -
    1289. 

  1289. -      if conflict.for_spec? state.spec
    1290. 

  1290. -        state.conflicts << [state.spec, conflict]
    1291. 

  1291. -        return state
    1292. 

  1292. -      end
    1293. 

  1293. -    end
    1294. 

  1294. -
    1295. 

  1295. -    nil
    1296. 

  1296. -  end
    1297. 

  1297. -
    1298. 

  1298. -  ##
    1299. 

  1299.    # Extracts the specifications that may be able to fulfill +dependency+ and
    1300. 

  1300.    # returns those that match the local platform and all those that match.
    1301. 

  1301.  
    1302. 

  1302. diff --git a/lib/rubygems/resolver/api_set.rb b/lib/rubygems/resolver/api_set.rb
    1303. 

  1303. index 89ee3c9..5475e62 100644
    1304. 

  1304. --- a/lib/rubygems/resolver/api_set.rb
    1305. 

  1305. +++ b/lib/rubygems/resolver/api_set.rb
    1306. 

  1306. @@ -25,10 +25,12 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
    1307. 

  1307.    # http://guides.rubygems.org/rubygems-org-api
    1308. 

  1308.  
    1309. 

  1309.    def initialize dep_uri = 'https://rubygems.org/api/v1/dependencies'
    1310. 

  1310. +    super()
    1311. 

  1311. +
    1312. 

  1312.      dep_uri = URI dep_uri unless URI === dep_uri # for ruby 1.8
    1313. 

  1313.  
    1314. 

  1314.      @dep_uri = dep_uri
    1315. 

  1315. -    @uri     = dep_uri + '../../..'
    1316. 

  1316. +    @uri     = dep_uri + '../..'
    1317. 

  1317.  
    1318. 

  1318.      @data   = Hash.new { |h,k| h[k] = [] }
    1319. 

  1319.      @source = Gem::Source.new @uri
    1320. 

  1320. @@ -41,6 +43,8 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
    1321. 

  1321.    def find_all req
    1322. 

  1322.      res = []
    1323. 

  1323.  
    1324. 

  1324. +    return res unless @remote
    1325. 

  1325. +
    1326. 

  1326.      versions(req.name).each do |ver|
    1327. 

  1327.        if req.dependency.match? req.name, ver[:number]
    1328. 

  1328.          res << Gem::Resolver::APISpecification.new(self, ver)
    1329. 

  1329. @@ -55,6 +59,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
    1330. 

  1330.    # data for DependencyRequests +reqs+.
    1331. 

  1331.  
    1332. 

  1332.    def prefetch reqs
    1333. 

  1333. +    return unless @remote
    1334. 

  1334.      names = reqs.map { |r| r.dependency.name }
    1335. 

  1335.      needed = names - @data.keys
    1336. 

  1336.  
    1337. 

  1337. diff --git a/lib/rubygems/resolver/best_set.rb b/lib/rubygems/resolver/best_set.rb
    1338. 

  1338. index fa6c9f8..20bb948 100644
    1339. 

  1339. --- a/lib/rubygems/resolver/best_set.rb
    1340. 

  1340. +++ b/lib/rubygems/resolver/best_set.rb
    1341. 

  1341. @@ -12,11 +12,30 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
    1342. 

  1342.    def initialize sources = Gem.sources
    1343. 

  1343.      super()
    1344. 

  1344.  
    1345. 

  1345. -    sources.each_source do |source|
    1346. 

  1346. +    @sources = sources
    1347. 

  1347. +  end
    1348. 

  1348. +
    1349. 

  1349. +  ##
    1350. 

  1350. +  # Picks which sets to use for the configured sources.
    1351. 

  1351. +
    1352. 

  1352. +  def pick_sets # :nodoc:
    1353. 

  1353. +    @sources.each_source do |source|
    1354. 

  1354.        @sets << source.dependency_resolver_set
    1355. 

  1355.      end
    1356. 

  1356.    end
    1357. 

  1357.  
    1358. 

  1358. +  def find_all req # :nodoc:
    1359. 

  1359. +    pick_sets if @remote and @sets.empty?
    1360. 

  1360. +
    1361. 

  1361. +    super
    1362. 

  1362. +  end
    1363. 

  1363. +
    1364. 

  1364. +  def prefetch reqs # :nodoc:
    1365. 

  1365. +    pick_sets if @remote and @sets.empty?
    1366. 

  1366. +
    1367. 

  1367. +    super
    1368. 

  1368. +  end
    1369. 

  1369. +
    1370. 

  1370.    def pretty_print q # :nodoc:
    1371. 

  1371.      q.group 2, '[BestSet', ']' do
    1372. 

  1372.        q.breakable
    1373. 

  1373. diff --git a/lib/rubygems/resolver/composed_set.rb b/lib/rubygems/resolver/composed_set.rb
    1374. 

  1374. index 19227e0..6f912b0 100644
    1375. 

  1375. --- a/lib/rubygems/resolver/composed_set.rb
    1376. 

  1376. +++ b/lib/rubygems/resolver/composed_set.rb
    1377. 

  1377. @@ -16,10 +16,21 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
    1378. 

  1378.    # Gem::Resolver::compose_sets instead.
    1379. 

  1379.  
    1380. 

  1380.    def initialize *sets
    1381. 

  1381. +    super()
    1382. 

  1382. +
    1383. 

  1383.      @sets = sets
    1384. 

  1384.    end
    1385. 

  1385.  
    1386. 

  1386.    ##
    1387. 

  1387. +  # Sets the remote network access for all composed sets.
    1388. 

  1388. +
    1389. 

  1389. +  def remote= remote
    1390. 

  1390. +    super
    1391. 

  1391. +
    1392. 

  1392. +    @sets.each { |set| set.remote = remote }
    1393. 

  1393. +  end
    1394. 

  1394. +
    1395. 

  1395. +  ##
    1396. 

  1396.    # Finds all specs matching +req+ in all sets.
    1397. 

  1397.  
    1398. 

  1398.    def find_all req
    1399. 

  1399. diff --git a/lib/rubygems/resolver/git_set.rb b/lib/rubygems/resolver/git_set.rb
    1400. 

  1400. index 1a2b230..d32710e 100644
    1401. 

  1401. --- a/lib/rubygems/resolver/git_set.rb
    1402. 

  1402. +++ b/lib/rubygems/resolver/git_set.rb
    1403. 

  1403. @@ -33,6 +33,8 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
    1404. 

  1404.    attr_reader :specs # :nodoc:
    1405. 

  1405.  
    1406. 

  1406.    def initialize # :nodoc:
    1407. 

  1407. +    super()
    1408. 

  1408. +
    1409. 

  1409.      @git             = ENV['git'] || 'git'
    1410. 

  1410.      @need_submodules = {}
    1411. 

  1411.      @repositories    = {}
    1412. 

  1412. @@ -91,6 +93,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
    1413. 

  1413.      @repositories.each do |name, (repository, reference)|
    1414. 

  1414.        source = Gem::Source::Git.new name, repository, reference
    1415. 

  1415.        source.root_dir = @root_dir
    1416. 

  1416. +      source.remote = @remote
    1417. 

  1417.  
    1418. 

  1418.        source.specs.each do |spec|
    1419. 

  1419.          git_spec = Gem::Resolver::GitSpecification.new self, spec, source
    1420. 

  1420. diff --git a/lib/rubygems/resolver/index_set.rb b/lib/rubygems/resolver/index_set.rb
    1421. 

  1421. index a6ef56b..ef01f0f 100644
    1422. 

  1422. --- a/lib/rubygems/resolver/index_set.rb
    1423. 

  1423. +++ b/lib/rubygems/resolver/index_set.rb
    1424. 

  1424. @@ -5,6 +5,8 @@
    1425. 

  1425.  class Gem::Resolver::IndexSet < Gem::Resolver::Set
    1426. 

  1426.  
    1427. 

  1427.    def initialize source = nil # :nodoc:
    1428. 

  1428. +    super()
    1429. 

  1429. +
    1430. 

  1430.      @f =
    1431. 

  1431.        if source then
    1432. 

  1432.          sources = Gem::SourceList.from [source]
    1433. 

  1433. @@ -34,6 +36,8 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
    1434. 

  1434.    def find_all req
    1435. 

  1435.      res = []
    1436. 

  1436.  
    1437. 

  1437. +    return res unless @remote
    1438. 

  1438. +
    1439. 

  1439.      name = req.dependency.name
    1440. 

  1440.  
    1441. 

  1441.      @all[name].each do |uri, n|
    1442. 

  1442. diff --git a/lib/rubygems/resolver/installer_set.rb b/lib/rubygems/resolver/installer_set.rb
    1443. 

  1443. index e35e0aa..045c893 100644
    1444. 

  1444. --- a/lib/rubygems/resolver/installer_set.rb
    1445. 

  1445. +++ b/lib/rubygems/resolver/installer_set.rb
    1446. 

  1446. @@ -24,15 +24,17 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
    1447. 

  1447.    # Creates a new InstallerSet that will look for gems in +domain+.
    1448. 

  1448.  
    1449. 

  1449.    def initialize domain
    1450. 

  1450. +    super()
    1451. 

  1451. +
    1452. 

  1452.      @domain = domain
    1453. 

  1453. +    @remote = consider_remote?
    1454. 

  1454.  
    1455. 

  1455.      @f = Gem::SpecFetcher.fetcher
    1456. 

  1456.  
    1457. 

  1457. -    @all = Hash.new { |h,k| h[k] = [] }
    1458. 

  1458.      @always_install      = []
    1459. 

  1459.      @ignore_dependencies = false
    1460. 

  1460.      @ignore_installed    = false
    1461. 

  1461. -    @loaded_remote_specs = []
    1462. 

  1462. +    @remote_set          = Gem::Resolver::BestSet.new
    1463. 

  1463.      @specs               = {}
    1464. 

  1464.    end
    1465. 

  1465.  
    1466. 

  1466. @@ -79,16 +81,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
    1467. 

  1467.        end
    1468. 

  1468.      end
    1469. 

  1469.  
    1470. 

  1470. -    if consider_remote? then
    1471. 

  1471. -      load_remote_specs dep
    1472. 

  1472. -
    1473. 

  1473. -      @all[name].each do |remote_source, n|
    1474. 

  1474. -        if dep.match? n then
    1475. 

  1475. -          res << Gem::Resolver::IndexSpecification.new(
    1476. 

  1476. -            self, n.name, n.version, remote_source, n.platform)
    1477. 

  1477. -        end
    1478. 

  1478. -      end
    1479. 

  1479. -    end
    1480. 

  1480. +    res.concat @remote_set.find_all req if consider_remote?
    1481. 

  1481.  
    1482. 

  1482.      res
    1483. 

  1483.    end
    1484. 

  1484. @@ -102,27 +95,6 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
    1485. 

  1485.    end
    1486. 

  1486.  
    1487. 

  1487.    ##
    1488. 

  1488. -  # Loads remote prerelease specs if +dep+ is a prerelease dependency
    1489. 

  1489. -
    1490. 

  1490. -  def load_remote_specs dep # :nodoc:
    1491. 

  1491. -    types = [:released]
    1492. 

  1492. -    types << :prerelease if dep.prerelease?
    1493. 

  1493. -
    1494. 

  1494. -    types.each do |type|
    1495. 

  1495. -      next if @loaded_remote_specs.include? type
    1496. 

  1496. -      @loaded_remote_specs << type
    1497. 

  1497. -
    1498. 

  1498. -      list, = @f.available_specs type
    1499. 

  1499. -
    1500. 

  1500. -      list.each do |uri, specs|
    1501. 

  1501. -        specs.each do |n|
    1502. 

  1502. -          @all[n.name] << [uri, n]
    1503. 

  1503. -        end
    1504. 

  1504. -      end
    1505. 

  1505. -    end
    1506. 

  1506. -  end
    1507. 

  1507. -
    1508. 

  1508. -  ##
    1509. 

  1509.    # Called from IndexSpecification to get a true Specification
    1510. 

  1510.    # object.
    1511. 

  1511.  
    1512. 

  1512. @@ -151,5 +123,16 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
    1513. 

  1513.      end
    1514. 

  1514.    end
    1515. 

  1515.  
    1516. 

  1516. +  def remote= remote # :nodoc:
    1517. 

  1517. +    case @domain
    1518. 

  1518. +    when :local then
    1519. 

  1519. +      @domain = :both if remote
    1520. 

  1520. +    when :remote then
    1521. 

  1521. +      @domain = nil unless remote
    1522. 

  1522. +    when :both then
    1523. 

  1523. +      @domain = :local unless remote
    1524. 

  1524. +    end
    1525. 

  1525. +  end
    1526. 

  1526. +
    1527. 

  1527.  end
    1528. 

  1528.  
    1529. 

  1529. diff --git a/lib/rubygems/resolver/lock_set.rb b/lib/rubygems/resolver/lock_set.rb
    1530. 

  1530. index cdb41b2..f498757 100644
    1531. 

  1531. --- a/lib/rubygems/resolver/lock_set.rb
    1532. 

  1532. +++ b/lib/rubygems/resolver/lock_set.rb
    1533. 

  1533. @@ -9,6 +9,8 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
    1534. 

  1534.    # Creates a new LockSet from the given +source+
    1535. 

  1535.  
    1536. 

  1536.    def initialize source
    1537. 

  1537. +    super()
    1538. 

  1538. +
    1539. 

  1539.      @source = Gem::Source::Lock.new source
    1540. 

  1540.      @specs  = []
    1541. 

  1541.    end
    1542. 

  1542. diff --git a/lib/rubygems/resolver/set.rb b/lib/rubygems/resolver/set.rb
    1543. 

  1543. index 32c137e..f053b65 100644
    1544. 

  1544. --- a/lib/rubygems/resolver/set.rb
    1545. 

  1545. +++ b/lib/rubygems/resolver/set.rb
    1546. 

  1546. @@ -5,6 +5,15 @@
    1547. 

  1547.  class Gem::Resolver::Set
    1548. 

  1548.  
    1549. 

  1549.    ##
    1550. 

  1550. +  # Set to true to disable network access for this set
    1551. 

  1551. +
    1552. 

  1552. +  attr_accessor :remote
    1553. 

  1553. +
    1554. 

  1554. +  def initialize # :nodoc:
    1555. 

  1555. +    @remote = true
    1556. 

  1556. +  end
    1557. 

  1557. +
    1558. 

  1558. +  ##
    1559. 

  1559.    # The find_all method must be implemented.  It returns all Resolver
    1560. 

  1560.    # Specification objects matching the given DependencyRequest +req+.
    1561. 

  1561.  
    1562. 

  1562. @@ -23,5 +32,13 @@ class Gem::Resolver::Set
    1563. 

  1563.    def prefetch reqs
    1564. 

  1564.    end
    1565. 

  1565.  
    1566. 

  1566. +  ##
    1567. 

  1567. +  # When true, this set is allowed to access the network when looking up
    1568. 

  1568. +  # specifications or dependencies.
    1569. 

  1569. +
    1570. 

  1570. +  def remote? # :nodoc:
    1571. 

  1571. +    @remote
    1572. 

  1572. +  end
    1573. 

  1573. +
    1574. 

  1574.  end
    1575. 

  1575.  
    1576. 

  1576. diff --git a/lib/rubygems/resolver/vendor_set.rb b/lib/rubygems/resolver/vendor_set.rb
    1577. 

  1577. index 3db637f..6e86707 100644
    1578. 

  1578. --- a/lib/rubygems/resolver/vendor_set.rb
    1579. 

  1579. +++ b/lib/rubygems/resolver/vendor_set.rb
    1580. 

  1580. @@ -21,6 +21,8 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set
    1581. 

  1581.    attr_reader :specs # :nodoc:
    1582. 

  1582.  
    1583. 

  1583.    def initialize # :nodoc:
    1584. 

  1584. +    super()
    1585. 

  1585. +
    1586. 

  1586.      @directories = {}
    1587. 

  1587.      @specs       = {}
    1588. 

  1588.    end
    1589. 

  1589. diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb
    1590. 

  1590. index bfd6fd2..8c5fb7d 100644
    1591. 

  1591. --- a/lib/rubygems/security.rb
    1592. 

  1592. +++ b/lib/rubygems/security.rb
    1593. 

  1593. @@ -120,11 +120,11 @@ end
    1594. 

  1594.  # * HighSecurity - Here's the bugger that got us into this mess.
    1595. 

  1595.  #   The HighSecurity policy is identical to the MediumSecurity policy,
    1596. 

  1596.  #   except that it does not allow unsigned gems.  A malicious user
    1597. 

  1597. -#   doesn't have a whole lot of options here; he can't modify the
    1598. 

  1598. -#   package contents without invalidating the signature, and he can't
    1599. 

  1599. +#   doesn't have a whole lot of options here; they can't modify the
    1600. 

  1600. +#   package contents without invalidating the signature, and they can't
    1601. 

  1601.  #   modify or remove signature or the signing certificate chain, or
    1602. 

  1602.  #   RubyGems will simply refuse to install the package.  Oh well, maybe
    1603. 

  1603. -#   he'll have better luck causing problems for CPAN users instead :).
    1604. 

  1604. +#   they'll have better luck causing problems for CPAN users instead :).
    1605. 

  1605.  #
    1606. 

  1606.  # The reason RubyGems refused to install your shiny new signed gem was because
    1607. 

  1607.  # it was from an untrusted source.  Well, your code is infallible (naturally),
    1608. 

  1608. diff --git a/lib/rubygems/source/git.rb b/lib/rubygems/source/git.rb
    1609. 

  1609. index 28178a5..2e3fa03 100644
    1610. 

  1610. --- a/lib/rubygems/source/git.rb
    1611. 

  1611. +++ b/lib/rubygems/source/git.rb
    1612. 

  1612. @@ -24,6 +24,11 @@ class Gem::Source::Git < Gem::Source
    1613. 

  1613.    attr_reader :reference
    1614. 

  1614.  
    1615. 

  1615.    ##
    1616. 

  1616. +  # When false the cache for this repository will not be updated.
    1617. 

  1617. +
    1618. 

  1618. +  attr_accessor :remote
    1619. 

  1619. +
    1620. 

  1620. +  ##
    1621. 

  1621.    # The git repository this gem is sourced from.
    1622. 

  1622.  
    1623. 

  1623.    attr_reader :repository
    1624. 

  1624. @@ -53,6 +58,7 @@ class Gem::Source::Git < Gem::Source
    1625. 

  1625.      @reference       = reference
    1626. 

  1626.      @need_submodules = submodules
    1627. 

  1627.  
    1628. 

  1628. +    @remote   = true
    1629. 

  1629.      @root_dir = Gem.dir
    1630. 

  1630.      @git      = ENV['git'] || 'git'
    1631. 

  1631.    end
    1632. 

  1632. @@ -85,6 +91,8 @@ class Gem::Source::Git < Gem::Source
    1633. 

  1633.    def checkout # :nodoc:
    1634. 

  1634.      cache
    1635. 

  1635.  
    1636. 

  1636. +    return false unless File.exist? repo_cache_dir
    1637. 

  1637. +
    1638. 

  1638.      unless File.exist? install_dir then
    1639. 

  1639.        system @git, 'clone', '--quiet', '--no-checkout',
    1640. 

  1640.               repo_cache_dir, install_dir
    1641. 

  1641. @@ -107,6 +115,8 @@ class Gem::Source::Git < Gem::Source
    1642. 

  1642.    # Creates a local cache repository for the git gem.
    1643. 

  1643.  
    1644. 

  1644.    def cache # :nodoc:
    1645. 

  1645. +    return unless @remote
    1646. 

  1646. +
    1647. 

  1647.      if File.exist? repo_cache_dir then
    1648. 

  1648.        Dir.chdir repo_cache_dir do
    1649. 

  1649.          system @git, 'fetch', '--quiet', '--force', '--tags',
    1650. 

  1650. @@ -142,6 +152,8 @@ class Gem::Source::Git < Gem::Source
    1651. 

  1651.    # The directory where the git gem will be installed.
    1652. 

  1652.  
    1653. 

  1653.    def install_dir # :nodoc:
    1654. 

  1654. +    return unless File.exist? repo_cache_dir
    1655. 

  1655. +
    1656. 

  1656.      File.join base_dir, 'gems', "#{@name}-#{dir_shortref}"
    1657. 

  1657.    end
    1658. 

  1658.  
    1659. 

  1659. @@ -177,6 +189,8 @@ class Gem::Source::Git < Gem::Source
    1660. 

  1660.    def specs
    1661. 

  1661.      checkout
    1662. 

  1662.  
    1663. 

  1663. +    return [] unless install_dir
    1664. 

  1664. +
    1665. 

  1665.      Dir.chdir install_dir do
    1666. 

  1666.        Dir['{,*,*/*}.gemspec'].map do |spec_file|
    1667. 

  1667.          directory = File.dirname spec_file
    1668. 

  1668. diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
    1669. 

  1669. index 59d71d3..f4e609a 100644
    1670. 

  1670. --- a/lib/rubygems/specification.rb
    1671. 

  1671. +++ b/lib/rubygems/specification.rb
    1672. 

  1672. @@ -241,6 +241,28 @@ class Gem::Specification < Gem::BasicSpecification
    1673. 

  1673.    attr_reader :summary
    1674. 

  1674.  
    1675. 

  1675.    ##
    1676. 

  1676. +  # Singular writer for #authors
    1677. 

  1677. +  #
    1678. 

  1678. +  # Usage:
    1679. 

  1679. +  #
    1680. 

  1680. +  #   spec.author = 'John Jones'
    1681. 

  1681. +
    1682. 

  1682. +  def author= o
    1683. 

  1683. +    self.authors = [o]
    1684. 

  1684. +  end
    1685. 

  1685. +
    1686. 

  1686. +  ##
    1687. 

  1687. +  # Sets the list of authors, ensuring it is an array.
    1688. 

  1688. +  #
    1689. 

  1689. +  # Usage:
    1690. 

  1690. +  #
    1691. 

  1691. +  #   spec.authors = ['John Jones', 'Mary Smith']
    1692. 

  1692. +
    1693. 

  1693. +  def authors= value
    1694. 

  1694. +    @authors = Array(value).flatten.grep(String)
    1695. 

  1695. +  end
    1696. 

  1696. +
    1697. 

  1697. +  ##
    1698. 

  1698.    # The platform this gem runs on.
    1699. 

  1699.    #
    1700. 

  1700.    # This is usually Gem::Platform::RUBY or Gem::Platform::CURRENT.
    1701. 

  1701. @@ -327,7 +349,7 @@ class Gem::Specification < Gem::BasicSpecification
    1702. 

  1702.                add_bindir(@executables),
    1703. 

  1703.                @extra_rdoc_files,
    1704. 

  1704.                @extensions,
    1705. 

  1705. -             ].flatten.sort.uniq.compact
    1706. 

  1706. +             ].flatten.uniq.compact.sort
    1707. 

  1707.    end
    1708. 

  1708.  
    1709. 

  1709.    ######################################################################
    1710. 

  1710. @@ -443,28 +465,6 @@ class Gem::Specification < Gem::BasicSpecification
    1711. 

  1711.    end
    1712. 

  1712.  
    1713. 

  1713.    ##
    1714. 

  1714. -  # Singular writer for #authors
    1715. 

  1715. -  #
    1716. 

  1716. -  # Usage:
    1717. 

  1717. -  #
    1718. 

  1718. -  #   spec.author = 'John Jones'
    1719. 

  1719. -
    1720. 

  1720. -  def author= o
    1721. 

  1721. -    self.authors = [o]
    1722. 

  1722. -  end
    1723. 

  1723. -
    1724. 

  1724. -  ##
    1725. 

  1725. -  # Sets the list of authors, ensuring it is an array.
    1726. 

  1726. -  #
    1727. 

  1727. -  # Usage:
    1728. 

  1728. -  #
    1729. 

  1729. -  #   spec.authors = ['John Jones', 'Mary Smith']
    1730. 

  1730. -
    1731. 

  1731. -  def authors= value
    1732. 

  1732. -    @authors = Array(value).flatten.grep(String)
    1733. 

  1733. -  end
    1734. 

  1734. -
    1735. 

  1735. -  ##
    1736. 

  1736.    # Executables included in the gem.
    1737. 

  1737.    #
    1738. 

  1738.    # For example, the rake gem has rake as an executable. You don’t specify the
    1739. 

  1739. diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
    1740. 

  1740. index 8dc37d6..328731d 100644
    1741. 

  1741. --- a/lib/rubygems/test_case.rb
    1742. 

  1742. +++ b/lib/rubygems/test_case.rb
    1743. 

  1743. @@ -115,6 +115,23 @@ class Gem::TestCase < MiniTest::Unit::TestCase
    1744. 

  1744.      assert File.exist?(path), msg
    1745. 

  1745.    end
    1746. 

  1746.  
    1747. 

  1747. +  ##
    1748. 

  1748. +  # Sets the ENABLE_SHARED entry in RbConfig::CONFIG to +value+ and restores
    1749. 

  1749. +  # the original value when the block ends
    1750. 

  1750. +
    1751. 

  1751. +  def enable_shared value
    1752. 

  1752. +    enable_shared = RbConfig::CONFIG['ENABLE_SHARED']
    1753. 

  1753. +    RbConfig::CONFIG['ENABLE_SHARED'] = value
    1754. 

  1754. +
    1755. 

  1755. +    yield
    1756. 

  1756. +  ensure
    1757. 

  1757. +    if enable_shared then
    1758. 

  1758. +      RbConfig::CONFIG['enable_shared'] = enable_shared
    1759. 

  1759. +    else
    1760. 

  1760. +      RbConfig::CONFIG.delete 'enable_shared'
    1761. 

  1761. +    end
    1762. 

  1762. +  end
    1763. 

  1763. +
    1764. 

  1764.    # TODO: move to minitest
    1765. 

  1765.    def refute_path_exists path, msg = nil
    1766. 

  1766.      msg = message(msg) { "Expected path '#{path}' to not exist" }
    1767. 

  1767. @@ -294,10 +311,10 @@ class Gem::TestCase < MiniTest::Unit::TestCase
    1768. 

  1768.  
    1769. 

  1769.      Gem.searcher = nil
    1770. 

  1770.      Gem::SpecFetcher.fetcher = nil
    1771. 

  1771. -    @orig_BASERUBY = Gem::ConfigMap[:BASERUBY]
    1772. 

  1772. -    Gem::ConfigMap[:BASERUBY] = Gem::ConfigMap[:ruby_install_name]
    1773. 

  1773. +    @orig_BASERUBY = RbConfig::CONFIG['BASERUBY']
    1774. 

  1774. +    RbConfig::CONFIG['BASERUBY'] = RbConfig::CONFIG['ruby_install_name']
    1775. 

  1775.  
    1776. 

  1776. -    @orig_arch = Gem::ConfigMap[:arch]
    1777. 

  1777. +    @orig_arch = RbConfig::CONFIG['arch']
    1778. 

  1778.  
    1779. 

  1779.      if win_platform?
    1780. 

  1780.        util_set_arch 'i386-mswin32'
    1781. 

  1781. @@ -315,8 +332,12 @@ class Gem::TestCase < MiniTest::Unit::TestCase
    1782. 

  1782.    def teardown
    1783. 

  1783.      $LOAD_PATH.replace @orig_LOAD_PATH if @orig_LOAD_PATH
    1784. 

  1784.  
    1785. 

  1785. -    Gem::ConfigMap[:BASERUBY] = @orig_BASERUBY
    1786. 

  1786. -    Gem::ConfigMap[:arch] = @orig_arch
    1787. 

  1787. +    if @orig_BASERUBY
    1788. 

  1788. +      RbConfig::CONFIG['BASERUBY'] = @orig_BASERUBY
    1789. 

  1789. +    else
    1790. 

  1790. +      RbConfig::CONFIG.delete('BASERUBY')
    1791. 

  1791. +    end
    1792. 

  1792. +    RbConfig::CONFIG['arch'] = @orig_arch
    1793. 

  1793.  
    1794. 

  1794.      if defined? Gem::RemoteFetcher then
    1795. 

  1795.        Gem::RemoteFetcher.fetcher = nil
    1796. 

  1796. @@ -898,7 +919,7 @@ Also, a list:
    1797. 

  1797.    # Set the platform to +arch+
    1798. 

  1798.  
    1799. 

  1799.    def util_set_arch(arch)
    1800. 

  1800. -    Gem::ConfigMap[:arch] = arch
    1801. 

  1801. +    RbConfig::CONFIG['arch'] = arch
    1802. 

  1802.      platform = Gem::Platform.new arch
    1803. 

  1803.  
    1804. 

  1804.      Gem.instance_variable_set :@platforms, nil
    1805. 

  1805. @@ -1245,10 +1266,17 @@ Also, a list:
    1806. 

  1806.    class StaticSet
    1807. 

  1807.  
    1808. 

  1808.      ##
    1809. 

  1809. +    # A StaticSet ignores remote because it has a fixed set of gems.
    1810. 

  1810. +
    1811. 

  1811. +    attr_accessor :remote
    1812. 

  1812. +
    1813. 

  1813. +    ##
    1814. 

  1814.      # Creates a new StaticSet for the given +specs+
    1815. 

  1815.  
    1816. 

  1816.      def initialize(specs)
    1817. 

  1817.        @specs = specs
    1818. 

  1818. +
    1819. 

  1819. +      @remote = true
    1820. 

  1820.      end
    1821. 

  1821.  
    1822. 

  1822.      ##
    1823. 

  1823. diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb
    1824. 

  1824. index 4cb2a1d..fa83833 100644
    1825. 

  1825. --- a/lib/rubygems/uninstaller.rb
    1826. 

  1826. +++ b/lib/rubygems/uninstaller.rb
    1827. 

  1827. @@ -237,7 +237,7 @@ class Gem::Uninstaller
    1828. 

  1828.      unless path_ok?(@gem_home, spec) or
    1829. 

  1829.             (@user_install and path_ok?(Gem.user_dir, spec)) then
    1830. 

  1830.        e = Gem::GemNotInHomeException.new \
    1831. 

  1831. -            "Gem is not installed in directory #{@gem_home}"
    1832. 

  1832. +            "Gem '#{spec.full_name}' is not installed in directory #{@gem_home}"
    1833. 

  1833.        e.spec = spec
    1834. 

  1834.  
    1835. 

  1835.        raise e
    1836. 

  1836. diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb
    1837. 

  1837. index fda8b0b..2066332 100644
    1838. 

  1838. --- a/lib/rubygems/version.rb
    1839. 

  1839. +++ b/lib/rubygems/version.rb
    1840. 

  1840. @@ -22,6 +22,11 @@
    1841. 

  1841.  # 3. 1.0.a.2
    1842. 

  1842.  # 4. 0.9
    1843. 

  1843.  #
    1844. 

  1844. +# If you want to specify a version restriction that includes both prereleases
    1845. 

  1845. +# and regular releases of the 1.x series this is the best way:
    1846. 

  1846. +#
    1847. 

  1847. +#   s.add_dependency 'example', '>= 1.0.0.a', '< 2.0.0'
    1848. 

  1848. +#
    1849. 

  1849.  # == How Software Changes
    1850. 

  1850.  #
    1851. 

  1851.  # Users expect to be able to specify a version constraint that gives them
    1852. 

  1852. @@ -81,8 +86,8 @@
    1853. 

  1853.  #
    1854. 

  1854.  # * Any "public" release of a gem should have a different version.  Normally
    1855. 

  1855.  #   that means incrementing the build number.  This means a developer can
    1856. 

  1856. -#   generate builds all day long for himself, but as soon as he/she makes a
    1857. 

  1857. -#   public release, the version must be updated.
    1858. 

  1858. +#   generate builds all day long, but as soon as they make a public release,
    1859. 

  1859. +#   the version must be updated.
    1860. 

  1860.  #
    1861. 

  1861.  # === Examples
    1862. 

  1862.  #
    1863. 

  1863. @@ -99,26 +104,25 @@
    1864. 

  1864.  # Version 1.1.1:: Fixed a bug in the linked list implementation.
    1865. 

  1865.  # Version 1.1.2:: Fixed a bug introduced in the last fix.
    1866. 

  1866.  #
    1867. 

  1867. -# Client A needs a stack with basic push/pop capability.  He writes to the
    1868. 

  1868. -# original interface (no <tt>top</tt>), so his version constraint looks
    1869. 

  1869. -# like:
    1870. 

  1870. +# Client A needs a stack with basic push/pop capability.  They write to the
    1871. 

  1871. +# original interface (no <tt>top</tt>), so their version constraint looks like:
    1872. 

  1872.  #
    1873. 

  1873.  #   gem 'stack', '~> 0.0'
    1874. 

  1874.  #
    1875. 

  1875.  # Essentially, any version is OK with Client A.  An incompatible change to
    1876. 

  1876. -# the library will cause him grief, but he is willing to take the chance (we
    1877. 

  1877. -# call Client A optimistic).
    1878. 

  1878. +# the library will cause them grief, but they are willing to take the chance
    1879. 

  1879. +# (we call Client A optimistic).
    1880. 

  1880.  #
    1881. 

  1881. -# Client B is just like Client A except for two things: (1) He uses the
    1882. 

  1882. -# <tt>depth</tt> method and (2) he is worried about future
    1883. 

  1883. -# incompatibilities, so he writes his version constraint like this:
    1884. 

  1884. +# Client B is just like Client A except for two things: (1) They use the
    1885. 

  1885. +# <tt>depth</tt> method and (2) they are worried about future
    1886. 

  1886. +# incompatibilities, so they write their version constraint like this:
    1887. 

  1887.  #
    1888. 

  1888.  #   gem 'stack', '~> 0.1'
    1889. 

  1889.  #
    1890. 

  1890.  # The <tt>depth</tt> method was introduced in version 0.1.0, so that version
    1891. 

  1891.  # or anything later is fine, as long as the version stays below version 1.0
    1892. 

  1892.  # where incompatibilities are introduced.  We call Client B pessimistic
    1893. 

  1893. -# because he is worried about incompatible future changes (it is OK to be
    1894. 

  1894. +# because they are worried about incompatible future changes (it is OK to be
    1895. 

  1895.  # pessimistic!).
    1896. 

  1896.  #
    1897. 

  1897.  # == Preventing Version Catastrophe:
    1898. 

  1898. @@ -185,6 +189,8 @@ class Gem::Version
    1899. 

  1899.    @@all = {}
    1900. 

  1900.  
    1901. 

  1901.    def self.new version # :nodoc:
    1902. 

  1902. +    return super unless Gem::VERSION == self.class
    1903. 

  1903. +
    1904. 

  1904.      @@all[version] ||= super
    1905. 

  1905.    end
    1906. 

  1906.  
    1907. 

  1907. diff --git a/lib/timeout.rb b/lib/timeout.rb
    1908. 

  1908. index ad951d2..d805dce 100644
    1909. 

  1909. --- a/lib/timeout.rb
    1910. 

  1910. +++ b/lib/timeout.rb
    1911. 

  1911. @@ -26,16 +26,25 @@ module Timeout
    1912. 

  1912.    class Error < RuntimeError
    1913. 

  1913.    end
    1914. 

  1914.    class ExitException < ::Exception # :nodoc:
    1915. 

  1915. -    attr_reader :klass, :thread
    1916. 

  1916. +    attr_reader :thread
    1917. 

  1917.  
    1918. 

  1918. -    def initialize(*)
    1919. 

  1919. -      super
    1920. 

  1920. -      @thread = Thread.current
    1921. 

  1921. -      freeze
    1922. 

  1922. +    def self.catch(*args)
    1923. 

  1923. +      exc = new(*args)
    1924. 

  1924. +      exc.instance_variable_set(:@thread, Thread.current)
    1925. 

  1925. +      exc.freeze
    1926. 

  1926. +      ::Kernel.catch(exc) {yield exc}
    1927. 

  1927.      end
    1928. 

  1928.  
    1929. 

  1929.      def exception(*)
    1930. 

  1930. -      throw(self, caller) if self.thread == Thread.current
    1931. 

  1931. +      if self.thread == Thread.current
    1932. 

  1932. +        bt = caller
    1933. 

  1933. +        begin
    1934. 

  1934. +          throw(self, bt)
    1935. 

  1935. +        rescue ArgumentError => e
    1936. 

  1936. +          raise unless e.message.start_with?("uncaught throw")
    1937. 

  1937. +          raise Error, message, backtrace
    1938. 

  1938. +        end
    1939. 

  1939. +      end
    1940. 

  1940.        self
    1941. 

  1941.      end
    1942. 

  1942.    end
    1943. 

  1943. @@ -67,7 +76,7 @@ module Timeout
    1944. 

  1944.      return yield(sec) if sec == nil or sec.zero?
    1945. 

  1945.      message = "execution expired"
    1946. 

  1946.      e = Error
    1947. 

  1947. -    bt = catch((klass||ExitException).new) do |exception|
    1948. 

  1948. +    bl = proc do |exception|
    1949. 

  1949.        begin
    1950. 

  1950.          x = Thread.current
    1951. 

  1951.          y = Thread.start {
    1952. 

  1952. @@ -80,8 +89,6 @@ module Timeout
    1953. 

  1953.            end
    1954. 

  1954.          }
    1955. 

  1955.          return yield(sec)
    1956. 

  1956. -      rescue (klass||ExitException) => e
    1957. 

  1957. -        e.backtrace
    1958. 

  1958.        ensure
    1959. 

  1959.          if y
    1960. 

  1960.            y.kill
    1961. 

  1961. @@ -89,6 +96,15 @@ module Timeout
    1962. 

  1962.          end
    1963. 

  1963.        end
    1964. 

  1964.      end
    1965. 

  1965. +    if klass
    1966. 

  1966. +      begin
    1967. 

  1967. +        bl.call(klass)
    1968. 

  1968. +      rescue klass => e
    1969. 

  1969. +        bt = e.backtrace
    1970. 

  1970. +      end
    1971. 

  1971. +    else
    1972. 

  1972. +      bt = ExitException.catch(message, &bl)
    1973. 

  1973. +    end
    1974. 

  1974.      rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o
    1975. 

  1975.      bt.reject! {|m| rej =~ m}
    1976. 

  1976.      level = -caller(CALLER_OFFSET).size
    1977. 

  1977. diff --git a/object.c b/object.c
    1978. 

  1978. index 466ec75..bb43b46 100644
    1979. 

  1979. --- a/object.c
    1980. 

  1980. +++ b/object.c
    1981. 

  1981. @@ -161,6 +161,7 @@ rb_obj_equal(VALUE obj1, VALUE obj2)
    1982. 

  1982.  VALUE
    1983. 

  1983.  rb_obj_hash(VALUE obj)
    1984. 

  1984.  {
    1985. 

  1985. +    long rb_objid_hash(st_index_t index);
    1986. 

  1986.      VALUE oid = rb_obj_id(obj);
    1987. 

  1987.  #if SIZEOF_LONG == SIZEOF_VOIDP
    1988. 

  1988.      st_index_t index = NUM2LONG(oid);
    1989. 

  1989. @@ -169,8 +170,7 @@ rb_obj_hash(VALUE obj)
    1990. 

  1990.  #else
    1991. 

  1991.  # error not supported
    1992. 

  1992.  #endif
    1993. 

  1993. -    st_index_t h = rb_hash_end(rb_hash_start(index));
    1994. 

  1994. -    return LONG2FIX(h);
    1995. 

  1995. +    return LONG2FIX(rb_objid_hash(index));
    1996. 

  1996.  }
    1997. 

  1997.  
    1998. 

  1998.  /*
    1999. 

  1999. diff --git a/proc.c b/proc.c
    2000. 

  2000. index f8b2e3b..e52beaf 100644
    2001. 

  2001. --- a/proc.c
    2002. 

  2002. +++ b/proc.c
    2003. 

  2003. @@ -1171,10 +1171,6 @@ mnew_from_me(rb_method_entry_t *me, VALUE defined_class, VALUE klass,
    2004. 

  2004.  	goto again;
    2005. 

  2005.      }
    2006. 

  2006.  
    2007. 

  2007. -    if (RB_TYPE_P(defined_class, T_ICLASS)) {
    2008. 

  2008. -	defined_class = RBASIC_CLASS(defined_class);
    2009. 

  2009. -    }
    2010. 

  2010. -
    2011. 

  2011.      klass = defined_class;
    2012. 

  2012.  
    2013. 

  2013.      while (rclass != klass &&
    2014. 

  2014. @@ -1396,9 +1392,16 @@ static VALUE
    2015. 

  2015.  method_owner(VALUE obj)
    2016. 

  2016.  {
    2017. 

  2017.      struct METHOD *data;
    2018. 

  2018. +    VALUE defined_class;
    2019. 

  2019.  
    2020. 

  2020.      TypedData_Get_Struct(obj, struct METHOD, &method_data_type, data);
    2021. 

  2021. -    return data->defined_class;
    2022. 

  2022. +    defined_class = data->defined_class;
    2023. 

  2023. +
    2024. 

  2024. +    if (RB_TYPE_P(defined_class, T_ICLASS)) {
    2025. 

  2025. +	defined_class = RBASIC_CLASS(defined_class);
    2026. 

  2026. +    }
    2027. 

  2027. +
    2028. 

  2028. +    return defined_class;
    2029. 

  2029.  }
    2030. 

  2030.  
    2031. 

  2031.  void
    2032. 

  2032. diff --git a/string.c b/string.c
    2033. 

  2033. index 900f900..cc30786 100644
    2034. 

  2034. --- a/string.c
    2035. 

  2035. +++ b/string.c
    2036. 

  2036. @@ -1465,6 +1465,7 @@ rb_str_modify_expand(VALUE str, long expand)
    2037. 

  2037.  	int termlen = TERM_LEN(str);
    2038. 

  2038.  	if (!STR_EMBED_P(str)) {
    2039. 

  2039.  	    REALLOC_N(RSTRING(str)->as.heap.ptr, char, capa + termlen);
    2040. 

  2040. +	    STR_UNSET_NOCAPA(str);
    2041. 

  2041.  	    RSTRING(str)->as.heap.aux.capa = capa;
    2042. 

  2042.  	}
    2043. 

  2043.  	else if (capa + termlen > RSTRING_EMBED_LEN_MAX + 1) {
    2044. 

  2044. diff --git a/struct.c b/struct.c
    2045. 

  2045. index 6be512e..2e026fb 100644
    2046. 

  2046. --- a/struct.c
    2047. 

  2047. +++ b/struct.c
    2048. 

  2048. @@ -156,7 +156,8 @@ rb_struct_set(VALUE obj, VALUE val)
    2049. 

  2049.      for (i=0; i<len; i++) {
    2050. 

  2050.  	slot = RARRAY_AREF(members, i);
    2051. 

  2051.  	if (rb_id_attrset(SYM2ID(slot)) == rb_frame_this_func()) {
    2052. 

  2052. -	    return RSTRUCT_SET(obj, i, val);
    2053. 

  2053. +	    RSTRUCT_SET(obj, i, val);
    2054. 

  2054. +	    return val;
    2055. 

  2055.  	}
    2056. 

  2056.      }
    2057. 

  2057.      rb_name_error(rb_frame_this_func(), "`%s' is not a struct member",
    2058. 

  2058. diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb
    2059. 

  2059. index 6fdc422..02bb5a5 100644
    2060. 

  2060. --- a/test/bigdecimal/test_bigdecimal.rb
    2061. 

  2061. +++ b/test/bigdecimal/test_bigdecimal.rb
    2062. 

  2062. @@ -701,6 +701,10 @@ class TestBigDecimal < Test::Unit::TestCase
    2063. 

  2063.      assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, (BigDecimal.new("-0") / 1).sign)
    2064. 

  2064.      assert_equal(2, BigDecimal.new("2") / 1)
    2065. 

  2065.      assert_equal(-2, BigDecimal.new("2") / -1)
    2066. 

  2066. +
    2067. 

  2067. +    assert_equal(BigDecimal('1486.868686869'), BigDecimal('1472.0') / BigDecimal('0.99'), '[ruby-core:59365] [#9316]')
    2068. 

  2068. +
    2069. 

  2069. +    assert_equal(4.124045235, BigDecimal('0.9932') / (700 * BigDecimal('0.344045') / BigDecimal('1000.0')), '[#9305]')
    2070. 

  2070.    end
    2071. 

  2071.  
    2072. 

  2072.    def test_div_with_float
    2073. 

  2073. diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb
    2074. 

  2074. index a07056d..dafba6e 100644
    2075. 

  2075. --- a/test/dl/test_base.rb
    2076. 

  2076. +++ b/test/dl/test_base.rb
    2077. 

  2077. @@ -39,6 +39,9 @@ when /gnu/	#GNU/Hurd
    2078. 

  2078.  when /mirbsd/
    2079. 

  2079.    libc_so = "/usr/lib/libc.so.41.10"
    2080. 

  2080.    libm_so = "/usr/lib/libm.so.7.0"
    2081. 

  2081. +when /freebsd/
    2082. 

  2082. +  libc_so = "/lib/libc.so.7"
    2083. 

  2083. +  libm_so = "/lib/libm.so.5"
    2084. 

  2084.  when /bsd|dragonfly/
    2085. 

  2085.    libc_so = "/usr/lib/libc.so"
    2086. 

  2086.    libm_so = "/usr/lib/libm.so"
    2087. 

  2087. diff --git a/test/dl/test_handle.rb b/test/dl/test_handle.rb
    2088. 

  2088. index 4ef93ad..83b8af1 100644
    2089. 

  2089. --- a/test/dl/test_handle.rb
    2090. 

  2090. +++ b/test/dl/test_handle.rb
    2091. 

  2091. @@ -181,7 +181,7 @@ module DL
    2092. 

  2092.        # In general uses of dlerror(3) should call it before use it.
    2093. 

  2093.        require 'socket'
    2094. 

  2094.        Socket.gethostbyname("localhost")
    2095. 

  2095. -      DL.dlopen("/usr/lib/libc.so").sym('strcpy')
    2096. 

  2096. +      DL.dlopen("/lib/libc.so.7").sym('strcpy')
    2097. 

  2097.      end if /freebsd/=~ RUBY_PLATFORM
    2098. 

  2098.    end
    2099. 

  2099.  end
    2100. 

  2100. diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
    2101. 

  2101. index 404c137..f58077e 100644
    2102. 

  2102. --- a/test/fiddle/helper.rb
    2103. 

  2103. +++ b/test/fiddle/helper.rb
    2104. 

  2104. @@ -40,6 +40,9 @@ when /gnu/	#GNU/Hurd
    2105. 

  2105.  when /mirbsd/
    2106. 

  2106.    libc_so = "/usr/lib/libc.so.41.10"
    2107. 

  2107.    libm_so = "/usr/lib/libm.so.7.0"
    2108. 

  2108. +when /freebsd/
    2109. 

  2109. +  libc_so = "/lib/libc.so.7"
    2110. 

  2110. +  libm_so = "/lib/libm.so.5"
    2111. 

  2111.  when /bsd|dragonfly/
    2112. 

  2112.    libc_so = "/usr/lib/libc.so"
    2113. 

  2113.    libm_so = "/usr/lib/libm.so"
    2114. 

  2114. diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
    2115. 

  2115. index 2af3e5c..c598cc3 100644
    2116. 

  2116. --- a/test/fiddle/test_handle.rb
    2117. 

  2117. +++ b/test/fiddle/test_handle.rb
    2118. 

  2118. @@ -183,7 +183,7 @@ module Fiddle
    2119. 

  2119.        # In general uses of dlerror(3) should call it before use it.
    2120. 

  2120.        require 'socket'
    2121. 

  2121.        Socket.gethostbyname("localhost")
    2122. 

  2122. -      Fiddle.dlopen("/usr/lib/libc.so").sym('strcpy')
    2123. 

  2123. +      Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
    2124. 

  2124.      end if /freebsd/=~ RUBY_PLATFORM
    2125. 

  2125.    end
    2126. 

  2126.  end if defined?(Fiddle)
    2127. 

  2127. diff --git a/test/net/imap/cacert.pem b/test/net/imap/cacert.pem
    2128. 

  2128. index bd7e68a..7073387 100644
    2129. 

  2129. --- a/test/net/imap/cacert.pem
    2130. 

  2130. +++ b/test/net/imap/cacert.pem
    2131. 

  2131. @@ -2,59 +2,65 @@ Certificate:
    2132. 

  2132.      Data:
    2133. 

  2133.          Version: 3 (0x2)
    2134. 

  2134.          Serial Number:
    2135. 

  2135. -            9f:dc:f7:94:98:05:43:4c
    2136. 

  2136. +            b9:90:a2:bf:62:69:17:9c
    2137. 

  2137.          Signature Algorithm: sha1WithRSAEncryption
    2138. 

  2138.          Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org
    2139. 

  2139.          Validity
    2140. 

  2140. -            Not Before: Dec 23 10:21:33 2010 GMT
    2141. 

  2141. -            Not After : Jan  1 10:21:33 2014 GMT
    2142. 

  2142. +            Not Before: Jan  3 01:34:17 2014 GMT
    2143. 

  2143. +            Not After : Jan  2 01:34:17 2019 GMT
    2144. 

  2144.          Subject: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org
    2145. 

  2145.          Subject Public Key Info:
    2146. 

  2146.              Public Key Algorithm: rsaEncryption
    2147. 

  2147. -                Public-Key: (1024 bit)
    2148. 

  2148. -                Modulus:
    2149. 

  2149. -                    00:ce:be:2c:9f:47:ba:db:9c:9c:5b:f0:38:3b:f3:
    2150. 

  2150. -                    74:20:37:76:23:9f:84:1c:81:90:b4:3e:00:20:34:
    2151. 

  2151. -                    98:7e:81:69:50:a1:c3:65:96:ea:fa:00:da:8c:cc:
    2152. 

  2152. -                    53:3f:ba:3c:d0:50:7a:5a:b4:6b:ac:d3:2e:18:ca:
    2153. 

  2153. -                    2a:69:b3:6a:6f:38:c2:32:a8:06:b6:0a:30:a9:ee:
    2154. 

  2154. -                    03:38:e9:05:a5:19:23:54:a8:3c:b9:08:ad:2b:72:
    2155. 

  2155. -                    23:df:93:22:c4:46:a8:ea:f1:a6:e9:30:4a:3f:83:
    2156. 

  2156. -                    39:e9:62:8e:8b:a3:5e:67:89:1d:7c:75:de:05:aa:
    2157. 

  2157. -                    58:b1:b7:79:7c:10:80:6d:87
    2158. 

  2158. +            RSA Public Key: (1024 bit)
    2159. 

  2159. +                Modulus (1024 bit):
    2160. 

  2160. +                    00:db:75:d0:45:de:b1:df:bf:71:a0:0e:b0:a5:e6:
    2161. 

  2161. +                    bc:f4:1c:9d:e5:25:67:64:c5:7b:cb:f1:af:c6:be:
    2162. 

  2162. +                    9a:aa:ea:7e:0f:cc:05:af:ef:40:69:06:b2:c9:13:
    2163. 

  2163. +                    9d:7e:eb:a2:06:e2:ea:7d:07:c7:c7:99:c7:fb:d5:
    2164. 

  2164. +                    b8:eb:63:77:62:2b:18:12:c3:53:58:d0:f5:c7:40:
    2165. 

  2165. +                    0c:01:d1:26:82:34:16:09:e3:dc:65:f4:dc:bb:5d:
    2166. 

  2166. +                    a5:41:60:e7:a9:74:ba:d7:4c:b6:a3:9c:c5:8c:89:
    2167. 

  2167. +                    af:cb:e8:9f:05:fe:ea:fe:64:24:bf:e7:ed:e3:f6:
    2168. 

  2168. +                    d0:fc:d6:eb:fc:06:82:10:fb
    2169. 

  2169.                  Exponent: 65537 (0x10001)
    2170. 

  2170.          X509v3 extensions:
    2171. 

  2171.              X509v3 Subject Key Identifier: 
    2172. 

  2172. -                41:C9:49:37:B1:FA:61:E3:BA:D7:19:3D:D9:DA:8C:B9:82:C9:B4:6A
    2173. 

  2173. +                E8:7E:58:AC:13:7B:03:22:8D:9E:AF:32:0B:84:89:80:80:0C:1E:C2
    2174. 

  2174.              X509v3 Authority Key Identifier: 
    2175. 

  2175. -                keyid:41:C9:49:37:B1:FA:61:E3:BA:D7:19:3D:D9:DA:8C:B9:82:C9:B4:6A
    2176. 

  2176. +                keyid:E8:7E:58:AC:13:7B:03:22:8D:9E:AF:32:0B:84:89:80:80:0C:1E:C2
    2177. 

  2177. +                DirName:/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org
    2178. 

  2178. +                serial:B9:90:A2:BF:62:69:17:9C
    2179. 

  2179.  
    2180. 

  2180.              X509v3 Basic Constraints: 
    2181. 

  2181.                  CA:TRUE
    2182. 

  2182.      Signature Algorithm: sha1WithRSAEncryption
    2183. 

  2183. -        86:00:33:b9:dd:ff:5f:83:59:5f:c3:29:3c:d7:11:db:10:b3:
    2184. 

  2184. -        d7:d1:70:fb:0a:c6:74:85:c6:ea:e1:15:c4:92:f8:0e:11:cc:
    2185. 

  2185. -        ff:a6:3c:31:c2:2c:66:d8:fe:63:93:9f:b0:97:e6:f5:bc:5c:
    2186. 

  2186. -        80:68:96:5d:eb:77:b9:23:dd:68:a7:49:03:ff:22:48:55:f1:
    2187. 

  2187. -        39:7c:20:21:ff:64:52:e1:f6:cf:3c:b3:4d:2c:5c:03:62:ea:
    2188. 

  2188. -        c5:49:99:07:fa:8d:ff:7b:c2:75:0c:ca:24:b5:0b:f5:b7:57:
    2189. 

  2189. -        3a:10:f0:8a:bb:9a:e8:92:4d:d5:6f:c2:a2:29:36:61:78:a4:
    2190. 

  2190. -        dc:7b
    2191. 

  2191. +        8f:77:06:4e:31:72:12:ee:68:09:70:27:d4:31:85:ef:10:95:
    2192. 

  2192. +        f9:0f:2b:66:63:08:37:88:6e:b7:9b:40:3e:18:77:33:86:e8:
    2193. 

  2193. +        61:6a:b7:3c:cb:c7:a6:d6:d5:92:6a:1f:56:d0:9f:5c:32:56:
    2194. 

  2194. +        d3:37:52:fe:0e:20:c2:7a:0d:fe:2d:3c:81:da:b8:7f:4d:6a:
    2195. 

  2195. +        08:01:d9:be:7a:a2:15:be:a6:ce:49:64:90:8c:9a:ca:6e:2e:
    2196. 

  2196. +        84:48:1d:94:19:56:94:46:aa:25:9b:68:c2:80:60:bf:cb:2e:
    2197. 

  2197. +        35:03:ea:0a:65:5a:33:38:c6:cc:81:46:c0:bc:36:86:96:39:
    2198. 

  2198. +        10:7d
    2199. 

  2199.  -----BEGIN CERTIFICATE-----
    2200. 

  2200. -MIIC6DCCAlGgAwIBAgIJAJ/c95SYBUNMMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
    2201. 

  2201. -VQQGEwJKUDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkx
    2202. 

  2202. -FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex
    2203. 

  2203. -JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTAxMjIz
    2204. 

  2204. -MTAyMTMzWhcNMTQwMTAxMTAyMTMzWjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgM
    2205. 

  2205. -B1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQKDA5SdWJ5IENv
    2206. 

  2206. -cmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz
    2207. 

  2207. +MIIDjTCCAvagAwIBAgIJALmQor9iaRecMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
    2208. 

  2208. +VQQGEwJKUDEQMA4GA1UECBMHU2hpbWFuZTEUMBIGA1UEBxMLTWF0ei1lIGNpdHkx
    2209. 

  2209. +FzAVBgNVBAoTDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDEwxSdWJ5IFRlc3QgQ0Ex
    2210. 

  2210. +JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTQwMTAz
    2211. 

  2211. +MDEzNDE3WhcNMTkwMTAyMDEzNDE3WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgT
    2212. 

  2212. +B1NoaW1hbmUxFDASBgNVBAcTC01hdHotZSBjaXR5MRcwFQYDVQQKEw5SdWJ5IENv
    2213. 

  2213. +cmUgVGVhbTEVMBMGA1UEAxMMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz
    2214. 

  2214.  ZWN1cml0eUBydWJ5LWxhbmcub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
    2215. 

  2215. -gQDOviyfR7rbnJxb8Dg783QgN3Yjn4QcgZC0PgAgNJh+gWlQocNllur6ANqMzFM/
    2216. 

  2216. -ujzQUHpatGus0y4Yyipps2pvOMIyqAa2CjCp7gM46QWlGSNUqDy5CK0rciPfkyLE
    2217. 

  2217. -Rqjq8abpMEo/gznpYo6Lo15niR18dd4Fqlixt3l8EIBthwIDAQABo1AwTjAdBgNV
    2218. 

  2218. -HQ4EFgQUQclJN7H6YeO61xk92dqMuYLJtGowHwYDVR0jBBgwFoAUQclJN7H6YeO6
    2219. 

  2219. -1xk92dqMuYLJtGowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCGADO5
    2220. 

  2220. -3f9fg1lfwyk81xHbELPX0XD7CsZ0hcbq4RXEkvgOEcz/pjwxwixm2P5jk5+wl+b1
    2221. 

  2221. -vFyAaJZd63e5I91op0kD/yJIVfE5fCAh/2RS4fbPPLNNLFwDYurFSZkH+o3/e8J1
    2222. 

  2222. -DMoktQv1t1c6EPCKu5rokk3Vb8KiKTZheKTcew==
    2223. 

  2223. +gQDbddBF3rHfv3GgDrCl5rz0HJ3lJWdkxXvL8a/Gvpqq6n4PzAWv70BpBrLJE51+
    2224. 

  2224. +66IG4up9B8fHmcf71bjrY3diKxgSw1NY0PXHQAwB0SaCNBYJ49xl9Ny7XaVBYOep
    2225. 

  2225. +dLrXTLajnMWMia/L6J8F/ur+ZCS/5+3j9tD81uv8BoIQ+wIDAQABo4H0MIHxMB0G
    2226. 

  2226. +A1UdDgQWBBToflisE3sDIo2erzILhImAgAwewjCBwQYDVR0jBIG5MIG2gBToflis
    2227. 

  2227. +E3sDIo2erzILhImAgAwewqGBkqSBjzCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgT
    2228. 

  2228. +B1NoaW1hbmUxFDASBgNVBAcTC01hdHotZSBjaXR5MRcwFQYDVQQKEw5SdWJ5IENv
    2229. 

  2229. +cmUgVGVhbTEVMBMGA1UEAxMMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz
    2230. 

  2230. +ZWN1cml0eUBydWJ5LWxhbmcub3JnggkAuZCiv2JpF5wwDAYDVR0TBAUwAwEB/zAN
    2231. 

  2231. +BgkqhkiG9w0BAQUFAAOBgQCPdwZOMXIS7mgJcCfUMYXvEJX5DytmYwg3iG63m0A+
    2232. 

  2232. +GHczhuhharc8y8em1tWSah9W0J9cMlbTN1L+DiDCeg3+LTyB2rh/TWoIAdm+eqIV
    2233. 

  2233. +vqbOSWSQjJrKbi6ESB2UGVaURqolm2jCgGC/yy41A+oKZVozOMbMgUbAvDaGljkQ
    2234. 

  2234. +fQ==
    2235. 

  2235.  -----END CERTIFICATE-----
    2236. 

  2236. diff --git a/test/net/imap/server.crt b/test/net/imap/server.crt
    2237. 

  2237. index d848b26..fa4f994 100644
    2238. 

  2238. --- a/test/net/imap/server.crt
    2239. 

  2239. +++ b/test/net/imap/server.crt
    2240. 

  2240. @@ -1,17 +1,17 @@
    2241. 

  2241.  Certificate:
    2242. 

  2242.      Data:
    2243. 

  2243. -        Version: 3 (0x2)
    2244. 

  2244. +        Version: 1 (0x0)
    2245. 

  2245.          Serial Number: 0 (0x0)
    2246. 

  2246.          Signature Algorithm: sha1WithRSAEncryption
    2247. 

  2247.          Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org
    2248. 

  2248.          Validity
    2249. 

  2249. -            Not Before: Dec 23 10:23:52 2010 GMT
    2250. 

  2250. -            Not After : Jan  1 10:23:52 2014 GMT
    2251. 

  2251. +            Not Before: Jan  3 01:34:17 2014 GMT
    2252. 

  2252. +            Not After : Jan  2 01:34:17 2019 GMT
    2253. 

  2253.          Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost
    2254. 

  2254.          Subject Public Key Info:
    2255. 

  2255.              Public Key Algorithm: rsaEncryption
    2256. 

  2256. -                Public-Key: (1024 bit)
    2257. 

  2257. -                Modulus:
    2258. 

  2258. +            RSA Public Key: (1024 bit)
    2259. 

  2259. +                Modulus (1024 bit):
    2260. 

  2260.                      00:db:75:d0:45:de:b1:df:bf:71:a0:0e:b0:a5:e6:
    2261. 

  2261.                      bc:f4:1c:9d:e5:25:67:64:c5:7b:cb:f1:af:c6:be:
    2262. 

  2262.                      9a:aa:ea:7e:0f:cc:05:af:ef:40:69:06:b2:c9:13:
    2263. 

  2263. @@ -22,40 +22,27 @@ Certificate:
    2264. 

  2264.                      af:cb:e8:9f:05:fe:ea:fe:64:24:bf:e7:ed:e3:f6:
    2265. 

  2265.                      d0:fc:d6:eb:fc:06:82:10:fb
    2266. 

  2266.                  Exponent: 65537 (0x10001)
    2267. 

  2267. -        X509v3 extensions:
    2268. 

  2268. -            X509v3 Basic Constraints: 
    2269. 

  2269. -                CA:FALSE
    2270. 

  2270. -            Netscape Comment: 
    2271. 

  2271. -                OpenSSL Generated Certificate
    2272. 

  2272. -            X509v3 Subject Key Identifier: 
    2273. 

  2273. -                E8:7E:58:AC:13:7B:03:22:8D:9E:AF:32:0B:84:89:80:80:0C:1E:C2
    2274. 

  2274. -            X509v3 Authority Key Identifier: 
    2275. 

  2275. -                keyid:41:C9:49:37:B1:FA:61:E3:BA:D7:19:3D:D9:DA:8C:B9:82:C9:B4:6A
    2276. 

  2276. -
    2277. 

  2277.      Signature Algorithm: sha1WithRSAEncryption
    2278. 

  2278. -        ae:ee:cd:fe:c9:af:48:0b:50:37:ac:6a:f6:68:90:9b:67:df:
    2279. 

  2279. -        6f:2d:17:c9:3c:a5:da:ad:39:dc:2a:5b:07:88:26:38:19:30:
    2280. 

  2280. -        d6:95:cf:10:69:c7:92:14:83:be:f1:b5:8e:6f:d9:91:51:c5:
    2281. 

  2281. -        63:ae:1c:89:ac:27:bf:4f:2a:8f:4e:0c:57:42:0a:c9:8e:0c:
    2282. 

  2282. -        f4:f3:02:f7:ea:44:b6:e4:47:05:af:4e:74:e4:87:87:d9:c8:
    2283. 

  2283. -        76:ed:ab:32:7c:f0:31:34:10:14:bc:a6:37:cd:d7:dc:33:da:
    2284. 

  2284. -        82:d3:d4:9b:e9:d5:cd:38:cc:fa:81:5f:4e:fd:5f:53:05:5d:
    2285. 

  2285. -        76:f9
    2286. 

  2286. +        85:f5:d3:05:8b:8c:f4:43:1c:88:f2:8f:b2:f2:93:77:b7:3d:
    2287. 

  2287. +        95:c6:a0:34:bc:33:6a:d8:85:5f:3e:86:08:10:c5:5c:c1:76:
    2288. 

  2288. +        a3:53:3c:dc:38:98:23:97:e7:da:21:ac:e8:4d:3c:96:70:29:
    2289. 

  2289. +        ff:ff:1e:4a:9a:17:2b:db:04:62:b9:ef:ab:ea:a7:a5:e8:7c:
    2290. 

  2290. +        b1:d5:ed:30:a8:6c:78:de:51:7e:e3:8a:c2:a4:64:a8:63:a2:
    2291. 

  2291. +        bc:fd:43:9c:f3:55:7d:54:c9:6a:d8:53:1c:4b:6b:03:aa:b6:
    2292. 

  2292. +        19:e6:a4:4f:47:00:96:c5:42:59:85:4e:c3:4e:cd:41:82:53:
    2293. 

  2293. +        10:f8
    2294. 

  2294.  -----BEGIN CERTIFICATE-----
    2295. 

  2295. -MIIC3jCCAkegAwIBAgIBADANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMCSlAx
    2296. 

  2296. -EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK
    2297. 

  2297. -DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI
    2298. 

  2298. -hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTEwMTIyMzEwMjM1MloX
    2299. 

  2299. -DTE0MDEwMTEwMjM1MlowYDELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx
    2300. 

  2300. -FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRIwEAYDVQQLDAlSdWJ5IFRlc3QxEjAQ
    2301. 

  2301. -BgNVBAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA23XQ
    2302. 

  2302. -Rd6x379xoA6wpea89Byd5SVnZMV7y/Gvxr6aqup+D8wFr+9AaQayyROdfuuiBuLq
    2303. 

  2303. -fQfHx5nH+9W462N3YisYEsNTWND1x0AMAdEmgjQWCePcZfTcu12lQWDnqXS610y2
    2304. 

  2304. -o5zFjImvy+ifBf7q/mQkv+ft4/bQ/Nbr/AaCEPsCAwEAAaN7MHkwCQYDVR0TBAIw
    2305. 

  2305. -ADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUw
    2306. 

  2306. -HQYDVR0OBBYEFOh+WKwTewMijZ6vMguEiYCADB7CMB8GA1UdIwQYMBaAFEHJSTex
    2307. 

  2307. -+mHjutcZPdnajLmCybRqMA0GCSqGSIb3DQEBBQUAA4GBAK7uzf7Jr0gLUDesavZo
    2308. 

  2308. -kJtn328tF8k8pdqtOdwqWweIJjgZMNaVzxBpx5IUg77xtY5v2ZFRxWOuHImsJ79P
    2309. 

  2309. -Ko9ODFdCCsmODPTzAvfqRLbkRwWvTnTkh4fZyHbtqzJ88DE0EBS8pjfN19wz2oLT
    2310. 

  2310. -1Jvp1c04zPqBX079X1MFXXb5
    2311. 

  2311. +MIICXDCCAcUCAQAwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYD
    2312. 

  2312. +VQQIEwdTaGltYW5lMRQwEgYDVQQHEwtNYXR6LWUgY2l0eTEXMBUGA1UEChMOUnVi
    2313. 

  2313. +eSBDb3JlIFRlYW0xFTATBgNVBAMTDFJ1YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJ
    2314. 

  2314. +ARYWc2VjdXJpdHlAcnVieS1sYW5nLm9yZzAeFw0xNDAxMDMwMTM0MTdaFw0xOTAx
    2315. 

  2315. +MDIwMTM0MTdaMGAxCzAJBgNVBAYTAkpQMRAwDgYDVQQIEwdTaGltYW5lMRcwFQYD
    2316. 

  2316. +VQQKEw5SdWJ5IENvcmUgVGVhbTESMBAGA1UECxMJUnVieSBUZXN0MRIwEAYDVQQD
    2317. 

  2317. +Ewlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANt10EXesd+/
    2318. 

  2318. +caAOsKXmvPQcneUlZ2TFe8vxr8a+mqrqfg/MBa/vQGkGsskTnX7rogbi6n0Hx8eZ
    2319. 

  2319. +x/vVuOtjd2IrGBLDU1jQ9cdADAHRJoI0Fgnj3GX03LtdpUFg56l0utdMtqOcxYyJ
    2320. 

  2320. +r8vonwX+6v5kJL/n7eP20PzW6/wGghD7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEA
    2321. 

  2321. +hfXTBYuM9EMciPKPsvKTd7c9lcagNLwzatiFXz6GCBDFXMF2o1M83DiYI5fn2iGs
    2322. 

  2322. +6E08lnAp//8eSpoXK9sEYrnvq+qnpeh8sdXtMKhseN5RfuOKwqRkqGOivP1DnPNV
    2323. 

  2323. +fVTJathTHEtrA6q2GeakT0cAlsVCWYVOw07NQYJTEPg=
    2324. 

  2324.  -----END CERTIFICATE-----
    2325. 

  2325. diff --git a/test/ruby/test_alias.rb b/test/ruby/test_alias.rb
    2326. 

  2326. index cef39d6..956fdb4 100644
    2327. 

  2327. --- a/test/ruby/test_alias.rb
    2328. 

  2328. +++ b/test/ruby/test_alias.rb
    2329. 

  2329. @@ -121,7 +121,7 @@ class TestAlias < Test::Unit::TestCase
    2330. 

  2330.      assert_equal([:Base, :M], SuperInAliasedModuleMethod::Derived.new.bar)
    2331. 

  2331.    end
    2332. 

  2332.  
    2333. 

  2333. -  def test_alias
    2334. 

  2334. +  def test_alias_wb_miss
    2335. 

  2335.      assert_normal_exit %q{
    2336. 

  2336.        require 'stringio'
    2337. 

  2337.        GC.verify_internal_consistency
    2338. 

  2338. diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
    2339. 

  2339. index b648c40..6ff304a 100644
    2340. 

  2340. --- a/test/ruby/test_array.rb
    2341. 

  2341. +++ b/test/ruby/test_array.rb
    2342. 

  2342. @@ -1524,6 +1524,11 @@ class TestArray < Test::Unit::TestCase
    2343. 

  2343.      assert(a.none?(&:frozen?))
    2344. 

  2344.      assert_equal(%w(a), b)
    2345. 

  2345.      assert(b.none?(&:frozen?))
    2346. 

  2346. +
    2347. 

  2347. +    bug9340 = "[ruby-core:59457]"
    2348. 

  2348. +    ary = [bug9340, bug9340.dup, bug9340.dup]
    2349. 

  2349. +    assert_equal 1, ary.uniq.size
    2350. 

  2350. +    assert_same bug9340, ary.uniq[0]
    2351. 

  2351.    end
    2352. 

  2352.  
    2353. 

  2353.    def test_uniq_with_block
    2354. 

  2354. diff --git a/test/ruby/test_backtrace.rb b/test/ruby/test_backtrace.rb
    2355. 

  2355. index aded544..6ec13e4 100644
    2356. 

  2356. --- a/test/ruby/test_backtrace.rb
    2357. 

  2357. +++ b/test/ruby/test_backtrace.rb
    2358. 

  2358. @@ -19,17 +19,16 @@ class TestBacktrace < Test::Unit::TestCase
    2359. 

  2359.    end
    2360. 

  2360.  
    2361. 

  2361.    def test_exception_backtrace_locations
    2362. 

  2362. -    bt = Fiber.new{
    2363. 

  2363. +    backtrace, backtrace_locations = Fiber.new{
    2364. 

  2364.        begin
    2365. 

  2365.          raise
    2366. 

  2366.        rescue => e
    2367. 

  2367. -        e.backtrace_locations
    2368. 

  2368. +        [e.backtrace, e.backtrace_locations]
    2369. 

  2369.        end
    2370. 

  2370.      }.resume
    2371. 

  2371. -    assert_equal(1, bt.size)
    2372. 

  2372. -    assert_match(/.+:\d+:.+/, bt[0].to_s)
    2373. 

  2373. +    assert_equal(backtrace, backtrace_locations.map{|e| e.to_s})
    2374. 

  2374.  
    2375. 

  2375. -    bt = Fiber.new{
    2376. 

  2376. +    backtrace, backtrace_locations = Fiber.new{
    2377. 

  2377.        begin
    2378. 

  2378.          begin
    2379. 

  2379.            helper_test_exception_backtrace_locations
    2380. 

  2380. @@ -37,11 +36,34 @@ class TestBacktrace < Test::Unit::TestCase
    2381. 

  2381.            raise
    2382. 

  2382.          end
    2383. 

  2383.        rescue => e
    2384. 

  2384. -        e.backtrace_locations
    2385. 

  2385. +        [e.backtrace, e.backtrace_locations]
    2386. 

  2386. +      end
    2387. 

  2387. +    }.resume
    2388. 

  2388. +    assert_equal(backtrace, backtrace_locations.map{|e| e.to_s})
    2389. 

  2389. +  end
    2390. 

  2390. +
    2391. 

  2391. +  def call_helper_test_exception_backtrace_locations
    2392. 

  2392. +    helper_test_exception_backtrace_locations(:bad_argument)
    2393. 

  2393. +  end
    2394. 

  2394. +
    2395. 

  2395. +  def test_argument_error_backtrace_locations
    2396. 

  2396. +    backtrace, backtrace_locations = Fiber.new{
    2397. 

  2397. +      begin
    2398. 

  2398. +        helper_test_exception_backtrace_locations(1)
    2399. 

  2399. +      rescue ArgumentError => e
    2400. 

  2400. +        [e.backtrace, e.backtrace_locations]
    2401. 

  2401. +      end
    2402. 

  2402. +    }.resume
    2403. 

  2403. +    assert_equal(backtrace, backtrace_locations.map{|e| e.to_s})
    2404. 

  2404. +
    2405. 

  2405. +    backtrace, backtrace_locations = Fiber.new{
    2406. 

  2406. +      begin
    2407. 

  2407. +        call_helper_test_exception_backtrace_locations
    2408. 

  2408. +      rescue ArgumentError => e
    2409. 

  2409. +        [e.backtrace, e.backtrace_locations]
    2410. 

  2410.        end
    2411. 

  2411.      }.resume
    2412. 

  2412. -    assert_equal(2, bt.size)
    2413. 

  2413. -    assert_match(/helper_test_exception_backtrace_locations/, bt[0].to_s)
    2414. 

  2414. +    assert_equal(backtrace, backtrace_locations.map{|e| e.to_s})
    2415. 

  2415.    end
    2416. 

  2416.  
    2417. 

  2417.    def test_caller_lev
    2418. 

  2418. diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
    2419. 

  2419. index 169157b..c872b11 100644
    2420. 

  2420. --- a/test/ruby/test_hash.rb
    2421. 

  2421. +++ b/test/ruby/test_hash.rb
    2422. 

  2422. @@ -558,12 +558,23 @@ class TestHash < Test::Unit::TestCase
    2423. 

  2423.      assert_equal(h3, h.reject {|k,v| v })
    2424. 

  2424.      assert_equal(base, h)
    2425. 

  2425.  
    2426. 

  2426. -    return unless RUBY_VERSION > "2.1.0"
    2427. 

  2427. +    unless RUBY_VERSION >= "2.2.0"
    2428. 

  2428. +      # [ruby-core:59154] [Bug #9223]
    2429. 

  2429. +      if @cls == Hash
    2430. 

  2430. +        assert_empty(EnvUtil.verbose_warning {h.reject {false}})
    2431. 

  2431. +        bug9275 = '[ruby-core:59254] [Bug #9275]'
    2432. 

  2432. +        c = Class.new(Hash)
    2433. 

  2433. +        assert_empty(EnvUtil.verbose_warning {c.new.reject {false}}, bug9275)
    2434. 

  2434. +      else
    2435. 

  2435. +        assert_match(/extra states/, EnvUtil.verbose_warning {h.reject {false}})
    2436. 

  2436. +      end
    2437. 

  2437. +      return
    2438. 

  2438. +    end
    2439. 

  2439.  
    2440. 

  2440.      h.instance_variable_set(:@foo, :foo)
    2441. 

  2441.      h.default = 42
    2442. 

  2442.      h.taint
    2443. 

  2443. -    h = h.reject {false}
    2444. 

  2444. +    h = EnvUtil.suppress_warning {h.reject {false}}
    2445. 

  2445.      assert_instance_of(Hash, h)
    2446. 

  2446.      assert_not_predicate(h, :tainted?)
    2447. 

  2447.      assert_nil(h.default)
    2448. 

  2448. @@ -1217,8 +1228,32 @@ class TestHash < Test::Unit::TestCase
    2449. 

  2449.      assert_no_memory_leak([], prepare, code, bug9187)
    2450. 

  2450.    end
    2451. 

  2451.  
    2452. 

  2452. +  def test_wrapper_of_special_const
    2453. 

  2453. +    bug9381 = '[ruby-core:59638] [Bug #9381]'
    2454. 

  2454. +
    2455. 

  2455. +    wrapper = Class.new do
    2456. 

  2456. +      def initialize(obj)
    2457. 

  2457. +        @obj = obj
    2458. 

  2458. +      end
    2459. 

  2459. +
    2460. 

  2460. +      def hash
    2461. 

  2461. +        @obj.hash
    2462. 

  2462. +      end
    2463. 

  2463. +
    2464. 

  2464. +      def eql?(other)
    2465. 

  2465. +        @obj.eql?(other)
    2466. 

  2466. +      end
    2467. 

  2467. +    end
    2468. 

  2468. +
    2469. 

  2469. +    hash = {5 => bug9381}
    2470. 

  2470. +    assert_equal(bug9381, hash[wrapper.new(5)])
    2471. 

  2471. +  end
    2472. 

  2472. +
    2473. 

  2473.    class TestSubHash < TestHash
    2474. 

  2474.      class SubHash < Hash
    2475. 

  2475. +      def reject(*)
    2476. 

  2476. +        super
    2477. 

  2477. +      end
    2478. 

  2478.      end
    2479. 

  2479.  
    2480. 

  2480.      def setup
    2481. 

  2481. diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb
    2482. 

  2482. index 621a06b..3f0931b 100644
    2483. 

  2483. --- a/test/ruby/test_pack.rb
    2484. 

  2484. +++ b/test/ruby/test_pack.rb
    2485. 

  2485. @@ -181,6 +181,7 @@ class TestPack < Test::Unit::TestCase
    2486. 

  2486.      assert_equal a[0], a.pack("p").unpack("p")[0]
    2487. 

  2487.      assert_equal a, a.pack("p").freeze.unpack("p*")
    2488. 

  2488.      assert_raise(ArgumentError) { (a.pack("p") + "").unpack("p*") }
    2489. 

  2489. +    assert_raise(ArgumentError) { (a.pack("p") << "d").unpack("p*") }
    2490. 

  2490.    end
    2491. 

  2491.  
    2492. 

  2492.    def test_format_string_modified
    2493. 

  2493. diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb
    2494. 

  2494. index 8aa99c5..e23b5b0 100644
    2495. 

  2495. --- a/test/ruby/test_struct.rb
    2496. 

  2496. +++ b/test/ruby/test_struct.rb
    2497. 

  2497. @@ -298,6 +298,12 @@ module TestStruct
    2498. 

  2498.      assert_same(x, o.b!)
    2499. 

  2499.    end
    2500. 

  2500.  
    2501. 

  2501. +  def test_setter_method_returns_value
    2502. 

  2502. +    klass = @Struct.new(:a)
    2503. 

  2503. +    x = klass.new
    2504. 

  2504. +    assert_equal "[Bug #9353]", x.send(:a=, "[Bug #9353]")
    2505. 

  2505. +  end
    2506. 

  2506. +
    2507. 

  2507.    class TopStruct < Test::Unit::TestCase
    2508. 

  2508.      include TestStruct
    2509. 

  2509.  
    2510. 

  2510. diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb
    2511. 

  2511. index 846f409..82d6e19 100644
    2512. 

  2512. --- a/test/ruby/test_super.rb
    2513. 

  2513. +++ b/test/ruby/test_super.rb
    2514. 

  2514. @@ -407,4 +407,50 @@ class TestSuper < Test::Unit::TestCase
    2515. 

  2515.      assert_equal([false, false], y.foo(false, false))
    2516. 

  2516.      assert_equal([1, 2, 3, false, 5], y.foo(1, 2, 3, false, 5))
    2517. 

  2517.    end
    2518. 

  2518. +
    2519. 

  2519. +  def test_missing_super_in_method_module
    2520. 

  2520. +    bug9315 = '[ruby-core:59358] [Bug #9315]'
    2521. 

  2521. +    a = Module.new do
    2522. 

  2522. +      def foo
    2523. 

  2523. +        super
    2524. 

  2524. +      end
    2525. 

  2525. +    end
    2526. 

  2526. +    b = Class.new do
    2527. 

  2527. +      include a
    2528. 

  2528. +    end
    2529. 

  2529. +    assert_raise(NoMethodError, bug9315) do
    2530. 

  2530. +      b.new.method(:foo).call
    2531. 

  2531. +    end
    2532. 

  2532. +  end
    2533. 

  2533. +
    2534. 

  2534. +  def test_module_super_in_method_module
    2535. 

  2535. +    bug9315 = '[ruby-core:59589] [Bug #9315]'
    2536. 

  2536. +    a = Module.new do
    2537. 

  2537. +      def foo
    2538. 

  2538. +        super
    2539. 

  2539. +      end
    2540. 

  2540. +    end
    2541. 

  2541. +    c = Class.new do
    2542. 

  2542. +      def foo
    2543. 

  2543. +        :ok
    2544. 

  2544. +      end
    2545. 

  2545. +    end
    2546. 

  2546. +    o = c.new.extend(a)
    2547. 

  2547. +    assert_nothing_raised(NoMethodError, bug9315) do
    2548. 

  2548. +      assert_equal(:ok, o.method(:foo).call, bug9315)
    2549. 

  2549. +    end
    2550. 

  2550. +  end
    2551. 

  2551. +
    2552. 

  2552. +  def test_missing_super_in_module_unbound_method
    2553. 

  2553. +    bug9377 = '[ruby-core:59619] [Bug #9377]'
    2554. 

  2554. +
    2555. 

  2555. +    a = Module.new do
    2556. 

  2556. +      def foo; super end
    2557. 

  2557. +    end
    2558. 

  2558. +
    2559. 

  2559. +    m = a.instance_method(:foo).bind(Object.new)
    2560. 

  2560. +    assert_raise(NoMethodError, bug9377) do
    2561. 

  2561. +      m.call
    2562. 

  2562. +    end
    2563. 

  2563. +  end
    2564. 

  2564.  end
    2565. 

  2565. diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
    2566. 

  2566. index 759c2fe..e337420 100644
    2567. 

  2567. --- a/test/rubygems/test_gem.rb
    2568. 

  2568. +++ b/test/rubygems/test_gem.rb
    2569. 

  2569. @@ -199,30 +199,21 @@ class TestGem < Gem::TestCase
    2570. 

  2570.    end
    2571. 

  2571.  
    2572. 

  2572.    def test_self_default_exec_format
    2573. 

  2573. -    orig_RUBY_INSTALL_NAME = Gem::ConfigMap[:ruby_install_name]
    2574. 

  2574. -    Gem::ConfigMap[:ruby_install_name] = 'ruby'
    2575. 

  2575. -
    2576. 

  2576. -    assert_equal '%s', Gem.default_exec_format
    2577. 

  2577. -  ensure
    2578. 

  2578. -    Gem::ConfigMap[:ruby_install_name] = orig_RUBY_INSTALL_NAME
    2579. 

  2579. +    ruby_install_name 'ruby' do
    2580. 

  2580. +      assert_equal '%s', Gem.default_exec_format
    2581. 

  2581. +    end
    2582. 

  2582.    end
    2583. 

  2583.  
    2584. 

  2584.    def test_self_default_exec_format_18
    2585. 

  2585. -    orig_RUBY_INSTALL_NAME = Gem::ConfigMap[:ruby_install_name]
    2586. 

  2586. -    Gem::ConfigMap[:ruby_install_name] = 'ruby18'
    2587. 

  2587. -
    2588. 

  2588. -    assert_equal '%s18', Gem.default_exec_format
    2589. 

  2589. -  ensure
    2590. 

  2590. -    Gem::ConfigMap[:ruby_install_name] = orig_RUBY_INSTALL_NAME
    2591. 

  2591. +    ruby_install_name 'ruby18' do
    2592. 

  2592. +      assert_equal '%s18', Gem.default_exec_format
    2593. 

  2593. +    end
    2594. 

  2594.    end
    2595. 

  2595.  
    2596. 

  2596.    def test_self_default_exec_format_jruby
    2597. 

  2597. -    orig_RUBY_INSTALL_NAME = Gem::ConfigMap[:ruby_install_name]
    2598. 

  2598. -    Gem::ConfigMap[:ruby_install_name] = 'jruby'
    2599. 

  2599. -
    2600. 

  2600. -    assert_equal 'j%s', Gem.default_exec_format
    2601. 

  2601. -  ensure
    2602. 

  2602. -    Gem::ConfigMap[:ruby_install_name] = orig_RUBY_INSTALL_NAME
    2603. 

  2603. +    ruby_install_name 'jruby' do
    2604. 

  2604. +      assert_equal 'j%s', Gem.default_exec_format
    2605. 

  2605. +    end
    2606. 

  2606.    end
    2607. 

  2607.  
    2608. 

  2608.    def test_self_default_sources
    2609. 

  2609. @@ -230,6 +221,7 @@ class TestGem < Gem::TestCase
    2610. 

  2610.    end
    2611. 

  2611.  
    2612. 

  2612.    def test_self_detect_gemdeps
    2613. 

  2613. +    skip 'Insecure operation - chdir' if RUBY_VERSION <= "1.8.7"
    2614. 

  2614.      rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], '-'
    2615. 

  2615.  
    2616. 

  2616.      FileUtils.mkdir_p 'detect/a/b'
    2617. 

  2617. @@ -339,21 +331,15 @@ class TestGem < Gem::TestCase
    2618. 

  2618.    end
    2619. 

  2619.  
    2620. 

  2620.    def test_self_extension_dir_shared
    2621. 

  2621. -    enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
    2622. 

  2622. -      RbConfig::CONFIG['ENABLE_SHARED'], 'yes'
    2623. 

  2623. -
    2624. 

  2624. -    assert_equal Gem.ruby_api_version, Gem.extension_api_version
    2625. 

  2625. -  ensure
    2626. 

  2626. -    RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared
    2627. 

  2627. +    enable_shared 'yes' do
    2628. 

  2628. +      assert_equal Gem.ruby_api_version, Gem.extension_api_version
    2629. 

  2629. +    end
    2630. 

  2630.    end
    2631. 

  2631.  
    2632. 

  2632.    def test_self_extension_dir_static
    2633. 

  2633. -    enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
    2634. 

  2634. -      RbConfig::CONFIG['ENABLE_SHARED'], 'no'
    2635. 

  2635. -
    2636. 

  2636. -    assert_equal "#{Gem.ruby_api_version}-static", Gem.extension_api_version
    2637. 

  2637. -  ensure
    2638. 

  2638. -    RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared
    2639. 

  2639. +    enable_shared 'no' do
    2640. 

  2640. +      assert_equal "#{Gem.ruby_api_version}-static", Gem.extension_api_version
    2641. 

  2641. +    end
    2642. 

  2642.    end
    2643. 

  2643.  
    2644. 

  2644.    def test_self_find_files
    2645. 

  2645. @@ -565,24 +551,43 @@ class TestGem < Gem::TestCase
    2646. 

  2646.    end
    2647. 

  2647.  
    2648. 

  2648.    def test_self_prefix_libdir
    2649. 

  2649. -    orig_libdir = Gem::ConfigMap[:libdir]
    2650. 

  2650. -    Gem::ConfigMap[:libdir] = @@project_dir
    2651. 

  2651. +    orig_libdir = RbConfig::CONFIG['libdir']
    2652. 

  2652. +    RbConfig::CONFIG['libdir'] = @@project_dir
    2653. 

  2653.  
    2654. 

  2654.      assert_nil Gem.prefix
    2655. 

  2655.    ensure
    2656. 

  2656. -    Gem::ConfigMap[:libdir] = orig_libdir
    2657. 

  2657. +    RbConfig::CONFIG['libdir'] = orig_libdir
    2658. 

  2658.    end
    2659. 

  2659.  
    2660. 

  2660.    def test_self_prefix_sitelibdir
    2661. 

  2661. -    orig_sitelibdir = Gem::ConfigMap[:sitelibdir]
    2662. 

  2662. -    Gem::ConfigMap[:sitelibdir] = @@project_dir
    2663. 

  2663. +    orig_sitelibdir = RbConfig::CONFIG['sitelibdir']
    2664. 

  2664. +    RbConfig::CONFIG['sitelibdir'] = @@project_dir
    2665. 

  2665.  
    2666. 

  2666.      assert_nil Gem.prefix
    2667. 

  2667.    ensure
    2668. 

  2668. -    Gem::ConfigMap[:sitelibdir] = orig_sitelibdir
    2669. 

  2669. +    RbConfig::CONFIG['sitelibdir'] = orig_sitelibdir
    2670. 

  2670. +  end
    2671. 

  2671. +
    2672. 

  2672. +  def test_self_read_binary
    2673. 

  2673. +    open 'test', 'w' do |io|
    2674. 

  2674. +      io.write "\xCF\x80"
    2675. 

  2675. +    end
    2676. 

  2676. +
    2677. 

  2677. +    assert_equal ["\xCF", "\x80"], Gem.read_binary('test').chars.to_a
    2678. 

  2678. +
    2679. 

  2679. +    skip 'chmod not supported' if Gem.win_platform?
    2680. 

  2680. +
    2681. 

  2681. +    begin
    2682. 

  2682. +      File.chmod 0444, 'test'
    2683. 

  2683. +
    2684. 

  2684. +      assert_equal ["\xCF", "\x80"], Gem.read_binary('test').chars.to_a
    2685. 

  2685. +    ensure
    2686. 

  2686. +      File.chmod 0644, 'test'
    2687. 

  2687. +    end
    2688. 

  2688.    end
    2689. 

  2689.  
    2690. 

  2690.    def test_self_refresh
    2691. 

  2691. +    skip 'Insecure operation - mkdir' if RUBY_VERSION <= "1.8.7"
    2692. 

  2692.      util_make_gems
    2693. 

  2693.  
    2694. 

  2694.      a1_spec = @a1.spec_file
    2695. 

  2695. @@ -602,6 +607,7 @@ class TestGem < Gem::TestCase
    2696. 

  2696.    end
    2697. 

  2697.  
    2698. 

  2698.    def test_self_refresh_keeps_loaded_specs_activated
    2699. 

  2699. +    skip 'Insecure operation - mkdir' if RUBY_VERSION <= "1.8.7"
    2700. 

  2700.      util_make_gems
    2701. 

  2701.  
    2702. 

  2702.      a1_spec = @a1.spec_file
    2703. 

  2703. @@ -624,46 +630,44 @@ class TestGem < Gem::TestCase
    2704. 

  2704.  
    2705. 

  2705.    def test_self_ruby_escaping_spaces_in_path
    2706. 

  2706.      orig_ruby = Gem.ruby
    2707. 

  2707. -    orig_bindir = Gem::ConfigMap[:bindir]
    2708. 

  2708. -    orig_ruby_install_name = Gem::ConfigMap[:ruby_install_name]
    2709. 

  2709. -    orig_exe_ext = Gem::ConfigMap[:EXEEXT]
    2710. 

  2710. +    orig_bindir = RbConfig::CONFIG['bindir']
    2711. 

  2711. +    orig_ruby_install_name = RbConfig::CONFIG['ruby_install_name']
    2712. 

  2712. +    orig_exe_ext = RbConfig::CONFIG['EXEEXT']
    2713. 

  2713.  
    2714. 

  2714. -    Gem::ConfigMap[:bindir] = "C:/Ruby 1.8/bin"
    2715. 

  2715. -    Gem::ConfigMap[:ruby_install_name] = "ruby"
    2716. 

  2716. -    Gem::ConfigMap[:EXEEXT] = ".exe"
    2717. 

  2717. +    RbConfig::CONFIG['bindir'] = "C:/Ruby 1.8/bin"
    2718. 

  2718. +    RbConfig::CONFIG['ruby_install_name'] = "ruby"
    2719. 

  2719. +    RbConfig::CONFIG['EXEEXT'] = ".exe"
    2720. 

  2720.      Gem.instance_variable_set("@ruby", nil)
    2721. 

  2721.  
    2722. 

  2722.      assert_equal "\"C:/Ruby 1.8/bin/ruby.exe\"", Gem.ruby
    2723. 

  2723.    ensure
    2724. 

  2724.      Gem.instance_variable_set("@ruby", orig_ruby)
    2725. 

  2725. -    Gem::ConfigMap[:bindir] = orig_bindir
    2726. 

  2726. -    Gem::ConfigMap[:ruby_install_name] = orig_ruby_install_name
    2727. 

  2727. -    Gem::ConfigMap[:EXEEXT] = orig_exe_ext
    2728. 

  2728. +    RbConfig::CONFIG['bindir'] = orig_bindir
    2729. 

  2729. +    RbConfig::CONFIG['ruby_install_name'] = orig_ruby_install_name
    2730. 

  2730. +    RbConfig::CONFIG['EXEEXT'] = orig_exe_ext
    2731. 

  2731.    end
    2732. 

  2732.  
    2733. 

  2733.    def test_self_ruby_path_without_spaces
    2734. 

  2734.      orig_ruby = Gem.ruby
    2735. 

  2735. -    orig_bindir = Gem::ConfigMap[:bindir]
    2736. 

  2736. -    orig_ruby_install_name = Gem::ConfigMap[:ruby_install_name]
    2737. 

  2737. -    orig_exe_ext = Gem::ConfigMap[:EXEEXT]
    2738. 

  2738. +    orig_bindir = RbConfig::CONFIG['bindir']
    2739. 

  2739. +    orig_ruby_install_name = RbConfig::CONFIG['ruby_install_name']
    2740. 

  2740. +    orig_exe_ext = RbConfig::CONFIG['EXEEXT']
    2741. 

  2741.  
    2742. 

  2742. -    Gem::ConfigMap[:bindir] = "C:/Ruby18/bin"
    2743. 

  2743. -    Gem::ConfigMap[:ruby_install_name] = "ruby"
    2744. 

  2744. -    Gem::ConfigMap[:EXEEXT] = ".exe"
    2745. 

  2745. +    RbConfig::CONFIG['bindir'] = "C:/Ruby18/bin"
    2746. 

  2746. +    RbConfig::CONFIG['ruby_install_name'] = "ruby"
    2747. 

  2747. +    RbConfig::CONFIG['EXEEXT'] = ".exe"
    2748. 

  2748.      Gem.instance_variable_set("@ruby", nil)
    2749. 

  2749.  
    2750. 

  2750.      assert_equal "C:/Ruby18/bin/ruby.exe", Gem.ruby
    2751. 

  2751.    ensure
    2752. 

  2752.      Gem.instance_variable_set("@ruby", orig_ruby)
    2753. 

  2753. -    Gem::ConfigMap[:bindir] = orig_bindir
    2754. 

  2754. -    Gem::ConfigMap[:ruby_install_name] = orig_ruby_install_name
    2755. 

  2755. -    Gem::ConfigMap[:EXEEXT] = orig_exe_ext
    2756. 

  2756. +    RbConfig::CONFIG['bindir'] = orig_bindir
    2757. 

  2757. +    RbConfig::CONFIG['ruby_install_name'] = orig_ruby_install_name
    2758. 

  2758. +    RbConfig::CONFIG['EXEEXT'] = orig_exe_ext
    2759. 

  2759.    end
    2760. 

  2760.  
    2761. 

  2761.    def test_self_ruby_api_version
    2762. 

  2762. -    orig_MAJOR, Gem::ConfigMap[:MAJOR] = Gem::ConfigMap[:MAJOR], '1'
    2763. 

  2763. -    orig_MINOR, Gem::ConfigMap[:MINOR] = Gem::ConfigMap[:MINOR], '2'
    2764. 

  2764. -    orig_TEENY, Gem::ConfigMap[:TEENY] = Gem::ConfigMap[:TEENY], '3'
    2765. 

  2765. +    orig_ruby_version, RbConfig::CONFIG['ruby_version'] = RbConfig::CONFIG['ruby_version'], '1.2.3'
    2766. 

  2766.  
    2767. 

  2767.      Gem.instance_variable_set :@ruby_api_version, nil
    2768. 

  2768.  
    2769. 

  2769. @@ -671,9 +675,7 @@ class TestGem < Gem::TestCase
    2770. 

  2770.    ensure
    2771. 

  2771.      Gem.instance_variable_set :@ruby_api_version, nil
    2772. 

  2772.  
    2773. 

  2773. -    Gem::ConfigMap[:MAJOR] = orig_MAJOR
    2774. 

  2774. -    Gem::ConfigMap[:MINOR] = orig_MINOR
    2775. 

  2775. -    Gem::ConfigMap[:TEENY] = orig_TEENY
    2776. 

  2776. +    RbConfig::CONFIG['ruby_version'] = orig_ruby_version
    2777. 

  2777.    end
    2778. 

  2778.  
    2779. 

  2779.    def test_self_ruby_version_1_8_5
    2780. 

  2780. @@ -825,7 +827,7 @@ class TestGem < Gem::TestCase
    2781. 

  2781.  
    2782. 

  2782.    def test_self_user_dir
    2783. 

  2783.      parts = [@userhome, '.gem', Gem.ruby_engine]
    2784. 

  2784. -    parts << Gem::ConfigMap[:ruby_version] unless Gem::ConfigMap[:ruby_version].empty?
    2785. 

  2785. +    parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
    2786. 

  2786.  
    2787. 

  2787.      assert_equal File.join(parts), Gem.user_dir
    2788. 

  2788.    end
    2789. 

  2789. @@ -857,6 +859,7 @@ class TestGem < Gem::TestCase
    2790. 

  2790.    end
    2791. 

  2791.  
    2792. 

  2792.    def test_self_needs_picks_up_unresolved_deps
    2793. 

  2793. +    skip 'loading from unsafe file' if RUBY_VERSION <= "1.8.7"
    2794. 

  2794.      save_loaded_features do
    2795. 

  2795.        util_clear_gems
    2796. 

  2796.        a = util_spec "a", "1"
    2797. 

  2797. @@ -949,6 +952,7 @@ class TestGem < Gem::TestCase
    2798. 

  2798.    end
    2799. 

  2799.  
    2800. 

  2800.    def test_load_plugins
    2801. 

  2801. +    skip 'Insecure operation - chdir' if RUBY_VERSION <= "1.8.7"
    2802. 

  2802.      plugin_path = File.join "lib", "rubygems_plugin.rb"
    2803. 

  2803.  
    2804. 

  2804.      Dir.chdir @tempdir do
    2805. 

  2805. @@ -1102,6 +1106,7 @@ class TestGem < Gem::TestCase
    2806. 

  2806.    end
    2807. 

  2807.  
    2808. 

  2808.    def test_auto_activation_of_detected_gemdeps_file
    2809. 

  2809. +    skip 'Insecure operation - chdir' if RUBY_VERSION <= "1.8.7"
    2810. 

  2810.      util_clear_gems
    2811. 

  2811.  
    2812. 

  2812.      a = new_spec "a", "1", nil, "lib/a.rb"
    2813. 

  2813. @@ -1264,6 +1269,7 @@ class TestGem < Gem::TestCase
    2814. 

  2814.    end
    2815. 

  2815.  
    2816. 

  2816.    def test_use_gemdeps_automatic
    2817. 

  2817. +    skip 'Insecure operation - chdir' if RUBY_VERSION <= "1.8.7"
    2818. 

  2818.      rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], '-'
    2819. 

  2819.  
    2820. 

  2820.      spec = util_spec 'a', 1
    2821. 

  2821. @@ -1300,6 +1306,7 @@ class TestGem < Gem::TestCase
    2822. 

  2822.    end
    2823. 

  2823.  
    2824. 

  2824.    def test_use_gemdeps_specific
    2825. 

  2825. +    skip 'Insecure operation - read' if RUBY_VERSION <= "1.8.7"
    2826. 

  2826.      rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], 'x'
    2827. 

  2827.  
    2828. 

  2828.      spec = util_spec 'a', 1
    2829. 

  2829. @@ -1317,6 +1324,19 @@ class TestGem < Gem::TestCase
    2830. 

  2830.      ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps
    2831. 

  2831.    end
    2832. 

  2832.  
    2833. 

  2833. +  def ruby_install_name name
    2834. 

  2834. +    orig_RUBY_INSTALL_NAME = RbConfig::CONFIG['ruby_install_name']
    2835. 

  2835. +    RbConfig::CONFIG['ruby_install_name'] = name
    2836. 

  2836. +
    2837. 

  2837. +    yield
    2838. 

  2838. +  ensure
    2839. 

  2839. +    if orig_RUBY_INSTALL_NAME then
    2840. 

  2840. +      RbConfig::CONFIG['ruby_install_name'] = orig_RUBY_INSTALL_NAME
    2841. 

  2841. +    else
    2842. 

  2842. +      RbConfig::CONFIG.delete 'ruby_install_name'
    2843. 

  2843. +    end
    2844. 

  2844. +  end
    2845. 

  2845. +
    2846. 

  2846.    def with_plugin(path)
    2847. 

  2847.      test_plugin_path = File.expand_path("test/rubygems/plugin/#{path}",
    2848. 

  2848.                                          @@project_dir)
    2849. 

  2849. diff --git a/test/rubygems/test_gem_commands_contents_command.rb b/test/rubygems/test_gem_commands_contents_command.rb
    2850. 

  2850. index d87e84f..7f5cf22 100644
    2851. 

  2851. --- a/test/rubygems/test_gem_commands_contents_command.rb
    2852. 

  2852. +++ b/test/rubygems/test_gem_commands_contents_command.rb
    2853. 

  2853. @@ -169,9 +169,9 @@ lib/foo.rb
    2854. 

  2854.      end
    2855. 

  2855.  
    2856. 

  2856.      expected = [
    2857. 

  2857. -      File.join(Gem::ConfigMap[:bindir], 'default_command'),
    2858. 

  2858. -      File.join(Gem::ConfigMap[:rubylibdir], 'default/gem.rb'),
    2859. 

  2859. -      File.join(Gem::ConfigMap[:archdir], 'default_gem.so')
    2860. 

  2860. +      File.join(RbConfig::CONFIG['bindir'], 'default_command'),
    2861. 

  2861. +      File.join(RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'),
    2862. 

  2862. +      File.join(RbConfig::CONFIG['archdir'], 'default_gem.so')
    2863. 

  2863.      ].sort.join "\n"
    2864. 

  2864.  
    2865. 

  2865.      assert_equal expected, @ui.output.chomp
    2866. 

  2866. diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb
    2867. 

  2867. index 253c459..bb7589f 100644
    2868. 

  2868. --- a/test/rubygems/test_gem_commands_environment_command.rb
    2869. 

  2869. +++ b/test/rubygems/test_gem_commands_environment_command.rb
    2870. 

  2870. @@ -26,7 +26,7 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
    2871. 

  2871.      assert_match %r|INSTALLATION DIRECTORY: #{Regexp.escape @gemhome}|,
    2872. 

  2872.                   @ui.output
    2873. 

  2873.      assert_match %r|RUBYGEMS PREFIX: |, @ui.output
    2874. 

  2874. -    assert_match %r|RUBY EXECUTABLE:.*#{Gem::ConfigMap[:ruby_install_name]}|,
    2875. 

  2875. +    assert_match %r|RUBY EXECUTABLE:.*#{RbConfig::CONFIG['ruby_install_name']}|,
    2876. 

  2876.                   @ui.output
    2877. 

  2877.      assert_match %r|EXECUTABLE DIRECTORY:|, @ui.output
    2878. 

  2878.      assert_match %r|RUBYGEMS PLATFORMS:|, @ui.output
    2879. 

  2879. diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
    2880. 

  2880. index 00bbf7b..6315cb5 100644
    2881. 

  2881. --- a/test/rubygems/test_gem_commands_install_command.rb
    2882. 

  2882. +++ b/test/rubygems/test_gem_commands_install_command.rb
    2883. 

  2883. @@ -316,6 +316,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
    2884. 

  2884.    end
    2885. 

  2885.  
    2886. 

  2886.    def test_execute_rdoc
    2887. 

  2887. +    skip if RUBY_VERSION <= "1.8.7"
    2888. 

  2888.      specs = spec_fetcher do |fetcher|
    2889. 

  2889.        fetcher.gem 'a', 2
    2890. 

  2890.      end
    2891. 

  2891. @@ -559,6 +560,20 @@ ERROR:  Possible alternatives: non_existent_with_hint
    2892. 

  2892.      assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
    2893. 

  2893.    end
    2894. 

  2894.  
    2895. 

  2895. +  def test_install_gem_ignore_dependencies_specific_file
    2896. 

  2896. +    spec = quick_spec 'a', 2
    2897. 

  2897. +
    2898. 

  2898. +    util_build_gem spec
    2899. 

  2899. +
    2900. 

  2900. +    FileUtils.mv spec.cache_file, @tempdir
    2901. 

  2901. +
    2902. 

  2902. +    @cmd.options[:ignore_dependencies] = true
    2903. 

  2903. +
    2904. 

  2904. +    @cmd.install_gem File.join(@tempdir, spec.file_name), nil
    2905. 

  2905. +
    2906. 

  2906. +    assert_equal %w[a-2], @cmd.installed_specs.map { |s| s.full_name }
    2907. 

  2907. +  end
    2908. 

  2908. +
    2909. 

  2909.    def test_parses_requirement_from_gemname
    2910. 

  2910.      spec_fetcher do |fetcher|
    2911. 

  2911.        fetcher.gem 'a', 2
    2912. 

  2912. diff --git a/test/rubygems/test_gem_commands_update_command.rb b/test/rubygems/test_gem_commands_update_command.rb
    2913. 

  2913. index 7537c1c..d259383 100644
    2914. 

  2914. --- a/test/rubygems/test_gem_commands_update_command.rb
    2915. 

  2915. +++ b/test/rubygems/test_gem_commands_update_command.rb
    2916. 

  2916. @@ -217,6 +217,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
    2917. 

  2917.    end
    2918. 

  2918.  
    2919. 

  2919.    def test_execute_rdoc
    2920. 

  2920. +    skip if RUBY_VERSION <= "1.8.7"
    2921. 

  2921.      spec_fetcher do |fetcher|
    2922. 

  2922.        fetcher.gem 'a', 2
    2923. 

  2923.  
    2924. 

  2924. @@ -239,7 +240,6 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
    2925. 

  2925.  
    2926. 

  2926.      a2 = @specs['a-2']
    2927. 

  2927.  
    2928. 

  2928. -    assert_path_exists File.join(a2.doc_dir, 'ri')
    2929. 

  2929.      assert_path_exists File.join(a2.doc_dir, 'rdoc')
    2930. 

  2930.    end
    2931. 

  2931.  
    2932. 

  2932. diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb
    2933. 

  2933. index 0a82fa6..352ebbb 100644
    2934. 

  2934. --- a/test/rubygems/test_gem_dependency_installer.rb
    2935. 

  2935. +++ b/test/rubygems/test_gem_dependency_installer.rb
    2936. 

  2936. @@ -551,7 +551,7 @@ class TestGemDependencyInstaller < Gem::TestCase
    2937. 

  2937.  
    2938. 

  2938.      env = "/\\S+/env" unless Gem.win_platform?
    2939. 

  2939.  
    2940. 

  2940. -    assert_match %r|\A#!#{env} #{Gem::ConfigMap[:ruby_install_name]}\n|,
    2941. 

  2941. +    assert_match %r|\A#!#{env} #{RbConfig::CONFIG['ruby_install_name']}\n|,
    2942. 

  2942.                   File.read(File.join(@gemhome, 'bin', 'a_bin'))
    2943. 

  2943.    end
    2944. 

  2944.  
    2945. 

  2945. diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb
    2946. 

  2946. index aa9008c..367c933 100644
    2947. 

  2947. --- a/test/rubygems/test_gem_ext_ext_conf_builder.rb
    2948. 

  2948. +++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb
    2949. 

  2949. @@ -42,47 +42,46 @@ class TestGemExtExtConfBuilder < Gem::TestCase
    2950. 

  2950.    end
    2951. 

  2951.  
    2952. 

  2952.    def test_class_build_rbconfig_make_prog
    2953. 

  2953. -    configure_args = RbConfig::CONFIG['configure_args']
    2954. 

  2954. +    configure_args do
    2955. 

  2955.  
    2956. 

  2956. -    File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
    2957. 

  2957. -      extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
    2958. 

  2958. -    end
    2959. 

  2959. +      File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
    2960. 

  2960. +        extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
    2961. 

  2961. +      end
    2962. 

  2962.  
    2963. 

  2963. -    output = []
    2964. 

  2964. +      output = []
    2965. 

  2965.  
    2966. 

  2966. -    Dir.chdir @ext do
    2967. 

  2967. -      Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
    2968. 

  2968. -    end
    2969. 

  2969. +      Dir.chdir @ext do
    2970. 

  2970. +        Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
    2971. 

  2971. +      end
    2972. 

  2972.  
    2973. 

  2973. -    assert_equal "creating Makefile\n", output[1]
    2974. 

  2974. -    assert_contains_make_command 'clean', output[2]
    2975. 

  2975. -    assert_contains_make_command '', output[4]
    2976. 

  2976. -    assert_contains_make_command 'install', output[6]
    2977. 

  2977. -  ensure
    2978. 

  2978. -    RbConfig::CONFIG['configure_args'] = configure_args
    2979. 

  2979. +      assert_equal "creating Makefile\n", output[1]
    2980. 

  2980. +      assert_contains_make_command 'clean', output[2]
    2981. 

  2981. +      assert_contains_make_command '', output[4]
    2982. 

  2982. +      assert_contains_make_command 'install', output[6]
    2983. 

  2983. +    end
    2984. 

  2984.    end
    2985. 

  2985.  
    2986. 

  2986.    def test_class_build_env_make
    2987. 

  2987. -    configure_args, env_make = RbConfig::CONFIG['configure_args'], ENV.delete('make')
    2988. 

  2988. -    RbConfig::CONFIG['configure_args'] = ''
    2989. 

  2989. +    env_make = ENV.delete 'make'
    2990. 

  2990.      ENV['make'] = 'anothermake'
    2991. 

  2991.  
    2992. 

  2992. -    File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
    2993. 

  2993. -      extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
    2994. 

  2994. -    end
    2995. 

  2995. +    configure_args '' do
    2996. 

  2996. +      File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
    2997. 

  2997. +        extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
    2998. 

  2998. +      end
    2999. 

  2999.  
    3000. 

  3000. -    output = []
    3001. 

  3001. +      output = []
    3002. 

  3002.  
    3003. 

  3003. -    assert_raises Gem::InstallError do
    3004. 

  3004. -      Dir.chdir @ext do
    3005. 

  3005. -        Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
    3006. 

  3006. +      assert_raises Gem::InstallError do
    3007. 

  3007. +        Dir.chdir @ext do
    3008. 

  3008. +          Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
    3009. 

  3009. +        end
    3010. 

  3010.        end
    3011. 

  3011. -    end
    3012. 

  3012.  
    3013. 

  3013. -    assert_equal "creating Makefile\n",   output[1]
    3014. 

  3014. -    assert_contains_make_command 'clean', output[2]
    3015. 

  3015. +      assert_equal "creating Makefile\n",   output[1]
    3016. 

  3016. +      assert_contains_make_command 'clean', output[2]
    3017. 

  3017. +    end
    3018. 

  3018.    ensure
    3019. 

  3019. -    RbConfig::CONFIG['configure_args'] = configure_args
    3020. 

  3020.      ENV['make'] = env_make
    3021. 

  3021.    end
    3022. 

  3022.  
    3023. 

  3023. @@ -108,6 +107,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
    3024. 

  3024.      assert_equal 'extconf failed, exit code 1', error.message
    3025. 

  3025.  
    3026. 

  3026.      assert_equal("#{Gem.ruby} extconf.rb", output[0])
    3027. 

  3027. +    assert_path_exists File.join @dest_path, 'mkmf.log'
    3028. 

  3028.    end
    3029. 

  3029.  
    3030. 

  3030.    def test_class_build_unconventional
    3031. 

  3031. @@ -188,5 +188,19 @@ end
    3032. 

  3032.      assert_equal 'Makefile not found', error.message
    3033. 

  3033.    end
    3034. 

  3034.  
    3035. 

  3035. +  def configure_args args = nil
    3036. 

  3036. +    configure_args = RbConfig::CONFIG['configure_args']
    3037. 

  3037. +    RbConfig::CONFIG['configure_args'] = args if args
    3038. 

  3038. +
    3039. 

  3039. +    yield
    3040. 

  3040. +
    3041. 

  3041. +  ensure
    3042. 

  3042. +    if configure_args then
    3043. 

  3043. +      RbConfig::CONFIG['configure_args'] = configure_args
    3044. 

  3044. +    else
    3045. 

  3045. +      RbConfig::CONFIG.delete 'configure_args'
    3046. 

  3046. +    end
    3047. 

  3047. +  end
    3048. 

  3048. +
    3049. 

  3049.  end
    3050. 

  3050.  
    3051. 

  3051. diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
    3052. 

  3052. index 615a9b5..eff62ab 100644
    3053. 

  3053. --- a/test/rubygems/test_gem_installer.rb
    3054. 

  3054. +++ b/test/rubygems/test_gem_installer.rb
    3055. 

  3055. @@ -41,7 +41,7 @@ version = \">= 0\"
    3056. 

  3056.  if ARGV.first
    3057. 

  3057.    str = ARGV.first
    3058. 

  3058.    str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
    3059. 

  3059. -  if str =~ /\\A_(.*)_\\z/
    3060. 

  3060. +  if str =~ /\\A_(.*)_\\z/ and Gem::Version.correct?($1) then
    3061. 

  3061.      version = $1
    3062. 

  3062.      ARGV.shift
    3063. 

  3063.    end
    3064. 

  3064. @@ -84,8 +84,8 @@ load Gem.bin_path('a', 'executable', version)
    3065. 

  3065.        orig_RUBY_FRAMEWORK_VERSION = RUBY_FRAMEWORK_VERSION
    3066. 

  3066.        Object.send :remove_const, :RUBY_FRAMEWORK_VERSION
    3067. 

  3067.      end
    3068. 

  3068. -    orig_bindir = Gem::ConfigMap[:bindir]
    3069. 

  3069. -    Gem::ConfigMap[:bindir] = Gem.bindir
    3070. 

  3070. +    orig_bindir = RbConfig::CONFIG['bindir']
    3071. 

  3071. +    RbConfig::CONFIG['bindir'] = Gem.bindir
    3072. 

  3072.  
    3073. 

  3073.      util_conflict_executable false
    3074. 

  3074.  
    3075. 

  3075. @@ -102,7 +102,11 @@ load Gem.bin_path('a', 'executable', version)
    3076. 

  3076.    ensure
    3077. 

  3077.      Object.const_set :RUBY_FRAMEWORK_VERSION, orig_RUBY_FRAMEWORK_VERSION if
    3078. 

  3078.        orig_RUBY_FRAMEWORK_VERSION
    3079. 

  3079. -    Gem::ConfigMap[:bindir] = orig_bindir
    3080. 

  3080. +    if orig_bindir then
    3081. 

  3081. +      RbConfig::CONFIG['bindir'] = orig_bindir
    3082. 

  3082. +    else
    3083. 

  3083. +      RbConfig::CONFIG.delete 'bindir'
    3084. 

  3084. +    end
    3085. 

  3085.    end
    3086. 

  3086.  
    3087. 

  3087.    def test_check_executable_overwrite_format_executable
    3088. 

  3088. @@ -1192,7 +1196,7 @@ gem 'other', version
    3089. 

  3089.  
    3090. 

  3090.      env_shebang = "/usr/bin/env" unless Gem.win_platform?
    3091. 

  3091.  
    3092. 

  3092. -    assert_equal("#!#{env_shebang} #{Gem::ConfigMap[:ruby_install_name]}",
    3093. 

  3093. +    assert_equal("#!#{env_shebang} #{RbConfig::CONFIG['ruby_install_name']}",
    3094. 

  3094.                   shebang)
    3095. 

  3095.    end
    3096. 

  3096.  
    3097. 

  3097. diff --git a/test/rubygems/test_gem_package_tar_header.rb b/test/rubygems/test_gem_package_tar_header.rb
    3098. 

  3098. index 5d85543..8f1f0c4 100644
    3099. 

  3099. --- a/test/rubygems/test_gem_package_tar_header.rb
    3100. 

  3100. +++ b/test/rubygems/test_gem_package_tar_header.rb
    3101. 

  3101. @@ -72,6 +72,20 @@ class TestGemPackageTarHeader < Gem::Package::TarTestCase
    3102. 

  3102.      end
    3103. 

  3103.    end
    3104. 

  3104.  
    3105. 

  3105. +  def test_initialize_typeflag
    3106. 

  3106. +    header = {
    3107. 

  3107. +      :mode     => '',
    3108. 

  3108. +      :name     => '',
    3109. 

  3109. +      :prefix   => '',
    3110. 

  3110. +      :size     => '',
    3111. 

  3111. +      :typeflag => '',
    3112. 

  3112. +    }
    3113. 

  3113. +
    3114. 

  3114. +    tar_header = Gem::Package::TarHeader.new header
    3115. 

  3115. +
    3116. 

  3116. +    assert_equal '0', tar_header.typeflag
    3117. 

  3117. +  end
    3118. 

  3118. +
    3119. 

  3119.    def test_empty_eh
    3120. 

  3120.      refute_empty @tar_header
    3121. 

  3121.  
    3122. 

  3122. diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb
    3123. 

  3123. index 5966710..17577dc 100644
    3124. 

  3124. --- a/test/rubygems/test_gem_platform.rb
    3125. 

  3125. +++ b/test/rubygems/test_gem_platform.rb
    3126. 

  3126. @@ -116,7 +116,11 @@ class TestGemPlatform < Gem::TestCase
    3127. 

  3127.  
    3128. 

  3128.      assert_equal expected, platform.to_a, 'i386-mswin32 VC6'
    3129. 

  3129.    ensure
    3130. 

  3130. -    RbConfig::CONFIG['RUBY_SO_NAME'] = orig_RUBY_SO_NAME
    3131. 

  3131. +    if orig_RUBY_SO_NAME then
    3132. 

  3132. +      RbConfig::CONFIG['RUBY_SO_NAME'] = orig_RUBY_SO_NAME
    3133. 

  3133. +    else
    3134. 

  3134. +      RbConfig::CONFIG.delete 'RUBY_SO_NAME'
    3135. 

  3135. +    end
    3136. 

  3136.    end
    3137. 

  3137.  
    3138. 

  3138.    def test_initialize_platform
    3139. 

  3139. diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
    3140. 

  3140. index 7e6d9c7..79f3a58 100644
    3141. 

  3141. --- a/test/rubygems/test_gem_remote_fetcher.rb
    3142. 

  3142. +++ b/test/rubygems/test_gem_remote_fetcher.rb
    3143. 

  3143. @@ -208,15 +208,15 @@ gems:
    3144. 

  3144.      fetcher.instance_variable_set :@test_data, data
    3145. 

  3145.  
    3146. 

  3146.      unless blow then
    3147. 

  3147. -      def fetcher.fetch_path arg
    3148. 

  3148. +      def fetcher.fetch_path arg, *rest
    3149. 

  3149.          @test_arg = arg
    3150. 

  3150.          @test_data
    3151. 

  3151.        end
    3152. 

  3152.      else
    3153. 

  3153. -      def fetcher.fetch_path arg
    3154. 

  3154. +      def fetcher.fetch_path arg, *rest
    3155. 

  3155.          # OMG I'm such an ass
    3156. 

  3156.          class << self; remove_method :fetch_path; end
    3157. 

  3157. -        def self.fetch_path arg
    3158. 

  3158. +        def self.fetch_path arg, *rest
    3159. 

  3159.            @test_arg = arg
    3160. 

  3160.            @test_data
    3161. 

  3161.          end
    3162. 

  3162. diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb
    3163. 

  3163. index 04ff507..bcbbcf1 100644
    3164. 

  3164. --- a/test/rubygems/test_gem_request.rb
    3165. 

  3165. +++ b/test/rubygems/test_gem_request.rb
    3166. 

  3166. @@ -1,9 +1,16 @@
    3167. 

  3167.  require 'rubygems/test_case'
    3168. 

  3168.  require 'rubygems/request'
    3169. 

  3169.  require 'ostruct'
    3170. 

  3170. +require 'base64'
    3171. 

  3171.  
    3172. 

  3172.  class TestGemRequest < Gem::TestCase
    3173. 

  3173.  
    3174. 

  3174. +  CA_CERT_FILE     = cert_path 'ca'
    3175. 

  3175. +  CHILD_CERT       = load_cert 'child'
    3176. 

  3176. +  PUBLIC_CERT      = load_cert 'public'
    3177. 

  3177. +  PUBLIC_CERT_FILE = cert_path 'public'
    3178. 

  3178. +  SSL_CERT         = load_cert 'ssl'
    3179. 

  3179. +
    3180. 

  3180.    def setup
    3181. 

  3181.      @proxies = %w[http_proxy HTTP_PROXY http_proxy_user HTTP_PROXY_USER http_proxy_pass HTTP_PROXY_PASS no_proxy NO_PROXY]
    3182. 

  3182.      @old_proxies = @proxies.map {|k| ENV[k] }
    3183. 

  3183. @@ -62,6 +69,44 @@ class TestGemRequest < Gem::TestCase
    3184. 

  3184.      assert_equal URI(@proxy_uri), proxy
    3185. 

  3185.    end
    3186. 

  3186.  
    3187. 

  3187. +  def test_configure_connection_for_https
    3188. 

  3188. +    connection = Net::HTTP.new 'localhost', 443
    3189. 

  3189. +
    3190. 

  3190. +    request = Gem::Request.new URI('https://example'), nil, nil, nil
    3191. 

  3191. +
    3192. 

  3192. +    def request.add_rubygems_trusted_certs store
    3193. 

  3193. +      store.add_cert TestGemRequest::PUBLIC_CERT
    3194. 

  3194. +    end
    3195. 

  3195. +
    3196. 

  3196. +    request.configure_connection_for_https connection
    3197. 

  3197. +
    3198. 

  3198. +    cert_store = connection.cert_store
    3199. 

  3199. +
    3200. 

  3200. +    assert cert_store.verify CHILD_CERT
    3201. 

  3201. +  end
    3202. 

  3202. +
    3203. 

  3203. +  def test_configure_connection_for_https_ssl_ca_cert
    3204. 

  3204. +    ssl_ca_cert, Gem.configuration.ssl_ca_cert =
    3205. 

  3205. +      Gem.configuration.ssl_ca_cert, CA_CERT_FILE
    3206. 

  3206. +
    3207. 

  3207. +    connection = Net::HTTP.new 'localhost', 443
    3208. 

  3208. +
    3209. 

  3209. +    request = Gem::Request.new URI('https://example'), nil, nil, nil
    3210. 

  3210. +
    3211. 

  3211. +    def request.add_rubygems_trusted_certs store
    3212. 

  3212. +      store.add_cert TestGemRequest::PUBLIC_CERT
    3213. 

  3213. +    end
    3214. 

  3214. +
    3215. 

  3215. +    request.configure_connection_for_https connection
    3216. 

  3216. +
    3217. 

  3217. +    cert_store = connection.cert_store
    3218. 

  3218. +
    3219. 

  3219. +    assert cert_store.verify CHILD_CERT
    3220. 

  3220. +    assert cert_store.verify SSL_CERT
    3221. 

  3221. +  ensure
    3222. 

  3222. +    Gem.configuration.ssl_ca_cert = ssl_ca_cert
    3223. 

  3223. +  end
    3224. 

  3224. +
    3225. 

  3225.    def test_get_proxy_from_env_fallback
    3226. 

  3226.      ENV['http_proxy'] = @proxy_uri
    3227. 

  3227.  
    3228. 

  3228. @@ -124,6 +169,30 @@ class TestGemRequest < Gem::TestCase
    3229. 

  3229.      assert_equal :junk, response.body
    3230. 

  3230.    end
    3231. 

  3231.  
    3232. 

  3232. +  def test_fetch_basic_auth
    3233. 

  3233. +    uri = URI.parse "https://user:pass@example.rubygems/specs.#{Gem.marshal_version}"
    3234. 

  3234. +    @request = Gem::Request.new(uri, Net::HTTP::Get, nil, nil)
    3235. 

  3235. +    conn = util_stub_connection_for :body => :junk, :code => 200
    3236. 

  3236. +
    3237. 

  3237. +    @request.fetch
    3238. 

  3238. +
    3239. 

  3239. +    auth_header = conn.payload['Authorization']
    3240. 

  3240. +
    3241. 

  3241. +    assert_equal "Basic #{Base64.encode64('user:pass')}".strip, auth_header
    3242. 

  3242. +  end
    3243. 

  3243. +
    3244. 

  3244. +  def test_fetch_basic_auth_encoded
    3245. 

  3245. +    uri = URI.parse "https://user:%7BDEScede%7Dpass@example.rubygems/specs.#{Gem.marshal_version}"
    3246. 

  3246. +    @request = Gem::Request.new(uri, Net::HTTP::Get, nil, nil)
    3247. 

  3247. +    conn = util_stub_connection_for :body => :junk, :code => 200
    3248. 

  3248. +
    3249. 

  3249. +    @request.fetch
    3250. 

  3250. +
    3251. 

  3251. +    auth_header = conn.payload['Authorization']
    3252. 

  3252. +
    3253. 

  3253. +    assert_equal "Basic #{Base64.encode64('user:{DEScede}pass')}".strip, auth_header
    3254. 

  3254. +  end
    3255. 

  3255. +
    3256. 

  3256.    def test_fetch_head
    3257. 

  3257.      uri = URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}"
    3258. 

  3258.      @request = Gem::Request.new(uri, Net::HTTP::Get, nil, nil)
    3259. 

  3259. diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb
    3260. 

  3260. index 8275795..a5fcdcc 100644
    3261. 

  3261. --- a/test/rubygems/test_gem_request_set.rb
    3262. 

  3262. +++ b/test/rubygems/test_gem_request_set.rb
    3263. 

  3263. @@ -59,6 +59,8 @@ class TestGemRequestSet < Gem::TestCase
    3264. 

  3264.      assert_includes installed, 'a-2'
    3265. 

  3265.      assert_path_exists File.join @gemhome, 'gems', 'a-2'
    3266. 

  3266.      assert_path_exists 'gem.deps.rb.lock'
    3267. 

  3267. +
    3268. 

  3268. +    assert rs.remote
    3269. 

  3269.    end
    3270. 

  3270.  
    3271. 

  3271.    def test_install_from_gemdeps_install_dir
    3272. 

  3272. @@ -89,6 +91,25 @@ class TestGemRequestSet < Gem::TestCase
    3273. 

  3273.      refute_path_exists File.join Gem.dir, 'gems', 'a-2'
    3274. 

  3274.    end
    3275. 

  3275.  
    3276. 

  3276. +  def test_install_from_gemdeps_local
    3277. 

  3277. +    spec_fetcher do |fetcher|
    3278. 

  3278. +      fetcher.gem 'a', 2
    3279. 

  3279. +    end
    3280. 

  3280. +
    3281. 

  3281. +    rs = Gem::RequestSet.new
    3282. 

  3282. +
    3283. 

  3283. +    open 'gem.deps.rb', 'w' do |io|
    3284. 

  3284. +      io.puts 'gem "a"'
    3285. 

  3285. +      io.flush
    3286. 

  3286. +
    3287. 

  3287. +      assert_raises Gem::UnsatisfiableDependencyError do
    3288. 

  3288. +        rs.install_from_gemdeps :gemdeps => io.path, :domain => :local
    3289. 

  3289. +      end
    3290. 

  3290. +    end
    3291. 

  3291. +
    3292. 

  3292. +    refute rs.remote
    3293. 

  3293. +  end
    3294. 

  3294. +
    3295. 

  3295.    def test_install_from_gemdeps_lockfile
    3296. 

  3296.      spec_fetcher do |fetcher|
    3297. 

  3297.        fetcher.gem 'a', 1
    3298. 

  3298. diff --git a/test/rubygems/test_gem_request_set_lockfile.rb b/test/rubygems/test_gem_request_set_lockfile.rb
    3299. 

  3299. index 9e0cab4..0be69bf 100644
    3300. 

  3300. --- a/test/rubygems/test_gem_request_set_lockfile.rb
    3301. 

  3301. +++ b/test/rubygems/test_gem_request_set_lockfile.rb
    3302. 

  3302. @@ -218,6 +218,7 @@ GEM
    3303. 

  3303.        c (~> 4)
    3304. 

  3304.        d
    3305. 

  3305.        e (~> 5.0, >= 5.0.1)
    3306. 

  3306. +    b (3-x86_64-linux)
    3307. 

  3307.  
    3308. 

  3308.  PLATFORMS
    3309. 

  3309.    #{Gem::Platform::RUBY}
    3310. 

  3310. @@ -238,7 +239,14 @@ DEPENDENCIES
    3311. 

  3311.  
    3312. 

  3312.      assert lockfile_set, 'could not find a LockSet'
    3313. 

  3313.  
    3314. 

  3314. -    assert_equal %w[a-2], lockfile_set.specs.map { |tuple| tuple.full_name }
    3315. 

  3315. +    assert_equal %w[a-2 b-3], lockfile_set.specs.map { |tuple| tuple.full_name }
    3316. 

  3316. +
    3317. 

  3317. +    expected = [
    3318. 

  3318. +      Gem::Platform::RUBY,
    3319. 

  3319. +      Gem::Platform.new('x86_64-linux'),
    3320. 

  3320. +    ]
    3321. 

  3321. +
    3322. 

  3322. +    assert_equal expected, lockfile_set.specs.map { |tuple| tuple.platform }
    3323. 

  3323.  
    3324. 

  3324.      spec = lockfile_set.specs.first
    3325. 

  3325.  
    3326. 

  3326. diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb
    3327. 

  3327. index 7d3311c..c97e9e7 100644
    3328. 

  3328. --- a/test/rubygems/test_gem_resolver.rb
    3329. 

  3329. +++ b/test/rubygems/test_gem_resolver.rb
    3330. 

  3330. @@ -33,6 +33,14 @@ class TestGemResolver < Gem::TestCase
    3331. 

  3331.      assert_same Gem::Resolver, Gem::DependencyResolver
    3332. 

  3332.    end
    3333. 

  3333.  
    3334. 

  3334. +  def test_self_compose_sets_best_set
    3335. 

  3335. +    best_set = @DR::BestSet.new
    3336. 

  3336. +
    3337. 

  3337. +    composed = @DR.compose_sets best_set
    3338. 

  3338. +
    3339. 

  3339. +    assert_equal best_set, composed
    3340. 

  3340. +  end
    3341. 

  3341. +
    3342. 

  3342.    def test_self_compose_sets_multiple
    3343. 

  3343.      index_set  = @DR::IndexSet.new
    3344. 

  3344.      vendor_set = @DR::VendorSet.new
    3345. 

  3345. diff --git a/test/rubygems/test_gem_resolver_api_set.rb b/test/rubygems/test_gem_resolver_api_set.rb
    3346. 

  3346. index 288f496..245f6c1 100644
    3347. 

  3347. --- a/test/rubygems/test_gem_resolver_api_set.rb
    3348. 

  3348. +++ b/test/rubygems/test_gem_resolver_api_set.rb
    3349. 

  3349. @@ -17,6 +17,14 @@ class TestGemResolverAPISet < Gem::TestCase
    3350. 

  3350.      assert_equal Gem::Source.new(URI('https://rubygems.org')),    set.source
    3351. 

  3351.    end
    3352. 

  3352.  
    3353. 

  3353. +  def test_initialize_deeper_uri
    3354. 

  3354. +    set = @DR::APISet.new 'https://rubygemsserver.com/mygems/api/v1/dependencies'
    3355. 

  3355. +
    3356. 

  3356. +    assert_equal URI('https://rubygemsserver.com/mygems/api/v1/dependencies'), set.dep_uri
    3357. 

  3357. +    assert_equal URI('https://rubygemsserver.com/mygems/'),                    set.uri
    3358. 

  3358. +    assert_equal Gem::Source.new(URI('https://rubygemsserver.com/mygems/')),    set.source
    3359. 

  3359. +  end
    3360. 

  3360. +
    3361. 

  3361.    def test_initialize_uri
    3362. 

  3362.      set = @DR::APISet.new @dep_uri
    3363. 

  3363.  
    3364. 

  3364. @@ -74,6 +82,15 @@ class TestGemResolverAPISet < Gem::TestCase
    3365. 

  3365.      assert_equal expected, set.find_all(a_dep)
    3366. 

  3366.    end
    3367. 

  3367.  
    3368. 

  3368. +  def test_find_all_local
    3369. 

  3369. +    set = @DR::APISet.new @dep_uri
    3370. 

  3370. +    set.remote = false
    3371. 

  3371. +
    3372. 

  3372. +    a_dep = @DR::DependencyRequest.new dep('a'), nil
    3373. 

  3373. +
    3374. 

  3374. +    assert_empty set.find_all(a_dep)
    3375. 

  3375. +  end
    3376. 

  3376. +
    3377. 

  3377.    def test_find_all_missing
    3378. 

  3378.      spec_fetcher
    3379. 

  3379.  
    3380. 

  3380. @@ -163,5 +180,29 @@ class TestGemResolverAPISet < Gem::TestCase
    3381. 

  3381.      set.prefetch [a_dep, b_dep]
    3382. 

  3382.    end
    3383. 

  3383.  
    3384. 

  3384. +  def test_prefetch_local
    3385. 

  3385. +    spec_fetcher
    3386. 

  3386. +
    3387. 

  3387. +    data = [
    3388. 

  3388. +      { :name         => 'a',
    3389. 

  3389. +        :number       => '1',
    3390. 

  3390. +        :platform     => 'ruby',
    3391. 

  3391. +        :dependencies => [], },
    3392. 

  3392. +    ]
    3393. 

  3393. +
    3394. 

  3394. +    @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
    3395. 

  3395. +    @fetcher.data["#{@dep_uri}?gems=b"]   = Marshal.dump []
    3396. 

  3396. +
    3397. 

  3397. +    set = @DR::APISet.new @dep_uri
    3398. 

  3398. +    set.remote = false
    3399. 

  3399. +
    3400. 

  3400. +    a_dep = @DR::DependencyRequest.new dep('a'), nil
    3401. 

  3401. +    b_dep = @DR::DependencyRequest.new dep('b'), nil
    3402. 

  3402. +
    3403. 

  3403. +    set.prefetch [a_dep, b_dep]
    3404. 

  3404. +
    3405. 

  3405. +    assert_empty set.instance_variable_get :@data
    3406. 

  3406. +  end
    3407. 

  3407. +
    3408. 

  3408.  end
    3409. 

  3409.  
    3410. 

  3410. diff --git a/test/rubygems/test_gem_resolver_best_set.rb b/test/rubygems/test_gem_resolver_best_set.rb
    3411. 

  3411. index 5bcff4a..2d16f8b 100644
    3412. 

  3412. --- a/test/rubygems/test_gem_resolver_best_set.rb
    3413. 

  3413. +++ b/test/rubygems/test_gem_resolver_best_set.rb
    3414. 

  3414. @@ -8,6 +8,12 @@ class TestGemResolverBestSet < Gem::TestCase
    3415. 

  3415.      @DR = Gem::Resolver
    3416. 

  3416.    end
    3417. 

  3417.  
    3418. 

  3418. +  def test_initialize
    3419. 

  3419. +    set = @DR::BestSet.new
    3420. 

  3420. +
    3421. 

  3421. +    assert_empty set.sets
    3422. 

  3422. +  end
    3423. 

  3423. +
    3424. 

  3424.    def test_find_all_index
    3425. 

  3425.      spec_fetcher do |fetcher|
    3426. 

  3426.        fetcher.spec 'a', 1
    3427. 

  3427. @@ -26,5 +32,49 @@ class TestGemResolverBestSet < Gem::TestCase
    3428. 

  3428.      assert_equal %w[a-1], found.map { |s| s.full_name }
    3429. 

  3429.    end
    3430. 

  3430.  
    3431. 

  3431. +  def test_find_all_local
    3432. 

  3432. +    spec_fetcher do |fetcher|
    3433. 

  3433. +      fetcher.spec 'a', 1
    3434. 

  3434. +      fetcher.spec 'a', 2
    3435. 

  3435. +      fetcher.spec 'b', 1
    3436. 

  3436. +    end
    3437. 

  3437. +
    3438. 

  3438. +    set = @DR::BestSet.new
    3439. 

  3439. +    set.remote = false
    3440. 

  3440. +
    3441. 

  3441. +    dependency = dep 'a', '~> 1'
    3442. 

  3442. +
    3443. 

  3443. +    req = @DR::DependencyRequest.new dependency, nil
    3444. 

  3444. +
    3445. 

  3445. +    found = set.find_all req
    3446. 

  3446. +
    3447. 

  3447. +    assert_empty found
    3448. 

  3448. +  end
    3449. 

  3449. +
    3450. 

  3450. +  def test_prefetch
    3451. 

  3451. +    spec_fetcher do |fetcher|
    3452. 

  3452. +      fetcher.spec 'a', 1
    3453. 

  3453. +    end
    3454. 

  3454. +
    3455. 

  3455. +    set = @DR::BestSet.new
    3456. 

  3456. +
    3457. 

  3457. +    set.prefetch []
    3458. 

  3458. +
    3459. 

  3459. +    refute_empty set.sets
    3460. 

  3460. +  end
    3461. 

  3461. +
    3462. 

  3462. +  def test_prefetch_local
    3463. 

  3463. +    spec_fetcher do |fetcher|
    3464. 

  3464. +      fetcher.spec 'a', 1
    3465. 

  3465. +    end
    3466. 

  3466. +
    3467. 

  3467. +    set = @DR::BestSet.new
    3468. 

  3468. +    set.remote = false
    3469. 

  3469. +
    3470. 

  3470. +    set.prefetch []
    3471. 

  3471. +
    3472. 

  3472. +    assert_empty set.sets
    3473. 

  3473. +  end
    3474. 

  3474. +
    3475. 

  3475.  end
    3476. 

  3476.  
    3477. 

  3477. diff --git a/test/rubygems/test_gem_resolver_git_set.rb b/test/rubygems/test_gem_resolver_git_set.rb
    3478. 

  3478. index 4643624..f82b942 100644
    3479. 

  3479. --- a/test/rubygems/test_gem_resolver_git_set.rb
    3480. 

  3480. +++ b/test/rubygems/test_gem_resolver_git_set.rb
    3481. 

  3481. @@ -70,6 +70,21 @@ class TestGemResolverGitSet < Gem::TestCase
    3482. 

  3482.      assert_equal [@set.specs['a']], found
    3483. 

  3483.    end
    3484. 

  3484.  
    3485. 

  3485. +  def test_find_all_local
    3486. 

  3486. +    name, _, repository, = git_gem
    3487. 

  3487. +
    3488. 

  3488. +    @set.add_git_gem name, repository, 'master', false
    3489. 

  3489. +    @set.remote = false
    3490. 

  3490. +
    3491. 

  3491. +    dependency = dep 'a', '~> 1.0'
    3492. 

  3492. +    req = Gem::Resolver::DependencyRequest.new dependency, nil
    3493. 

  3493. +    @reqs.add req
    3494. 

  3494. +
    3495. 

  3495. +    @set.prefetch @reqs
    3496. 

  3496. +
    3497. 

  3497. +    assert_empty @set.find_all dependency
    3498. 

  3498. +  end
    3499. 

  3499. +
    3500. 

  3500.    def test_root_dir
    3501. 

  3501.      assert_equal Gem.dir, @set.root_dir
    3502. 

  3502.  
    3503. 

  3503. diff --git a/test/rubygems/test_gem_resolver_index_set.rb b/test/rubygems/test_gem_resolver_index_set.rb
    3504. 

  3504. index 137e9b5..b0adc51 100644
    3505. 

  3505. --- a/test/rubygems/test_gem_resolver_index_set.rb
    3506. 

  3506. +++ b/test/rubygems/test_gem_resolver_index_set.rb
    3507. 

  3507. @@ -24,5 +24,40 @@ class TestGemResolverIndexSet < Gem::TestCase
    3508. 

  3508.      refute_same Gem::SpecFetcher.fetcher, fetcher
    3509. 

  3509.    end
    3510. 

  3510.  
    3511. 

  3511. +  def test_find_all
    3512. 

  3512. +    spec_fetcher do |fetcher|
    3513. 

  3513. +      fetcher.spec 'a', 1
    3514. 

  3514. +      fetcher.spec 'a', 2
    3515. 

  3515. +      fetcher.spec 'b', 1
    3516. 

  3516. +    end
    3517. 

  3517. +
    3518. 

  3518. +    set = @DR::BestSet.new
    3519. 

  3519. +
    3520. 

  3520. +    dependency = dep 'a', '~> 1'
    3521. 

  3521. +
    3522. 

  3522. +    req = @DR::DependencyRequest.new dependency, nil
    3523. 

  3523. +
    3524. 

  3524. +    found = set.find_all req
    3525. 

  3525. +
    3526. 

  3526. +    assert_equal %w[a-1], found.map { |s| s.full_name }
    3527. 

  3527. +  end
    3528. 

  3528. +
    3529. 

  3529. +  def test_find_all_local
    3530. 

  3530. +    spec_fetcher do |fetcher|
    3531. 

  3531. +      fetcher.spec 'a', 1
    3532. 

  3532. +      fetcher.spec 'a', 2
    3533. 

  3533. +      fetcher.spec 'b', 1
    3534. 

  3534. +    end
    3535. 

  3535. +
    3536. 

  3536. +    set = @DR::BestSet.new
    3537. 

  3537. +    set.remote = false
    3538. 

  3538. +
    3539. 

  3539. +    dependency = dep 'a', '~> 1'
    3540. 

  3540. +
    3541. 

  3541. +    req = @DR::DependencyRequest.new dependency, nil
    3542. 

  3542. +
    3543. 

  3543. +    assert_empty set.find_all req
    3544. 

  3544. +  end
    3545. 

  3545. +
    3546. 

  3546.  end
    3547. 

  3547.  
    3548. 

  3548. diff --git a/test/rubygems/test_gem_resolver_installer_set.rb b/test/rubygems/test_gem_resolver_installer_set.rb
    3549. 

  3549. index af4db64..258f9bc 100644
    3550. 

  3550. --- a/test/rubygems/test_gem_resolver_installer_set.rb
    3551. 

  3551. +++ b/test/rubygems/test_gem_resolver_installer_set.rb
    3552. 

  3552. @@ -2,6 +2,34 @@ require 'rubygems/test_case'
    3553. 

  3553.  
    3554. 

  3554.  class TestGemResolverInstallerSet < Gem::TestCase
    3555. 

  3555.  
    3556. 

  3556. +  def test_consider_local_eh
    3557. 

  3557. +    set = Gem::Resolver::InstallerSet.new :remote
    3558. 

  3558. +
    3559. 

  3559. +    refute set.consider_local?
    3560. 

  3560. +
    3561. 

  3561. +    set = Gem::Resolver::InstallerSet.new :both
    3562. 

  3562. +
    3563. 

  3563. +    assert set.consider_local?
    3564. 

  3564. +
    3565. 

  3565. +    set = Gem::Resolver::InstallerSet.new :local
    3566. 

  3566. +
    3567. 

  3567. +    assert set.consider_local?
    3568. 

  3568. +  end
    3569. 

  3569. +
    3570. 

  3570. +  def test_consider_remote_eh
    3571. 

  3571. +    set = Gem::Resolver::InstallerSet.new :remote
    3572. 

  3572. +
    3573. 

  3573. +    assert set.consider_remote?
    3574. 

  3574. +
    3575. 

  3575. +    set = Gem::Resolver::InstallerSet.new :both
    3576. 

  3576. +
    3577. 

  3577. +    assert set.consider_remote?
    3578. 

  3578. +
    3579. 

  3579. +    set = Gem::Resolver::InstallerSet.new :local
    3580. 

  3580. +
    3581. 

  3581. +    refute set.consider_remote?
    3582. 

  3582. +  end
    3583. 

  3583. +
    3584. 

  3584.    def test_load_spec
    3585. 

  3585.      specs = spec_fetcher do |fetcher|
    3586. 

  3586.        fetcher.spec 'a', 2
    3587. 

  3587. @@ -18,5 +46,47 @@ class TestGemResolverInstallerSet < Gem::TestCase
    3588. 

  3588.      assert_equal specs["a-2-#{Gem::Platform.local}"].full_name, spec.full_name
    3589. 

  3589.    end
    3590. 

  3590.  
    3591. 

  3591. +  def test_remote_equals_both
    3592. 

  3592. +    set = Gem::Resolver::InstallerSet.new :both
    3593. 

  3593. +    set.remote = true
    3594. 

  3594. +
    3595. 

  3595. +    assert set.consider_local?
    3596. 

  3596. +    assert set.consider_remote?
    3597. 

  3597. +
    3598. 

  3598. +    set = Gem::Resolver::InstallerSet.new :both
    3599. 

  3599. +    set.remote = false
    3600. 

  3600. +
    3601. 

  3601. +    assert set.consider_local?
    3602. 

  3602. +    refute set.consider_remote?
    3603. 

  3603. +  end
    3604. 

  3604. +
    3605. 

  3605. +  def test_remote_equals_local
    3606. 

  3606. +    set = Gem::Resolver::InstallerSet.new :local
    3607. 

  3607. +    set.remote = true
    3608. 

  3608. +
    3609. 

  3609. +    assert set.consider_local?
    3610. 

  3610. +    assert set.consider_remote?
    3611. 

  3611. +
    3612. 

  3612. +    set = Gem::Resolver::InstallerSet.new :local
    3613. 

  3613. +    set.remote = false
    3614. 

  3614. +
    3615. 

  3615. +    assert set.consider_local?
    3616. 

  3616. +    refute set.consider_remote?
    3617. 

  3617. +  end
    3618. 

  3618. +
    3619. 

  3619. +  def test_remote_equals_remote
    3620. 

  3620. +    set = Gem::Resolver::InstallerSet.new :remote
    3621. 

  3621. +    set.remote = true
    3622. 

  3622. +
    3623. 

  3623. +    refute set.consider_local?
    3624. 

  3624. +    assert set.consider_remote?
    3625. 

  3625. +
    3626. 

  3626. +    set = Gem::Resolver::InstallerSet.new :remote
    3627. 

  3627. +    set.remote = false
    3628. 

  3628. +
    3629. 

  3629. +    refute set.consider_local?
    3630. 

  3630. +    refute set.consider_remote?
    3631. 

  3631. +  end
    3632. 

  3632. +
    3633. 

  3633.  end
    3634. 

  3634.  
    3635. 

  3635. diff --git a/test/rubygems/test_gem_source_git.rb b/test/rubygems/test_gem_source_git.rb
    3636. 

  3636. index 026492e..58bff84 100644
    3637. 

  3637. --- a/test/rubygems/test_gem_source_git.rb
    3638. 

  3638. +++ b/test/rubygems/test_gem_source_git.rb
    3639. 

  3639. @@ -27,6 +27,26 @@ class TestGemSourceGit < Gem::TestCase
    3640. 

  3640.      assert_path_exists File.join @source.install_dir, 'a.gemspec'
    3641. 

  3641.    end
    3642. 

  3642.  
    3643. 

  3643. +  def test_checkout_local
    3644. 

  3644. +    @source.remote = false
    3645. 

  3645. +
    3646. 

  3646. +    @source.checkout
    3647. 

  3647. +
    3648. 

  3648. +    install_dir = File.join Gem.dir, 'bundler', 'gems', "a-#{@head[0..11]}"
    3649. 

  3649. +
    3650. 

  3650. +    refute_path_exists File.join install_dir, 'a.gemspec'
    3651. 

  3651. +  end
    3652. 

  3652. +
    3653. 

  3653. +  def test_checkout_local_cached
    3654. 

  3654. +    @source.cache
    3655. 

  3655. +
    3656. 

  3656. +    @source.remote = false
    3657. 

  3657. +
    3658. 

  3658. +    @source.checkout
    3659. 

  3659. +
    3660. 

  3660. +    assert_path_exists File.join @source.install_dir, 'a.gemspec'
    3661. 

  3661. +  end
    3662. 

  3662. +
    3663. 

  3663.    def test_checkout_submodules
    3664. 

  3664.      source = Gem::Source::Git.new @name, @repository, 'master', true
    3665. 

  3665.  
    3666. 

  3666. @@ -54,6 +74,14 @@ class TestGemSourceGit < Gem::TestCase
    3667. 

  3667.      end
    3668. 

  3668.    end
    3669. 

  3669.  
    3670. 

  3670. +  def test_cache_local
    3671. 

  3671. +    @source.remote = false
    3672. 

  3672. +
    3673. 

  3673. +    @source.cache
    3674. 

  3674. +
    3675. 

  3675. +    refute_path_exists @source.repo_cache_dir
    3676. 

  3676. +  end
    3677. 

  3677. +
    3678. 

  3678.    def test_dir_shortref
    3679. 

  3679.      @source.cache
    3680. 

  3680.  
    3681. 

  3681. @@ -99,6 +127,12 @@ class TestGemSourceGit < Gem::TestCase
    3682. 

  3682.      assert_equal expected, @source.install_dir
    3683. 

  3683.    end
    3684. 

  3684.  
    3685. 

  3685. +  def test_install_dir_local
    3686. 

  3686. +    @source.remote = false
    3687. 

  3687. +
    3688. 

  3688. +    assert_nil @source.install_dir
    3689. 

  3689. +  end
    3690. 

  3690. +
    3691. 

  3691.    def test_repo_cache_dir
    3692. 

  3692.      expected =
    3693. 

  3693.        File.join Gem.dir, 'cache', 'bundler', 'git', "a-#{@hash}"
    3694. 

  3694. @@ -211,6 +245,15 @@ class TestGemSourceGit < Gem::TestCase
    3695. 

  3695.      assert_equal extension_dir, b_spec.extension_dir
    3696. 

  3696.    end
    3697. 

  3697.  
    3698. 

  3698. +  def test_specs_local
    3699. 

  3699. +    source = Gem::Source::Git.new @name, @repository, 'master', true
    3700. 

  3700. +    source.remote = false
    3701. 

  3701. +
    3702. 

  3702. +    capture_io do
    3703. 

  3703. +      assert_empty source.specs
    3704. 

  3704. +    end
    3705. 

  3705. +  end
    3706. 

  3706. +
    3707. 

  3707.    def test_uri_hash
    3708. 

  3708.      assert_equal @hash, @source.uri_hash
    3709. 

  3709.  
    3710. 

  3710. diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
    3711. 

  3711. index 7aa9d5a..1afb5ba 100644
    3712. 

  3712. --- a/test/rubygems/test_gem_specification.rb
    3713. 

  3713. +++ b/test/rubygems/test_gem_specification.rb
    3714. 

  3714. @@ -999,8 +999,8 @@ dependencies: []
    3715. 

  3715.      assert_equal 'summary', spec.summary
    3716. 

  3716.      assert_same spec.summary, new_spec.summary
    3717. 

  3717.  
    3718. 

  3718. -    assert_equal %w[lib/file.rb test/file.rb bin/exec README.txt
    3719. 

  3719. -                    ext/extconf.rb].sort,
    3720. 

  3720. +    assert_equal %w[README.txt bin/exec ext/extconf.rb lib/file.rb
    3721. 

  3721. +                    test/file.rb].sort,
    3722. 

  3722.                   spec.files
    3723. 

  3723.      refute_same spec.files, new_spec.files, 'files'
    3724. 

  3724.  
    3725. 

  3725. @@ -1109,7 +1109,31 @@ dependencies: []
    3726. 

  3726.      @a2.executable = 'app'
    3727. 

  3727.  
    3728. 

  3728.      assert_equal nil, @a2.bindir
    3729. 

  3729. -    assert_equal %w[lib/code.rb app].sort, @a2.files
    3730. 

  3730. +    assert_equal %w[app lib/code.rb].sort, @a2.files
    3731. 

  3731. +  end
    3732. 

  3732. +
    3733. 

  3733. +  def test_extensions_equals_nil
    3734. 

  3734. +    @a2.instance_variable_set(:@extensions, nil)
    3735. 

  3735. +    assert_equal nil, @a2.instance_variable_get(:@extensions)
    3736. 

  3736. +    assert_equal %w[lib/code.rb], @a2.files
    3737. 

  3737. +  end
    3738. 

  3738. +
    3739. 

  3739. +  def test_test_files_equals_nil
    3740. 

  3740. +    @a2.instance_variable_set(:@test_files, nil)
    3741. 

  3741. +    assert_equal nil, @a2.instance_variable_get(:@test_files)
    3742. 

  3742. +    assert_equal %w[lib/code.rb], @a2.files
    3743. 

  3743. +  end
    3744. 

  3744. +
    3745. 

  3745. +  def test_executables_equals_nil
    3746. 

  3746. +    @a2.instance_variable_set(:@executables, nil)
    3747. 

  3747. +    assert_equal nil, @a2.instance_variable_get(:@executables)
    3748. 

  3748. +    assert_equal %w[lib/code.rb], @a2.files
    3749. 

  3749. +  end
    3750. 

  3750. +
    3751. 

  3751. +  def test_extra_rdoc_files_equals_nil
    3752. 

  3752. +    @a2.instance_variable_set(:@extra_rdoc_files, nil)
    3753. 

  3753. +    assert_equal nil, @a2.instance_variable_get(:@extra_rdoc_files)
    3754. 

  3754. +    assert_equal %w[lib/code.rb], @a2.files
    3755. 

  3755.    end
    3756. 

  3756.  
    3757. 

  3757.    def test_build_extensions
    3758. 

  3758. @@ -1437,7 +1461,7 @@ dependencies: []
    3759. 

  3759.    def test_executable_equals
    3760. 

  3760.      @a2.executable = 'app'
    3761. 

  3761.      assert_equal 'app', @a2.executable
    3762. 

  3762. -    assert_equal %w[lib/code.rb bin/app].sort, @a2.files
    3763. 

  3763. +    assert_equal %w[bin/app lib/code.rb].sort, @a2.files
    3764. 

  3764.    end
    3765. 

  3765.  
    3766. 

  3766.    def test_extensions
    3767. 

  3767. @@ -1765,26 +1789,39 @@ dependencies: []
    3768. 

  3768.    end
    3769. 

  3769.  
    3770. 

  3770.    def test_require_paths
    3771. 

  3771. -    enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
    3772. 

  3772. -      RbConfig::CONFIG['ENABLE_SHARED'], 'no'
    3773. 

  3773. +    enable_shared 'no' do
    3774. 

  3774. +      ext_spec
    3775. 

  3775.  
    3776. 

  3776. -    ext_spec
    3777. 

  3777. -
    3778. 

  3778. -    @ext.require_path = 'lib'
    3779. 

  3779. +      @ext.require_path = 'lib'
    3780. 

  3780.  
    3781. 

  3781. -    ext_install_dir = Pathname(@ext.extension_dir)
    3782. 

  3782. -    full_gem_path = Pathname(@ext.full_gem_path)
    3783. 

  3783. -    relative_install_dir = ext_install_dir.relative_path_from full_gem_path
    3784. 

  3784. +      ext_install_dir = Pathname(@ext.extension_dir)
    3785. 

  3785. +      full_gem_path = Pathname(@ext.full_gem_path)
    3786. 

  3786. +      relative_install_dir = ext_install_dir.relative_path_from full_gem_path
    3787. 

  3787.  
    3788. 

  3788. -    assert_equal [relative_install_dir.to_s, 'lib'], @ext.require_paths
    3789. 

  3789. -  ensure
    3790. 

  3790. -    RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared
    3791. 

  3791. +      assert_equal [relative_install_dir.to_s, 'lib'], @ext.require_paths
    3792. 

  3792. +    end
    3793. 

  3793.    end
    3794. 

  3794.  
    3795. 

  3795.    def test_source
    3796. 

  3796.      assert_kind_of Gem::Source::Installed, @a1.source
    3797. 

  3797.    end
    3798. 

  3798.  
    3799. 

  3799. +  def test_source_paths
    3800. 

  3800. +    ext_spec
    3801. 

  3801. +
    3802. 

  3802. +    @ext.require_paths = %w[lib ext foo]
    3803. 

  3803. +    @ext.extensions << 'bar/baz'
    3804. 

  3804. +
    3805. 

  3805. +    expected = %w[
    3806. 

  3806. +      lib
    3807. 

  3807. +      ext
    3808. 

  3808. +      foo
    3809. 

  3809. +      bar
    3810. 

  3810. +    ]
    3811. 

  3811. +
    3812. 

  3812. +    assert_equal expected, @ext.source_paths
    3813. 

  3813. +  end
    3814. 

  3814. +
    3815. 

  3815.    def test_full_require_paths
    3816. 

  3816.      ext_spec
    3817. 

  3817.  
    3818. 

  3818. @@ -2435,7 +2472,7 @@ duplicate dependency on b (>= 1.2.3), (~> 1.2) use:
    3819. 

  3819.        assert_equal '["lib2"] are not files', e.message
    3820. 

  3820.      end
    3821. 

  3821.  
    3822. 

  3822. -    assert_equal %w[lib/code.rb test/suite.rb bin/exec ext/a/extconf.rb lib2].sort,
    3823. 

  3823. +    assert_equal %w[bin/exec ext/a/extconf.rb lib/code.rb lib2 test/suite.rb].sort,
    3824. 

  3824.                   @a1.files
    3825. 

  3825.    end
    3826. 

  3826.  
    3827. 

  3827. @@ -2911,9 +2948,9 @@ end
    3828. 

  3828.  
    3829. 

  3829.    def with_syck
    3830. 

  3830.      begin
    3831. 

  3831. +      verbose, $VERBOSE = $VERBOSE, nil
    3832. 

  3832.        require "yaml"
    3833. 

  3833.        old_engine = YAML::ENGINE.yamler
    3834. 

  3834. -      verbose, $VERBOSE = $VERBOSE, nil
    3835. 

  3835.        YAML::ENGINE.yamler = 'syck'
    3836. 

  3836.        load 'rubygems/syck_hack.rb'
    3837. 

  3837.      rescue NameError
    3838. 

  3838. diff --git a/test/rubygems/test_gem_uninstaller.rb b/test/rubygems/test_gem_uninstaller.rb
    3839. 

  3839. index 1eea30f..11fdaf6 100644
    3840. 

  3840. --- a/test/rubygems/test_gem_uninstaller.rb
    3841. 

  3841. +++ b/test/rubygems/test_gem_uninstaller.rb
    3842. 

  3842. @@ -131,6 +131,23 @@ class TestGemUninstaller < Gem::InstallerTestCase
    3843. 

  3843.      Gem::Installer.exec_format = nil
    3844. 

  3844.    end
    3845. 

  3845.  
    3846. 

  3846. +  def test_remove_not_in_home
    3847. 

  3847. +    uninstaller = Gem::Uninstaller.new nil, :install_dir => "#{@gemhome}2"
    3848. 

  3848. +
    3849. 

  3849. +    e = assert_raises Gem::GemNotInHomeException do
    3850. 

  3850. +      use_ui ui do
    3851. 

  3851. +        uninstaller.remove @spec
    3852. 

  3852. +      end
    3853. 

  3853. +    end
    3854. 

  3854. +
    3855. 

  3855. +    expected =
    3856. 

  3856. +      "Gem '#{@spec.full_name}' is not installed in directory #{@gemhome}2"
    3857. 

  3857. +
    3858. 

  3858. +    assert_equal expected, e.message
    3859. 

  3859. +
    3860. 

  3860. +    assert_path_exists @spec.gem_dir
    3861. 

  3861. +  end
    3862. 

  3862. +
    3863. 

  3863.    def test_path_ok_eh
    3864. 

  3864.      uninstaller = Gem::Uninstaller.new nil
    3865. 

  3865.  
    3866. 

  3866. diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb
    3867. 

  3867. index e0499fe..5a65b5c 100644
    3868. 

  3868. --- a/test/rubygems/test_gem_version.rb
    3869. 

  3869. +++ b/test/rubygems/test_gem_version.rb
    3870. 

  3870. @@ -3,6 +3,9 @@ require "rubygems/version"
    3871. 

  3871.  
    3872. 

  3872.  class TestGemVersion < Gem::TestCase
    3873. 

  3873.  
    3874. 

  3874. +  class V < ::Gem::Version
    3875. 

  3875. +  end
    3876. 

  3876. +
    3877. 

  3877.    def test_bump
    3878. 

  3878.      assert_bumped_version_equal "5.3", "5.2.4"
    3879. 

  3879.    end
    3880. 

  3880. @@ -37,6 +40,13 @@ class TestGemVersion < Gem::TestCase
    3881. 

  3881.      assert_equal v('1.1'), Gem::Version.create(ver)
    3882. 

  3882.    end
    3883. 

  3883.  
    3884. 

  3884. +  def test_class_new_subclass
    3885. 

  3885. +    v1 = Gem::Version.new '1'
    3886. 

  3886. +    v2 = V.new '1'
    3887. 

  3887. +
    3888. 

  3888. +    refute_same v1, v2
    3889. 

  3889. +  end
    3890. 

  3890. +
    3891. 

  3891.    def test_eql_eh
    3892. 

  3892.      assert_version_eql "1.2",    "1.2"
    3893. 

  3893.      refute_version_eql "1.2",    "1.2.0"
    3894. 

  3894. diff --git a/test/test_delegate.rb b/test/test_delegate.rb
    3895. 

  3895. index ca65ef3..6270cc6 100644
    3896. 

  3896. --- a/test/test_delegate.rb
    3897. 

  3897. +++ b/test/test_delegate.rb
    3898. 

  3898. @@ -180,4 +180,61 @@ class TestDelegateClass < Test::Unit::TestCase
    3899. 

  3899.      x = assert_nothing_raised(ArgumentError, bug9155) {break Bug9155.new(1)}
    3900. 

  3900.      assert_equal(1, x.to_i, bug9155)
    3901. 

  3901.    end
    3902. 

  3902. +
    3903. 

  3903. +  class Bug9403
    3904. 

  3904. +    Name = '[ruby-core:59718] [Bug #9403]'
    3905. 

  3905. +    SD = SimpleDelegator.new(new)
    3906. 

  3906. +    class << SD
    3907. 

  3907. +      def method_name
    3908. 

  3908. +        __method__
    3909. 

  3909. +      end
    3910. 

  3910. +      def callee_name
    3911. 

  3911. +        __callee__
    3912. 

  3912. +      end
    3913. 

  3913. +      alias aliased_name callee_name
    3914. 

  3914. +      def dir_name
    3915. 

  3915. +        __dir__
    3916. 

  3916. +      end
    3917. 

  3917. +    end
    3918. 

  3918. +    dc = DelegateClass(self)
    3919. 

  3919. +    dc.class_eval do
    3920. 

  3920. +      def method_name
    3921. 

  3921. +        __method__
    3922. 

  3922. +      end
    3923. 

  3923. +      def callee_name
    3924. 

  3924. +        __callee__
    3925. 

  3925. +      end
    3926. 

  3926. +      alias aliased_name callee_name
    3927. 

  3927. +      def dir_name
    3928. 

  3928. +        __dir__
    3929. 

  3929. +      end
    3930. 

  3930. +    end
    3931. 

  3931. +    DC = dc.new(new)
    3932. 

  3932. +  end
    3933. 

  3933. +
    3934. 

  3934. +  def test_method_in_simple_delegator
    3935. 

  3935. +    assert_equal(:method_name, Bug9403::SD.method_name, Bug9403::Name)
    3936. 

  3936. +  end
    3937. 

  3937. +
    3938. 

  3938. +  def test_callee_in_simple_delegator
    3939. 

  3939. +    assert_equal(:callee_name, Bug9403::SD.callee_name, Bug9403::Name)
    3940. 

  3940. +    assert_equal(:aliased_name, Bug9403::SD.aliased_name, Bug9403::Name)
    3941. 

  3941. +  end
    3942. 

  3942. +
    3943. 

  3943. +  def test_dir_in_simple_delegator
    3944. 

  3944. +    assert_equal(__dir__, Bug9403::SD.dir_name, Bug9403::Name)
    3945. 

  3945. +  end
    3946. 

  3946. +
    3947. 

  3947. +  def test_method_in_delegator_class
    3948. 

  3948. +    assert_equal(:method_name, Bug9403::DC.method_name, Bug9403::Name)
    3949. 

  3949. +  end
    3950. 

  3950. +
    3951. 

  3951. +  def test_callee_in_delegator_class
    3952. 

  3952. +    assert_equal(:callee_name, Bug9403::DC.callee_name, Bug9403::Name)
    3953. 

  3953. +    assert_equal(:aliased_name, Bug9403::DC.aliased_name, Bug9403::Name)
    3954. 

  3954. +  end
    3955. 

  3955. +
    3956. 

  3956. +  def test_dir_in_delegator_class
    3957. 

  3957. +    assert_equal(__dir__, Bug9403::DC.dir_name, Bug9403::Name)
    3958. 

  3958. +  end
    3959. 

  3959.  end
    3960. 

  3960. diff --git a/test/test_timeout.rb b/test/test_timeout.rb
    3961. 

  3961. index 9d51ca5..e849cc5 100644
    3962. 

  3962. --- a/test/test_timeout.rb
    3963. 

  3963. +++ b/test/test_timeout.rb
    3964. 

  3964. @@ -57,4 +57,33 @@ class TestTimeout < Test::Unit::TestCase
    3965. 

  3965.      end
    3966. 

  3966.      assert_raise_with_message(exc, /execution expired/) {raise e if e}
    3967. 

  3967.    end
    3968. 

  3968. +
    3969. 

  3969. +  def test_custom_exception
    3970. 

  3970. +    bug9354 = '[ruby-core:59511] [Bug #9354]'
    3971. 

  3971. +    err = Class.new(StandardError) do
    3972. 

  3972. +      def initialize(msg) super end
    3973. 

  3973. +    end
    3974. 

  3974. +    assert_nothing_raised(ArgumentError, bug9354) do
    3975. 

  3975. +      assert_equal(:ok, timeout(100, err) {:ok})
    3976. 

  3976. +    end
    3977. 

  3977. +  end
    3978. 

  3978. +
    3979. 

  3979. +  def test_exit_exception
    3980. 

  3980. +    assert_raise_with_message(Timeout::ExitException, "boon") do
    3981. 

  3981. +      Timeout.timeout(10, Timeout::ExitException) do
    3982. 

  3982. +        raise Timeout::ExitException, "boon"
    3983. 

  3983. +      end
    3984. 

  3984. +    end
    3985. 

  3985. +  end
    3986. 

  3986. +
    3987. 

  3987. +  def test_enumerator_next
    3988. 

  3988. +    bug9380 = '[ruby-dev:47872] [Bug #9380]: timeout in Enumerator#next'
    3989. 

  3989. +    e = (o=Object.new).to_enum
    3990. 

  3990. +    def o.each
    3991. 

  3991. +      sleep
    3992. 

  3992. +    end
    3993. 

  3993. +    assert_raise_with_message(Timeout::Error, 'execution expired', bug9380) do
    3994. 

  3994. +      Timeout.timeout(0.01) {e.next}
    3995. 

  3995. +    end
    3996. 

  3996. +  end
    3997. 

  3997.  end
    3998. 

  3998. diff --git a/test/test_weakref.rb b/test/test_weakref.rb
    3999. 

  3999. index 85820b1..f12e943 100644
    4000. 

  4000. --- a/test/test_weakref.rb
    4001. 

  4001. +++ b/test/test_weakref.rb
    4002. 

  4002. @@ -19,9 +19,14 @@ class TestWeakRef < Test::Unit::TestCase
    4003. 

  4003.    end
    4004. 

  4004.  
    4005. 

  4005.    def test_recycled
    4006. 

  4006. -    weak = make_weakref
    4007. 

  4007. -    ObjectSpace.garbage_collect
    4008. 

  4008. -    ObjectSpace.garbage_collect
    4009. 

  4009. +    weaks = []
    4010. 

  4010. +    weak = nil
    4011. 

  4011. +    100.times do
    4012. 

  4012. +      weaks << make_weakref
    4013. 

  4013. +      ObjectSpace.garbage_collect
    4014. 

  4014. +      ObjectSpace.garbage_collect
    4015. 

  4015. +      break if weak = weaks.find {|w| !w.weakref_alive?}
    4016. 

  4016. +    end
    4017. 

  4017.      assert_raise(WeakRef::RefError) {weak.to_s}
    4018. 

  4018.      assert_not_predicate(weak, :weakref_alive?)
    4019. 

  4019.    end
    4020. 

  4020. diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
    4021. 

  4021. index 563b91e..2126500 100644
    4022. 

  4022. --- a/test/thread/test_queue.rb
    4023. 

  4023. +++ b/test/thread/test_queue.rb
    4024. 

  4024. @@ -55,6 +55,13 @@ class TestQueue < Test::Unit::TestCase
    4025. 

  4025.      assert_equal(1, q.max)
    4026. 

  4026.      assert_raise(ArgumentError) { q.max = -1 }
    4027. 

  4027.      assert_equal(1, q.max)
    4028. 

  4028. +
    4029. 

  4029. +    before = q.max
    4030. 

  4030. +    q.max.times { q << 1 }
    4031. 

  4031. +    t1 = Thread.new { q << 1 }
    4032. 

  4032. +    sleep 0.01 until t1.stop?
    4033. 

  4033. +    q.max = q.max + 1
    4034. 

  4034. +    assert_equal before + 1, q.max
    4035. 

  4035.    end
    4036. 

  4036.  
    4037. 

  4037.    def test_queue_pop_interrupt
    4038. 

  4038. @@ -134,6 +141,29 @@ class TestQueue < Test::Unit::TestCase
    4039. 

  4039.      assert_same q, retval
    4040. 

  4040.    end
    4041. 

  4041.  
    4042. 

  4042. +  def test_sized_queue_throttle
    4043. 

  4043. +    q = SizedQueue.new(1)
    4044. 

  4044. +    i = 0
    4045. 

  4045. +    consumer = Thread.new do
    4046. 

  4046. +      while q.pop
    4047. 

  4047. +        i += 1
    4048. 

  4048. +        Thread.pass
    4049. 

  4049. +      end
    4050. 

  4050. +    end
    4051. 

  4051. +    nprod = 4
    4052. 

  4052. +    npush = 100
    4053. 

  4053. +
    4054. 

  4054. +    producer = nprod.times.map do
    4055. 

  4055. +      Thread.new do
    4056. 

  4056. +        npush.times { q.push(true) }
    4057. 

  4057. +      end
    4058. 

  4058. +    end
    4059. 

  4059. +    producer.each(&:join)
    4060. 

  4060. +    q.push(nil)
    4061. 

  4061. +    consumer.join
    4062. 

  4062. +    assert_equal(nprod * npush, i)
    4063. 

  4063. +  end
    4064. 

  4064. +
    4065. 

  4065.    def test_queue_thread_raise
    4066. 

  4066.      q = Queue.new
    4067. 

  4067.      th1 = Thread.new do
    4068. 

  4068. diff --git a/version.h b/version.h
    4069. 

  4069. index be88078..a3c4820 100644
    4070. 

  4070. --- a/version.h
    4071. 

  4071. +++ b/version.h
    4072. 

  4072. @@ -1,10 +1,10 @@
    4073. 

  4073.  #define RUBY_VERSION "2.1.0"
    4074. 

  4074. -#define RUBY_RELEASE_DATE "2013-12-25"
    4075. 

  4075. -#define RUBY_PATCHLEVEL 0
    4076. 

  4076. +#define RUBY_RELEASE_DATE "2014-02-06"
    4077. 

  4077. +#define RUBY_PATCHLEVEL 27
    4078. 

  4078.  
    4079. 

  4079. -#define RUBY_RELEASE_YEAR 2013
    4080. 

  4080. -#define RUBY_RELEASE_MONTH 12
    4081. 

  4081. -#define RUBY_RELEASE_DAY 25
    4082. 

  4082. +#define RUBY_RELEASE_YEAR 2014
    4083. 

  4083. +#define RUBY_RELEASE_MONTH 2
    4084. 

  4084. +#define RUBY_RELEASE_DAY 6
    4085. 

  4085.  
    4086. 

  4086.  #include "ruby/version.h"
    4087. 

  4087.  
    4088. 

  4088. diff --git a/vm_insnhelper.c b/vm_insnhelper.c
    4089. 

  4089. index 99b0c75..edf4e46 100644
    4090. 

  4090. --- a/vm_insnhelper.c
    4091. 

  4091. +++ b/vm_insnhelper.c
    4092. 

  4092. @@ -126,20 +126,22 @@ NORETURN(static void argument_error(const rb_iseq_t *iseq, int miss_argc, int mi
    4093. 

  4093.  static void
    4094. 

  4094.  argument_error(const rb_iseq_t *iseq, int miss_argc, int min_argc, int max_argc)
    4095. 

  4095.  {
    4096. 

  4096. +    rb_thread_t *th = GET_THREAD();
    4097. 

  4097.      VALUE exc = rb_arg_error_new(miss_argc, min_argc, max_argc);
    4098. 

  4098. -    VALUE bt = rb_make_backtrace();
    4099. 

  4099. -    VALUE err_line = 0;
    4100. 

  4100. +    VALUE at;
    4101. 

  4101.  
    4102. 

  4102.      if (iseq) {
    4103. 

  4103. -	int line_no = FIX2INT(rb_iseq_first_lineno(iseq->self));
    4104. 

  4104. -
    4105. 

  4105. -	err_line = rb_sprintf("%s:%d:in `%s'",
    4106. 

  4106. -			      RSTRING_PTR(iseq->location.path),
    4107. 

  4107. -			      line_no, RSTRING_PTR(iseq->location.label));
    4108. 

  4108. -	rb_funcall(bt, rb_intern("unshift"), 1, err_line);
    4109. 

  4109. +	vm_push_frame(th, iseq, VM_FRAME_MAGIC_METHOD, Qnil /* self */, Qnil /* klass */, Qnil /* specval*/,
    4110. 

  4110. +		      iseq->iseq_encoded, th->cfp->sp, 0 /* local_size */, 0 /* me */, 0 /* stack_max */);
    4111. 

  4111. +	at = rb_vm_backtrace_object();
    4112. 

  4112. +	vm_pop_frame(th);
    4113. 

  4113. +    }
    4114. 

  4114. +    else {
    4115. 

  4115. +	at = rb_vm_backtrace_object();
    4116. 

  4116.      }
    4117. 

  4117.  
    4118. 

  4118. -    rb_funcall(exc, rb_intern("set_backtrace"), 1, bt);
    4119. 

  4119. +    rb_iv_set(exc, "bt_locations", at);
    4120. 

  4120. +    rb_funcall(exc, rb_intern("set_backtrace"), 1, at);
    4121. 

  4121.      rb_exc_raise(exc);
    4122. 

  4122.  }
    4123. 

  4123.  
    4124. 

  4124. @@ -2002,7 +2004,8 @@ vm_search_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_inf
    4125. 

  4125.  	current_defined_class = RCLASS_REFINED_CLASS(current_defined_class);
    4126. 

  4126.      }
    4127. 

  4127.  
    4128. 

  4128. -    if (!FL_TEST(current_defined_class, RMODULE_INCLUDED_INTO_REFINEMENT) &&
    4129. 

  4129. +    if (BUILTIN_TYPE(current_defined_class) != T_MODULE &&
    4130. 

  4130. +	!FL_TEST(current_defined_class, RMODULE_INCLUDED_INTO_REFINEMENT) &&
    4131. 

  4131.  	!rb_obj_is_kind_of(ci->recv, current_defined_class)) {
    4132. 

  4132.  	VALUE m = RB_TYPE_P(current_defined_class, T_ICLASS) ?
    4133. 

  4133.  	    RBASIC(current_defined_class)->klass : current_defined_class;
    4134. 

  4134. @@ -2022,6 +2025,12 @@ vm_search_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_inf
    4135. 

  4135.  		 " by define_method() is not supported."
    4136. 

  4136.  		 " Specify all arguments explicitly.");
    4137. 

  4137.      }
    4138. 

  4138. +    if (!ci->klass) {
    4139. 

  4139. +	/* bound instance method of module */
    4140. 

  4140. +	ci->aux.missing_reason = NOEX_SUPER;
    4141. 

  4141. +	CI_SET_FASTPATH(ci, vm_call_method_missing, 1);
    4142. 

  4142. +	return;
    4143. 

  4143. +    }
    4144. 

  4144.  
    4145. 

  4145.      /* TODO: use inline cache */
    4146. 

  4146.      ci->me = rb_method_entry(ci->klass, ci->mid, &ci->defined_class);
    4147. 

  4147. diff --git a/win32/Makefile.sub b/win32/Makefile.sub
    4148. 

  4148. index 305f37d..a04e802 100644
    4149. 

  4149. --- a/win32/Makefile.sub
    4150. 

  4150. +++ b/win32/Makefile.sub
    4151. 

  4151. @@ -1034,14 +1034,17 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
    4152. 

  4152.  			-so_name=$(RUBY_SO_NAME) \
    4153. 

  4153.  			. $(icondirs) $(win_srcdir)
    4154. 

  4154.  
    4155. 

  4155. -$(arch)-fake.rb: $(MKFILES)
    4156. 

  4156. +$(arch)-fake.rb: $(MKFILES) $(srcdir)/version.h
    4157. 

  4157.  	@echo Creating <<$@
    4158. 

  4158.  class Object
    4159. 

  4159. +  remove_const :CROSS_COMPILING if defined?(CROSS_COMPILING)
    4160. 

  4160.    CROSS_COMPILING = RUBY_PLATFORM
    4161. 

  4161.    remove_const :RUBY_PLATFORM
    4162. 

  4162.    remove_const :RUBY_VERSION
    4163. 

  4163. +  remove_const :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION)
    4164. 

  4164.    RUBY_PLATFORM = "$(arch)"
    4165. 

  4165. -  RUBY_VERSION = "$(MAJOR).$(MINOR).$(TEENY)"
    4166. 

  4166. +  RUBY_VERSION = $(RUBY_PROGRAM_VERSION)
    4167. 

  4167. +  RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (" + $(RUBY_PROGRAM_RELEASE_DATE) + ") [#{RUBY_PLATFORM}]"
    4168. 

  4168.  end
    4169. 

  4169.  class File
    4170. 

  4170.    remove_const :ALT_SEPARATOR
    4171. 

  4171. diff --git a/win32/setup.mak b/win32/setup.mak
    4172. 

  4172. index 458212b..b6358e5 100644
    4173. 

  4173. --- a/win32/setup.mak
    4174. 

  4174. +++ b/win32/setup.mak
    4175. 

  4175. @@ -117,6 +117,8 @@ int main(void) {return (EnumProcesses(NULL,0,NULL) ? 0 : 1);}
    4176. 

  4176.  MAJOR = RUBY_API_VERSION_MAJOR
    4177. 

  4177.  MINOR = RUBY_API_VERSION_MINOR
    4178. 

  4178.  TEENY = RUBY_API_VERSION_TEENY
    4179. 

  4179. +RUBY_PROGRAM_VERSION = RUBY_VERSION
    4180. 

  4180. +RUBY_PROGRAM_RELEASE_DATE = RUBY_RELEASE_DATE
    4181. 

  4181.  MSC_VER = _MSC_VER
    4182. 

  4182.  <<
    4183. 

  4183.  
    4184. 

  4184. diff --git a/win32/win32.c b/win32/win32.c
    4185. 

  4185. index 9cbd07f..2c888ae 100644
    4186. 

  4186. --- a/win32/win32.c
    4187. 

  4187. +++ b/win32/win32.c
    4188. 

  4188. @@ -6965,7 +6965,7 @@ rb_w32_fd_is_text(int fd)
    4189. 

  4189.      return _osfile(fd) & FTEXT;
    4190. 

  4190.  }
    4191. 

  4191.  
    4192. 

  4192. -#if RUBY_MSVCRT_VERSION < 80 && !defined(__MINGW64__)
    4193. 

  4193. +#if RUBY_MSVCRT_VERSION < 80 && !defined(HAVE__GMTIME64_S)
    4194. 

  4194.  /* License: Ruby's */
    4195. 

  4195.  static int
    4196. 

  4196.  unixtime_to_systemtime(const time_t t, SYSTEMTIME *st)
    4197. 

  4197. @@ -7027,7 +7027,11 @@ systemtime_to_localtime(TIME_ZONE_INFORMATION *tz, SYSTEMTIME *gst, SYSTEMTIME *
    4198. 

  4198.  }
    4199. 

  4199.  #endif
    4200. 

  4200.  
    4201. 

  4201. -#ifdef __MINGW64__
    4202. 

  4202. +#ifdef HAVE__GMTIME64_S
    4203. 

  4203. +# ifndef HAVE__LOCALTIME64_S
    4204. 

  4204. +/* assume same as _gmtime64_s() */
    4205. 

  4205. +#  define HAVE__LOCALTIME64_S 1
    4206. 

  4206. +# endif
    4207. 

  4207.  # ifndef MINGW_HAS_SECURE_API
    4208. 

  4208.     _CRTIMP errno_t __cdecl _gmtime64_s(struct tm* tm, const __time64_t *time);
    4209. 

  4209.     _CRTIMP errno_t __cdecl _localtime64_s(struct tm* tm, const __time64_t *time);
    4210. 

  4210. @@ -7046,7 +7050,7 @@ gmtime_r(const time_t *tp, struct tm *rp)
    4211. 

  4211.  	errno = e;
    4212. 

  4212.  	return NULL;
    4213. 

  4213.      }
    4214. 

  4214. -#if RUBY_MSVCRT_VERSION >= 80 || defined(__MINGW64__)
    4215. 

  4215. +#if RUBY_MSVCRT_VERSION >= 80 || defined(HAVE__GMTIME64_S)
    4216. 

  4216.      e = gmtime_s(rp, tp);
    4217. 

  4217.      if (e != 0) goto error;
    4218. 

  4218.  #else
    4219. 

  4219. @@ -7070,7 +7074,7 @@ localtime_r(const time_t *tp, struct tm *rp)
    4220. 

  4220.  	errno = e;
    4221. 

  4221.  	return NULL;
    4222. 

  4222.      }
    4223. 

  4223. -#if RUBY_MSVCRT_VERSION >= 80 || defined(__MINGW64__)
    4224. 

  4224. +#if RUBY_MSVCRT_VERSION >= 80 || defined(HAVE__LOCALTIME64_S)
    4225. 

  4225.      e = localtime_s(rp, tp);
    4226. 

  4226.      if (e) goto error;
    4227. 

  4227.  #else
    4228. 

  4228.