summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [GitProxy] Only try and submodule deinit on git 2.9.0+seg-deinit-submodulesSamuel Giddins2016-06-273-2/+3
|
* [GitProxy] Deinit submodules if they are not requestedSamuel Giddins2016-06-242-2/+5
|
* Auto merge of #4712 - bundler:seg-skip-reresolve, r=indirectHomu2016-06-252-3/+24
|\ | | | | | | | | | | [Definition] Add a #change_reason printed in debug @indirect this might make your debugging a bit easier?
| * [Definition] Add a #change_reason printed in debugseg-skip-reresolveSamuel Giddins2016-06-241-2/+23
| |
| * [SpecSet] Don't mutate the skip listSamuel Giddins2016-06-241-1/+1
|/ | | | This could cause definition to think bundler is being updated
* Auto merge of #4702 - bundler:seg-major-deprecations, r=indirectHomu2016-06-2411-30/+165
|\ | | | | | | | | | | | | | | Add machinery for printing major deprecations First step towards handling all of #4695 \c @RochesterinNYC @indirect
| * Fix matching against multiple major deprecationsseg-major-deprecationsSamuel Giddins2016-06-231-2/+2
| |
| * [SharedHelpers] Fix printing rubygems versionSamuel Giddins2016-06-231-1/+1
| |
| * [Shell] Fix #silenceSamuel Giddins2016-06-231-2/+2
| |
| * Add spec for not printing major deprecations with --quietSamuel Giddins2016-06-231-0/+7
| |
| * Add spec machinery for testing major deprecationsSamuel Giddins2016-06-232-3/+73
| |
| * Print the first batch of major deprecation warningsSamuel Giddins2016-06-235-21/+13
| |
| * Add machinery for printing major deprecationsSamuel Giddins2016-06-235-10/+44
| |
| * [UI] Add support for printing major deprecationsSamuel Giddins2016-06-233-0/+9
| |
| * [Settings] Move keys to their own line & sortSamuel Giddins2016-06-231-3/+26
|/ | | | Will make future diffs much easier to read
* Auto merge of #4701 - chrismo:issue-4592-gem-path-empty-string, r=segiddinsHomu2016-06-242-6/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unset GEM_PATH with nil not empty string. This should fix #4592, the tests all pass, but the line of code in question goes back to 2010, so this sorta seems slightly dangerous, but it's probable the circumstances of hitting this line in conjunction with `bundle exec` is a combination that didn't exist prior to 1.12.x. Issue #4592 has a full diagnosis, but the gist of it is this: if an empty string is passed as the `GEM_PATH` to the subsequent process launched by `bundle exec`, then if the `cmd` portion of `bundle exec` is a ruby shebanged file, then if the current bundle install uses a local path (`disable_shared_gems` is true) then it won't be able to find the bundler gem at all because Bundler doesn't install itself into its own Bundle, it's only installed in the system gems for the Ruby. `nil` must be passed because the RubyGems code that sets up the `GEM_PATH` does a conditional on the current `GEM_PATH` and empty string evaluates to true, whereas `nil` evaluates to false. In the false case the `GEM_PATH` is internally populated with the system gems path such that the bundler gem can be found.
| * Unset `GEM_PATH` with `nil` not empty string.chrismo2016-06-222-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix #4592, the tests all pass, but the line of code in question goes back to 2010, so this sorta seems slightly dangerous, but it's probable the circumstances of hitting this line in conjunction with `bundle exec` is a combination that didn't exist prior to 1.12.x. Issue #4592 has a full diagnosis, but the gist of it is this: if an empty string is passed as the `GEM_PATH` to the subsequent process launched by `bundle exec`, then if the `cmd` portion of `bundle exec` is a ruby shebanged file, then if the current bundle install uses a local path (`disable_shared_gems` is true) then it won't be able to find the bundler gem at all because Bundler doesn't install itself into its own Bundle, it's only installed in the system gems for the Ruby. `nil` must be passed because the RubyGems code that sets up the `GEM_PATH` does a conditional on the current `GEM_PATH` and empty string evaluates to true, whereas `nil` evaluates to false. In the false case the `GEM_PATH` is internally populated with the system gems path such that the bundler gem can be found.
* | Auto merge of #4700 - bundler:seg-lockfile-frozen-string-old-rg, r=segiddinsHomu2016-06-231-4/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | [LockfileParser] Support for old RG on Ruby 2.3+ Fixes #4698 \c @allenzhao
| * | [LockfileParser] Support for old RG on Ruby 2.3+Samuel Giddins2016-06-221-4/+6
|/ /
* | Auto merge of #4694 - bundler:seg-rubygems-merger, r=indirectHomu2016-06-223-11/+24
|\ \ | | | | | | | | | Change Rakefile to work as a RubyGems submodule
| * | [PostItTrampoline] Support for running as a default specseg-rubygems-mergerSamuel Giddins2016-06-211-2/+5
| | |
| * | Change Rakefile to work as a submoduleSamuel Giddins2016-06-212-9/+19
|/ /
* | Auto merge of #4692 - bundler:seg-fix-trampoline-specs, r=segiddinsHomu2016-06-211-1/+1
|\ \ | | | | | | | | | Fix hardcoded bundler version string in trampoline specs
| * | Fix hardcoded bundler version string in trampoline specsSamuel Giddins2016-06-201-1/+1
|/ /
* | Merge tag 'v1.13.0.pre.1'Samuel Giddins2016-06-202-1/+43
|\ \ | | | | | | | | | Version 1.13.0.pre.1
| * | Version 1.13.0.pre.1 with changelogv1.13.0.pre.1Samuel Giddins2016-06-202-1/+43
|/ /
* | Auto merge of #4691 - bundler:seg-doc-update-bundler, r=indirectHomu2016-06-211-0/+3
|\ \ | | | | | | | | | | | | | | | [Docs] Add update --bundler \c @indirect
| * | [Docs] Add update --bundlerSamuel Giddins2016-06-201-0/+3
| | |
* | | Auto merge of #4689 - kruczjak:clean_man, r=indirectHomu2016-06-201-19/+19
|\ \ \ | | | | | | | | | | | | [Docs] Remove descriptions in brackets inside gemfile.5.ronn
| * | | [Docs] Remove descriptions in bracketskruczjak2016-06-191-19/+19
| |/ /
* | | Merge pull request #4671 from bundler/seg-molinillo-0.5.0Samuel Giddins2016-06-1915-200/+763
|\ \ \ | | | | | | | | Update vendored Molinillo to 0.5.0
| * | | [Resolver] Mark molinillo methods as publicseg-molinillo-0.5.0Samuel Giddins2016-06-191-2/+2
| | | |
| * | | Update vendored Molinillo to 0.5.0Samuel Giddins2016-06-1414-198/+761
| | | |
* | | | Merge pull request #4456 from sandlerr/sandlerr/safe_outputSamuel Giddins2016-06-195-13/+31
|\ \ \ \ | | | | | | | | | | do not log the credentials used to contact a gem server
| * | | | add a test for not logging passwordsRoman Sandler2016-06-181-0/+12
| | | | |
| * | | | Do not log the credentials used to contact a gem serverRoman Sandler2016-06-184-13/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a filter_uri method to HTTPError backed by the URICredentialsFilter to be used when preparing error output. In the tests, replace a double object with a real URI and change a test hostname to be valid so that older versions of Ruby's URI module don't choke on it. It would be cool to somehow replace this work with the `anonymized_uri` in the Bundler::Source::Rubygems::Remote class.
* | | | Merge pull request #4618 from jrafanie/use_set_for_orderless_array_comparisonSamuel Giddins2016-06-194-9/+160
|\ \ \ \ | |/ / / |/| | | [WIP] Properly detect path spec changes to avoid needless re-resolve
| * | | Don't include dev dependencies when comparing indexes.Joe Rafaniello2016-06-172-1/+8
| | | |
| * | | Detect changes in path specs by comparing locked specs to source specsJoe Rafaniello2016-06-173-10/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we'd wrongly conclude there are no path changes when there are changes. We'd parse the Gemfile.lock and compare the source.specs, the gemspecs currently in the path, to what's in the Gemfile.lock's locked.specs. Unfortunately, locked.specs for Path sources creates an Index with the specs from the filesystem and NOT what we already parsed from the Gemfile.lock! In other words, we compare the filesystems specs for a path to itself and always conclude "No changes detected!" Instead, we build an index with specs for the source we want from the already parsed Gemfile.lock. We use this index to compare to the current source.specs index from the filesystem. Ironically, this issue was masked by the bug from our prior fix, namely that dependencies_for_source_changed? always would conclude that there were changes. Because of that bug, it would short circuit out of the nothing_changed? method and force a re-resolve with path gems, which would properly build the Gemfile.lock from the prior parsed one. Undo some test changes needed to get the first fix to pass.
| * | | Use Set equality for path gems to avoid unneeded re-resolution.Joe Rafaniello2016-06-174-5/+42
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - For comparing source dependencies to locked source dependencies - For comparing two Bundler::Index dependencies Added test case. Fixed bad tests cases hidden by the above bug: - 'foo' depended on rack but we didn't build 'rack' in the path - We couldn't find 'bar' built into 'foo/bar' because the :path only had 'foo'
* | | Merge pull request #4670 from bundler/seg-remove-private-methodsSamuel Giddins2016-06-141-2/+8
|\ \ \ | |/ / |/| | [RubygemsIntegration] Allow redefining private methods
| * | [RubygemsIntegration] Allow redefining private methodsseg-remove-private-methodsSamuel Giddins2016-06-141-2/+8
|/ /
* | Auto merge of #4643 - bundler:seg-postit-trampoline, r=indirectHomu2016-06-1117-3/+341
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [bundle] Automatically trampoline to postit - [x] Specs ~~Except on bundle exec, since that would be too slow~~ ~~If you want, I guess we could vendor postit and manually setup the `LOAD_PATH` and `-r` the full path to the vendored postit exe. Your call.~~ Done this \c @indirect
| * | [PostIt] Update for support for RubyGems 1.3.6seg-postit-trampolineSamuel Giddins2016-06-101-3/+3
| | |
| * | [PostIt] Update to add legacy RubyGems supportSamuel Giddins2016-06-102-4/+15
| | |
| * | Spec support for old rubygems binstub formatSamuel Giddins2016-06-101-0/+9
| | |
| * | Update PostIt to rescue an error that exists on old RGVsSamuel Giddins2016-06-101-1/+1
| | |
| * | Fail gracefully when installing bundler failsSamuel Giddins2016-06-102-2/+20
| | |
| * | Add a spec for trampoliningSamuel Giddins2016-06-102-1/+120
| | |
| * | Add total bundler version trampolining via vendored postitSamuel Giddins2016-06-1016-8/+183
| | |