Skip to content
This repository was archived by the owner on Apr 14, 2021. It is now read-only.

Backport the latest commits on ruby core repository.#6973

Merged
4 commits merged intomasterfrom
backport-ruby-core
Feb 20, 2019
Merged

Backport the latest commits on ruby core repository.#6973
4 commits merged intomasterfrom
backport-ruby-core

Conversation

@hsbt
Copy link
Copy Markdown
Member

@hsbt hsbt commented Feb 19, 2019

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

RSpec example of the bundled bundler was failed on Ruby 2.7 from ruby core repository. I fixed some of the issues on ruby core repository.

What was your diagnosis of the problem?

  1. I fixed the location of lib/bundler.gemspec to lib/bundler/bundler.gemspec for fixing gemspec issue of Ruby 2.6.1: ruby/ruby@7c9771b
  2. The current Bundler examples relied on the same versions of Ruby that are the first binary of PATH and rspec invocation binary. But the ruby core repository uses the different versions for them.

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

I fixed the location path of bundler.gemspec and uses ENV['BUNDLE_GEM'] instead of hard-coded gem command.

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

There is no options on ruby core repository. I welcome to another options.

hsbt added 3 commits February 19, 2019 22:35
@hsbt
The ruby core applied the difference structure from bundler upstream
0c95d6d 
repository. We need to modify a configuration for test-bundler.
@hsbt
Fixup r66984. It breakes bundler's examples.
0f3375e
@hsbt
Use ENV["BUNDLE_GEM"] instead of gem command provided by system ruby.
48c0ed4 
  It break the examples of bundler. Because some examples detect the
  different version of system ruby than test target version like trunk.
deivid-rodriguez
deivid-rodriguez reviewed Feb 19, 2019
View reviewed changes
deivid-rodriguez
deivid-rodriguez reviewed Feb 19, 2019
View reviewed changes
deivid-rodriguez
deivid-rodriguez reviewed Feb 19, 2019
View reviewed changes
@deivid-rodriguez
Copy link
Copy Markdown
Contributor

deivid-rodriguez commented Feb 19, 2019

Made some suggestions for cop happyness.

@hsbt
Copy link
Copy Markdown
Member Author

hsbt commented Feb 20, 2019

@deivid-rodriguez Thanks! I need to invoke bin/rubocop -a before send a pull-request 😇

@hsbt
Copy link
Copy Markdown
Member Author

hsbt commented Feb 20, 2019

@bundlerbot r+

ghost pushed a commit that referenced this pull request Feb 20, 2019
@bundlerbot @hsbt
Merge #6973
98a0a2d 
6973: Backport the latest commits on ruby core repository. r=hsbt a=hsbt

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

RSpec example of the bundled bundler was failed on Ruby 2.7 from ruby core repository. I fixed some of the issues on ruby core repository.

### What was your diagnosis of the problem?

1. I fixed the location of `lib/bundler.gemspec` to `lib/bundler/bundler.gemspec` for fixing gemspec issue of Ruby 2.6.1: ruby/ruby@7c9771b
2. The current Bundler examples relied on the same versions of Ruby that are the first binary of PATH and rspec invocation binary. But the ruby core repository uses the different versions for them.

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

I fixed the location path of bundler.gemspec and uses `ENV['BUNDLE_GEM']` instead of hard-coded `gem` command.

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

There is no options on ruby core repository. I welcome to another options.


Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
@ghost
Copy link
Copy Markdown

ghost commented Feb 20, 2019

Build succeeded

@ghost ghost merged commit c5396b6 into master Feb 20, 2019
@ghost ghost deleted the backport-ruby-core branch February 20, 2019 07:47
hsbt added a commit that referenced this pull request Feb 20, 2019
@bundlerbot @hsbt
Merge #6973
d3cf5b4 
6973: Backport the latest commits on ruby core repository. r=hsbt a=hsbt

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

RSpec example of the bundled bundler was failed on Ruby 2.7 from ruby core repository. I fixed some of the issues on ruby core repository.

### What was your diagnosis of the problem?

1. I fixed the location of `lib/bundler.gemspec` to `lib/bundler/bundler.gemspec` for fixing gemspec issue of Ruby 2.6.1: ruby/ruby@7c9771b
2. The current Bundler examples relied on the same versions of Ruby that are the first binary of PATH and rspec invocation binary. But the ruby core repository uses the different versions for them.

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

I fixed the location path of bundler.gemspec and uses `ENV['BUNDLE_GEM']` instead of hard-coded `gem` command.

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

There is no options on ruby core repository. I welcome to another options.

Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
(cherry picked from commit 98a0a2d)
hsbt added a commit that referenced this pull request Feb 20, 2019
@bundlerbot @hsbt
Merge #6973
87c8dd3 
6973: Backport the latest commits on ruby core repository. r=hsbt a=hsbt

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

RSpec example of the bundled bundler was failed on Ruby 2.7 from ruby core repository. I fixed some of the issues on ruby core repository.

### What was your diagnosis of the problem?

1. I fixed the location of `lib/bundler.gemspec` to `lib/bundler/bundler.gemspec` for fixing gemspec issue of Ruby 2.6.1: ruby/ruby@7c9771b
2. The current Bundler examples relied on the same versions of Ruby that are the first binary of PATH and rspec invocation binary. But the ruby core repository uses the different versions for them.

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

