summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [Settings] Make auto_install a bool keyseg-auto-install-bool-keySamuel Giddins2016-09-231-0/+1
|
* Auto merge of #5002 - alepore:fix-colors, r=indirectHomu2016-09-202-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix message parenthesis color Hello! Using Bundler version 1.13.1 i noticed a small graphic inconsistency on parentheses color: <img width="349" alt="screen shot 2016-09-19 at 16 16 10" src="https://cloud.githubusercontent.com/assets/557414/18635257/b41a0366-7e84-11e6-9664-174c90a0863f.png"> This commit resets the opening parenthesis color: <img width="287" alt="screen shot 2016-09-19 at 16 27 08" src="https://cloud.githubusercontent.com/assets/557414/18635630/f7081b94-7e85-11e6-963c-8c2b869a9443.png"> Is this the expected behaviour? The spec was only checking the closing parenthesis color. p.s: Imho green parentheses look better here.
| * fix message parenthesis colorAlessandro Lepore2016-09-202-2/+2
| |
* | Auto merge of #4956 - bundler:seg-prompt-for-sudo, r=indirectHomu2016-09-202-2/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Always prompt once for sudo I think this should close #3006 ? This is an alternate to https://github.com/bundler/bundler/issues/4905. \c @b-ggs
| * | Always prompt once for sudoseg-prompt-for-sudoSamuel Giddins2016-09-072-2/+9
| | |
* | | Auto merge of #4968 - bundler:seg-exec-load-docs, r=indirectHomu2016-09-201-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | Update bundle-exec docs for exec loading See https://github.com/bundler/bundler/issues/4852 @indirect
| * | | Update bundle-exec docs for exec loadingseg-exec-load-docsSamuel Giddins2016-09-111-0/+9
| | | |
* | | | Auto merge of #4998 - srbaker:patch-1, r=segiddinsHomu2016-09-191-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | ::Rake::CommandFailedError doesn't exist.
| * | | ::Rake::CommandFailedError doesn't exist.Steven R. Baker2016-09-171-1/+1
| | | |
* | | | Auto merge of #4971 - bundler:seg-pare-metadata-error, r=indirectHomu2016-09-192-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [EndpointSpecification] Raise a helpful error when parsing metadata fails Would make diagnosing a recent issue around this easier \c @indirect would love to get this into 1.13.1
| * | | | [EndpointSpecification] Raise a helpful error when parsing metadata failsseg-pare-metadata-errorSamuel Giddins2016-09-162-0/+15
| | | | |
* | | | | Auto merge of #4967 - bundler:seg-lock-no-update, r=indirectHomu2016-09-194-11/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Lock] Default to not updating Closes https://github.com/bundler/bundler/issues/4957
| * | | | | [Lock] Default to not updatingseg-lock-no-updateSamuel Giddins2016-09-114-11/+38
| | |_|/ / | |/| | |
* | | | | Auto merge of #4994 - bundler:seg-definition-init-perf, r=segiddinsHomu2016-09-171-4/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | [Definition] Avoid parsing lockfile twice on init \c @chrismo
| * | | | [Definition] Avoid parsing lockfile twice on initseg-definition-init-perfSamuel Giddins2016-09-161-4/+2
| | | | |
* | | | | Auto merge of #4976 - bundler:seg-fix-eval-gemfile-path-sources, r=indirectHomu2016-09-172-1/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Path] Store lockfile paths relative to the root, not the gemfile path Closes https://github.com/bundler/bundler/issues/4966, but i'm wondering if this will break anything else?
| * | | | | [Path] Fix serializing absolute paths that are inside the rootseg-fix-eval-gemfile-path-sourcesSamuel Giddins2016-09-131-1/+1
| | | | | |
| * | | | | [Path] Store lockfile paths relative to the root, not the gemfile pathSamuel Giddins2016-09-132-1/+24
| | |_|/ / | |/| | |
* | | | | Auto merge of #4983 - bundler:seg-redefine-method-visibility, r=indirecthomu-tmpHomu2016-09-161-0/+13
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [RubygemsIntegration] Ensure redefined methods have the same visibility Closes #4975 \c @indirect @headius I'd love to get this out as 1.13.2 asap, if it works
| * | | | [RubygemsIntegration] Only set visibility if theres a methodSamuel Giddins2016-09-161-1/+2
| | | | |
| * | | | [RubygemsIntegration] Ensure redefined methods have the same visibilitySamuel Giddins2016-09-161-0/+12
|/ / / /
* | | | Auto merge of #4922 - ↵Homu2016-09-153-2/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JuanitoFatas:fix/4914-gemfile-engine-symbol-and-string, r=segiddins Support specify engine by symbol in Gemfile This fixes #4914. Our test suite did not run with jruby but I have manually verified this patch works. Details can be seen below. <details> <summary>View manual verification details</summary> The spec I added in this PR works with jruby: ``` $ chruby jruby-9.1.2.0 $ ruby -v jruby 9.1.2.0 (2.3.0) 2016-05-26 7357c8f Java HotSpot(TM) 64-Bit Server VM 25.25-b02 on 1.8.0_25-b17 +jit [darwin-x86_64] $ rspec spec/install/gemfile_spec.rb Run options: exclude {:rubygems_master=>true, :git=>"=< 2.8.1", :rubygems=>"=< 2.6.4", :ruby=>"=< 2.3.0", :realworld=>true, :sudo=>true} bundle install with duplicated gems will display a warning with --gemfile finds the gemfile with gemfile set via config uses the gemfile to install uses the gemfile while in a subdirectory with deprecated features reports that lib is an invalid option with engine specified in symbol <--------------------- HERE should not report error <--------------------- HERE Retried examples: 0 Finished in 43.89 seconds (files took 1.68 seconds to load) 6 examples, 0 failures ``` Real-world Gemfile also works after this patch: ``` $ ruby -v jruby 9.1.2.0 (2.3.0) 2016-05-26 7357c8f Java HotSpot(TM) 64-Bit Server VM 25.25-b02 on 1.8.0_25-b17 +jit [darwin-x86_64] $ cat Gemfile source "https://rubygems.org" ruby '2.3.0', :engine => :jruby, engine_version: '9.1.2.0' $ dbundle The Gemfile specifies no dependencies Bundle complete! 0 Gemfile dependencies, 1 gem now installed. Use `bundle show [gemname]` to see where a bundled gem is installed. ``` </details>
| * | | | Use Hashrocket => because we support Ruby 1.8.7JuanitoFatas2016-09-151-2/+2
| | | | |
| * | | | Support specify engine by symbol in GemfileJuanitoFatas2016-09-153-2/+39
| | | | |
* | | | | Auto merge of #4990 - bundler:seg-realworld-flex, r=segiddinsHomu2016-09-151-2/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | Dynamically fetch expected rails version This way, we don't have to update this expectation every time a new rails version comes out
| * | | | Dynamically fetch expected rails versionseg-realworld-flexSamuel Giddins2016-09-151-2/+10
|/ / / /
* | | | Auto merge of #4977 - chrismo:cons_lock_shared_deps, r=segiddinsHomu2016-09-142-3/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #4934. Make GVP _after_ eager unlock. When Definition creates the GemVersionPromoter, it needs to do so _after_ it's performed the eager_unlock so the GVP gets the correct list of unlocked gems. Prior to this fix, it had a stricter list of gems being updated with the new `--patch` or `--minor` options used with `bundle update` and in some cases would have inconsistent results when used without a conservative switch or the `--major` option. See #4934 for details.
| * | | | Fix #4934. Make GVP _after_ eager unlock.chrismo2016-09-132-3/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Definition creates the GemVersionPromoter, it needs to do so _after_ it's performed the eager_unlock so the GVP gets the correct list of unlocked gems. Prior to this fix, it had a stricter list of gems being updated with the new `--patch` or `--minor` options used with `bundle update` and in some cases would have inconsistent results when used without a conservative switch or the `--major` option. See #4934 for details.
* | | | | Merge tag 'v1.13.1'Samuel Giddins2016-09-132-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Version 1.13.1
| * | | | | Version 1.13.1 with changelogv1.13.1Samuel Giddins2016-09-132-1/+8
| | | | | |
| * | | | | Auto merge of #4972 - bundler:seg-molinillo-0.5.1, r=indirectHomu2016-09-132-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update vendored Molinillo to 0.5.1 See https://github.com/CocoaPods/Molinillo/releases/0.5.1 I'd love this to be a 1.13.1 (cherry picked from commit ffbb417d22592fe3b0a6e5f6008fc7eee491b027)
| * | | | | Auto merge of #4944 - dekellum:missing-require-rubygems-source, r=indirectHomu2016-09-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [RubygemsExt] Add missing require rubygems/source The change referenced below as released in 1.13.0.rc.2, may attempt to reference Gem::Source without it being loaded, resulting in: ~~~ [!] There was an error parsing `Gemfile`: [!] There was an error while loading `elided.gemspec`: uninitialized constant Gem::Source. Bundler cannot continue. ~~~ Observed this on ruby 2.2.5 with stock rubygems 2.4.5 as well as upgraded rubygems 2.6.6. Add this require. f9de70ee931ca4a8500916fa9480f6df6c062626 by @segiddins: > [RubygemsExt] return Source::Installed from #source when appropriate (cherry picked from commit 3b5d04700aff686e0d119d4a7df329a19323f759)
| * | | | | Version 1.13.0 with changelogv1.13.0Andre Arko2016-09-062-1/+5
| | | | | |
| * | | | | Version 1.13.0.rc.2 with changelogv1.13.0.rc.2Andre Arko2016-08-212-2/+34
| | | | | |
| * | | | | postpone the `add` command until 1.14Andre Arko2016-08-212-94/+0
| | | | | | | | | | | | | | | | | | | | | | | | see also #4901
| * | | | | we can just use repo1 instead of copying to repo2Andre Arko2016-08-211-3/+1
| | | | | |
| * | | | | it’s not injecting anymoreAndre Arko2016-08-211-1/+1
| | | | | |
| * | | | | mark inject deprecated for removal in 2.0Andre Arko2016-08-211-0/+1
| | | | | |
* | | | | | Auto merge of #4972 - bundler:seg-molinillo-0.5.1, r=indirectHomu2016-09-132-3/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update vendored Molinillo to 0.5.1 See https://github.com/CocoaPods/Molinillo/releases/0.5.1 I'd love this to be a 1.13.1
| * | | | | Update vendored Molinillo to 0.5.1seg-molinillo-0.5.1Samuel Giddins2016-09-132-3/+9
|/ / / / /
* | | | | Auto merge of #4958 - biow0lf:master, r=indirectHomu2016-09-121-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | Fix typo in CHANGELOG.md
| * | | | Fix typo in CHANGELOG.md [ci skip]Igor Zubkov2016-09-091-1/+1
| | |/ / | |/| |
* | | | Auto merge of #4955 - bundler:seg-fail-invalid-uri-schemes, r=indirectHomu2016-09-112-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fail gracefully when attempting to request from an unknown URI scheme Closes #4953
| * | | | Fail gracefully when attempting to request from an unknown URI schemeseg-fail-invalid-uri-schemesSamuel Giddins2016-09-072-0/+22
| | |_|/ | |/| |
* | | | Auto merge of #4931 - bundler:seg-compact-index-debugging, r=indirectHomu2016-09-112-4/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add debug logging to the compact index client \c @indirect
| * | | | Add debug logging to the compact index clientseg-compact-index-debuggingSamuel Giddins2016-09-061-3/+26
| | | | |
| * | | | [CompactIndexClient::Updater] Support weak etagsSamuel Giddins2016-09-061-1/+1
| | | | |
* | | | | Auto merge of #4944 - dekellum:missing-require-rubygems-source, r=indirectHomu2016-09-111-0/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [RubygemsExt] Add missing require rubygems/source The change referenced below as released in 1.13.0.rc.2, may attempt to reference Gem::Source without it being loaded, resulting in: ~~~ [!] There was an error parsing `Gemfile`: [!] There was an error while loading `elided.gemspec`: uninitialized constant Gem::Source. Bundler cannot continue. ~~~ Observed this on ruby 2.2.5 with stock rubygems 2.4.5 as well as upgraded rubygems 2.6.6. Add this require. f9de70ee931ca4a8500916fa9480f6df6c062626 by @segiddins: > [RubygemsExt] return Source::Installed from #source when appropriate
| * | | | But I only put that there to amuse you, RubocopDavid Kellum2016-09-021-1/+1
| | | | |
| * | | | If this works, you are just as nuisance, RubocopDavid Kellum2016-09-021-1/+2
| | | | |