<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/bundler.git/lib, branch parallel_rspec</title>
<subtitle>github.com: bundler/bundler.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/'/>
<entry>
<title>Merge #7238</title>
<updated>2019-07-23T18:40:23+00:00</updated>
<author>
<name>Bundlerbot</name>
<email>bot@bundler.io</email>
</author>
<published>2019-07-23T18:40:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/commit/?id=e9c83b85622ebffecc645dcf092af8b607f46f10'/>
<id>e9c83b85622ebffecc645dcf092af8b607f46f10</id>
<content type='text'>
7238: Point to CoC which contains the contributor covenant r=deivid-rodriguez a=ajwann

### What was the end-user problem that led to this PR?

The generated README contains two different links to contributor covenant. Since the generated Code of Conduct *contains* the text of the Contributor Covenant, we can just point the generated README to the generated CoC, and explicitly refer to it as the code of conduct. 

### What is your fix for the problem, implemented in this PR?

The generated readme now points to the gems CoC (which contains the Contributor Covenant)

Closes #6905.

Co-authored-by: Adam Wanninger &lt;ajwann@ajwann.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
7238: Point to CoC which contains the contributor covenant r=deivid-rodriguez a=ajwann

### What was the end-user problem that led to this PR?

The generated README contains two different links to contributor covenant. Since the generated Code of Conduct *contains* the text of the Contributor Covenant, we can just point the generated README to the generated CoC, and explicitly refer to it as the code of conduct. 

### What is your fix for the problem, implemented in this PR?

The generated readme now points to the gems CoC (which contains the Contributor Covenant)

Closes #6905.

Co-authored-by: Adam Wanninger &lt;ajwann@ajwann.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Point to CoC which contains the contributor covenant</title>
<updated>2019-07-23T14:59:25+00:00</updated>
<author>
<name>Adam Wanninger</name>
<email>ajwann@ajwann.com</email>
</author>
<published>2019-07-08T22:43:42+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/commit/?id=a94f74682ebd40fd552a663e42713b5dff3e95ab'/>
<id>a94f74682ebd40fd552a663e42713b5dff3e95ab</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove uneeded bundler key</title>
<updated>2019-07-23T09:22:59+00:00</updated>
<author>
<name>David Rodríguez</name>
<email>deivid.rodriguez@riseup.net</email>
</author>
<published>2019-07-23T06:15:29+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/commit/?id=a82ad111e5bcd1db2b331cceed0330f453912e61'/>
<id>a82ad111e5bcd1db2b331cceed0330f453912e61</id>
<content type='text'>
It sounds like this was mistankenly added in
4337a499d0108fc3748084934aaed7591b355a26. Then the forgotten MANPATH key
was added in bf5bf106230772934602768bb31a68dc925691f0, but this one
should've been removed I think.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
It sounds like this was mistankenly added in
4337a499d0108fc3748084934aaed7591b355a26. Then the forgotten MANPATH key
was added in bf5bf106230772934602768bb31a68dc925691f0, but this one
should've been removed I think.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge #7250</title>
<updated>2019-07-22T13:50:47+00:00</updated>
<author>
<name>Bundlerbot</name>
<email>bot@bundler.io</email>
</author>
<published>2019-07-22T13:50:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/commit/?id=a9beb66ed23d9ea5bb1b07256400b503fad80a62'/>
<id>a9beb66ed23d9ea5bb1b07256400b503fad80a62</id>
<content type='text'>
7250: Fix ruby core dsl spec.rb failure, warning on build_metadata.rb r=deivid-rodriguez a=MSP-Greg

### What was the end-user problem that led to this PR?

Travis CI job on Ruby master was failing &amp; had a nuisance warning.

### What is your fix for the problem, implemented in this PR?

1. dls_spec.rb - Minor change to the error msg regexp match string

2. build_metadata.rb - change `if @git_commit_sha` to `if instance_variable_defined? :@git_commit_sha`

Co-authored-by: MSP-Greg &lt;msp-greg@users.noreply.github.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
7250: Fix ruby core dsl spec.rb failure, warning on build_metadata.rb r=deivid-rodriguez a=MSP-Greg

### What was the end-user problem that led to this PR?

Travis CI job on Ruby master was failing &amp; had a nuisance warning.

### What is your fix for the problem, implemented in this PR?

1. dls_spec.rb - Minor change to the error msg regexp match string

2. build_metadata.rb - change `if @git_commit_sha` to `if instance_variable_defined? :@git_commit_sha`

Co-authored-by: MSP-Greg &lt;msp-greg@users.noreply.github.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge #7249</title>
<updated>2019-07-20T22:27:57+00:00</updated>
<author>
<name>Bundlerbot</name>
<email>bot@bundler.io</email>
</author>
<published>2019-07-20T22:27:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/commit/?id=a03b11b267503c03b1b009d141b1fed6d193a9e5'/>
<id>a03b11b267503c03b1b009d141b1fed6d193a9e5</id>
<content type='text'>
7249: Add `bundle package` functionality to `bundle cache` r=indirect a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that the previous plan provided no migration path from the current `bundle cache` to the future one (an alias to `bundle package`).

