Граф коммитов

141 Коммитов

Автор SHA1 Сообщение Дата
Nobuyoshi Nakada 2b7409a2f2
Specify explicit separator not to be affected by $; 2020-03-08 17:38:37 +09:00
Hiroshi SHIBATA 13f4f07f21 Merge bundler-2.1.4 2020-01-08 18:00:32 +09:00
Yusuke Endoh 75dca097b8 [bundler/bundler] Do `require "rubygems"` only when needed
This require causes circular require.

```
$ touch empty_file

$ RUBYGEMS_GEMDEPS=empty_file ./local/bin/ruby -w -e ''
/home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92: warning: /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92: warning: loading in progress, circular require considered harmful - /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb
	from <internal:gem_prelude>:1:in  `<internal:gem_prelude>'
	from <internal:gem_prelude>:1:in  `require'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb:1417:in  `<top (required)>'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb:1203:in  `use_gemdeps'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/user_interaction.rb:47:in  `use_ui'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems.rb:1204:in  `block in use_gemdeps'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in  `require'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in  `require'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/bundler.rb:11:in  `<top (required)>'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/bundler.rb:11:in  `require_relative'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/bundler/rubygems_integration.rb:3:in  `<top (required)>'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in  `require'
	from /home/mame/work/ruby/local/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in  `require'
```

