summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2016-03-05 21:16:43 -0800
committerTim Smith <tsmith84@gmail.com>2016-03-05 21:21:39 -0800
commitfc687aabc64b844e2e68f23a21ecdb8176bc975e (patch)
treebe33cf13f55d1d81316c5409a0f99a4caed62627
parent27123a6e5d768323f45f2d07dcf210db4b3c8133 (diff)
downloadchef-fc687aabc64b844e2e68f23a21ecdb8176bc975e.tar.gz
What's with all the exclamation points
We use these in odd places and not consistently. It's like knife is yelling at me when I mess up or it's really excited I updated a node (but not environments for some reason)
-rw-r--r--lib/chef/knife/configure.rb4
-rw-r--r--lib/chef/knife/cookbook_site_share.rb2
-rw-r--r--lib/chef/knife/data_bag_edit.rb2
-rw-r--r--lib/chef/knife/edit.rb2
-rw-r--r--lib/chef/knife/node_from_file.rb2
-rw-r--r--lib/chef/knife/role_from_file.rb2
-rw-r--r--lib/chef/knife/ssh.rb2
7 files changed, 8 insertions, 8 deletions
diff --git a/lib/chef/knife/configure.rb b/lib/chef/knife/configure.rb
index df41aa7265..e726e32684 100644
--- a/lib/chef/knife/configure.rb
+++ b/lib/chef/knife/configure.rb
@@ -108,13 +108,13 @@ EOH
ui.msg("")
ui.msg("You must place your client key in:")
ui.msg(" #{new_client_key}")
- ui.msg("Before running commands with Knife!")
+ ui.msg("Before running commands with Knife")
ui.msg("")
ui.msg("*****")
ui.msg("")
ui.msg("You must place your validation key in:")
ui.msg(" #{validation_key}")
- ui.msg("Before generating instance data with Knife!")
+ ui.msg("Before generating instance data with Knife")
ui.msg("")
ui.msg("*****")
end
diff --git a/lib/chef/knife/cookbook_site_share.rb b/lib/chef/knife/cookbook_site_share.rb
index fc5517cebc..6f37568f5f 100644
--- a/lib/chef/knife/cookbook_site_share.rb
+++ b/lib/chef/knife/cookbook_site_share.rb
@@ -90,7 +90,7 @@ class Chef
begin
do_upload("#{tmp_cookbook_dir}/#{cookbook_name}.tgz", category, Chef::Config[:node_name], Chef::Config[:client_key])
- ui.info("Upload complete!")
+ ui.info("Upload complete")
Chef::Log.debug("Removing local staging directory at #{tmp_cookbook_dir}")
FileUtils.rm_rf tmp_cookbook_dir
rescue => e
diff --git a/lib/chef/knife/data_bag_edit.rb b/lib/chef/knife/data_bag_edit.rb
index ffe9a9035a..5d76762058 100644
--- a/lib/chef/knife/data_bag_edit.rb
+++ b/lib/chef/knife/data_bag_edit.rb
@@ -49,7 +49,7 @@ class Chef
def run
if @name_args.length != 2
- stdout.puts "You must supply the data bag and an item to edit!"
+ stdout.puts "You must supply the data bag and an item to edit"
stdout.puts opt_parser
exit 1
end
diff --git a/lib/chef/knife/edit.rb b/lib/chef/knife/edit.rb
index cd2c1c741b..5275f3c59b 100644
--- a/lib/chef/knife/edit.rb
+++ b/lib/chef/knife/edit.rb
@@ -32,7 +32,7 @@ class Chef
result.write(new_value)
output "Updated #{format_path(result)}"
else
- output "#{format_path(result)} unchanged!"
+ output "#{format_path(result)} unchanged"
end
rescue Chef::ChefFS::FileSystem::OperationNotAllowedError => e
ui.error "#{format_path(e.entry)}: #{e.reason}."
diff --git a/lib/chef/knife/node_from_file.rb b/lib/chef/knife/node_from_file.rb
index 8e05e2798a..61b83edd92 100644
--- a/lib/chef/knife/node_from_file.rb
+++ b/lib/chef/knife/node_from_file.rb
@@ -42,7 +42,7 @@ class Chef
output(format_for_display(updated)) if config[:print_after]
- ui.info("Updated Node #{updated.name}!")
+ ui.info("Updated Node #{updated.name}")
end
end
diff --git a/lib/chef/knife/role_from_file.rb b/lib/chef/knife/role_from_file.rb
index e1f4737ab9..bf21a38fd7 100644
--- a/lib/chef/knife/role_from_file.rb
+++ b/lib/chef/knife/role_from_file.rb
@@ -42,7 +42,7 @@ class Chef
output(format_for_display(updated)) if config[:print_after]
- ui.info("Updated Role #{updated.name}!")
+ ui.info("Updated Role #{updated.name}")
end
end
diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index 9c0f8936f0..4ccc300036 100644
--- a/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
@@ -162,7 +162,7 @@ class Chef
search_nodes
if list.length == 0
if @action_nodes.length == 0
- ui.fatal("No nodes returned from search!")
+ ui.fatal("No nodes returned from search")
else
ui.fatal("#{@action_nodes.length} #{@action_nodes.length > 1 ? "nodes" : "node"} found, " +
"but does not have the required attribute to establish the connection. " +