archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-21 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
70591 commits 28 branches 1175 tags 514 MiB
Commit graph

63 commits

Author SHA1 Message Date
Hiroshi SHIBATA
c8b5d7031e
Merge RubyGems-3.3.7 and Bundler-2.3.7 (#5543) 2022-02-14 13:56:43 +09:00
Hiroshi SHIBATA
6794f8cf92
Merge pull request #5482 from hsbt/rubygems-3-3-bundler-2-3 
Merge RubyGems 3.3.x and Bundler 2.3.x
 2022-02-02 16:57:34 +09:00
Hiroshi SHIBATA
fb1ab27f53 Merge RubyGems-3.3.1 and Bundler-2.3.1 2021-12-23 09:44:45 +09:00
Hiroshi SHIBATA
69dc2ea465 Merge RubyGems-3.3.0 and Bundler-2.3.0 2021-12-21 15:27:05 +09:00
David Rodríguez
d49ee9e2c3 [rubygems/rubygems] These method should be returning a string 
dc391f4d87
 2021-11-25 04:02:20 +09:00
Hiroshi SHIBATA
c082c6eb7c Sync RubyGems and Bundler with upstream 2021-07-07 15:31:52 +09:00
David Rodríguez
6e2240a2f9 Sync latest bundler & rubygems development version 2021-07-07 13:30:20 +09:00
David Rodríguez
5b0abba931 Sync bundler & rubygems 2021-05-11 11:29:41 +09:00
Hiroshi SHIBATA
ed149dbf46 Merge the master branch of Bundler 2021-04-15 15:36:15 +09:00
David Rodríguez
53468cc111 Sync latest development version of bundler & rubygems 2021-03-08 13:47:35 +09:00
Hiroshi SHIBATA
d386a58f6f Merge bundler-2.2.0.rc.2 2020-10-15 17:19:02 +09:00
David Rodríguez
5783d0dbfc Import remaining changes 
The "sync with commits" scripts failed to properly import these for some
reason.
 2020-07-15 16:05:12 +09:00
David Rodríguez
414b1485d6 [rubygems/rubygems] More portable PATH edition 
a6d50afad0
 2020-06-18 19:14:15 +09:00
David Rodríguez
77df7ccc10 [rubygems/rubygems] Remove now unused "bang helpers" 
84e4c58e83
 2020-06-18 19:14:15 +09:00
David Rodríguez
a572e78201 [rubygems/rubygems] s/gem_command!/gem_command 
f52733f6a4
 2020-06-18 19:14:15 +09:00
David Rodríguez
61b6f53337 [rubygems/rubygems] Make helpers raise by default 
ade0c441d5
 2020-06-18 19:14:15 +09:00
David Rodríguez
117b504b98 Fix most exec specs 
The `gem_command` helper was failing to require `support/hax.rb`, which
takes care of making sure rubygems actually picks up the right `ruby`
executable under ruby-core setup (`ENV["RUBY"]`). This caused binstubs
to be generated with a wrong shebang, and that caused `bundle exec` to
not work. The error message was pretty confusing though due to
https://bugs.ruby-lang.org/issues/16952.
 2020-06-15 12:38:39 +09:00
David Rodríguez
e413e746af [rubygems/rubygems] Remove forgotten_command_line_usages from specs 
Instead, use the non-deprecated option except when specifically testing
deprecated CLI flags. In that case, pass the flag directly and limit
the specs to `bundler < 3`.

3d5e186241
 2020-06-05 07:32:42 +09:00
David Rodríguez
5c924f597f [rubygems/rubygems] Make forgotten_command_line_options always "forget" options 
4d39338670
 2020-06-05 07:32:42 +09:00
David Rodríguez
592762069d [rubygems/rubygems] Support running specs against a tarball 
When bundler specs are run from a ruby tarball (ruby-core does this),
there's no git folder, so `git ls-files` fails.

Support this case by making specs rely on the list of files from the
bundler gemspec instead, and invert the spec that makes sure we ship the
right set of files.

As per the other quality specs, skip them in this case.

b28d5ec931
 2020-06-05 07:32:42 +09:00
Hiroshi SHIBATA
1ab410caf8 Revert "Fix a failure in bundle version with version outputs the version with build metadata" 
This reverts commit fcc8be0198.
 2020-06-05 07:32:42 +09:00
Kazuhiro NISHIYAMA
fcc8be0198
Fix a failure in bundle version with version outputs the version with build metadata 
```
  1) bundle version with version outputs the version with build metadata
     Failure/Error: expect(out).to match(/\ABundler version #{Regexp.escape(Bundler::VERSION)} \(\d{4}-\d{2}-\d{2} commit #{COMMIT_HASH}\)\z/)

       expected "Bundler version 2.2.0.dev (2020-05-25 commit )" to match /\ABundler version 2\.2\.0\.dev \(\d{4}-\d{2}-\d{2} commit (?-mix:unknown|[a-fA-F0-9]{7,})\)\z/
       Diff:
       @@ -1,2 +1,2 @@
       -/\ABundler version 2\.2\.0\.dev \(\d{4}-\d{2}-\d{2} commit (?-mix:unknown|[a-fA-F0-9]{7,})\)\z/
       +"Bundler version 2.2.0.dev (2020-05-25 commit )"

       Commands:
       $ /home/user/snapshot-master/ruby -I/home/user/snapshot-master/spec/bundler -r/home/user/snapshot-master/spec/bundler/support/artifice/fail.rb -r/home/user/snapshot-master/spec/bundler/support/hax.rb /home/user/snapshot-master/tmp/1/gems/system/bin/bundle version
       Bundler version 2.2.0.dev (2020-05-25 commit )
       # $? => 0
```
 2020-05-25 20:08:30 +09:00
Hiroshi SHIBATA
c7ebeb7eda Sync Bundler PR #3624 2020-05-22 20:32:30 +09:00
Kazuhiro NISHIYAMA
6c1a51dae8
Skip some tests if extracted from tarball (again) 
Fix up previous commit

ref
9aa75795f9,
38002a8adb, and
0e60b59d58
 2020-05-19 00:58:33 +09:00
Hiroshi SHIBATA
d4acf254e3 Use the gemspec in build_dir directly 2020-05-14 09:11:28 +09:00
Hiroshi SHIBATA
fcb5a9ee46 Resolved the file path of gemspec for ruby core repository 2020-05-13 07:54:37 +09:00
Hiroshi SHIBATA
0e60b59d58 Update the bundler version with master branch 2020-05-13 07:54:37 +09:00
Hiroshi SHIBATA
13f4f07f21 Merge bundler-2.1.4 2020-01-08 18:00:32 +09:00
Hiroshi SHIBATA
38002a8adb Prepare to release bundler-2.1.0 2019-12-15 16:41:10 +09:00
Hiroshi SHIBATA
bb9ecd026a Merge Bundler 2.1.0.pre3 released version 2019-11-13 10:19:51 +09:00
Hiroshi SHIBATA
7585bc3187 Merge Bundler 2.1.0.pre.3 
Features:
    - Add caller information to some deprecation messages to make them easier to fix [#7361](https://github.com/bundler/bundler/pull/7361)
    - Reconcile `bundle cache` vs `bundle package` everywhere. Now in docs, CLI help and everywhere else `bundle cache` is the preferred version and `bundle package` remains as an alias [#7389](https://github.com/bundler/bundler/pull/7389)
    - Display some basic `bundler` documentation together with ruby's RDoc based documentation [#7394](https://github.com/bundler/bundler/pull/7394)

  Bugfixes:
    - Fix typos deprecation message and upgrading docs [#7374](https://github.com/bundler/bundler/pull/7374)
    - Deprecation warnings about `taint` usage on ruby 2.7 [#7385](https://github.com/bundler/bundler/pull/7385)
    - Fix `--help` flag not correctly delegating to `man` when used with command aliases [#7388](https://github.com/bundler/bundler/pull/7388)
    - `bundle add` should cache newly added gems if an application cache exists [#7393](https://github.com/bundler/bundler/pull/7393)
    - Stop using an insecure folder as a "fallback home" when user home is not defined [#7416](https://github.com/bundler/bundler/pull/7416)
    - Fix `bundler/inline` warning about `Bundler.root` redefinition [#7417](https://github.com/bundler/bundler/pull/7417)
 2019-11-11 18:56:25 +09:00
David Rodríguez
683f9e1dbf [bundler/bundler] No need to activate the fileutils default gem 
The version we're vendoring actually relaxed this restriction back to
2.3.0+, so we can always use the vendored version.

d366cbfe5d
 2019-08-18 13:45:45 +09:00
David Rodríguez
4756c5f7e7 [bundler/bundler] Remove unnecessary rubygems monkeypatch 
Instead, make sure we always load the local copy of bundler during
specs, and never end up using the default copy.

ac655ffeda
 2019-08-18 13:45:35 +09:00
David Rodríguez
a2d7c97a91
[bundler/bundler] Extract yet another helper method 
948a863bd8
 2019-08-17 17:08:51 +09:00
David Rodríguez
09455301ef
[bundler/bundler] Extract a with_root_gemspec helper 
f20c2bdf6a
 2019-08-17 17:08:51 +09:00
David Rodríguez
9925e1a10f
[bundler/bundler] Remove unneeded to_s calls 
They are implicit inside `gem_command!`.

6bdb13c899
 2019-08-17 17:08:51 +09:00
David Rodríguez
aef5509139
[bundler/bundler] Extract single gem installation logic 
7888d621c8
 2019-08-17 17:08:51 +09:00
David Rodríguez
20af44c277
[bundler/bundler] Unalias install_gem 
Since I plan to reuse it for something else.

5379382198
 2019-08-17 17:08:50 +09:00
David Rodríguez
6506993462
[bundler/bundler] Use join consistently 
096e53dfe6
 2019-08-17 17:08:50 +09:00
David Rodríguez
122bc65042
[bundler/bundler] Reuse gem_bin helper inside gem_command 
The logic for choosing `gem_bin` should work here too even if it's not
identical.

6ca0271b27
 2019-08-17 17:08:50 +09:00
David Rodríguez
63d78afc2d
[bundler/bundler] Remove more dead code 
17d4d0de8e
 2019-08-17 17:08:50 +09:00
David Rodríguez
2e6509498c
[bundler/bundler] Remove dead code 
cae948f514
 2019-08-17 17:08:50 +09:00
David Rodríguez
3bebdda649
[bundler/bundler] Remove unnecessary rubygems require 
039604ff95
 2019-08-17 17:08:50 +09:00
David Rodríguez
745b286161
[bundler/bundler] Move lib helper together with path helpers 
f2df73bdb4
 2019-08-17 17:08:49 +09:00
David Rodríguez
50a91fcd10
[bundler/bundler] Reuse lib method 
4589a57852
 2019-08-17 17:08:49 +09:00
David Rodríguez
521a2d2beb [bundler/bundler] Revert "make system_bundle_bin_path helper and resolve failing tests for ruby < 2.6" 
This reverts commit e63e844bc7444c6a489fcde0dc7011c6c4807edd.

It was introduced to resolve some failing tests at the cost of making
the intention of the spec much less clear.

Thanks to the previous fixes we have added to this spec, we can revert
that patch now.

b29a40820f
 2019-08-16 14:30:23 +09:00
David Rodríguez
c4a2a9a381
[bundler/bundler] Remove now unused logic 
5b285685a4
 2019-08-03 09:29:59 +09:00
David Rodríguez
c3ddd47ce7
[bundler/bundler] Normalize file:// handling in specs 
5946d62ad0
 2019-08-03 09:29:55 +09:00
David Rodríguez
d8d5e16305
[bundler/bundler] Use a clean gemspec for gem helper specs 
f694fe7f67
 2019-08-03 09:29:55 +09:00
Hiroshi SHIBATA
8f37629519 Merge bundler master from upstream. 
Pick from 8dd59e3ba97eb80a599f8149f31bf40773b69dc0
 2019-06-09 12:44:10 +09:00