I fixed the location path of bundler.gemspec and uses `ENV['BUNDLE_GEM']` instead of hard-coded `gem` command.

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

There is no options on ruby core repository. I welcome to another options.

Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
(cherry picked from commit 98a0a2d)
@hsbt hsbt mentioned this pull request Feb 20, 2019
Merged
ghost pushed a commit that referenced this pull request Feb 20, 2019
@bundlerbot @hsbt
Merge #6977
7199b12 
6977: Update the location of bundler gemspec. r=deivid-rodriguez a=hsbt

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

On the ruby core repository has the original patch for the test suite. The current bundler repository was inconsistency status with it.

### What was your diagnosis of the problem?

This pull-request was the missing commit of #6973

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

The test suite of bundler break the inconsistency gemspec location,






Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
hsbt added a commit that referenced this pull request Feb 20, 2019
@bundlerbot @hsbt
Merge #6977
ef2a7f9 
6977: Update the location of bundler gemspec. r=deivid-rodriguez a=hsbt

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

On the ruby core repository has the original patch for the test suite. The current bundler repository was inconsistency status with it.

### What was your diagnosis of the problem?

This pull-request was the missing commit of #6973

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

The test suite of bundler break the inconsistency gemspec location,






Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
(cherry picked from commit 7199b12)
hsbt added a commit that referenced this pull request Feb 20, 2019
@bundlerbot @hsbt
Merge #6977
fa15029 
6977: Update the location of bundler gemspec. r=deivid-rodriguez a=hsbt

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

On the ruby core repository has the original patch for the test suite. The current bundler repository was inconsistency status with it.

### What was your diagnosis of the problem?

This pull-request was the missing commit of #6973

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

The test suite of bundler break the inconsistency gemspec location,






Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
(cherry picked from commit 7199b12)
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Sep 18, 2019
misc/ruby-bundler: update to 2.0.2
e53ff40 
## 2.0.2 (2019-05-13)

Changes:

  - Fixes for Bundler integration with ruby-src ([#6941](rubygems/bundler#6941), [#6973](rubygems/bundler#6973), [#6977](rubygems/bundler#6977), [#6315](rubygems/bundler#6315), [#7061](rubygems/bundler#7061))
  - Use `__dir__` instead of `__FILE__` when generating a gem with `bundle gem` ([#6503](rubygems/bundler#6503))
  - Use `https` on externals links in the Bundler gemspec ([#6721](rubygems/bundler#6721))
  - Removed duplicate gem names from the suggested `did you mean` list for gem typos ([#6739](rubygems/bundler#6739))
  - Removed Ruby 1.x compatibility code ([#6764](rubygems/bundler#6764), [#6806](rubygems/bundler#6806))
  - Fixed an issue where `bundle remove` would crash with certain Gemfiles ([#6768](rubygems/bundler#6769))
  - Fixed indentation in the Bundler executable template ([#6773](rubygems/bundler#6773))
  - Fixed an issue where plugins could register for the same Bundler hook multiple times ([#6775](rubygems/bundler#6775))
  - Changed the "multiple sources" message in `bundle install` to be a warning instead of an error ([#6790](rubygems/bundler#6790))
  - Fixed a bug where path gems would break when using `only_update_to_newer_versions` ([#6774](rubygems/bundler#6774))
  - Fixed a bug where installing plugins with the `--delpoyment` setting would fail ([#6805](rubygems/bundler#6805))
  - Fixed an issue where `bundle update` couldn't update & install a gem when `no_install` was set (a `bundle package` config) ([#7078](rubygems/bundler#7078))
  - Fixed an issue where users could not run `bundle exec` on default gems ([#6963](rubygems/bundler#6963))
  - Updated vendor libraries to their latest version ([#7076](rubygems/bundler#7067), [#7068](rubygems/bundler#7068))
  - Fixed an issue where the `github` source was not using `https` by default that we mentioned in the 2.0 release ([#7182](rubygems/bundler#7182))
  - Fixed an issue where `rake release` was not outputting the message to users asking for a 2fa token ([#7199](rubygems/bundler#7199))

Documentation:

  - Fix incorrect documented `BUNDLE_PATH_RELATIVE_TO_CWD` env var ([#6751](rubygems/bundler#6751))
  - Update URLs in Bundler's documentation to use `https` ([#6935](rubygems/bundler#6935))

## 2.0.1 (2019-01-04)

Changes:

  - Relaxed RubyGems requirement to `>= 2.5.0` ([#6867](rubygems/bundler#6867))

## 2.0.0 (2019-01-03)

No new changes

## 2.0.0.pre.3 (2018-12-30)

Breaking Changes:

  - Bundler 2 now requires RubyGems 3.0.0 at minimum

Changes:

  - Ruby 2.6 compatibility fixes (@segiddins)
  - Import changes from Bundler 1.17.3 release

Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`

## 2.0.0.pre.2 (2018-11-27)

Breaking Changes:

  - `:github` source in the Gemfile now defaults to using HTTPS

Changes

  - Add compatibility for Bundler merge into ruby-src

Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`

## 2.0.0.pre.1 (2018-11-09)

Breaking Changes:

  - Dropped support for versions of Ruby < 2.3
  - Dropped support for version of RubyGems < 2.5
  - Moved error messages from STDOUT to STDERR

Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@deivid-rodriguez deivid-rodriguez deivid-rodriguez left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hsbt @deivid-rodriguez