summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Cooper <josh@puppetlabs.com>2011-07-11 16:40:00 -0700
committerJacob Helwig <jacob@puppetlabs.com>2011-08-19 13:48:28 -0700
commitd9c3b0f5ac1e8f7ccbdb4b4edd2fa3e93fe882a5 (patch)
tree5e010d14fd0313cbe831ac116458d4cbe7575c56
parent9ebe500c496f76c5678fcde9c52d65c8282c9fe6 (diff)
downloadpuppet-d9c3b0f5ac1e8f7ccbdb4b4edd2fa3e93fe882a5.tar.gz
puppet-d9c3b0f5ac1e8f7ccbdb4b4edd2fa3e93fe882a5.tar.xz
puppet-d9c3b0f5ac1e8f7ccbdb4b4edd2fa3e93fe882a5.zip
(#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 <jacob@puppetlabs.com> (cherry picked from commit d7d384ec0b7f28a8f0be20defcc2eebd0550aff0)
-rw-r--r--lib/puppet/defaults.rb2
-rwxr-xr-xspec/integration/defaults_spec.rb10
2 files changed, 11 insertions, 1 deletions
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