Add support for TruffleRuby by eregon · Pull Request #6693 · rubygems/bundler

eregon · 2018-09-09T15:01:57Z

Hello,
This PR adds support for TruffleRuby in Bundler.

I searched for rbx and jruby (case-insensitive) through the codebase to find all places which need changes and where tests use specific Ruby implementations. So hopefully this PR is complete, but please tell me if I missed something.

I'd also like to test TruffleRuby in Bundler's CI, but will do this as a separate PR, as we first need the next release of TruffleRuby so that it includes the fix for truffleruby/truffleruby#1413.

…by in Bundler

* stub RUBY_ENGINE in specs, Bundler.ruby_engine no longer exists.

eregon · 2018-09-09T15:10:30Z

This should also be backported to 1.16.x.

colby-swandale · 2018-09-09T23:05:35Z

spec/support/platforms.rb

      when "jruby"
        JRUBY_VERSION
      else
-        raise BundlerError, "That RUBY_ENGINE is not recognized"


Woo! This is awesome! 🎉

My first question though, why are you modifying this behavior instead of adding to it?

we might also want to check that RUBY_ENGINE_VERSION is indeed defined? I'm not sure if all Rubies define it

My thinking was rather than adding a special case for truffleruby I'd make it general.
Every not ancient (=1.8) Ruby version should define RUBY_ENGINE_VERSION, it's a standard constant like RUBY_ENGINE, RUBY_VERSION, etc.
I can add a defined? if it causes a problem for an implementation but it seems unlikely as currently this code path was hardcoded to only support MRI, JRuby and Rubinius.

@colby-swandale What do you think? Is this code fine as-is or should I change it to something else?

I'm happy with the PR, so let's merge it

segiddins · 2018-09-10T04:02:49Z

spec/support/platforms.rb

      when "jruby"
        JRUBY_VERSION
      else
-        raise BundlerError, "That RUBY_ENGINE is not recognized"


we might also want to check that RUBY_ENGINE_VERSION is indeed defined? I'm not sure if all Rubies define it

colby-swandale · 2018-09-10T22:02:13Z

@bundlerbot r+

bundlerbot · 2018-09-10T22:02:14Z

📌 Commit 6a7b2c1 has been approved by colby-swandale

bundlerbot · 2018-09-10T22:02:24Z

⌛ Testing commit 6a7b2c1 with merge 7a33207...

Add support for TruffleRuby Hello, This PR adds support for TruffleRuby in Bundler. I searched for `rbx` and `jruby` (case-insensitive) through the codebase to find all places which need changes and where tests use specific Ruby implementations. So hopefully this PR is complete, but please tell me if I missed something. I'd also like to test TruffleRuby in Bundler's CI, but will do this as a separate PR, as we first need the next release of TruffleRuby so that it includes the fix for truffleruby/truffleruby#1413.

deivid-rodriguez · 2018-09-11T00:04:51Z

@eregon This is great, thanks!

This PR I opened to rubygems a while ago is somehow related. Maybe you want to have a look since you have experience accross several implementations and the constants they define.

bundlerbot · 2018-09-11T15:48:30Z

💥 Test timed out

eregon · 2018-09-11T20:35:36Z

@bundlerbot timed out, should it be retried or is there an issue with the PR?

colby-swandale · 2018-09-11T21:07:02Z

@bundlerbot retry

bundlerbot · 2018-09-11T21:07:14Z

⌛ Testing commit 6a7b2c1 with merge 368d759...

Add support for TruffleRuby Hello, This PR adds support for TruffleRuby in Bundler. I searched for `rbx` and `jruby` (case-insensitive) through the codebase to find all places which need changes and where tests use specific Ruby implementations. So hopefully this PR is complete, but please tell me if I missed something. I'd also like to test TruffleRuby in Bundler's CI, but will do this as a separate PR, as we first need the next release of TruffleRuby so that it includes the fix for truffleruby/truffleruby#1413.

bundlerbot · 2018-09-11T21:33:48Z

☀️ Test successful - status-travis
Approved by: colby-swandale
Pushing 368d759 to master...

eregon · 2018-09-11T22:17:09Z

Thanks for review and merging!

hsbt · 2018-09-12T00:44:24Z

This should also be backported to 1.16.x.

This pull-request is not bugfix. I think we need to bump 1.17.x maybe.

Can we merge non-bugfix feature with tiny versionup?

colby-swandale · 2018-09-12T01:08:50Z

@hsbt We have allowed non-bugfixes to go into minor releases before if it made sense. And this isn't a huge change - so i'm happy to backport this into the next patch release.

