summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [Settings] Print pretty values for settings as their converted values, ↵seg-config-converted-valueSamuel Giddins2017-06-222-12/+26
| | | | rather than strings
* Auto merge of #5805 - bundler:colby/welcome-message, r=colby-swandaleThe Bundler Bot2017-06-221-0/+7
|\ | | | | | | | | | | add welcome message for PR auto replies This PR is adding the welcome message that will serve as the auto reply for Bundlerbot when a new PR is opened.
| * remove info about running test suite, its redundantcolby/welcome-messageColby Swandale2017-06-221-1/+1
| |
| * feedback and fixed some clarity issuesColby Swandale2017-06-221-2/+2
| |
| * add welcome message for PR auto repliesColby Swandale2017-06-221-0/+7
| |
* | Auto merge of #5804 - bundler:seg-remove-postit-trampoline, r=indirectThe Bundler Bot2017-06-2117-469/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completely remove the postit trampoline ### What was the end-user problem that led to this PR? The problem was the bundler trampoline we tried to introduce never completely worked, it worked even less with bundler installed as a default gem (as we intend to do with RubyGems, like, a year ago), and it worked by doing disgusting things that we couldn't be confident would work under all circumstances. ### Was was your diagnosis of the problem? My diagnosis was our best bet was to completely remove the trampoline from bundler itself. We intend to address the user story of switching bundler versions in RubyGems directly, where the gymnastics required will hopefully be much less obtrusive. Additionally ### What is your fix for the problem, implemented in this PR? My fix is to completely delete all references to trampolining / postit from Bundler and admit defeat. ### Why did you choose this fix out of the possible options? I chose this fix because I'm unwilling to maintain the trampoline any longer, and since it's never been enabled, I feel this is my last chance to pull it from Bundler before I'm stuck maintaining code that doesn't work for all eternity. This will also _finally_ unblock me shipping RubyGems 2.7.
| * | Completely remove the postit trampolineSamuel Giddins2017-06-2117-469/+5
|/ /
* | Auto merge of #5802 - koic:remove_require_spec_helper_from_spec_files, ↵The Bundler Bot2017-06-213-3/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | r=colby-swandale Remove `require "spec_helper"` from spec files Follow up of #5634. Since `--require spec_helper` is specified in the .rspec file, This PR will remove redundancy.
| * | Remove `require "spec_helper"` from spec filesKoichi ITO2017-06-213-3/+0
|/ /
* | Auto merge of #5795 - bundler:seg-spec-warnings, r=segiddinsThe Bundler Bot2017-06-202-9/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid warnings in the specs on Ruby 1.8.7 ### What was the end-user problem that led to this PR? The problem was the specs had method redefinition warnings on 1.8.7. ### Was was your diagnosis of the problem? My diagnosis was the `mkpath` hack was causing some, as well as us requiring support files by their absolute paths. ### What is your fix for the problem, implemented in this PR? My fix requires support files by relative paths and updates rspec to 3.6, where the `mkpath` hack is unnecessary. ### Why did you choose this fix out of the possible options? I chose this fix because it works on 1.8.7 without any adverse effects on modern rubies.
| * | Avoid warnings in the specs on Ruby 1.8.7seg-spec-warningsSamuel Giddins2017-06-202-9/+2
| | |
* | | Auto merge of #5791 - bundler:seg-verbose-cli-print-no-defaults, ↵The Bundler Bot2017-06-202-4/+15
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r=colby-swandale [CLI] Dont print defaults in the command printed with --verbose ### What was the end-user problem that led to this PR? The problem was that running `bundle lock --verbose` would print Running `bundle lock --add-platform --remove-platform --verbose` with bundler 1.15.1 even though the platform flags were never specified. This was surfaced by https://github.com/bundler/bundler/pull/5724, which will be fixed by this PR. ### Was was your diagnosis of the problem? My diagnosis was that default values of options were being printed. ### What is your fix for the problem, implemented in this PR? My fix is to filter out the default values before getting Thor ### Why did you choose this fix out of the possible options? I chose this fix because there is no way, within the `CLI` instance, to tell which flags the user has explicitly given, so I felt that filtering out those options that had default values was the next-best thing.
| * | [CLI] Sort options for stability on ruby < 2seg-verbose-cli-print-no-defaultsSamuel Giddins2017-06-202-2/+2
| | |
| * | [CLI] Dont print defaults in the command printed with --verboseSamuel Giddins2017-06-192-4/+15
|/ /
* | Auto merge of #5727 - bundler:seg-update-source-feature-flag, r=indirectThe Bundler Bot2017-06-195-1/+23
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a feature flag for `bundle update —source NAME` not unlocking a gem with that name ### What was the end-user problem that led to this PR? The problem is that `bundle update --source NAME` will unlock a _gem_ with that name, in addition to the source. ### Was was your diagnosis of the problem? My diagnosis was that we unlocked based on `spec.name` instead of `spec.source.name`. ### What is your fix for the problem, implemented in this PR? My fix is to put this backwards-compatibility hack behind a feature flag that will turn off on 2.0. ### Why did you choose this fix out of the possible options? I chose this fix because it allows the current behavior to continue for those who depend upon it, but the hack will be disabled by default on 2.0, or when `unlock_source_unlocks_spec` is set to true.
| * Add a feature flag for `bundle update —source NAME` not unlocking a gem ↵seg-update-source-feature-flagSamuel Giddins2017-06-185-1/+23
|/ | | | with that name
* Auto merge of #5785 - bundler:colby/fix-group-conflict-error, r=segiddinsThe Bundler Bot2017-06-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix a missing space in the group conflict error message ### What was the end-user problem that led to this PR? There is a typo in the error message that is printed to users when a user specifies a set of conflicting groups when running bundle install. There is a missing space after the first sentence. ``` › bundle install --with foo --without foo You can't list a group in both, --with and --without.The offending groups are: foo. ``` ### Was was your diagnosis of the problem? execute `bundle install --with foo --without foo`
| * fix a missing space in the group conflict error messagecolby/fix-group-conflict-errorColby Swandale2017-06-181-1/+1
| |
* | Auto merge of #5783 - bundler:seg-fix-manpath, r=segiddinsThe Bundler Bot2017-06-172-0/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [EnvironmentPreserver] Allow preserving MANPATH ### What was the end-user problem that led to this PR? The problem was Bundler could throw an exception during setup when a gem contained manpages we were adding to `$MANPATH`. Fixes #5730. ### Was was your diagnosis of the problem? My diagnosis was that `$MANPATH` wasn't whitelisted as a key we preserved / were 'allowed' to override via `SharedHelpers.set_env`. ### What is your fix for the problem, implemented in this PR? My fix is to add `$MANPATH` to that list of keys, as @jules2689 suggested. I also added some test coverage around us setting the proper man path. ### Why did you choose this fix out of the possible options? I chose this fix because it treats that env var in the same way as others bundler sets.
| * | [EnvironmentPreserver] Allow preserving MANPATHseg-fix-manpathSamuel Giddins2017-06-162-0/+39
|/ /
* | Auto merge of #5729 - HippoDippo:patch-1, r=colby-swandaleThe Bundler Bot2017-06-161-1/+1
|\ \ | | | | | | | | | | | | | | | Update bundle-gem.ronn Fixed minor typo in Docs. Hope this helps!
| * | Update bundle-gem.ronnKaycee2017-06-151-1/+1
| | |
* | | Auto merge of #5718 - bundler:seg-reduce-gemfile-eval-count, r=indirectThe Bundler Bot2017-06-166-13/+65
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Eval Gemfiles one fewer time when running `bundle install` This is just a straight port of https://github.com/bundler/bundler/pull/4952 to master from `2-0-dev`. Unfortunately, the Gemfile is still eval'ed twice when plugins are enabled.
| * | | Eval Gemfiles one fewer time when running `bundle install`seg-reduce-gemfile-eval-countSamuel Giddins2017-06-146-13/+65
| | | |
* | | | Auto merge of #5728 - bundler:seg-bundle-gem-github-source, r=indirectThe Bundler Bot2017-06-163-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create Gemfiles with an HTTPS github source defined ### What was the end-user problem that led to this PR? The problem was that people are creating new Gemfiles that use the built-in `github` git source, which is being removed in 2.0. Additionally, it does _not_ use an encrypted connection to GitHub. ### Was was your diagnosis of the problem? My diagnosis was that we can't change the default because of backwards compatibility, but we can encourage _new_ Gemfiles to "do the right thing". ### What is your fix for the problem, implemented in this PR? My fix is to add our new, recommended definition of the shortcut to all bundler-generated gemfiles. ### Why did you choose this fix out of the possible options? I chose this fix because it will only affect new Gemfiles.
| * | | | Create Gemfiles with an HTTPS github source definedseg-bundle-gem-github-sourceSamuel Giddins2017-06-153-0/+6
| | | | |
* | | | | Auto merge of #5721 - bundler:seg-binstubs-shebang, r=indirectThe Bundler Bot2017-06-163-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --shebang option to binstubs command Ports https://github.com/bundler/bundler/pull/4070 to master. bundle install `--binstubs` option is to be removed from Bundler 2.0 but currently supports setting the shebang using the `--shebang` option. See #1467 introducing the `--shebang` option, which with this commit is ported to the binstubs command.
| * | | | | Add --shebang option to binstubs commandseg-binstubs-shebangDimitris Zorbas2017-06-133-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bundle install `--binstubs` option is to be removed from Bundler 2.0 but currently supports setting the shebang using the `--shebang` option. See #1467 introducing the `--shebang` option, which with this commit is ported to the binstubs command.
* | | | | | Auto merge of #5719 - bundler:seg-prefer-gems-rb, r=indirectThe Bundler Bot2017-06-167-9/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [2.0] Add a feature flag to prefer gems.rb to Gemfile With `prefer_gems_rb` set (by default on 2.0), Bundler will prefer a `gems.rb` that is in the same directory as a `Gemfile`
| * | | | | | Add a feature flag to prefer gems.rb to Gemfileseg-prefer-gems-rbSamuel Giddins2017-06-157-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With `prefer_gems_rb` set (by default on 2.0), Bundler will prefer a `gems.rb` that is in the same directory as a `Gemfile`
* | | | | | | Auto merge of #5716 - bundler:seg-version-build-metadata, r=indirectThe Bundler Bot2017-06-1611-7/+150
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print build metadata when running `bundle version` Closes #5049. Will get all the build metadata into `bundle env` once https://github.com/bundler/bundler/pull/5703 lands, since I don't want conflicts and want to use that code for generating the "tables"
| * | | | | | Avoid git shenanigans with the build metadata fileseg-version-build-metadataSamuel Giddins2017-06-1311-44/+76
| | | | | | |
| * | | | | | [Rakefile] Run hooks quietlySamuel Giddins2017-06-122-5/+5
| | | | | | |
| * | | | | | [Rakefile] Add tasks to setup git hooksSamuel Giddins2017-06-122-1/+48
| | | | | | |
| * | | | | | Rebuild build metadata whenever the HEAD changesSamuel Giddins2017-06-121-1/+1
| | | | | | |
| * | | | | | [Rakefile] Assume that the build metadata is unchanged before changing itSamuel Giddins2017-06-121-0/+2
| | | | | | |
| * | | | | | [BUILD_METADATA] Make the defaults "dynamic"Samuel Giddins2017-06-121-2/+2
| | | | | | |
| * | | | | | Add a rake task to generate build metadataSamuel Giddins2017-06-121-0/+18
| | | | | | |
| * | | | | | Print build metadata when running `bundle version`Samuel Giddins2017-06-123-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly don’t print it with -v or —version, though
| * | | | | | Commit blank generated build metadata fileSamuel Giddins2017-06-121-0/+9
| | | | | | |
| * | | | | | [Rakefile] Add support for generated files not checked into gitSamuel Giddins2017-06-122-1/+6
| | | | | | |
* | | | | | | Auto merge of #5702 - bundler:seg-load-path-gem-plugins, r=indirectThe Bundler Bot2017-06-154-1/+56
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Installer] Load plugin files from path gems Closes #5429 . Because RubyGems doesn't know about path gems before we install, we need to manually load the plugin files for the path gems we're installing. This is basically copying the logic RG uses, but scoped only to those gems that we're entirely responsible for.
| * | | | | | Ensure that diff/lcs is loaded in the specsseg-load-path-gem-pluginsSamuel Giddins2017-06-142-1/+7
| | | | | | |
| * | | | | | [RubyGemsIntegration] Implement #matches_for_glob for RG < 1.8Samuel Giddins2017-06-142-1/+9
| | | | | | |
| * | | | | | [Installer] Load plugin files from path gemsSamuel Giddins2017-06-143-1/+42
| | |_|_|/ / | |/| | | |
* | | | | | Auto merge of #5484 - bundler:aa-clearer-sponsorship, r=indirectThe Bundler Bot2017-06-151-5/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | clearer, more specific wording about sponsorship and contributing make it clear that everyone's contributions are welcome, and make it clear that Ruby Together funds contributors, but does not maintain the project directly
| * | | | | github strips css, never mindaa-clearer-sponsorshipAndre Arko2017-03-311-2/+1
| | | | | |
| * | | | | less commas, float the logo leftAndre Arko2017-03-311-2/+3
| | | | | |
| * | | | | re-order it to prioritize users looking for infoAndre Arko2017-03-021-9/+9
| | | | | |
| * | | | | update wording to be even clearerAndre Arko2017-03-021-2/+2
| | | | | |