### What was your diagnosis of the problem?

My diagnosis was that we should probably tell users first that in bundler 3, `bundle cache` will have a different implementation. However, after playing around with it a bit, I noticed that the additions to `bundle cache` provided by `bundle package` are fully backwards compatible. Or maybe I'm missing something but at least all `bundle cache` tests still pass when changing the implementation under the hood to use `bundle package`. As far as I can see, the only backwards incompatible change (start caching `git` and `path` gems by default) is already covered by the exisiting `cache_all` flag), so we should be good.

### What is your fix for the problem, implemented in this PR?

My fix is to remove the current implementation of `bundle cache`, and replace it with the current implementation of `bundle package`.

### Why did you choose this fix out of the possible options?

I chose this fix because it allows us to remove code and it reduces confusion about `bundle cache` vs `bundle package` making them work exactly the same.

On a future PR, I plan to clean this up so that everything (docs, code, tests) use `bundle cache`, and `bundle package` is left only as an alias. 

Co-authored-by: David Rodríguez &lt;deivid.rodriguez@riseup.net&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
7249: Add `bundle package` functionality to `bundle cache` r=indirect a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that the previous plan provided no migration path from the current `bundle cache` to the future one (an alias to `bundle package`).

### What was your diagnosis of the problem?

My diagnosis was that we should probably tell users first that in bundler 3, `bundle cache` will have a different implementation. However, after playing around with it a bit, I noticed that the additions to `bundle cache` provided by `bundle package` are fully backwards compatible. Or maybe I'm missing something but at least all `bundle cache` tests still pass when changing the implementation under the hood to use `bundle package`. As far as I can see, the only backwards incompatible change (start caching `git` and `path` gems by default) is already covered by the exisiting `cache_all` flag), so we should be good.

### What is your fix for the problem, implemented in this PR?

My fix is to remove the current implementation of `bundle cache`, and replace it with the current implementation of `bundle package`.

### Why did you choose this fix out of the possible options?

I chose this fix because it allows us to remove code and it reduces confusion about `bundle cache` vs `bundle package` making them work exactly the same.

On a future PR, I plan to clean this up so that everything (docs, code, tests) use `bundle cache`, and `bundle package` is left only as an alias. 

Co-authored-by: David Rodríguez &lt;deivid.rodriguez@riseup.net&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge #7248</title>
<updated>2019-07-19T04:26:18+00:00</updated>
<author>
<name>Bundlerbot</name>
<email>bot@bundler.io</email>
</author>
<published>2019-07-19T04:26:18+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/commit/?id=3f57b102c76fea2f701152e087c88f53df17d3d0'/>
<id>3f57b102c76fea2f701152e087c88f53df17d3d0</id>
<content type='text'>
7248: Fix nested bundle exec's when bundler is a default gem r=deivid-rodriguez a=MSP-Greg

### What was the end-user problem that led to this PR?

The problem was that when bundler is a default gem, nested `bundle exec` commands generate a LoadError.

```
/home/travis/.rvm/rubies/ruby-head/bin/bundle:30:in `load': cannot load such file --
/home/travis/.rvm/rubies/ruby-head/lib/bin/bundle (LoadError)
```

### What was your diagnosis of the problem?

Not accounting for Bundler being installed as a default gem. When it's a default, the lib and exe folders do not share the same root folder.

This was the result of a change in https://github.com/bundler/bundler/commit/e742c3d5f458a4a59cf0eaab2567eca844f956d1 (#7100).

### Repo Example

Using Ruby master/trunk/ruby-head (as of https://github.com/ruby/ruby/commit/0c6c937904aafc1809386bd892a2d114d22d01fe), from a folder where `bundle exec` can be ran:

```
bundle exec "bundle exec 'ruby -v'"
```

### What is your fix for the problem, implemented in this PR?

Small adjustment to logic for finding the correct exe/bundle file.

### Why did you choose this fix out of the possible options?

I chose this fix because it's similar to previous code.

Fixes #7244.

Co-authored-by: MSP-Greg &lt;msp-greg@users.noreply.github.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
7248: Fix nested bundle exec's when bundler is a default gem r=deivid-rodriguez a=MSP-Greg

### What was the end-user problem that led to this PR?

The problem was that when bundler is a default gem, nested `bundle exec` commands generate a LoadError.

```
/home/travis/.rvm/rubies/ruby-head/bin/bundle:30:in `load': cannot load such file --
/home/travis/.rvm/rubies/ruby-head/lib/bin/bundle (LoadError)
```

### What was your diagnosis of the problem?

Not accounting for Bundler being installed as a default gem. When it's a default, the lib and exe folders do not share the same root folder.

