diff options
| author | kaustubh-d <kaustubh@clogeny.com> | 2013-05-13 10:58:16 +0530 |
|---|---|---|
| committer | adamedx <adamed@opscode.com> | 2013-05-13 21:43:52 -0700 |
| commit | 0bf91c1cdec15a1f1a01b053bb80496fce8ac293 (patch) | |
| tree | 525a4fdb88586b5b4972a3789d0ee1fd3f60a149 | |
| parent | 88ffc1fa73d9933e5999b4d1ae59cc179c482897 (diff) | |
| download | chef-0bf91c1cdec15a1f1a01b053bb80496fce8ac293.tar.gz | |
rephrase messages related to colored output options change.
| -rw-r--r-- | lib/chef/application/client.rb | 2 | ||||
| -rw-r--r-- | lib/chef/application/knife.rb | 2 | ||||
| -rw-r--r-- | spec/unit/application/client_spec.rb | 2 | ||||
| -rw-r--r-- | spec/unit/application/knife_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index 365e58778e..9dfad97da6 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -59,7 +59,7 @@ class Chef::Application::Client < Chef::Application :long => '--[no-]color', :boolean => true, :default => !Chef::Platform.windows?, - :description => "Use colored output, defaults to enabled (windows default disabled)" + :description => "Use colored output, defaults to enabled on *NIX platforms and disabled on Windows platforms" option :log_level, :short => "-l LEVEL", diff --git a/lib/chef/application/knife.rb b/lib/chef/application/knife.rb index f92da7fb91..82045d8a29 100644 --- a/lib/chef/application/knife.rb +++ b/lib/chef/application/knife.rb @@ -44,7 +44,7 @@ class Chef::Application::Knife < Chef::Application :long => '--[no-]color', :boolean => true, :default => !Chef::Platform.windows?, - :description => "Use colored output, defaults to enabled (windows default disabled)" + :description => "Use colored output, defaults to enabled on *NIX platforms and disabled on Windows platforms" option :environment, :short => "-E ENVIRONMENT", diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb index 9c9acadad6..04a86bee8d 100644 --- a/spec/unit/application/client_spec.rb +++ b/spec/unit/application/client_spec.rb @@ -141,7 +141,7 @@ describe Chef::Application::Client, "configure_chef" do @app.configure_chef end - it "should set default colored output to false on windows and true otherwise" do + it "should set the colored output to false by default on windows and true otherwise" do if windows? Chef::Config[:color].should be_false else diff --git a/spec/unit/application/knife_spec.rb b/spec/unit/application/knife_spec.rb index dde79d6c05..16f94c7786 100644 --- a/spec/unit/application/knife_spec.rb +++ b/spec/unit/application/knife_spec.rb @@ -61,7 +61,7 @@ describe Chef::Application::Knife do end end - it "should set default colored output to false on windows and true otherwise" do + it "should set the colored output to false by default on windows and true otherwise" do with_argv(*%w{noop knife command}) do @knife.should_receive(:exit).with(0) @knife.run |