diff options
author | Sutou Kouhei <kou@clear-code.com> | 2020-01-20 05:42:57 +0900 |
---|---|---|
committer | Sutou Kouhei <kou@clear-code.com> | 2020-01-20 09:15:40 +0900 |
commit | 9e60772c0b428ba82b57a44e52acd21bebef0f59 (patch) | |
tree | 356c07e35ca05aea67c42f22b4f56877c40a79db | |
parent | 94288385498a69e679b576affae393578131e2a3 (diff) | |
download | bundler-9e60772c0b428ba82b57a44e52acd21bebef0f59.tar.gz |
Prepend debug label to resolver's debug message
If we have the same label in all resolver's debug messages, we can find
resolver's debug message easily. For example, we can use "/BUNDLER:"
in less. It's useful when we have many debug messages.
-rw-r--r-- | lib/bundler/resolver.rb | 2 | ||||
-rw-r--r-- | spec/install/gems/resolving_spec.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 8b029cc0dc..61bb648598 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -75,7 +75,7 @@ module Bundler return unless debug? debug_info = yield debug_info = debug_info.inspect unless debug_info.is_a?(String) - warn debug_info.split("\n").map {|s| " " * depth + s } + warn debug_info.split("\n").map {|s| "BUNDLER: " + " " * depth + s } end def debug? diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb index 323b28fdb1..5689da8175 100644 --- a/spec/install/gems/resolving_spec.rb +++ b/spec/install/gems/resolving_spec.rb @@ -79,7 +79,7 @@ RSpec.describe "bundle install with install-time dependencies" do bundle :install, :env => { "BUNDLER_DEBUG_RESOLVER" => "1" } - expect(err).to include("Creating possibility state for net_c") + expect(err).to include("BUNDLER: Starting resolution") end end @@ -93,7 +93,7 @@ RSpec.describe "bundle install with install-time dependencies" do bundle :install, :env => { "DEBUG_RESOLVER" => "1" } - expect(err).to include("Creating possibility state for net_c") + expect(err).to include("BUNDLER: Starting resolution") end end @@ -108,8 +108,8 @@ RSpec.describe "bundle install with install-time dependencies" do bundle :install, :env => { "DEBUG_RESOLVER_TREE" => "1" } expect(err).to include(" net_b"). - and include("Starting resolution"). - and include("Finished resolution"). + and include("BUNDLER: Starting resolution"). + and include("BUNDLER: Finished resolution"). and include("Attempting to activate") end end |