Support file structure of ruby core repository. by hsbt · Pull Request #6743 · rubygems/bundler

hsbt · 2018-10-16T04:57:42Z

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

In the ruby core repository, I put bundler executable and bundler libraries under the bin and lib directories. It breaks the current behavior.

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

Support the structure of ruby core repository.

hsbt · 2018-10-16T10:16:37Z

I will add another commits later.

colby-swandale · 2018-10-16T22:49:41Z

bundler.gemspec

+  require File.expand_path("../lib/bundler/version", __FILE__)
+rescue LoadError
+  # for Ruby core repository
+  require File.expand_path("../bundler/version", __FILE__)


Is there a way to avoid this? Using a rescue to support Ruby core does not seem nice.

There is no solution yet.

we could use File.file?

lib/bundler/version string was used the other example directory. This string can be only once in gemspec.

see https://github.com/bundler/bundler/blob/master/spec/runtime/setup_spec.rb#L877

hsbt · 2018-10-17T11:26:29Z

I'm still working this. After merging #6742, I will rebase and test with the current ruby core HEAD.

They are replaced build binary on ruby core repository.

The ruby core repository couldn't invoke its examples.

them after finished bundler rspec.

hsbt · 2018-11-01T13:11:56Z

I finished to fix or skip failing examples on ruby core repository. the all of examples is working fine on ruby core repository with ruby/ruby#1991.

segiddins · 2018-11-06T06:28:27Z

bundler.gemspec

+  require File.expand_path("../lib/bundler/version", __FILE__)
+rescue LoadError
+  # for Ruby core repository
+  require File.expand_path("../bundler/version", __FILE__)


we could use File.file?

segiddins · 2018-11-06T06:30:13Z

spec/spec_helper.rb


+  config.before :suite do
+    if ENV["BUNDLE_RUBY"]
+      @orig_ruby = Gem.ruby


could we use around to avoid needing an ivar?

segiddins · 2018-11-06T06:31:05Z

spec/bundler/ssl_certs/certificate_manager_spec.rb

  # Pretend bundler root is rubygems root
  before do
+    # Backing up rubygems ceriticates
+    FileUtils.mv(rubygems_certs_dir, rubygems_certs_dir + ".back") if ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]


can this use the helper method for the conditional?

segiddins · 2018-11-06T06:31:47Z

spec/support/helpers.rb

        args = %("#{args}")
      end
-      sys_exec("#{Gem.ruby} -rrubygems -S gem --backtrace #{command} #{args}")
+      gem = ENV["BUNDLE_GEM"] || "#{Gem.ruby} -rrubygems -S gem --backtrace"


when won't ruby -rrubygems -S gem invoke ruby gems?

ENV["BUNDLE_GEM"] was stored $(srcdir)/bin/gem from ruby source repository. In ruby core repository, It needs to works working directory without source directory.

…e/setup_spec.rb:896

hsbt · 2018-11-12T11:29:40Z

@segiddins @colby-swandale Do you have additional comments or feedback? I will merge this a few days later.

hsbt · 2018-11-16T02:44:18Z

@bundlerbot r+

6743: Support file structure of ruby core repository. r=hsbt a=hsbt ### What was the end-user problem that led to this PR? In the ruby core repository, I put bundler executable and bundler libraries under the `bin` and `lib` directories. It breaks the current behavior. ### What is your fix for the problem, implemented in this PR? Support the structure of ruby core repository. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>

ghost · 2018-11-16T03:19:49Z

Build succeeded

continuous-integration/travis-ci/push

colby-swandale · 2018-11-16T09:23:33Z

Ah, sorry i didn't reply @hsbt, i missed the ping 🙇. I had no more issues, so i'm happy to see this merged.

#6743 was failed with ruby core repository and ignored working example. Fixed them.

6786: Followed up #6743 r=hsbt a=hsbt ### What was the end-user problem that led to this PR? #6743 was failed with ruby core repository and ignored working example. I fixed them. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>

6743: Support file structure of ruby core repository. r=hsbt a=hsbt In the ruby core repository, I put bundler executable and bundler libraries under the `bin` and `lib` directories. It breaks the current behavior. Support the structure of ruby core repository. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org> (cherry picked from commit 172ec59)

6786: Followed up #6743 r=hsbt a=hsbt I fixed them. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org> (cherry picked from commit 9cfe9bd)

