summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Remove version overriding stuff"revert-c675b59Hiroshi SHIBATA2019-08-031-1/+17
| | | | This reverts commit c675b59e8f7e3b4102cf0e83598b4df23691f209.
* Merge #7267Bundlerbot2019-08-023-7/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7267: Use RbConfig::CONFIG directly instead of Gem::ConfigMap. r=deivid-rodriguez a=hsbt ### What was the end-user problem that led to this PR? When we try to remove `Gem::ConfigMap` on rubygems repository, It breaks the bundler examples. https://github.com/rubygems/rubygems/pull/2848#issuecomment-515726585 ### What was your diagnosis of the problem? Gem::ConfigMap is compatibility code for the old Ruby like 1.8/1.9. ### What is your fix for the problem, implemented in this PR? Use RbConfig instead of `Gem::ConfigMap` directly. It was always provided after the Ruby 2.x. Co-authored-by: Hiroshi SHIBATA <hsbt@ruby-lang.org>
| * Remove Bundler.rubygems.config_map because it was deprecated.remove-gem-configmapHiroshi SHIBATA2019-08-012-5/+1
| |
| * The keys for RbConfig::CONFIG was String.Hiroshi SHIBATA2019-08-011-2/+2
| |
| * Use RbConfig::CONFIG directly instead of Gem::ConfigMap.Hiroshi SHIBATA2019-07-282-3/+4
| | | | | | | | Gem::ConfigMap is compatibility code for the old Ruby like 1.8/1.9.
* | Merge #7269Bundlerbot2019-08-014-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7269: Bump rubocop to 0.74.0 r=hsbt a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that we are using an outdated rubocop version. ### What was your diagnosis of the problem? My diagnosis was that we should upgrade, specially because the newest version fixes an issue that made us disable a cop under some situations. ### What is your fix for the problem, implemented in this PR? My fix is to upgrade rubocop and remove the now unneeded exclusions. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Bump rubocop to 0.74.0bump_rubocopDavid Rodríguez2019-07-314-4/+4
|/ / | | | | | | | | And reenable exclusion because the bug why we added them has been fixed. See https://github.com/rubocop-hq/rubocop/issues/6861.
* | Merge #7123Bundlerbot2019-07-312-101/+83
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7123: Refactors to `bundle outdated` r=deivid-rodriguez a=ryanfox1985 ### What was the end-user problem that led to this PR? Code in `bundle outdated` code be simpler and more readable. ### What is your fix for the problem, implemented in this PR? My fix is to refactor the command. Co-authored-by: Guillermo Guerrero <wolf.fox1985@gmail.com> Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Add exclamation mark to methodDavid Rodríguez2019-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | | To indicate that it can raise. Co-authored-by: Guillermo Guerrero <wolf.fox1985@gmail.com> Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Move `strict` to an attributeDavid Rodríguez2019-07-241-8/+8
| | | | | | | | | | | | | | | Co-authored-by: Guillermo Guerrero <wolf.fox1985@gmail.com> Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Extract some methodsDavid Rodríguez2019-07-241-19/+31
| | | | | | | | | | | | | | | Co-authored-by: Guillermo Guerrero <wolf.fox1985@gmail.com> Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Unfold message to single line for readabilityDavid Rodríguez2019-07-241-2/+1
| | |
| * | Extract a `print_gems` methodGuillermo Guerrero2019-07-241-16/+13
| | |
| * | Less complexityGuillermo Guerrero2019-07-241-15/+8
| | |
| * | Move more locals to attributesDavid Rodríguez2019-07-241-10/+11
| | | | | | | | | | | | | | | Co-authored-by: Guillermo Guerrero <wolf.fox1985@gmail.com> Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Move `any?` logic to the attributeDavid Rodríguez2019-07-241-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | It's the only usage of the `options_include_groups` attribute and its name suggests a boolean, so it fits better now. Co-authored-by: Guillermo Guerrero <wolf.fox1985@gmail.com> Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Move `options_include_groups` to an attributeDavid Rodríguez2019-07-241-5/+5
| | | | | | | | | | | | | | | Co-authored-by: Guillermo Guerrero <wolf.fox1985@gmail.com> Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | Move duplicated code to `before` blocksGuillermo Guerrero2019-07-241-24/+6
| | |
* | | Merge #7265Bundlerbot2019-07-311-5/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7265: Fix incorrect sectioning in `gemfile` man page r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that Gemfile's man page has incorrect syntax in the section where examples for `:ref`, `:tag` and `:branch` are given. ### What was your diagnosis of the problem? My diagnosis was that the section was incorrect since the examples were listed as a separate section. Also, the syntax seems incorrect, since building the docs with [ronn-ng]() (something I've been experimenting with lately) gives the following error: ``` $ bin/rake man/gemfile.5 /home/deivid/.rbenv/versions/2.6.3/bin/ruby -S ronn --roff --pipe man/gemfile.5.ronn > man/gemfile.5 warn: unrecognized inline tag: ["p"] warn: unrecognized inline tag: ["p"] warn: unrecognized inline tag: ["p"] man/gemfile.5 ran for 0.000305 0.000038 0.317832 ( 0.317939) ``` ### What is your fix for the problem, implemented in this PR? My fix is to correct the syntax. The comparison of the rendered man page is: #### `bundle help gemfile` (before) ``` (...) branch, tag, and ref You MUST only specify at most one of these options. The default is :branch => "master" For example: submodules For reference, a git submodule https://git-scm.com/book/en/v2/Git-Tools-Submodules lets you have another git repository within a subfolder of your repository. Specify :submodules => true to cause bundler to expand any submodules included in the git repository (...) ``` #### `bundle help gemfile` (after) ``` (...) branch, tag, and ref You MUST only specify at most one of these options. The default is :branch => "master". For example: git "https://github.com/rails/rails.git", :branch => "5-0-stable" do git "https://github.com/rails/rails.git", :tag => "v5.0.0" do git "https://github.com/rails/rails.git", :ref => "4aded" do submodules For reference, a git submodule https://git-scm.com/book/en/v2/Git-Tools-Submodules lets you have another git repository within a subfolder of your repository. Specify :submodules => true to cause bundler to expand any submodules included in the git repository (...) ``` ### Why did you choose this fix out of the possible options? I chose this fix because it seems like the right thing to do. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | | Fix `git` options examplesfix_gemfile_manpageDavid Rodríguez2019-07-261-3/+3
| | | |
| * | | Fix incorrect sectioning in `gemfile` man pageDavid Rodríguez2019-07-261-2/+1
| | |/ | |/|
* | | Merge #7268Bundlerbot2019-07-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7268: Fix typo in binstubs documentation r=hsbt a=scotttesler ### What was the end-user problem that led to this PR? There is a typo in the [binstubs documentation](https://bundler.io/v2.0/man/bundle-binstubs.1.html). It currently reads > This gives you a file that can **by** run directly It should read > This gives you a file that can **be** run directly ![Screen Shot 2019-07-29 at 3 14 24 PM](https://user-images.githubusercontent.com/586779/62079346-2452b180-b214-11e9-84c6-e2661c60eb4a.png) ### What is your fix for the problem, implemented in this PR? Fix the typo in the RONN file that is used to generate this documentation. Co-authored-by: Scott Tesler <scottiet123@gmail.com>
| * | | Fix typo in binstubs documentationScott Tesler2019-07-291-1/+1
|/ / /
* | | Merge #7259Bundlerbot2019-07-292-26/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7259: Relax bundler binstub r=indirect a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that the logic to select bundler versions was different when bundler is run from a rubygems binstub that when bundler is run from a bundler binstub. ### What was your diagnosis of the problem? My diagnosis was that we should unify the logic. ### What is your fix for the problem, implemented in this PR? My fix is to use the same logic implemented in the rubygems version finder, namely, only fail if the major version of bundler does not match. ### Why did you choose this fix out of the possible options? I chose this fix because it makes things consistent. Fixes #7243. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | | Add workaround from old rubygemsrelax_bundler_binstubDavid Rodríguez2019-07-231-1/+9
| | | | | | | | | | | | | | | | | | | | In these versions, the `approximate_recommendation` method doesn't include the prerelease logic.
| * | | Update error messages to be more preciseDavid Rodríguez2019-07-232-14/+14
| | | |
| * | | Remove unnecessary method parameterDavid Rodríguez2019-07-231-2/+2
| | | |
| * | | Use a consistent requirement in binstubDavid Rodríguez2019-07-232-10/+21
| | | |
| * | | Remove redundant begin-end blockDavid Rodríguez2019-07-231-2/+1
| | | |
| * | | Don't need 1.8 compatibilityDavid Rodríguez2019-07-231-2/+1
| | | |
* | | | Merge #7258Bundlerbot2019-07-2912-38/+67
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7258: Restore the removal of the `--all` flag for `bundle cache` in Bundler 3 r=indirect a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that I accidentally restored this flag on Bundler 3 in #7249, but the plan still is to remove it. ### What was your diagnosis of the problem? My diagnosis was that I need to remove it again. ### What is your fix for the problem, implemented in this PR? My fix is to remove it. ### Why did you choose this fix out of the possible options? I chose this fix because it's the original plan and makes sense. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | | Remove now unused logicrestore_all_flag_bundle_cache_removalDavid Rodríguez2019-07-241-1/+0
| | | |
| * | | Remove unnecessary indirectionsDavid Rodríguez2019-07-242-2/+2
| | | | | | | | | | | | | | | | | | | | These specs are only run on bundler 2, so the compatibility method is not needed.
| * | | Always set `cache_all` via config during testsDavid Rodríguez2019-07-247-31/+60
| | | | | | | | | | | | | | | | | | | | So that the behavior is the same regardless of the tested bundler version.
| * | | Prefer feature flag to harcoded checkDavid Rodríguez2019-07-241-1/+1
| | | |
| * | | Restore `cache_all` flag removalDavid Rodríguez2019-07-241-3/+4
| | |/ | |/|
* | | Merge #7257Bundlerbot2019-07-2610-19/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7257: Get some more Windows specs passing r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that Windows build is still red. ### What was your diagnosis of the problem? My diagnosis was that some functionality is actually working, but specs need to be adapted, because some error messages include the platform on Windows. ### What is your fix for the problem, implemented in this PR? My fix is to use `force_ruby_platform` for those specs. ### Why did you choose this fix out of the possible options? I chose this fix because... I'm not sure, maybe it's better to adapt the error messages to include the platform when run on Windows. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | | Skip specs using `Process.fork` on Windowswindows_fixesDavid Rodríguez2019-07-231-0/+6
| | | |
| * | | Try make some specs platform independentDavid Rodríguez2019-07-236-0/+17
| | | |
| * | | Check for generic lockfilesDavid Rodríguez2019-07-233-5/+3
| | | |
| * | | Indentation fixesDavid Rodríguez2019-07-231-14/+14
| | |/ | |/|
* | | Merge #6809Bundlerbot2019-07-264-16/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6809: Fix using gemspec & force_ruby_platform on windows r=deivid-rodriguez a=segiddins ### What was the end-user problem that led to this PR? The problem was using `gemspec` and `force_ruby_platform` on Windows would lead to gems not being requirable. Fixes #6801. ### What was your diagnosis of the problem? My diagnosis was there was a place where `force_ruby_platform` wasn't being taken into account, namely the query methods on `Bundler.current_ruby` ### What is your fix for the problem, implemented in this PR? My fix was to add a check for the local platform in `current_ruby`, so the `force_ruby_platform` override would be taken into account. ### Why did you choose this fix out of the possible options? I chose this fix because it avoids hard-coding knowledge of the setting in more places. Co-authored-by: Samuel Giddins <segiddins@segiddins.me> Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | | [CurrentRuby] Say we are ruby? when the generic local platform is ↵segiddins/gemspec-force-ruby-platformSamuel Giddins2019-07-092-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Gem::Platform::RUBY This allows us to always say we're ruby? when force_ruby_platform is set, and fixes using gemspec & force_ruby_platform on windows.
| * | | [GemHelpers] Remove the special code path for ruby platform being its own ↵Samuel Giddins2019-07-091-3/+1
| | | | | | | | | | | | | | | | generic
| * | | Make some specs more explicitDavid Rodríguez2019-07-091-13/+11
| | | |
* | | | Merge #7200Bundlerbot2019-07-2515-452/+860
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7200: Bump net-http-persistent to 3.1.0 r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that I wanted to propose some changes to this vendored gem, but I found out that we are using an old version of it. ### What was your diagnosis of the problem? My diagnosis was that we should upgrade. ### What is your fix for the problem, implemented in this PR? My fix is to upgrade the dependency. Since it's a major update, it required some changes. Also, I had to: * Add a new artifice task to vendorize new `connection_pool` dependency. This is the main downside of this PR, that the new version adds a dependency on this gem. But this gem is very stable, and rarely changes and releases new versions, as can be seen by its [releases](https://github.com/mperham/connection_pool/releases). * Cherry-pick a Windows fix not yet merged into master branch of `net-http-persistent`: https://github.com/drbrain/net-http-persistent/pull/90. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * | | | net-http-persistent 3.1.0 has been releasedbump_net_http_persistentDavid Rodríguez2019-07-253-9/+31
| | | | |
| * | | | Add a few comments on vendored dependenciesDavid Rodríguez2019-07-251-0/+14
| | | | |
| * | | | Adapt to the way my automatiek patch worksDavid Rodríguez2019-07-241-1/+1
| | | | |
| * | | | Bump automatiek to 0.2.0David Rodríguez2019-07-242-11/+1
| | | | |