delta/bundler.git, branch improve_fileutils_require

Require version relatively in fileutils

2019-05-03T14:19:07+00:00

Merge #7149

2019-05-03T08:48:33+00:00

7149: Fix bundle update crash r=deivid-rodriguez a=deivid-rodriguez

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

The problem was that I introduced a regression with https://github.com/bundler/bundler/pull/6329. When running `bundle update `, where `` is included in the Gemfile, but it's for another platform from the current one, `bundle` would crash with the following error:

```
NoMethodError: undefined method `source' for nil:NilClass
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/cli/update.rb:86:in `block in run'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/cli/update.rb:78:in `each'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/cli/update.rb:78:in `run'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/cli.rb:280:in `block in update'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/settings.rb:129:in `temporary'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/cli.rb:279:in `update'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/vendor/thor/lib/thor/command.rb:27:in `run'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/vendor/thor/lib/thor/invocation.rb:126:in `invoke_command'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/vendor/thor/lib/thor.rb:387:in `dispatch'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/cli.rb:26:in `dispatch'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/vendor/thor/lib/thor/base.rb:466:in `start'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/cli.rb:17:in `start'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/exe/bundle:21:in `block in '
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/lib/bundler/friendly_errors.rb:123:in `with_friendly_errors'
  /home/deivid/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/gems/bundler-2.1.0.pre.1/exe/bundle:13:in `'
  /home/deivid/.rbenv/versions/2.6.3/bin/bundle:23:in `load'
  /home/deivid/.rbenv/versions/2.6.3/bin/bundle:23:in `'
```


### What was your diagnosis of the problem?

My diagnosis was that we can't always rely on the spec being updated not being `nil` in the definition. It can be `nil` for gems in excluded groups, or for gems included only for platforms different from the current one.

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

My fix is to handle this case and show a proper error.

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

I chose this fix because it's user friendly.


Co-authored-by: David Rodríguez

Merge #7153

2019-05-02T14:37:43+00:00

7153: Rename local variables for readability r=deivid-rodriguez a=mtsmfm

Extracted from https://github.com/bundler/bundler/pull/7143#discussion_r279187838

> Also, I would split the variable rename, which is great because it makes the code more readable, to a separate commit

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

No end-user is affected because it's just local var name.

As a bundler contributor, I think it's much easier to understand if we rename them.
When I was investigating https://github.com/bundler/bundler/pull/7143, it's hard to understand what `other` stuff and `deps2` is.

Co-authored-by: Fumiaki MATSUSHIMA

Merge #7147

2019-05-02T14:03:46+00:00

7147: Fix specs with rubygems master installed globally r=deivid-rodriguez a=deivid-rodriguez

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

The problem was if you have rubygems's master installed globally, bundler specs no longer pass.

### What was your diagnosis of the problem?

My diagnosis was that having rubygems master installed, installs bundler's master as a default gem. That actually makes bundler behave better. In particular, `bundle show` and `bundle licenses` start properly handling the `bundler` gem itself.

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

My fix is to change bundler's code to fix this specs in every situation, and not only when the bundler version being tested is also installed as a default gem.

NOTE: I also included some changes to unify `bundle show` deprecation specs in the file that tests all deprecations.

Co-authored-by: David Rodríguez

Rename local variables for readability

2019-05-01T08:18:19+00:00

Merge #7148

2019-05-01T00:46:19+00:00

7148: Use `Gem.add_to_load_path` if available r=hsbt a=deivid-rodriguez

This is a follow up to https://github.com/rubygems/rubygems/pull/2749.

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

My fix is to unify all LOAD_PATH manipulation in a single place, that uses rubygems logic if available.

Co-authored-by: David Rodríguez

Merge #7151

2019-04-30T14:04:21+00:00

7151: Bump rubocop to 0.68.0 r=hsbt a=deivid-rodriguez

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

The problem was that our rubocop version is getting outdated. Also, I added [a PR to rubocop](https://github.com/rubocop-hq/rubocop/pull/6935) so that we can remove the exclusions in our configuration, and it has now been released.

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

My fix is to update rubocop to the latest version, update the configuration, and fix new offenses.

Co-authored-by: David Rodríguez

Merge #7150

2019-04-30T07:21:59+00:00

7150: Proper group skip message for bundle update r=deivid-rodriguez a=deivid-rodriguez

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

The problem was that when `bundle update` skipped groups, it shows a message about "gems not being installed". The message could be better and say "gems not being updated" instead, since that's what the user was trying to do.

### What was your diagnosis of the problem?

My diagnosis was that helper method was reused by the update and the install commands, but its message was specific to install.

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

My fix is to pass a parameter to the method with the calling command, so that the message is customized properly.

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

I chose this fix because it's easy.


Co-authored-by: David Rodríguez

Bump rubocop to 0.68.0

2019-04-29T22:30:17+00:00

Merge #7138

2019-04-29T21:58:48+00:00

7138: Remove unnecessary `BUNDLER_SPEC_RUN` env variable r=indirect a=deivid-rodriguez

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

The problem was that our library code contains logic that's only necessary for bundler's specs. I think library code should not contain this kind of code, since it affects end users.

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

My fix is to remove the logic, and instead ensure the specs satisfy what the code wanted to ensure (that specs pass even when there's a Gemfile further up in the directory hierarchy outside of the bundler's development copy).

Co-authored-by: David Rodríguez