eregon · 2018-09-12T08:47:29Z

1.16.x or 1.17.x is fine, what TruffleRuby needs is a (non-pre) release of Bundler so the patches in TruffleRuby can be removed and TruffleRuby can use vanilla Bundler.

Is there a schedule for the next Bundler release?
The next release of TruffleRuby has feature freeze on September 21.
That might be quite close, but it would be ideal so there is no overlap between patches in TruffleRuby and support for TruffleRuby in Bundler.

colby-swandale · 2018-09-12T11:39:34Z

There is no scheduled time for a release, but i will try and get your changes released before the 21st.

Add support for TruffleRuby Hello, This PR adds support for TruffleRuby in Bundler. I searched for `rbx` and `jruby` (case-insensitive) through the codebase to find all places which need changes and where tests use specific Ruby implementations. So hopefully this PR is complete, but please tell me if I missed something. I'd also like to test TruffleRuby in Bundler's CI, but will do this as a separate PR, as we first need the next release of TruffleRuby so that it includes the fix for truffleruby/truffleruby#1413. (cherry picked from commit 368d759)

* 1-16-stable: Version 1.16.5 with changelog scope TruffleRuby platform specs to be RubyGems >= 2.1.0 Auto merge of #6689 - bundler:colby/fix-bundler-load-error, r=colby-swandale Auto merge of #6695 - bundler:segiddins/6684-gvp-prefer-non-pres, r=colby-swandale Auto merge of #6693 - eregon:truffleruby, r=colby-swandale Auto merge of #6692 - eregon:simplify-autoload-require-deprecate, r=segiddins Auto merge of #6688 - voxik:check-search, r=colby-swandale Auto merge of #6682 - bundler:bundle_env_formatting, r=colby-swandale Auto merge of #6675 - MaxLap:master, r=greysteil Auto merge of #6669 - ChrisBr:fix_dep_proxy, r=segiddins Auto merge of #6664 - greysteil:avoid-printing-git-error, r=colby-swandale

eregon added 7 commits September 9, 2018 16:38

Add TruffleRuby to Bundler::Dependency::PLATFORM_MAP

6fe3038

Fallback to the standard RUBY_ENGINE_VERSION constant

abf4fdc

Add TruffleRuby to the list of possible shebangs

7c49a21

Add TruffleRuby to the list of engines in Bundler

455bfe1

Update the Gemfile documentation to reflect the addition of TruffleRu…

54c6c49

…by in Bundler

Add specs for the truffleruby platform

ed924f8

Adapt RubyVersion spec now that it fallbacks to RUBY_ENGINE_VERSION

f81de9a

* stub RUBY_ENGINE in specs, Bundler.ruby_engine no longer exists.

Fix alignment of "end" as required by RuboCop

6a7b2c1

colby-swandale reviewed Sep 9, 2018

View reviewed changes

segiddins approved these changes Sep 10, 2018

View reviewed changes

colby-swandale added this to the 1.16.5 milestone Sep 10, 2018

bundlerbot merged commit 6a7b2c1 into rubygems:master Sep 11, 2018

Uh oh!

Conversation

eregon commented Sep 9, 2018

Uh oh!

eregon commented Sep 9, 2018

Uh oh!

colby-swandale Sep 9, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

segiddins Sep 10, 2018

Choose a reason for hiding this comment

Uh oh!

eregon Sep 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eregon Sep 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

colby-swandale Sep 10, 2018

Choose a reason for hiding this comment

Uh oh!

segiddins Sep 10, 2018

Choose a reason for hiding this comment

Uh oh!

colby-swandale commented Sep 10, 2018

Uh oh!

bundlerbot commented Sep 10, 2018

Uh oh!

bundlerbot commented Sep 10, 2018

Uh oh!

deivid-rodriguez commented Sep 11, 2018

Uh oh!

bundlerbot commented Sep 11, 2018

Uh oh!

eregon commented Sep 11, 2018

Uh oh!

colby-swandale commented Sep 11, 2018

Uh oh!

bundlerbot commented Sep 11, 2018

Uh oh!

bundlerbot commented Sep 11, 2018

Uh oh!

eregon commented Sep 11, 2018

Uh oh!

hsbt commented Sep 12, 2018

Uh oh!

colby-swandale commented Sep 12, 2018

Uh oh!

eregon commented Sep 12, 2018

Uh oh!

colby-swandale commented Sep 12, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

colby-swandale Sep 9, 2018 •

edited

Loading

eregon Sep 10, 2018 •

edited

Loading

eregon Sep 10, 2018 •

edited

Loading