1376 Commits

Author SHA1 Message Date
nagachika
bdb8980f01 merge revision(s) 4f1e0bfacd93c28bff549e2f3603c3b4942429a3:
Followed up CVE-2022-39253 for bundler examples

	---
	 spec/bundler/cache/git_spec.rb           | 3 +++
	 spec/bundler/install/gemfile/git_spec.rb | 9 +++++++++
	 spec/bundler/update/git_spec.rb          | 3 +++
	 3 files changed, 15 insertions(+)
2022-11-24 11:21:28 +09:00
nagachika
3b231086cb merge revision(s) 36f297e62108072b9377d927321928b994f66a93:
Use valid tokens as cookie names

	---
	 spec/ruby/library/cgi/cookie/name_spec.rb  | 12 ++++++------
	 spec/ruby/library/cgi/cookie/parse_spec.rb | 10 +++++-----
	 2 files changed, 11 insertions(+), 11 deletions(-)
2022-11-24 11:21:28 +09:00
Nobuyoshi Nakada
1561556693 The tzdata 2022c removed Amsterdam Mean Time 2022-09-20 16:50:02 +09:00
David Rodríguez
a6d990892c Fix spec to not touch the network
And not depend on the state of rack's master branch, in particular, on
their Ruby support range.
2022-04-12 14:07:25 +09:00
Nobuyoshi Nakada
5758c6487d Expect to receive a non-keywords hash
`RSpec::Mocks::ArgumentListMatcher#args_match?` fails when a
non-keywords hash is passed while a keyword hash is expected.

This is a change in `rspec-mocks` 3.10.3, so we need to adapt to it.
2022-04-12 14:07:25 +09:00
Hiroshi SHIBATA
cdec8a29c5 Merge Bundler-2.2.33 2022-04-12 14:07:25 +09:00
nagachika
ea04e3fff7 Fix bundler test failures.
These failures are caused by the incompatibility in keyword argument
treatment in rspec-mocks.
I fix the expectations in the bundler/rubygems_integration_spec.rb.
These tests are not touched in the master branch.
It seems that the following patch also fix the failures.
But I believe the expectations in these tests are wrong. We should pass a Hash literal explicitly.

