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

Create standalone bundler/setup.rb at a consistent path. #4274

Merged
merged 1 commit into from Mar 22, 2016

Conversation

glennpratt
Copy link
Contributor

While chasing a threading / chdir bug in #4264, I discovered bundler/setup.rb isn't written to a proper directory when run in a subdirectory and binstubs don't work (#4264 (comment)).

This changes that so bundler/setup.rb is written relative to Bundler.root instead of cwd and expands test coverage a bit.

@glennpratt glennpratt force-pushed the standalone-bundler-path branch 2 times, most recently from 5826b07 to 5652525 Compare February 4, 2016 21:01
@segiddins
Copy link
Member

👍

@indirect r?

def sys_exec(cmd, expect_err = false)
Open3.popen3(cmd.to_s) do |stdin, stdout, stderr, wait_thr|
def sys_exec(cmd, expect_err = false, popen_opts = {})
Open3.popen3(cmd.to_s, popen_opts) do |stdin, stdout, stderr, wait_thr|
Copy link
Member

Choose a reason for hiding this comment

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

this seems to be failing on 1.8.7

Copy link
Contributor Author

Choose a reason for hiding this comment

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

😿

I started using that pattern because I was getting warnings about nested chdir blocks. I can probably just avoid using the blocks. I might not get back to this till next week though.

Copy link
Member

Choose a reason for hiding this comment

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

you can definitely nest chdir blocks -- the issue is probably with threads or something?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, I didn't actually look into where threads were coming from, but when I wrapped some of the examples in chdir I got warnings. I'm sure I can work around it.

@indirect
Copy link
Member

indirect commented Feb 5, 2016

👍 from me

@homu
Copy link
Contributor

homu commented Feb 8, 2016

☔ The latest upstream changes (presumably #4283) made this pull request unmergeable. Please resolve the merge conflicts.

@indirect
Copy link
Member

indirect commented Feb 8, 2016

@glennpratt if you can rebase this and get it passing on 1.8, I think it's good to merge.

@segiddins
Copy link
Member

@glennpratt ping on this?

@glennpratt
Copy link
Contributor Author

Sorry, been pretty busy with other things. I'll probably get to this next week.

@@ -61,6 +82,21 @@
end
end

describe "with gem that has an invalid gemspec", :realworld => true do
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Marking this existing test as :realworld.

glennpratt referenced this pull request Mar 15, 2016
…valid-gemspec-for-dependency

Add helpful invalid gemspec error message for `bundle install --standalone`
@glennpratt
Copy link
Contributor Author

@segiddins @indirect updated. Not sure I can take the blame for the SSL fails on RGV=master.

@glennpratt glennpratt force-pushed the standalone-bundler-path branch 2 times, most recently from 7678d9b to d0c282a Compare March 22, 2016 14:47
glennpratt added a commit to glennpratt/bundler that referenced this pull request Mar 22, 2016
@homu
Copy link
Contributor

homu commented Mar 22, 2016

☔ The latest upstream changes (presumably #4377) made this pull request unmergeable. Please resolve the merge conflicts.

@segiddins
Copy link
Member

@homu r+

@homu
Copy link
Contributor

homu commented Mar 22, 2016

📌 Commit 0ba8444 has been approved by segiddins

@homu
Copy link
Contributor

homu commented Mar 22, 2016

⌛ Testing commit 0ba8444 with merge 4c54e5f...

homu added a commit that referenced this pull request Mar 22, 2016
Create standalone bundler/setup.rb at a consistent path.

While chasing a threading / chdir bug in #4264, I discovered `bundler/setup.rb` isn't written to a proper directory when run in a subdirectory and binstubs don't work (#4264 (comment)).

This changes that so `bundler/setup.rb` is written relative to `Bundler.root` instead of `cwd` and expands test coverage a bit.
@homu
Copy link
Contributor

homu commented Mar 22, 2016

☀️ Test successful - status

@homu homu merged commit 0ba8444 into rubygems:master Mar 22, 2016
@coilysiren coilysiren modified the milestone: Release Archive Oct 9, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants