summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* more release editsversion-policies-updateAndré Arko2020-01-251-4/+4
| | | keep editing, add tldr, mention man pages
* Clarify doc updates for minorsAndré Arko2020-01-251-1/+1
|
* ✂️André Arko2020-01-201-1/+1
| | | removes trailing whitespace (I hope)
* Return backporting caveatAndré Arko2020-01-191-0/+2
| | | I didn't actually mean to delete this paragraph, whoops
* Revise compatibility policiesAndré Arko2020-01-191-10/+12
| | | This updates the written policies to reflect discussions, agreements, and public statements during 2019.
* Merge #7589Bundlerbot2020-01-193-2/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7589: Add support for BUNDLER_ prefixed debug environment variables r=colby-swandale a=kou DEBUG_RESOLVER is used in RubyGems too. So we can't enable it only for Bundler. ### What was the end-user problem that led to this PR? The problem was not the end-user problem. It's a developer problem. ### What was your diagnosis of the problem? My diagnosis was RubyGems also uses `DEBUG_RESOLVER` environment variable. So we can't use `DEBUG_RESOLVER` environment variable to enable debug mode only for Bundler. We can use `DEBUG_RESOLVER_TREE` instead of `DEBUG_RESOLVER` only for `Bundler::Resolver`. But we can't do it for `Bundler::GemVersionPromoter`. ### What is your fix for the problem, implemented in this PR? My fix adds `BUNDLER_` prefix to `DEBUG_RESOLVER` and `DEBUG_RESOLVER_TREE` like other environment variables for Bundler such as `BUNDLER_EDITOR` do. ### Why did you choose this fix out of the possible options? I chose this fix because adding prefix is a common way. Bundlerd Molinillo and Thor also use this way such as `MOLINILLO_DEBUG` and `THOR_SHELL`. Co-authored-by: Sutou Kouhei <kou@clear-code.com>
| * Add support for BUNDLER_ prefixed debug environment variablesSutou Kouhei2020-01-193-2/+21
|/ | | | | DEBUG_RESOLVER is used in RubyGems too. So we can't enable it only for Bundler.
* Merge #7577Bundlerbot2020-01-1828-70/+70
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7577: Update references to old repo location r=deivid-rodriguez a=duckinator Related: #7572. ### What was the end-user problem that led to this PR? A lot of things use the outdated `https://github.com/bundler/bundler` URL (and similarly for e.g. `bundler/bundler-site`). ### What is your fix for the problem, implemented in this PR? My fix was to update the outdated URLs. :slightly_smiling_face: ### TODO - [x] `bundler.gemspec` - [x] `CHANGELOG.md` (Moved to its own PR, #7582) - [x] `CODE_OF_CONDUCT.md` - [x] `doc/`, excluding reference to now-dead `pullreview.com` - [x] `doc/contributing/HOW_YOU_CAN_HELP.md` reference to long-dead `pullreview.com` - [x] `.github/config.yml` - [x] `lib/` (comments) - [ ] `lib/` (functional changes) - [ ] `man/` - [x] `README.md` - [x] `spec/` (comments, `skip` messages) - [ ] `spec/` (functional changes) - [ ] `task/release.rake` Co-authored-by: Ellen Marie Dash <me@duckie.co>
| * [docs] remove outdated reference to PullReview service.Ellen Marie Dash2020-01-171-1/+1
| |
| * [repo move] Update GitHub URL in comments in lib/.Ellen Marie Dash2020-01-162-2/+2
| |
| * [repo move] Update GitHub URL in comments and `skip` messages in spec/Ellen Marie Dash2020-01-1610-24/+24
| |
| * [repo move] Update GitHub URL in bundler.gemspec.Ellen Marie Dash2020-01-161-3/+3
| |
| * [repo move] Update GitHub URL in CODE_OF_CONDUCT.md + README.md.Ellen Marie Dash2020-01-162-5/+5
| |
| * [repo move] Update GitHub URL in doc/.Ellen Marie Dash2020-01-1612-34/+34
| |
| * [repo move] Update GitHub URL in .github/config.ymlEllen Marie Dash2020-01-161-1/+1
| |
* | Merge #7584Bundlerbot2020-01-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7584: Fix flaky test failure r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that sometimes a spec is failing on Windows because the rename syscall sometimes is raising Errno::EXDEV. ### What was your diagnosis of the problem? I don't really know why this problem is happening. ### What is your fix for the problem, implemented in this PR? My fix is to stop renaming the folder and copy it instead. ### Why did you choose this fix out of the possible options? I chose this fix because copying will no longer make a rename syscall, so at least it should no longer fail in the same way. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Use copy instead of movingci/fix_flakyDavid Rodríguez2020-01-181-1/+1
| | | | | | | | | | | | | | | | | | I'm not really sure why, but the rename syscall sometimes is raising Errno::EXDEV under Windows. I figure using a copy will fix the issue, and it stills reproduces the regression the test is meant to check for.
* | | Merge #7582Bundlerbot2020-01-171-741/+741
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7582: Update GitHub links in CHANGELOG.md r=deivid-rodriguez a=duckinator Related: #7572 ("Update all references to old repo location to new one") Follow-up for: #7577 ("Update references to old repo location") This updates all the links in `CHANGELOG.md`. It's a large enough diff that I decided to make a separate PR for it, to avoid blocking #7577. Command used to update the file: sed -i 's|https://github.com/bundler/bundler|https://github.com/rubygems/bundler|' CHANGELOG.md Co-authored-by: Ellen Marie Dash <me@duckie.co>
| * | [repo move] Update GitHub links in CHANGELOG.mdEllen Marie Dash2020-01-171-741/+741
| |/
* | Merge #7559Bundlerbot2020-01-172-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7559: Reactivate usused code for ruby version resolution r=deivid-rodriguez a=larskanis The code was changed in commit 38b0e7ed64c3ca1c40f43c5aa9a1ead2f6cd7049 so that RubyVersion.system was no longer respected. This is reactivated now and specs are adjusted accordingly. ### What was the end-user problem that led to this PR? Not known. ### What was your diagnosis of the problem? I read the bundler source code and noticed this. ### What is your fix for the problem, implemented in this PR? My fix re-adds the ruby version as it was before commit 38b0e7ed64c3ca1c40f43c5aa9a1ead2f6cd7049 , since it seems to be a mistake. ### Why did you choose this fix out of the possible options? As a alternative I added #7558 that removes the code in question. Co-authored-by: Lars Kanis <kanis@comcard.de>
| * | Reactivate usused code for ruby version resolutionLars Kanis2020-01-162-4/+4
| |/ | | | | | | | | The code was changed in commit 38b0e7ed64c3ca1c40f43c5aa9a1ead2f6cd7049 so that RubyVersion.system was no longer respected. This is reactivated now and specs are adjusted accordingly.
* | Merge #7578Bundlerbot2020-01-172-2/+32
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7578: Don't ignore resolved platform information r=deivid-rodriguez a=kou This is a follow-up change of #7522. ### What was the end-user problem that led to this PR? The problem was installing wrong platform gem even when resolver resolves the correct platform gem. See also: * https://github.com/rubygems/bundler/pull/7522#issuecomment-574628275 * https://github.com/rubygems/bundler/pull/7522#issuecomment-574882536 ### What was your diagnosis of the problem? My diagnosis was `Bundler::LazySpecification#__materialize__` doesn't care about the resolved platform information. ### What is your fix for the problem, implemented in this PR? My fix cares about the resolved platform information. ### Why did you choose this fix out of the possible options? I chose this fix because we should respect the resolved platform information to install correct gem. Co-authored-by: Sutou Kouhei <kou@clear-code.com>
| * Don't use needless specific APISutou Kouhei2020-01-171-1/+1
| | | | | | Co-Authored-By: David Rodríguez <deivid.rodriguez@riseup.net>
| * Revert MatchPlatform#platforms_match?Sutou Kouhei2020-01-172-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because some examples are failed: rspec ./spec/cache/gems_spec.rb:236 # bundle cache when previously cached doesn't remove gems that are for another platform rspec ./spec/commands/install_spec.rb:220 # bundle install with gem sources the simple case with a gem that installs multiple platforms installs gems for the local platform as first choice rspec ./spec/commands/update_spec.rb:39 # bundle update with --all updates the entire bundle rspec ./spec/commands/update_spec.rb:49 # bundle update with --all doesn't delete the Gemfile.lock file if something goes wrong rspec ./spec/commands/update_spec.rb:104 # bundle update with a top level dependency unlocks all child dependencies that are unrelated to other locked dependencies rspec ./spec/commands/update_spec.rb:115 # bundle update with an unknown dependency should inform the user rspec ./spec/commands/update_spec.rb:119 # bundle update with an unknown dependency should suggest alternatives rspec ./spec/commands/update_spec.rb:126 # bundle update with a child dependency should update the child dependency rspec ./spec/commands/update_spec.rb:299 # bundle update in a frozen bundle should suggest different command when frozen is set globally rspec ./spec/runtime/platform_spec.rb:60 # Bundler.setup with multi platform stuff will add the resolve for the current platform
| * Don't ignore resolved platform informationSutou Kouhei2020-01-173-3/+34
|/ | | | This is a follow-up change of #7522.
* Merge #7522Bundlerbot2020-01-1612-73/+183
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7522: Improve platform specific gem resolution r=deivid-rodriguez a=kou ### What was the end-user problem that led to this PR? Platform specific gems aren't resolved when platform specific gems are conflicted. For example, in the following situation, foo-1.0.0-x64-mingw32 that requires bar<1 is conflicted because there is no bar<1. Without this change, Bundler raises a conflict error. But users can use foo-1.0.0 (no x64-mingw32) in this situation. With this change, Bundler resolves to foo-1.0.0 (no x64-mingw32). ```ruby @index = build_index do gem "bar", "1.0.0" gem "foo", "1.0.0" gem "foo", "1.0.0", "x64-mingw32" do dep "bar", "< 1" end end dep "foo" platforms "x64-mingw32" ```` See also #6247. This change includes the specs that were added in #6247. ### What was your diagnosis of the problem? Not platform specific gem (foo-1.0.0 in the above case) isn't tried to be resolved when platform specific gem (foo-1.0.0-x64-mingw32 in the above case) is available. ### What is your fix for the problem, implemented in this PR? In this PR, not platform specific gem (foo-1.0.0 in the above case) is also tried to be resolved even when platform specific gem (foo-1.0.0-x64-mingw32 in the above case) is available. Priority is "platform specific gem" -> "not platform specific gem". So platform specific gem is usable, platform specific gem is used. Not platform specific gem is used as fallback. `search_for` represents this. Here is the `search_for` specification: https://github.com/bundler/bundler/blob/master/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb#L11-L13 > Search for the specifications that match the given dependency. The specifications in the returned array will be considered in reverse order, so the latest version ought to be last. ## Why did you choose this fix out of the possible options? I choose this fix because this is based on Molinillo's specification. Co-authored-by: Lars Kanis <lars@greiz-reinsdorf.de> Co-authored-by: Samuel Giddins <segiddins@segiddins.me> Co-authored-by: Sutou Kouhei <kou@clear-code.com>
| * Remove needless ifSutou Kouhei2020-01-161-4/+5
| |
| * Add no required_ruby_version againSutou Kouhei2020-01-151-0/+17
| |
| * Sort available platformsSutou Kouhei2020-01-152-9/+10
| |
| * Always add a spec group for all platforms to candidatesSutou Kouhei2020-01-153-26/+34
| |
| * SpecGroup#to_specs doesn't return duplicated specsSutou Kouhei2020-01-152-1/+9
| |
| * Fix styleSutou Kouhei2020-01-151-2/+2
| |
| * Always add "ruby" version to selected spec groups as fallbackSutou Kouhei2020-01-152-6/+10
| |
| * Fix the name of Ruby requirementSutou Kouhei2020-01-151-2/+2
| | | | | | | | We should use "Ruby\0" instead of "ruby\0".
| * Rename SpecGroup#spec to SpecGroup#spec_forSutou Kouhei2020-01-152-4/+5
| |
| * Add SpecGroup#copy_forSutou Kouhei2020-01-152-12/+12
| |
| * Revert unskippable skipsSutou Kouhei2020-01-152-0/+14
| |
| * Try unskipping on WindowsSutou Kouhei2020-01-152-18/+0
| |
| * Add support for force_ruby_platform with specific_platform againSutou Kouhei2020-01-153-13/+19
| |
| * Don't set platforms to dependency registered by gemspecSutou Kouhei2020-01-154-49/+1
| | | | | | | | | | | | | | | | | | Platform related dependencies are resolved in Resolver now. So we don't need to register all available platforms explicitly. This reverts commit 0a8ca4879e0b79aa4109a0dc424940b079ef38d0. See also: #4150 and #4102
| * Update expected for specific_platform feature flags caseSutou Kouhei2020-01-152-4/+17
| | | | | | | | | | In this case, Bundler uses specific platform to resolve dependency. So error message includes specific platform information.
| * Add support for specific_platform feature flagSutou Kouhei2020-01-151-5/+10
| |
| * Add support for multiple platform spec group againSutou Kouhei2020-01-152-4/+31
| |
| * Improve platform specific gem resolutionSutou Kouhei2020-01-153-6/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It resolves #6247. This changes includes the patches that add (RSpec) specs for this situation in #6247. If there is a platform specific gem but it can't be resolved available version, Bundler reports an error. For example, @index = build_index do gem "bar", "1.0.0" gem "foo", "1.0.0" gem "foo", "1.0.0", "x64-mingw32" do dep "bar", "< 1" end end dep "foo" platforms "x64-mingw32" raises an error because foo-1.0.0-x64-mingw32 requires bar<1 but there isn't bar<1. With this change, foo-1.0.0 (no x64-mingw32) is used as fallback. Because foo-1.0.0 doesn't depend on bar<1.
| * Add a spec for when differing dependencies cause the generic version gem to ↵Samuel Giddins2020-01-151-0/+14
| | | | | | | | be the only option
| * Add two specs for choosing platform specific gemsLars Kanis2020-01-151-0/+29
| | | | | | | | The first spec succeeds, but the second spec fails currently.
* | Merge #7563Bundlerbot2020-01-163-140/+142
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7563: Adds documentation for BUNDLE_APP_CONFIG env var r=deivid-rodriguez a=dchandekstark Fixes #7085 ### What was the end-user problem that led to this PR? The problem was missing documentation. ### What was your diagnosis of the problem? N/A ### What is your fix for the problem, implemented in this PR? Provided some documentation. ### Why did you choose this fix out of the possible options? N/A Co-authored-by: David Chandek-Stark <david.chandek.stark@duke.edu>
| * | Adds documentation for BUNDLE_APP_CONFIG env varDavid Chandek-Stark2020-01-153-140/+142
|/ /
* | Merge #7575Bundlerbot2020-01-151-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7575: Fix travis-ci badge status r=hsbt a=teitei-tk ### What was the end-user problem that led to this PR? n/a ### What was your diagnosis of the problem? repository was transferred and url changed. ### What is your fix for the problem, implemented in this PR? update badge url for travis-ci in README.md ### Why did you choose this fix out of the possible options? n/a Co-authored-by: teitei-tk <teitei.tk@gmail.com>
| * update travis ci build badge urlteitei-tk2020-01-101-1/+1
| |
View Lorry Controller Status