--- a/common.mk
+++ b/common.mk
@@ -1365,7 +1365,7 @@ yes-test-bundler-precheck: main
 no-test-bundler-prepare: no-test-bundler-precheck
 yes-test-bundler-prepare: yes-test-bundler-precheck
        $(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
-               --install-dir .bundle --conservative "rspec:~> 3.8" "rake:~> 13.0" "parallel_tests:~> 2.29"
+               --install-dir .bundle --conservative "rspec-core:= 3.10.1" "rspec-expectations:= 3.10.1" "rspec-mocks:= 3.10.2" "rake:~> 13.0" "parallel_tests:~> 2.29"

 RSPECOPTS =
 BUNDLER_SPECS =
2022-02-12 17:12:32 +09:00
nagachika
034872d6a6 merge revision(s) 342e7a094a70d6f90b96262c88177dae32976c85:
[rubygems/rubygems] Fix spec to not touch the network

	And not depend on the state of rack's master branch, in particular, on
	their Ruby support range.

	https://github.com/rubygems/rubygems/commit/9ea4baffac
	---
	 spec/bundler/commands/remove_spec.rb | 4 +++-
	 1 file changed, 3 insertions(+), 1 deletion(-)
2022-02-12 16:52:38 +09:00
Hiroshi SHIBATA
c2125240cc Merge RubyGems-3.2.32 and Bundler-2.2.32 2021-11-24 19:46:22 +09:00
Hiroshi SHIBATA
b19b2e9867 Merge RubyGems 3.2.31 and Bundler 2.2.31 2021-11-22 10:51:35 +09:00
Hiroshi SHIBATA
e27381d289 Merge RubyGems 3.2.30 and Bundler 2.2.30 2021-11-22 10:51:35 +09:00
Hiroshi SHIBATA
e262272b6a Merge RubyGems 3.2.29 and Bundler 2.2.29 2021-11-22 10:51:35 +09:00
Hiroshi SHIBATA
24f911f474 Merge RubyGems 3.2.28 and Bundler 2.2.28 2021-11-22 10:51:35 +09:00
Hiroshi SHIBATA
31a7104852 Merge RubyGems 3.2.27 and Bundler 2.2.27 2021-11-22 10:51:35 +09:00
nagachika
fe9d33beb7 merge revision(s) 89242279e61b023a81c58065c62a82de8829d0b3,529fc204af84f825f98f83c34b004acbaa802615: [Backport #18141]
Marshal.load: do not call the proc until strings have their encoding

	Ref: https://bugs.ruby-lang.org/issues/18141
	---
	 marshal.c                             |  7 +++-
	 spec/ruby/core/marshal/shared/load.rb | 62 +++++++++++++++++++++++------------
	 test/ruby/test_marshal.rb             | 17 ++++++++++
	 3 files changed, 64 insertions(+), 22 deletions(-)

	marshal.c: don't call the proc with partially initialized objects.
	 (#4866)

	For cyclic objects, it requires to keep a st_table of the partially
	initialized objects.
	---
	 marshal.c                             | 75 ++++++++++++++++++++---------------
	 spec/ruby/core/marshal/shared/load.rb | 75 ++++++++++++++++++++---------------
	 test/ruby/test_marshal.rb             | 12 ++++++
	 3 files changed, 97 insertions(+), 65 deletions(-)
2021-10-09 15:05:24 +09:00
Hiroshi SHIBATA
37f824377f Merge RubyGems 3.2.26 and Bundler 2.2.26 2021-08-19 15:46:40 +09:00
Hiroshi SHIBATA
41a2863780 Merge RubyGems 3.2.25 and Bundler 2.2.25 2021-08-19 15:46:40 +09:00
Hiroshi SHIBATA
679185d6c8 Merge RubyGems 3.2.24 and Bundler 2.2.24 2021-08-19 15:46:40 +09:00
Hiroshi SHIBATA
f1039afa41 Merge RubyGems 3.2.23 and Bundler 2.2.23 2021-08-19 15:46:40 +09:00
Hiroshi SHIBATA
ec171fa1f9 Merge RubyGems-3.2.22 and Bundler-2.2.22 2021-07-07 10:03:15 +09:00
Hiroshi SHIBATA
865221f0ba Merge RubyGems-3.2.21 and Bundler-2.2.21 2021-07-07 10:03:15 +09:00
Hiroshi SHIBATA
1e98ec27f6 Merge RubyGems-3.2.20 and Bundler-2.2.20 2021-07-07 10:03:15 +09:00
Hiroshi SHIBATA
f63d3bbb6e Merge RubyGems-3.2.19 and Bundler-2.2.19 2021-07-07 10:03:15 +09:00
Hiroshi SHIBATA
d4b4281959 Merge RubyGems-3.2.18 and Bundler-2.2.18 2021-07-07 10:03:15 +09:00
Hiroshi SHIBATA
dd28c03d5f Merge RubyGems-3.2.17 and Bundler-2.2.17 2021-07-07 10:03:15 +09:00
Hiroshi SHIBATA
3e2f089432 Merge RubyGems-3.2.16 and Bundler-2.2.16 2021-07-07 10:03:15 +09:00
nagachika
5af5ea7f86 merge revision(s) cfd162d535c7a4f8b1f95255cc6be696a8b75557: [Backport #17467]
Make String#{strip,lstrip}{,!} strip leading NUL bytes

	The documentation already specifies that they strip whitespace
	and defines whitespace to include null.

	This wraps the new behavior in the appropriate guards in the specs,
	but does not specify behavior for previous versions, because this
	is a bug that could be backported.

	Fixes [Bug #17467]
	---
	 spec/ruby/core/string/lstrip_spec.rb | 18 ++++++++++++------
	 spec/ruby/core/string/strip_spec.rb  | 22 ++++++++++------------
	 string.c                             |  4 ++--
	 test/ruby/test_string.rb             | 16 ++++++++++++++++
	 4 files changed, 40 insertions(+), 20 deletions(-)
2021-05-23 16:09:17 +09:00
nagachika
6e6157d9a9 merge revision(s) 6268fdc662c75c61091b2ab0b476ec15df023328:
spec/ruby/core/hash/transform_keys_spec.rb: Fix the failure of
	 ruby_3_0

	https://github.com/ruby/spec/pull/833
	8290e5ad89
	---
	 spec/ruby/core/hash/transform_keys_spec.rb | 4 ++--
	 1 file changed, 2 insertions(+), 2 deletions(-)
2021-04-18 17:59:19 +09:00
nagachika
84d9a9afc0 merge revision(s) 31e0382723bfb35cffe3ca485dd0577668cafa07,5e5fb72f99701dc27c66ab148471893f14e6d6f0,fb6ebe55d91187d9635e0183d47dbf38e95b1141,522d4cd32f7727886f4fcbc28ed29c08d361ee20: [Backport #17735]
Keep non evaluated keys in `Hash#transform_keys!` [Bug #17735]

	---
	 hash.c                                     |  6 +++++-
	 spec/ruby/core/hash/transform_keys_spec.rb | 12 +++++++++++-
	 test/ruby/test_hash.rb                     |  8 ++++++++
	 3 files changed, 24 insertions(+), 2 deletions(-)

	Clear an intermediate hash [Bug #17735]

	---
	 hash.c | 1 +
	 1 file changed, 1 insertion(+)

	Hide an intermediate array

	---
	 hash.c | 6 ++++--
	 1 file changed, 4 insertions(+), 2 deletions(-)

	Force recycle intermediate collection in Hash#transform_keys! [Bug
	 #17735]

	* Force recycle intermediate hash

	* Force recycle intermediate array too

	https://github.com/ruby/ruby/pull/4329#issuecomment-808840718
	---
	 hash.c | 2 ++
	 1 file changed, 2 insertions(+)
2021-04-15 10:25:30 +09:00
Hiroshi SHIBATA
2efda212b0
Merge RubyGems-3.2.15 and Bundler-2.2.15 (#4311) 2021-03-24 04:52:19 +09:00
Hiroshi SHIBATA
0476ce0370 Merge RubyGems-3.2.14 and Bundler-2.2.14 2021-03-11 17:24:52 +09:00
Hiroshi SHIBATA
7efc7afcae Merge RubyGems-3.2.13 and Bundler-2.2.13 2021-03-11 17:24:52 +09:00
Hiroshi SHIBATA
06cd5711e0 Merge RubyGems-3.2.12 and Bundler-2.2.12 2021-03-11 17:24:52 +09:00
Hiroshi SHIBATA
f375bc77d2 Merge RubyGems-3.2.11 and Bundler-2.2.11 2021-03-11 17:24:52 +09:00
Hiroshi SHIBATA
38f8b8d070 Merge RubyGems-3.2.10 and Bundler-2.2.10 2021-03-11 17:24:52 +09:00
Hiroshi SHIBATA
09c681ab38
Merge RubyGems 3.2.9 and Bundler 2.2.9 (#4158) 2021-02-09 22:53:57 +09:00
Hiroshi SHIBATA
cc51cfabfd Merge Bundler-2.2.7 2021-02-02 21:30:08 +09:00
Hiroshi SHIBATA
151e469a62
Merge RubyGems 3.2.6 and Bundler 2.2.6 (#4103) 2021-01-21 14:35:56 +09:00
Hiroshi SHIBATA
93dcf0828d Merge Bundler-2.2.5 2021-01-14 16:44:42 +09:00
Hiroshi SHIBATA
d4f5827a6d Merge Bundler-2.2.4 2021-01-14 16:44:42 +09:00
Marcus Stollsteimer
93a1ef6709 Fix typos 2020-12-24 23:20:04 +01:00
Jeremy Evans
1e215a66d2 Fix class of method in Method#inspect for singleton classes of classes
Previously, due to a change to fix bug 15608, Method#inspect output
changed for class methods:

Ruby 2.7
"#<Method: String.prepend(*)>"

Before change:
"#<Method: #<Class:Object>(Module)#prepend(*)>"

This is wrong because the Method object was created from String and
not Object. This is because the fix for bug 15608 assumed it was
being called on the singleton class of a instance, and would skip
the first singleton class until it got to the class itself.  For
class methods, this results in always using the superclass. Fix
behavior to not skip until the superclass if the singleton class
is the singleton class of a module or class.

After change:
"#<Method: #<Class:Object>(Module)#prepend(*)>"

Fixes [Bug #17428]
2020-12-23 19:29:19 -08:00
Hiroshi SHIBATA
339227363c Merge RubyGems 3.2.3 and Bundler 2.2.3 2020-12-23 10:17:41 +09:00
卜部昌平
fa356a798a Enumerator.new: raise unless block given
Has been deprecated since c73b6bd7ebd01133538c645566944132dbde4d13.
[Feature #17116] [ruby-dev:50945]
2020-12-22 13:52:03 +09:00
Nobuyoshi Nakada
a29b9e5efe
Remvoed no longer needed version guards 2020-12-22 07:52:14 +09:00
Nobuyoshi Nakada
8918a9cf6c Removed rb_cData entity
* Use the wrapper of rb_cObject instead of data access
* Replaced rest of extentions
* Updated the version guard for Data
* Added the version guard of rb_cData
2020-12-22 02:51:49 +09:00
卜部昌平
c30f03d328 Data: delete
Has been deprecated since 684bdf6171b76f5bc5e4f05926a5ab01ec2b4fd5.

Matz says in [ruby-core:83954] that Data should be an alias of Object.
Because rb_cData has not been deprecated, let us deprecate the constant
to make it a C-level synonym of rb_cObject.
2020-12-22 02:51:49 +09:00
Kazuhiro NISHIYAMA
63849a1cd9
Fix misspellings [ci skip] 2020-12-21 10:54:24 +09:00
Nobuyoshi Nakada
9c73c75624
Use Integer instead of Fixnum/Bignum 2020-12-21 01:19:55 +09:00
Nobuyoshi Nakada
fb8f011422
Fixed indefinite articles before "Integer" [ci skip] 2020-12-21 01:19:55 +09:00