summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow files other than Gemfile.lock to be opened in definition specssegiddins/allow-rubygems-to-open-filesSamuel Giddins2018-12-081-0/+2
|
* Merge #6832Bundlerbot2018-12-061-7/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6832: Bring CI matrix back to its previous state r=colby-swandale a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that we lost some CI matrix entries after #6830. ### What was your diagnosis of the problem? My diagnosis was that extra entries should be defined under `jobs:` now, specifying their stage. ### What is your fix for the problem, implemented in this PR? My fix is to merge the `jobs` and `matrix` section, and specify the `stage` of each entry. ### Why did you choose this fix out of the possible options? I chose this fix because it seems to bring back the matrix to the way it was before (except for the extra linting stage). Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
| * Bring CI matrix back to its previous stateDavid Rodríguez2018-12-061-7/+10
|/
* Merge #6830Bundlerbot2018-12-062-5/+10
|\ | | | | | | | | | | | | | | | | | | 6830: move rubocop into a separate stage in Travis-CI r=deivid-rodriguez a=colby-swandale ## Overview This PR is pretty much a copy of https://github.com/rubygems/rubygems/pull/2510. It moves rubocop into a separate stage that is run before any tests are executed. This will allow for faster feedback and mean that we don't have to run rubocop on all our available instances in Travis. Co-authored-by: Colby Swandale <me@colby.fyi>
| * move rubocop into a separate stage in Travis-CIColby Swandale2018-12-062-5/+10
|/
* Merge #6818Bundlerbot2018-12-012-1/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6818: Following up ruby core changes. r=hsbt a=hsbt ### What is your fix for the problem, implemented in this PR? These changes enabled to use the same configuration of executables in ruby core repository. * To use libexec instead of bin directory. * Restore exe direcotry for bundler.gemspec while running test suite. ### Why did you choose this fix out of the possible options? The ruby core repository uses `exe` directory for other usage. I chose `libexec` instead of `exe` in ruby core. And, The location of `bundler.gemspec` is not the root of the repository on ruby core. We should restore `libexec` to `exe` under the `lib` dir. see. https://github.com/ruby/ruby/blob/trunk/lib/bundler.gemspec Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
| * Following up ruby core changes.SHIBATA Hiroshi2018-11-272-1/+13
| | | | | | | | | | * To use libexec instead of bin directory. * Restore exe direcotry for bundler.gemspec while running test suite.
* | Merge #6811Bundlerbot2018-11-271-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | 6811: use '|' to preserve line breaks in welcome message r=colby-swandale a=colby-swandale ### What was the end-user problem that led to this PR? I used the wrong block in the welcome message YAML. `>` strips the new line breaks, we want to use `|` instead. Co-authored-by: Colby Swandale <me@colby.fyi>
| * use '|' to preserve line breaks in welcome messageColby Swandale2018-11-271-1/+1
|/
* Merge #6798Bundlerbot2018-11-263-1/+19
|\ | | | | | | | | | | | | | | | | | | | | | | 6798: Use https in the Github shortcut by default in Bundler 2 r=colby-swandale a=colby-swandale This PR is setting Git gems to be fetched over https by default. Note: This PR is successing #6791 Closes #6785 Co-authored-by: Colby Swandale <me@colby.fyi>
| * add feature flag to use https for :git in the dslcolby/git-https-defaultColby Swandale2018-11-253-1/+19
| |
* | Merge #6805Bundlerbot2018-11-242-11/+35
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6805: [Plugin] Ignore the deployment setting r=colby-swandale a=segiddins ### What was the end-user problem that led to this PR? The problem was installing a new plugin in deployment mode would fail with a suggestion the lock file was corrupted, when it installed fine without deployment mode. Fixes #6795. ### What was your diagnosis of the problem? My diagnosis was deployment mode was interfering with installing a new plugin. ### What is your fix for the problem, implemented in this PR? My fix overrides the deployment and frozen settings when creating the plugin Definition. ### Why did you choose this fix out of the possible options? I chose this fix because having a "frozen" plugin bundle makes no sense, since plugins aren't written to the lockfile. Co-authored-by: Samuel Giddins <segiddins@segiddins.me>
| * | [Plugin] Ignore the deployment settingsegiddins/plugins-ignore-deploymentSamuel Giddins2018-11-242-11/+35
| | | | | | | | | | | | This allows installing plugins when the bundler is frozen, since plugins are not locked anyways
* | | Merge #6806Bundlerbot2018-11-241-4/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 6806: Todo remove require for Bundler 2.0 r=colby-swandale a=gavrieltal Co-authored-by: Gavriel Loria <gtloria@protonmail.com>
| * | Merge branch 'todo-remove-require-for-2.0' of ↵Gavriel Loria2018-11-240-0/+0
| |\ \ | | | | | | | | | | | | https://github.com/gavrieltal/bundler into todo-remove-require-for-2.0
| | * | removed require statement for ruby < 1.9 for bundler 2.0Gavriel Loria2018-11-241-4/+0
| | | |
| * | | removing requre gem_remote_fetcherGavriel Loria2018-11-241-4/+0
| |/ /
* | | Merge #6804Bundlerbot2018-11-242-7/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 6804: move welcome message to new welcome bot r=colby-swandale a=colby-swandale This PR is moving the functionality of the welcome bot to https://github.com/apps/welcome and will deprecate https://github.com/bundler/bundlerbot. Co-authored-by: Colby Swandale <me@colby.fyi>
| * | move welcome message to new welcome botcolby/new-welcome-botColby Swandale2018-11-242-7/+9
|/ /
* | Merge #6796Bundlerbot2018-11-231-6/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6796: removed string dup in lockfile_parser.rb for bundler 2.0 r=segiddins a=gavrieltal a task recommended by a TODO comment for the upgrade to Bundler 2.0 Co-authored-by: Gavriel Loria <gtloria@protonmail.com>
| * | removed string dup in lockfile_parser.rb for bundler 2.0Gavriel Loria2018-11-211-6/+4
|/ /
* | Merge #6774Bundlerbot2018-11-213-1/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6774: [Definition] Dont pin path deps to newer versions r=segiddins a=segiddins ### What was the end-user problem that led to this PR? The problem was setting `only_update_to_newer_versions` would break using path gems. Closes #6750 ### What was your diagnosis of the problem? My diagnosis was path gems should _always_ get their version used, since there's 0 alternative versions from a path source. ### What is your fix for the problem, implemented in this PR? My fix should circuits the list of additional requirements when the dependency's source is a path source. ### Why did you choose this fix out of the possible options? I chose this fix because it solves the problem in the same place that has the feature flag conditional Co-authored-by: Samuel Giddins <segiddins@segiddins.me> Co-authored-by: Grey Baker <greysteil@gmail.com>
| * | Add test that gemspec version downgrades work with ↵Grey Baker2018-11-211-0/+14
| | | | | | | | | | | | BUNDLE_BUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS
| * | [Definition] Dont pin path deps to newer versionssegiddins/6750-allow-changing-local-gem-versionSamuel Giddins2018-11-172-1/+17
| | |
* | | Merge #6794Bundlerbot2018-11-201-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 6794: Fix typo from `ssl_certs.rb` r=hsbt a=Mateus-Resende There was a typo mistake in a comment inside `spec/bundler/ssl_certs/certificate_manager_spec.rb#14`. Co-authored-by: Mateus Resende <mateus.resende@runtastic.com>
| * | Fix typo from `ssl_certs.rb`Mateus Resende2018-11-201-1/+1
|/ /
* | Merge #6790Bundlerbot2018-11-172-9/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6790: Fix multiple source warning messages from `error` to `warn` r=greysteil a=jlw ### What was the end-user problem that led to this PR? I've been working on a few repos for most of this year that use a privately-hosted gem with the same name (but completely different purpose) as a gem hosted at rubygems.org - whenever I start with a clean copy and `bundle install` for the first time, I am presented with a warning in red that the gem was found in multiple sources. The red text makes me think that something went wrong, even though bundler did exactly what I wanted it to do. The user experience is wrong - a warning should not be red. ### What was your diagnosis of the problem? When I looked at the source, I saw immediately that the warning was using `Bundler.ui.error` instead of `Bundler.ui.warn`. This is a bug fix with a limited lifespan - after setting up a local copy of bundler I see that 2.0's handling of multiple sources A) is smarter and bypasses the error in most of the repos where I saw it with bundler 1.x; and B) fails early with a different error message in the remaining repos. ### What is your fix for the problem, implemented in this PR? The fix is simply switching to `Bundler.ui.warn` in this case. ### Why did you choose this fix out of the possible options? _I didn't see any other possible options._ Co-authored-by: Jeremy Weathers <jeremy@codekindly.com>
| * | Fix multiple source warning messages from `error` to `warn`Jeremy Weathers2018-11-162-9/+10
| | |
* | | Merge #6786Bundlerbot2018-11-162-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6786: Followed up #6743 r=hsbt a=hsbt ### What was the end-user problem that led to this PR? #6743 was failed with ruby core repository and ignored working example. I fixed them. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
| * | | Followed up https://github.com/bundler/bundler/pull/6743SHIBATA Hiroshi2018-11-162-5/+5
|/ / / | | | | | | | | | | | | #6743 was failed with ruby core repository and ignored working example. Fixed them.
* | | Merge #6775Bundlerbot2018-11-162-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6775: [Plugin::Index] Only register each plugin once for a given hook r=colby-swandale a=segiddins ### What was the end-user problem that led to this PR? The problem was running `plugin install` twice for a plugin withs hooks would cause that hook to be registered twice. Closes #6771. ### What was your diagnosis of the problem? My diagnosis was a plugin's hooks should only be run once per event. ### What is your fix for the problem, implemented in this PR? My fix is to `uniq` the list of plugins registered for each event. Co-authored-by: Samuel Giddins <segiddins@segiddins.me> Co-authored-by: Olle Jonsson <olle.jonsson@gmail.com> Co-authored-by: Colby Swandale <me@colby.fyi>
| * | | fix rubocopColby Swandale2018-11-161-5/+5
| | | |
| * | | Double-register hook in spec segiddins/6771-uniq-hook-registrationOlle Jonsson2018-11-101-1/+6
| | | | | | | | | | | | | | | | | | | | To make it clear the list is uniq’d Co-Authored-By: segiddins <segiddins@segiddins.me>
| * | | [Plugin::Index] Only register each plugin once for a given hookSamuel Giddins2018-11-052-1/+10
| | |/ | |/|
* | | Merge #6743Bundlerbot2018-11-1630-65/+131
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6743: Support file structure of ruby core repository. r=hsbt a=hsbt ### What was the end-user problem that led to this PR? In the ruby core repository, I put bundler executable and bundler libraries under the `bin` and `lib` directories. It breaks the current behavior. ### What is your fix for the problem, implemented in this PR? Support the structure of ruby core repository. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
| * | Revert File.file? conditioon on gemspec, Because it break ↵support-structure-of-ruby-coreSHIBATA Hiroshi2018-11-071-4/+4
| | | | | | | | | | | | spec/runtime/setup_spec.rb:896
| * | rubocop -aSHIBATA Hiroshi2018-11-071-1/+0
| | |
| * | expand version path for rspec examples.SHIBATA Hiroshi2018-11-071-3/+2
| | |
| * | Added extnameSHIBATA Hiroshi2018-11-071-2/+2
| | |
| * | To use around hook instead of before suite.SHIBATA Hiroshi2018-11-061-4/+3
| | |
| * | To use helper method instead of env variables.SHIBATA Hiroshi2018-11-061-2/+2
| | |
| * | To use File.file? instead of handling LoadError.SHIBATA Hiroshi2018-11-061-3/+4
| | |
| * | Support old versions of Ruby on platform_spec.rbSHIBATA Hiroshi2018-11-021-7/+7
| | |
| * | Partly reverted 09bfdfa31ad5ae34d29745344493f6a63d355804.SHIBATA Hiroshi2018-11-021-4/+4
| | |
| * | To use helper method instead of env variables.SHIBATA Hiroshi2018-11-011-1/+1
| | |
| * | rubocop -aSHIBATA Hiroshi2018-11-011-1/+1
| | |
| * | Fixed typoSHIBATA Hiroshi2018-11-011-1/+1
| | |
| * | Backport from ruby coreSHIBATA Hiroshi2018-11-0120-72/+83
| | |
| * | rubocop -aSHIBATA Hiroshi2018-10-206-16/+14
| | |
| * | Restore rubygems certificates. Current bundler examples will removeSHIBATA Hiroshi2018-10-201-1/+7
| | | | | | | | | | | | them after finished bundler rspec.
View Lorry Controller Status