This was the result of a change in https://github.com/bundler/bundler/commit/e742c3d5f458a4a59cf0eaab2567eca844f956d1 (#7100).

### Repo Example

Using Ruby master/trunk/ruby-head (as of https://github.com/ruby/ruby/commit/0c6c937904aafc1809386bd892a2d114d22d01fe), from a folder where `bundle exec` can be ran:

```
bundle exec "bundle exec 'ruby -v'"
```

### What is your fix for the problem, implemented in this PR?

Small adjustment to logic for finding the correct exe/bundle file.

### Why did you choose this fix out of the possible options?

I chose this fix because it's similar to previous code.

Fixes #7244.

Co-authored-by: MSP-Greg &lt;msp-greg@users.noreply.github.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>fix nested bundle exec's when bundler is a default gem</title>
<updated>2019-07-16T18:46:09+00:00</updated>
<author>
<name>MSP-Greg</name>
<email>MSP-Greg@users.noreply.github.com</email>
</author>
<published>2019-07-13T13:20:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/commit/?id=537c0ab712dc0a91d10839096ecb28273292eab9'/>
<id>537c0ab712dc0a91d10839096ecb28273292eab9</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>build_metadata.rb - fix 'warning: instance variable @git_commit_sha not initialized'</title>
<updated>2019-07-16T16:39:24+00:00</updated>
<author>
<name>MSP-Greg</name>
<email>MSP-Greg@users.noreply.github.com</email>
</author>
<published>2019-07-16T16:39:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/commit/?id=37a1eec8c84ea0a446201cd268bab8d93bc429e1'/>
<id>37a1eec8c84ea0a446201cd268bab8d93bc429e1</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Alias `cache` to `package` now</title>
<updated>2019-07-15T19:30:34+00:00</updated>
<author>
<name>David Rodríguez</name>
<email>deivid.rodriguez@riseup.net</email>
</author>
<published>2019-07-15T18:48:05+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/commit/?id=69497adf904ef8c231316aba73db1f7524b060e5'/>
<id>69497adf904ef8c231316aba73db1f7524b060e5</id>
<content type='text'>
The additions of the `package` command are not actually backwards
incompatible, so we can do this transition without further care. All
existing specs of `bundle cache` pass when using the `bundle package`
implementation for it.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The additions of the `package` command are not actually backwards
incompatible, so we can do this transition without further care. All
existing specs of `bundle cache` pass when using the `bundle package`
implementation for it.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge #7239</title>
<updated>2019-07-15T18:55:10+00:00</updated>
<author>
<name>Bundlerbot</name>
<email>bot@bundler.io</email>
</author>
<published>2019-07-15T18:55:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/bundler.git/commit/?id=36ce7ccf84968d2a7f0eba98c605a5eac8e17e68'/>
<id>36ce7ccf84968d2a7f0eba98c605a5eac8e17e68</id>
<content type='text'>
7239: Fully remove compatibility guard r=deivid-rodriguez a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that this code is untested and never run.

### What was your diagnosis of the problem?

My diagnosis was that we can remove it.

### What is your fix for the problem, implemented in this PR?

My fix is to remove the code.

### Why did you choose this fix out of the possible options?

I actually intented to remove this in https://github.com/bundler/bundler/pull/6983, but after a discussing it with @simi I decided to keep it (see https://github.com/bundler/bundler/pull/6983#discussion_r259327593). After a second though I think this is safe to remove and that the potential use case (that the latest bundler is allowed to be installed by a really really old rubygems that didn't support ruby version constraints) is not a problem. The `required_ruby_version` constraint landed in [rubygems 0.6, 15 years ago](https://github.com/rubygems/rubygems/commit/240a9d3a3dc7211cad9680ce2579f502e215b519).

Co-authored-by: David Rodríguez &lt;deivid.rodriguez@riseup.net&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
7239: Fully remove compatibility guard r=deivid-rodriguez a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that this code is untested and never run.

### What was your diagnosis of the problem?

My diagnosis was that we can remove it.

### What is your fix for the problem, implemented in this PR?

My fix is to remove the code.

### Why did you choose this fix out of the possible options?

I actually intented to remove this in https://github.com/bundler/bundler/pull/6983, but after a discussing it with @simi I decided to keep it (see https://github.com/bundler/bundler/pull/6983#discussion_r259327593). After a second though I think this is safe to remove and that the potential use case (that the latest bundler is allowed to be installed by a really really old rubygems that didn't support ruby version constraints) is not a problem. The `required_ruby_version` constraint landed in [rubygems 0.6, 15 years ago](https://github.com/rubygems/rubygems/commit/240a9d3a3dc7211cad9680ce2579f502e215b519).

Co-authored-by: David Rodríguez &lt;deivid.rodriguez@riseup.net&gt;
</pre>
</div>
</content>
</entry>
</feed>