https://github.com/bundler/bundler/commit/c7c5bcea92
2019-12-25 15:38:55 +09:00
Hiroshi SHIBATA 1857b44278
Merge Bundler 2.1.2 from bundler/bundler.
[Misc #16449][ruby-core:96458]
2019-12-25 07:28:02 +09:00
Hiroshi SHIBATA efbc0d499c
Merge bundler-2.1.1 from bundler/bundler 2019-12-18 14:53:19 +09:00
David Rodríguez 0fab900538 Vendor thor 1.0.0 2019-12-15 16:41:10 +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
Bundlerbot 434af7303c
[bundler/bundler] Merge #7340
7340: Fix bundle clean issue r=deivid-rodriguez a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that `bundle clean` is crashing under some conditions.

### What was your diagnosis of the problem?

My diagnosis was that sometimes (when the bundle includes git sourced gems with extensions), it assumes that some paths exist, but they don't.

### What is your fix for the problem, implemented in this PR?

My fix is to ignore those paths.

### Why did you choose this fix out of the possible options?

I chose this fix because it fixes the issue.

Fixes #7338.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
(cherry picked from commit b007fde67c77c1f15f13b97eda186644c2a2be04)

https://github.com/bundler/bundler/commit/3766053507
2019-09-18 18:26:33 +09:00
David Rodríguez e6ad9452b6
[bundler/bundler] Fix remembered flag deprecation message
It was suggested a deprecated command as a fix.

https://github.com/bundler/bundler/commit/e330a9a34f
2019-09-18 18:26:33 +09:00
David Rodríguez 1cb8cf5df0
[bundler/bundler] Version 2.1.0.pre.2
https://github.com/bundler/bundler/commit/6e9774b377
2019-09-18 18:26:33 +09:00
David Rodríguez 0c6529bac2
[bundler/bundler] Revert "Add all platforms to lockfile by default"
This reverts commit 3dc509e645abb497e4dc92a7c42be471ff87db0b.

https://github.com/bundler/bundler/commit/b5766564fb
2019-09-18 18:26:32 +09:00
David Rodríguez 6f16ededdd
[bundler/bundler] Revert "Remove now meaningless warning"
This reverts commit 00b095b98fe4bd44950beaf3bc9f1d91eac7b69e.

https://github.com/bundler/bundler/commit/e93bce3b20
2019-09-18 18:26:32 +09:00
David Rodríguez f18d88b535
[bundler/bundler] Revert "Remove now meaningless setting"
This reverts commit 52c5a0eedec34b5d86464b3cf135dc2002486f1d.

https://github.com/bundler/bundler/commit/b4cc36deb9
2019-09-18 18:26:32 +09:00
David Rodríguez 399501cdfe
[bundler/bundler] Revert "Remove now unused method"
This reverts commit 3a2d2f025081755bdb38af660897e7b2f749a33a.

https://github.com/bundler/bundler/commit/13cef81582
2019-09-18 18:26:32 +09:00
Takayuki Nakata c27aaf1a8f
[bundler/bundler] Fix comments and messages to refer to https url
https://github.com/bundler/bundler/commit/a86b49f1b9
2019-09-18 18:26:32 +09:00
David Rodríguez c92e098781
[bundler/bundler] Fix --path option descriptions
To not mention that the flag is remembered when it's not.

https://github.com/bundler/bundler/commit/82f0b95854
2019-09-18 18:26:32 +09:00
David Rodríguez a29ead52e1
[bundler/bundler] Deprecate `--path` flag to `bundle check`
https://github.com/bundler/bundler/commit/0a0e7cf5ec
2019-09-18 18:26:32 +09:00
Jeremy Evans b5b3afadfa Fix a couple of bundler issues with keyword argument separation
There are more issues than this, but hopefully this is enough
to get make test-bundler passing in CI.
2019-08-30 12:39:31 -07:00
Kazuhiro NISHIYAMA 998ee350b9
Revert "require 'pp' before use PP"
of lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb.
This reverts commit 500149709b partially.
2019-08-30 16:09:08 +09:00
Nobuyoshi Nakada 631db0de27
Removed debug print
It seems to be fixed by b870ca5879.
2019-08-30 16:00:18 +09:00
Kazuhiro NISHIYAMA b870ca5879
Add guard as same as `==`
Try to fix failure at https://github.com/ruby/ruby/runs/207580232#step:10:382
```
       undefined method `name' for "Gemfile.lock":String
       /home/runner/work/ruby/ruby/lib/bundler/resolver/spec_group.rb:65:in `eql?'
```
2019-08-30 12:49:27 +09:00
Kazuhiro NISHIYAMA 500149709b
require 'pp' before use PP
`Kernel#pp` has wrapper, but `PP` does not.

https://github.com/ruby/ruby/runs/207405029#step:10:141
`NameError: uninitialized constant Bundler::Molinillo::Resolver::Resolution::PP`
2019-08-30 10:21:50 +09:00
Nobuyoshi Nakada 4419b5dbc2
The investigation is going on... 2019-08-21 13:31:22 +09:00
David Rodríguez 5ea08883cf
[bundler/bundler] Remove old rubies stuff no longer needed
https://github.com/bundler/bundler/commit/36fb3287f4
2019-08-21 07:58:46 +09:00
David Rodríguez 5a384e2c08 Fix some bundler specs (#2380)
* These seem to consistenly pass already

* Show actual command when running `make test-bundler`

Current the setup command that installs the necessary gems for testing
bundler was printed, but not the actual command that runs the tests.
That was a bit confusing.

* Borrow trick from setproctitle specs

* A title that long doesn't get set sometimes

No idea why, but the test doesn't need that the title is that long.

* Fix most gem helper spec ruby-core failures

* Fix the rest of the gem helper failures

* Fix version spec by improving the assertion

* Remove unnecessary `BUNDLE_RUBY` environment var

We can use `RUBY` when necessary, and `BUNDLE_RUBY` is not a good name
because bundler considers `BUNDLE_*` variables as settings.

* Rename `BUNDLE_GEM` to `GEM_COMMAND`

This is more descriptive I think, and also friendlier for bundler
because `BUNDLE_` env variables are interpreted by bundler as settings,
and this is not a bundler setting.

This fixes one bundler spec failure in config specs against ruby-core.

* Fix quality spec when run in core

Use the proper path helper.

* Fix dummy lib builder to never load default gems

If a dummy library is named as a default gem, when requiring the library
from its executable, the default gem would be loaded when running from
core, because in core all default gems share path with bundler, and thus
they are always in the $LOAD_PATH. We fix the issue by loading lib
relatively inside dummy lib executables.

* More exact assertions

Sometimes I have the problem that I do some "print debugging" inside
specs, and suddently the spec passes. This happens when the assertion is
too relaxed, and the things I print make it match, specially when they
are simple strings like "1.0" than can be easily be part of gem paths
that I print for debugging.

I fix this by making a more exact assertion.

* Detect the correct shebang when ENV["RUBY"] is set

* Relax assertion

So that the spec passes even if another paths containing "ext" are in
the load path. This works to fix a ruby-core issue, but it's a better
assertion in general. We just want to know that the extension path was
added.

* Use folder structure independent path helper

It should fix this spec for ruby-core.

* Fix the last failing spec on ruby-core

* Skip `bundle open <default_gem>` spec when no default gems
2019-08-20 09:46:31 +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.

https://github.com/bundler/bundler/commit/d366cbfe5d
2019-08-18 13:45:45 +09:00
David Rodríguez 998204882b [bundler/bundler] Last relative requires
https://github.com/bundler/bundler/commit/fb587b9ebb
2019-08-18 13:44:56 +09:00
David Rodríguez 7659f00a8d [bundler/bundler] Move local variable to only branch where it's used
https://github.com/bundler/bundler/commit/3995b3345d
2019-08-18 13:44:36 +09:00
Zehan Zhao d80f5399ad [bundler/bundler] Fix open default gem error
https://github.com/bundler/bundler/commit/792d724752
2019-08-18 13:44:26 +09:00
David Rodríguez cc644c7116 [bundler/bundler] Fix `bundle doctor` command
Previously `bundle doctor` would fail on any bundle that does not
include git gems or plugins. This is because the previously used
`Bundler.home` does not exist unless the bundle includes git gems or
plugins. For example, with `bundle config set path .bundle`, it points
to which does not exist unless this kind of gems exist in the Gemfile.

The name `Bundler.home` is really unfortunate, it should probably be
have more descriptive name, and be private. But for now I just want to
make `bundle doctor` usable.

https://github.com/bundler/bundler/commit/5531a18c1e
2019-08-18 13:44:03 +09:00
David Stosik a02dbcecb1 [bundler/bundler] Bundler displays a duplicate gem entries warning even if gems only appear once per group
https://github.com/bundler/bundler/commit/d18a83109e
2019-08-18 13:43:59 +09:00
David Rodríguez 6357540945
[bundler/bundler] Fix bundle bin location in core repo
https://github.com/bundler/bundler/commit/9437568ab4
2019-08-17 17:08:49 +09:00
Kazuhiro NISHIYAMA ccbfb054b1
Fix typos 2019-08-17 13:57:12 +09:00
David Rodríguez b587e8c7f1 [bundler/bundler] Add `--[no-]git` option to `bundle gem`
I think using `--no-git` can be useful when creating gems inside
monorepos.

https://github.com/bundler/bundler/commit/154c687310
2019-08-16 14:30:23 +09:00
David Rodríguez 8f28ae65a8 [bundler/bundler] Remove misleading comment in Gemfile
Since we no longer use `git` to find out the list of files, the comment
is misleading.

https://github.com/bundler/bundler/commit/54d85d5349
2019-08-16 14:30:23 +09:00
David Rodríguez cd15d27d10 [bundler/bundler] Stop printing deprecation messages during specs
Previously under some circunstances (met during some specs), bundler
would print deprecations to a separate UI different from "bundler's UI".
This UI would not be captured by the specs, and thus would be printed to
screen during the specs.

This commit fixes that by making sure all deprecation messages always go
through bundler's UI.

https://github.com/bundler/bundler/commit/220c54b7fa
2019-08-16 14:30:23 +09:00
Masato Ohba 6412121b00 [bundler/bundler] Fix typo in comment: attibutes -> attributes
https://github.com/bundler/bundler/commit/876545805e
2019-08-16 14:30:23 +09:00
Benoit Daloze 2b0f3aa095 [bundler/bundler] Use the standard RUBY_ENGINE_VERSION instead of JRUBY_VERSION
* RUBY_ENGINE and RUBY_ENGINE_VERSION are defined on every modern Ruby.
* There is no such constant as TRUFFLERUBY_VERSION or RBX_VERSION.

https://github.com/bundler/bundler/commit/f9d910403b
2019-08-16 14:30:23 +09:00
David Rodríguez 6711343d5a [bundler/bundler] Fix inconsistent lockfile order
When Gemfile would specify path sources as relative paths starting with
"./", the lockfile would have inconsistent order on `bundle install` and
`bundle update`.

https://github.com/bundler/bundler/commit/c7532ced89
2019-08-16 14:30:23 +09:00
David Rodríguez 500c3cb6a5 [bundler/bundler] Reuse `root` method
https://github.com/bundler/bundler/commit/42363091da
2019-08-16 14:30:23 +09:00
Hiroshi SHIBATA 0bd1cd677f
[bundler/bundler] Remove Bundler.rubygems.config_map because it was deprecated.
https://github.com/bundler/bundler/commit/5215ae7fa3
2019-08-03 09:41:17 +09:00
Adam Wanninger aad7443e16
[bundler/bundler] Point to CoC which contains the contributor covenant
https://github.com/bundler/bundler/commit/a94f74682e
2019-08-03 09:32:38 +09:00
David Rodríguez 7ed1fc527e
[bundler/bundler] Bump rubocop to 0.74.0
And reenable exclusion because the bug why we added them has been fixed.
See https://github.com/rubocop-hq/rubocop/issues/6861.

https://github.com/bundler/bundler/commit/bda63fcffc
2019-08-03 09:30:00 +09:00
David Rodríguez dab944e6ca
[bundler/bundler] net-http-persistent 3.1.0 has been released
https://github.com/bundler/bundler/commit/ffb7d6fa53
2019-08-03 09:30:00 +09:00
David Rodríguez fcb58f65b1
[bundler/bundler] Adapt to the way my automatiek patch works
https://github.com/bundler/bundler/commit/b8ee4aec0b
2019-08-03 09:30:00 +09:00
David Rodríguez 97f3ceeaa5
[bundler/bundler] Bump net-http-persistent to 3.0.1
* Adds an extra artifice task to vendorize new `connection_pool`
dependency.

* Cherry-pick's needed Windows fix not yet merged into master branch of
`net-http-persistent`.

* Update bundler usages to be compatible with the new version, and fix
unit specs.

https://github.com/bundler/bundler/commit/0575baa6bb
2019-08-03 09:30:00 +09:00
David Rodríguez 267a72be80
[bundler/bundler] Enable `Style/UnneededInterpolation` cop
https://github.com/bundler/bundler/commit/4c6a3c3cf7
2019-08-03 09:30:00 +09:00
David Rodríguez e84e63230b
[bundler/bundler] Check for straneous quotes
And use single quotes consistenly.

https://github.com/bundler/bundler/commit/8b9fbbb2df
2019-08-03 09:30:00 +09:00