From d9c3b0f5ac1e8f7ccbdb4b4edd2fa3e93fe882a5 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Mon, 11 Jul 2011 16:40:00 -0700 Subject: (#8356) Color defaults to false on Windows Windows consoles do not support ansi escape sequences for colorizing output. This commit changes the default setting of 'color' to false when the "microsoft_windows" feature is present. Paired-with: Jacob Helwig (cherry picked from commit d7d384ec0b7f28a8f0be20defcc2eebd0550aff0) --- lib/puppet/defaults.rb | 2 +- spec/integration/defaults_spec.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index d714305b3..85626b2f9 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -47,7 +47,7 @@ module Puppet exits. Comma-separate multiple values. For a list of all values, specify 'all'. This feature is only available in Puppet versions higher than 0.18.4."], - :color => ["ansi", "Whether to use colors when logging to the console. + :color => [(Puppet.features.microsoft_windows? ? "false" : "ansi"), "Whether to use colors when logging to the console. Valid values are `ansi` (equivalent to `true`), `html` (mostly used during testing with TextMate), and `false`, which produces no color."], diff --git a/spec/integration/defaults_spec.rb b/spec/integration/defaults_spec.rb index 8cf0e3e7b..84297e8f9 100755 --- a/spec/integration/defaults_spec.rb +++ b/spec/integration/defaults_spec.rb @@ -277,4 +277,14 @@ describe "Puppet defaults" do subject { Puppet.settings[:reporturl] } it { should == "http://localhost:3000/reports/upload" } end + + describe "when configuring color" do + it "should default to ansi", :unless => Puppet.features.microsoft_windows? do + Puppet.settings[:color].should == 'ansi' + end + + it "should default to false", :if => Puppet.features.microsoft_windows? do + Puppet.settings[:color].should == 'false' + end + end end -- cgit