Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix uncaught Gem::LoadError in binstub loader #448

Merged
merged 1 commit into from Nov 18, 2015

Conversation

felixbuenemann
Copy link
Contributor

The previous binstub code added in #444 did not catch Gem::LoadErrors which can be generated by bundler or rubygems trying to load the spring gem.

This fixes #447.

@rails-bot
Copy link

r? @jonleighton

(@rails-bot has picked a reviewer for you, use r? to override)

rescue LoadError => e
raise unless e.message.end_with? spring_bin_path, 'spring/binstub'
raise unless e.message =~ /spring/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.include?("spring") ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should suffice, I'll update.

@felixbuenemann
Copy link
Contributor Author

r? @grosser

@rails-bot rails-bot assigned grosser and unassigned jonleighton Nov 18, 2015
The previous binstub code did not catch Gem::LoadErrors which can
be generated by bundler or rubygems trying to load the spring gem.

This fixes rails#447.
@felixbuenemann
Copy link
Contributor Author

Updated to use include? instead of regex.

@felixbuenemann
Copy link
Contributor Author

Btw. I've manually tested against heroku with the new binstub code.

grosser added a commit that referenced this pull request Nov 18, 2015
…error

Fix uncaught Gem::LoadError in binstub loader
@grosser grosser merged commit 8153684 into rails:master Nov 18, 2015
@grosser
Copy link
Collaborator

grosser commented Nov 18, 2015

1.4.4

@felixbuenemann felixbuenemann deleted the fix-new-binstub-gem-load-error branch November 18, 2015 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

spring is not part of the bundle for production environment
4 participants