6743: Support file structure of ruby core repository. r=hsbt a=hsbt In the ruby core repository, I put bundler executable and bundler libraries under the `bin` and `lib` directories. It breaks the current behavior. Support the structure of ruby core repository. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org> (cherry picked from commit 172ec59) (cherry picked from commit 02cd169)

6786: Followed up #6743 r=hsbt a=hsbt I fixed them. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org> (cherry picked from commit 9cfe9bd) (cherry picked from commit a7207e1)

* 1-17-stable: Version 1.17.2 with changelog Merge #6798 Merge #6818 Merge #6786 Merge #6743 Merge #6742 Merge #6740 Merge #6834 Merge pull request #6752 from bundler/indirect/backport-6737

hsbt changed the title ~~Support file structure of ruby core repository.~~ [WIP] Support file structure of ruby core repository. Oct 16, 2018

colby-swandale reviewed Oct 16, 2018

View reviewed changes

hsbt added 7 commits October 20, 2018 19:59

Support file structure of ruby core repository.

94f664f

rubocop -a

91aaca7

Fixed existence example.

ce655f1

Added to support BUNDLE_RUBY and BUNDLE_GEM environmental variables.

5417b21

They are replaced build binary on ruby core repository.

Added ruby_core filtering condition with some examples.

2519ba9

The ruby core repository couldn't invoke its examples.

Restore rubygems certificates. Current bundler examples will remove

96f2424

them after finished bundler rspec.

rubocop -a

6d2c0d2

hsbt force-pushed the support-structure-of-ruby-core branch from 3bb9fdb to 6d2c0d2 Compare October 20, 2018 11:01

colby-swandale added this to the 2.0.0 milestone Oct 29, 2018

colby-swandale added the incoming label Oct 30, 2018

colby-swandale removed this from the 2.0.0 milestone Oct 30, 2018

hsbt added 3 commits November 1, 2018 22:02

Backport from ruby core

09bfdfa

Fixed typo

35c189b

rubocop -a

55d1328

hsbt added 3 commits November 1, 2018 22:16

To use helper method instead of env variables.

886de38

Partly reverted 09bfdfa.

8ff21c9

Support old versions of Ruby on platform_spec.rb

abb17aa

hsbt changed the title ~~[WIP] Support file structure of ruby core repository.~~ Support file structure of ruby core repository. Nov 1, 2018

hsbt added this to the 2.0.0 milestone Nov 3, 2018

segiddins reviewed Nov 6, 2018

View reviewed changes

hsbt added 5 commits November 6, 2018 20:29

To use File.file? instead of handling LoadError.

359b692

To use helper method instead of env variables.

8b1245c

To use around hook instead of before suite.

35031a1

Added extname

4905910

expand version path for rspec examples.

3df26b9

hsbt added 2 commits November 7, 2018 15:27

rubocop -a

79307d4

Revert File.file? conditioon on gemspec, Because it break spec/runtim…

2aa84b2

…e/setup_spec.rb:896

ghost merged commit 2aa84b2 into master Nov 16, 2018

deivid-rodriguez deleted the support-structure-of-ruby-core branch November 16, 2018 10:16

hsbt added a commit that referenced this pull request Nov 16, 2018

Followed up #6743

66f5dcb

#6743 was failed with ruby core repository and ignored working example. Fixed them.

hsbt mentioned this pull request Nov 16, 2018

Followed up #6743 #6786

Merged

hsbt added a commit that referenced this pull request Nov 16, 2018

Merge #6786

a7207e1

6786: Followed up #6743 r=hsbt a=hsbt I fixed them. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org> (cherry picked from commit 9cfe9bd)

hsbt added a commit that referenced this pull request Dec 11, 2018

Merge #6786

ab73067

6786: Followed up #6743 r=hsbt a=hsbt I fixed them. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org> (cherry picked from commit 9cfe9bd) (cherry picked from commit a7207e1)

This pull request was closed.

Uh oh!

Conversation

hsbt commented Oct 16, 2018

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

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

Uh oh!

hsbt commented Oct 16, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hsbt commented Oct 17, 2018

Uh oh!

hsbt commented Nov 1, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hsbt commented Nov 12, 2018

Uh oh!

hsbt commented Nov 16, 2018

Uh oh!

ghost commented Nov 16, 2018

Build succeeded

Uh oh!

colby-swandale commented Nov 16, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants