summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [Resolver] Improve sorting of deps with 0 or 1 possibilityseg-resolver-sortingSamuel Giddins2017-02-172-6/+10
|
* [Resolver] Improve resolver debug outputSamuel Giddins2017-02-171-3/+3
|
* Auto merge of #5221 - bundler:seg-update-thor, r=indirectThe Bundler Bot2017-02-1328-323/+416
|\ | | | | | | | | | | | | | | [Thor] Update to v0.19.4 Closes #4876 @rafaelfranca
| * [CLI] Re-allow bundle help --no-colorseg-update-thorSamuel Giddins2017-02-121-0/+3
| |
| * [Thor] Update to v0.19.4Samuel Giddins2017-02-1227-323/+413
| |
* | Merge tag 'v1.14.4'Samuel Giddins2017-02-122-1/+14
|\ \ | |/ |/| | | Version 1.14.4
| * Version 1.14.4 with changelogv1.14.4Samuel Giddins2017-02-122-1/+14
| |
| * Auto merge of #5415 - nodo:issue-5358-conflicts-in-bundle-gem, r=segiddinsThe Bundler Bot2017-02-122-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Fix #5358] Handle files conflicts when using `bundle gem` `bundle gem` command fails with an exception when creating a gem having the same name of a file in the specified path. For instance: > touch hello > bundle gem hello This bug is due to Thor gem. At the moment, Thor does not handle conflicts between files and directories. This commit mitigates the problem by rescuing the exception from Thor and gracefully exit with an error message. Fixes https://github.com/bundler/bundler/issues/5358 (cherry picked from commit f93accce1e9d948eaef79e2f380fd7d396687808)
| * Auto merge of #5410 - bundler:seg-git-build-args, r=indirectThe Bundler Bot2017-02-123-6/+56
| | | | | | | | | | | | | | | | | | Properly set native extension build args for git gems Closes https://github.com/bundler/bundler/pull/5399 Closes https://github.com/bundler/bundler/issues/5401 (cherry picked from commit 74341aaaa949e914cd1cffb163cd99bdf14b91df)
| * Auto merge of #5363 - svoop:permissive_tmp_home_dirs, r=indirectThe Bundler Bot2017-02-123-21/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permissive temporary home directory We're deploying to a server with several Ruby applications each with it's own user. However, the home directory of these users is *not* writable by the users. Since Bundler 1.14.x, a temporary home directoy in the `tmpdir` is used as a fallback. This works well for only one user, but will fail with more than one: 1. user1 execs `bundle` 2. `/tmp/bundler/home/user1` is created usually with 0755 modes 3. user2 execs `bundle` 4. `/tmp/bundler/home/user2` cannot be created since user2 can't write to `home` This PR adds a `chmod` to apply mode 0777 to `home`. It rescues to nil in order to silently fail on step 4 (user2 cannot chmod `home` since it's owned by user1) as well as in case of any other problem performing chmod. Since we're in a fallback here, I guess it's okay to do this. However, if this is too much code smell, a `unless File.exist?` will do the trick as well. (cherry picked from commit 311b090449b591d4fb96a725e548b4d35ac95ed0)
| * Auto merge of #5413 - bundler:seg-molinillo-0.5.6, r=segiddinsThe Bundler Bot2017-02-125-10/+37
| | | | | | | | | | | | | | | | | | | | | | Update vendored Molinillo to 0.5.6 See https://github.com/CocoaPods/Molinillo/releases/0.5.6 closes #5359 closes #5362 (cherry picked from commit 3360aac96610f640ddfef0d65303d15bc99539d9)
| * Auto merge of #5408 - bundler:seg-ensure-silent-shell-parity, r=segiddinsThe Bundler Bot2017-02-122-0/+38
| | | | | | | | | | | | | | | | [UI::Silent] Ensure all the same methods as Shell are implemented Finish up the work of #5368 (cherry picked from commit cad91be3c8f4ab5a71eee284c051cb2e7c2cb3a2)
| * Auto merge of #5391 - bundler:seg-ruby-version-requirement-valid, r=indirectThe Bundler Bot2017-02-122-1/+25
| | | | | | | | | | | | | | | | [RubyVersion] Ensure passed-in versions are valid during init Closes #5380 (cherry picked from commit 427f07f77f414f43d693c87c104546af3d9fe984)
| * Auto merge of #5368 - savionok:sav-cover-Bundler-FriendlyErrors-with-tests, ↵The Bundler Bot2017-02-122-3/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r=segiddins Fix silent.rb method interface Hi, This is my first contribution to bundler, so I started by covering bundler/friendly_errors.rb with unit tests. After covering it, I spotted a bug in lib/bundler/ui/silent.rb, trace method interface, so I fix it in this PR. Waiting for feedback! (cherry picked from commit c0de8f625f0ae2ed5cc2b26673c875e2900a9829)
| * Auto merge of #5393 - 5t111111:fix-warning-when-a-dependency-unused, r=segiddinsThe Bundler Bot2017-02-122-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix misleading warning message when a dependency is unused on any platform The current warning message for a dep with empty platform is misleading/confusing. You see a sort of the below warning when you `bundle install`, ``` The dependency tzinfo-data (>= 0) will be unused by any of the platforms Bundler is installing for. Bundler is installing for ruby but the dependency is only for x86-mingw32, x86-mswin32, x64-mingw32, java. To add those platforms to the bundle, run `bundle lock --add-platform mingw, mswin, x64_mingw, jruby`. ``` However, there two issues exist in this message "run `bundle lock --add-platform mingw, mswin, x64_mingw, jruby`": - You must not have comma (,) for separators - these commas will be considered as comma itself. see [here](https://github.com/bundler/bundler/blob/242fcbcb2d15d39c63e3441756b77fbfcc1b73b2/lib/bundler/cli/lock.rb#L34-L41) - mingw, mswin, x64_mingw, jruby are not valid platforms - platforms must be specified as the formats that rubygems can understand, like (x86-mingw32, x86-mswin32, x64-mingw32, java) This fixes these issues. (cherry picked from commit cd872ef1e8281252786535df960275cd391933bc)
| * Auto merge of #5392 - bundler:improve-messaging, r=segiddinsThe Bundler Bot2017-02-121-4/+4
| | | | | | | | | | | | | | | | marketing-ify the post-install message /cc @segiddins @mrb (cherry picked from commit 5db7e161e9057603188600549c226a1b40807e6e)
| * Auto merge of #5389 - Shekharrajak:5384_inject_usage, r=segiddinsThe Bundler Bot2017-02-123-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show inject usage when args are passed incorrectly Closes #5384 Now it shows the error : ``` $ bundle inject "gem_name" 1 "v" ERROR: "bundle inject" was called with arguments ["gem_name", "1", "v"] Usage: "bundle inject GEM VERSION" $ bundle inject "gem_name" "v" 1 ERROR: "bundle inject" was called with arguments ["gem_name", "v", "1"] Usage: "bundle inject GEM VERSION" ``` (cherry picked from commit ec5cab34d3b12467433ca1a1eafc460e42834084)
| * Auto merge of #5376 - colby-swandale:bundle-show-update-lock, r=segiddinsThe Bundler Bot2017-02-122-0/+28
| | | | | | | | | | | | | | | | | | | | Bundle show --outdated shouldn't be updating versions This PR is for #5375. I have added a spec (currently failing) of the desired behavior for `bundle show --outdated` I'm currently looking into a fix for this but welcome anyone else to come in as well. (cherry picked from commit d9d699c174a06da8052bc7da0d5ba64438968653)
| * Auto merge of #5382 - bundler:seg-error-template-issues-url, r=segiddinsThe Bundler Bot2017-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [FriendlyErrors] Update ISSUES.md URL This URL no longer exists after the docs reorganization \c @feministy I'd like to release this as 1.14.x so people aren't frustrated when opening new issues (cherry picked from commit fb8c5a7e509cb0a54a4b34f8a93b86484241a747)
* | Auto merge of #5266 - bundler:seg-install-frozen-gemspec-deps-changed, ↵The Bundler Bot2017-02-128-20/+81
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | r=indirect [Definition] Fail when installing in frozen mode & gemspec deps have changed Closes #5264 - [x] Specs
| * | [Source::Path] Don’t store cache paths in the lockfileseg-install-frozen-gemspec-deps-changedSamuel Giddins2017-02-102-5/+37
| | |
| * | [Definition] Allow adding new gemspecs to a Path sourceSamuel Giddins2017-02-103-5/+6
| | |
| * | Add a spec for installing in deployment after changing gemspecSamuel Giddins2017-02-101-0/+25
| | |
| * | Use Array#include in the spec helperSamuel Giddins2017-02-101-2/+2
| | |
| * | [Definition] Only consider runtime deps in path source comparisonSamuel Giddins2017-02-101-1/+2
| | |
| * | [Definition] Fail when installing in frozen mode & gemspec deps have changedSamuel Giddins2017-02-101-3/+4
| | |
| * | [SpecSet] Optimize lookupSamuel Giddins2017-02-101-4/+5
| | |
* | | Auto merge of #5422 - bundler:seg-release-pr-number-to-s, r=segiddinsThe Bundler Bot2017-02-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | [Release] Coerce PR numbers to strings for the regexp matching Today in 'testing release code is hard'...
| * | | [Release] Coerce PR numbers to strings for the regexp matchingseg-release-pr-number-to-sSamuel Giddins2017-02-101-1/+1
| |/ /
* | | Auto merge of #5418 - bundler:seg-unit-test-no-internet, r=segiddinsThe Bundler Bot2017-02-101-2/+3
|\ \ \ | |/ / |/| | | | | Allow the gem helper spec to pass much faster without a net connection
| * | Allow the gem helper spec to pass much faster without a net connectionseg-unit-test-no-internetSamuel Giddins2017-02-091-2/+3
| | |
* | | Auto merge of #5420 - amatsuda:extention, r=segiddinsThe Bundler Bot2017-02-101-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | s/@disable_extentions/@disable_extensions/ Typo.
| * | | s/@disable_extentions/@disable_extensions/Akira Matsuda2017-02-101-2/+2
|/ / /
* | | Auto merge of #5415 - nodo:issue-5358-conflicts-in-bundle-gem, r=segiddinsThe Bundler Bot2017-02-102-1/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Fix #5358] Handle files conflicts when using `bundle gem` `bundle gem` command fails with an exception when creating a gem having the same name of a file in the specified path. For instance: > touch hello > bundle gem hello This bug is due to Thor gem. At the moment, Thor does not handle conflicts between files and directories. This commit mitigates the problem by rescuing the exception from Thor and gracefully exit with an error message. Fixes https://github.com/bundler/bundler/issues/5358
| * | | [Fix #5358] Handle files conflicts when using `bundle gem`Andrea Nodari2017-02-092-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `bundle gem` command fails with an exception when creating a gem having the same name of a file in the specified path. For instance: > touch hello > bundle gem hello This bug is due to Thor gem. At the moment, Thor does not handle conflicts between files and directories. This commit mitigates the problem by rescuing the exception from Thor and gracefully exit with an error message.
* | | | Auto merge of #5416 - bundler:seg-fix-milestone-release, r=segiddinsThe Bundler Bot2017-02-091-7/+21
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | [Release] Fix pulling PRs from milestone Implement pagination Account for the fact that only issues can be filtered by milestone, not PRs
| * | | [Release] Fix pulling PRs from milestoneseg-fix-milestone-releaseSamuel Giddins2017-02-091-7/+21
|/ / / | | | | | | | | | | | | | | | Implement pagination Account for the fact that only issues can be filtered by milestone, not PRs
* | | Auto merge of #5414 - bundler:seg-patch-release-milestone, r=segiddinsThe Bundler Bot2017-02-091-2/+22
|\ \ \ | | | | | | | | | | | | [Release] Pull PRs to backport from GH milestone
| * | | [Release] Pull PRs to backport from GH milestoneseg-patch-release-milestoneSamuel Giddins2017-02-081-2/+22
| | | |
* | | | Auto merge of #5410 - bundler:seg-git-build-args, r=indirectThe Bundler Bot2017-02-093-6/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly set native extension build args for git gems Closes https://github.com/bundler/bundler/pull/5399 Closes https://github.com/bundler/bundler/issues/5401
| * | | | Properly set native extension build args for git gemsseg-git-build-argsSamuel Giddins2017-02-073-6/+56
| | |/ / | |/| |
* | | | Auto merge of #5363 - svoop:permissive_tmp_home_dirs, r=indirectThe Bundler Bot2017-02-093-21/+71
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permissive temporary home directory We're deploying to a server with several Ruby applications each with it's own user. However, the home directory of these users is *not* writable by the users. Since Bundler 1.14.x, a temporary home directoy in the `tmpdir` is used as a fallback. This works well for only one user, but will fail with more than one: 1. user1 execs `bundle` 2. `/tmp/bundler/home/user1` is created usually with 0755 modes 3. user2 execs `bundle` 4. `/tmp/bundler/home/user2` cannot be created since user2 can't write to `home` This PR adds a `chmod` to apply mode 0777 to `home`. It rescues to nil in order to silently fail on step 4 (user2 cannot chmod `home` since it's owned by user1) as well as in case of any other problem performing chmod. Since we're in a fallback here, I guess it's okay to do this. However, if this is too much code smell, a `unless File.exist?` will do the trick as well.
| * | | Hack to work around rspec-mocks 3.5 broken on Ruby 1.8Sven Schwyn2017-02-081-0/+8
| | | |
| * | | Permissive temporary home directorySven Schwyn2017-02-082-21/+63
| | | | | | | | | | | | | | | | When falling back to a temporary home directory, make sure the "home" directory has mode 0777 to prevent "permission denied" when this mechanism is used by more than one login.
* | | | Auto merge of #5406 - roseaboveit:fix_doc_sub_dir_readme_links, r=feministyThe Bundler Bot2017-02-083-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix links in READMEs causing 404 errors in Github In doc/contributing/README.md, doc/documentation/README.md, and doc/development/README.md, there were links that referenced files in the same doc directory but prepended the directory name. This lead to urls that were broken due to having the directory name stated twice. I didn't want to clog the issues section with this since it isn't actually an issue with bundler. But I can create an issue of that would be better. Just noticed as I was trying to figure out how to get started. This will be my first OS contribution, so even though it is minor, please let me know if I did anything wrong. Thanks.
| * | | | Fix links in READMEs causing 404 errors in GithubWhitney-Rose Levis2017-02-053-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In doc/contributing/README.md, doc/documentation/README.md, and doc/development/README.md, there were links that referenced files in the same doc directory but prepended the directory name. This lead to urls that were broken due to having the directory name stated twice.
* | | | | Auto merge of #5413 - bundler:seg-molinillo-0.5.6, r=segiddinsThe Bundler Bot2017-02-085-10/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update vendored Molinillo to 0.5.6 See https://github.com/CocoaPods/Molinillo/releases/0.5.6 closes #5359 closes #5362
| * | | | | Update vendored Molinillo to 0.5.6seg-molinillo-0.5.6Samuel Giddins2017-02-085-10/+37
|/ / / / /
* | | | | Auto merge of #5408 - bundler:seg-ensure-silent-shell-parity, r=segiddinsThe Bundler Bot2017-02-082-0/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [UI::Silent] Ensure all the same methods as Shell are implemented Finish up the work of #5368
| * | | | | [UI::Silent] Ensure all the same methods as Shell are implementedseg-ensure-silent-shell-paritySamuel Giddins2017-02-072-0/+38
| | |_|/ / | |/| | |