summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2016-03-05 21:04:42 -0800
committerTim Smith <tsmith84@gmail.com>2016-03-05 21:21:39 -0800
commit9f298906fabed36b136314f5e2acb9793011d1ee (patch)
treec195bfef7055615c22c306944e4548b110b59544
parent60c8124366ab34b5992fc03c508b345218c90dfe (diff)
downloadchef-9f298906fabed36b136314f5e2acb9793011d1ee.tar.gz
Single space after periods
Double spacing is for typewriters. Knife doesn't run on typewriters http://www.writersdigest.com/online-editor/how-many-spaces-after-a-period
-rw-r--r--lib/chef/knife/bootstrap.rb2
-rw-r--r--lib/chef/knife/core/hashed_command_loader.rb2
-rw-r--r--lib/chef/knife/core/subcommand_loader.rb2
-rw-r--r--lib/chef/knife/data_bag_edit.rb2
-rw-r--r--lib/chef/knife/data_bag_secret_options.rb4
-rw-r--r--lib/chef/knife/data_bag_show.rb2
-rw-r--r--lib/chef/knife/delete.rb2
-rw-r--r--lib/chef/knife/deps.rb4
-rw-r--r--lib/chef/knife/index_rebuild.rb4
-rw-r--r--lib/chef/knife/osc_user_create.rb2
-rw-r--r--lib/chef/knife/raw.rb6
-rw-r--r--lib/chef/knife/serve.rb2
-rw-r--r--lib/chef/knife/upload.rb2
-rw-r--r--lib/chef/knife/xargs.rb8
14 files changed, 22 insertions, 22 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index 52fa177159..f5dc29371f 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -189,7 +189,7 @@ class Chef
option :hint,
:long => "--hint HINT_NAME[=HINT_FILE]",
- :description => "Specify Ohai Hint to be set on the bootstrap target. Use multiple --hint options to specify multiple hints.",
+ :description => "Specify Ohai Hint to be set on the bootstrap target. Use multiple --hint options to specify multiple hints.",
:proc => Proc.new { |h|
Chef::Config[:knife][:hints] ||= Hash.new
name, path = h.split("=")
diff --git a/lib/chef/knife/core/hashed_command_loader.rb b/lib/chef/knife/core/hashed_command_loader.rb
index 1165af6eb2..8423c01812 100644
--- a/lib/chef/knife/core/hashed_command_loader.rb
+++ b/lib/chef/knife/core/hashed_command_loader.rb
@@ -60,7 +60,7 @@ class Chef
if errors.empty?
commands
else
- Chef::Log.error "There are files specified in the manifest that are missing. Please rehash to update the subcommands cache. If you see this error after rehashing delete the cache at #{Chef::Knife::SubcommandLoader.plugin_manifest_path}"
+ Chef::Log.error "There are files specified in the manifest that are missing. Please rehash to update the subcommands cache. If you see this error after rehashing delete the cache at #{Chef::Knife::SubcommandLoader.plugin_manifest_path}"
Chef::Log.error "Missing files:\n\t#{errors.values.flatten.join("\n\t")}"
{}
end
diff --git a/lib/chef/knife/core/subcommand_loader.rb b/lib/chef/knife/core/subcommand_loader.rb
index 72329d8b95..d21f0daee2 100644
--- a/lib/chef/knife/core/subcommand_loader.rb
+++ b/lib/chef/knife/core/subcommand_loader.rb
@@ -51,7 +51,7 @@ class Chef
Chef::Log.debug("Using autogenerated hashed command manifest #{plugin_manifest_path}")
Knife::SubcommandLoader::HashedCommandLoader.new(chef_config_dir, plugin_manifest)
elsif custom_manifest?
- Chef.log_deprecation("Using custom manifest #{plugin_manifest_path} is deprecated. Please use a `knife rehash` autogenerated manifest instead.")
+ Chef.log_deprecation("Using custom manifest #{plugin_manifest_path} is deprecated. Please use a `knife rehash` autogenerated manifest instead.")
Knife::SubcommandLoader::CustomManifestLoader.new(chef_config_dir, plugin_manifest)
else
Knife::SubcommandLoader::GemGlobLoader.new(chef_config_dir)
diff --git a/lib/chef/knife/data_bag_edit.rb b/lib/chef/knife/data_bag_edit.rb
index e059df5828..ffe9a9035a 100644
--- a/lib/chef/knife/data_bag_edit.rb
+++ b/lib/chef/knife/data_bag_edit.rb
@@ -61,7 +61,7 @@ class Chef
ui.info("Encrypting data bag using provided secret.")
item_to_save = Chef::EncryptedDataBagItem.encrypt_data_bag_item(edited_item, read_secret)
else
- ui.info("Saving data bag unencrypted. To encrypt it, provide an appropriate secret.")
+ ui.info("Saving data bag unencrypted. To encrypt it, provide an appropriate secret.")
item_to_save = edited_item
end
diff --git a/lib/chef/knife/data_bag_secret_options.rb b/lib/chef/knife/data_bag_secret_options.rb
index 7e458007f0..b426cd442c 100644
--- a/lib/chef/knife/data_bag_secret_options.rb
+++ b/lib/chef/knife/data_bag_secret_options.rb
@@ -37,14 +37,14 @@ class Chef
base.option :secret,
:short => "-s SECRET",
:long => "--secret ",
- :description => "The secret key to use to encrypt data bag item values. Can also be defaulted in your config with the key 'secret'",
+ :description => "The secret key to use to encrypt data bag item values. Can also be defaulted in your config with the key 'secret'",
# Need to store value from command line in separate variable - knife#merge_configs populates same keys
# on config object from
:proc => Proc.new { |s| set_cl_secret(s) }
base.option :secret_file,
:long => "--secret-file SECRET_FILE",
- :description => "A file containing the secret key to use to encrypt data bag item values. Can also be defaulted in your config with the key 'secret_file'",
+ :description => "A file containing the secret key to use to encrypt data bag item values. Can also be defaulted in your config with the key 'secret_file'",
:proc => Proc.new { |sf| set_cl_secret_file(sf) }
base.option :encrypt,
diff --git a/lib/chef/knife/data_bag_show.rb b/lib/chef/knife/data_bag_show.rb
index 82978db5cf..ea9c390f19 100644
--- a/lib/chef/knife/data_bag_show.rb
+++ b/lib/chef/knife/data_bag_show.rb
@@ -48,7 +48,7 @@ class Chef
secret)
format_for_display(raw.to_hash)
elsif encrypted && !secret
- ui.warn("Encrypted data bag detected, but no secret provided for decoding. Displaying encrypted data.")
+ ui.warn("Encrypted data bag detected, but no secret provided for decoding. Displaying encrypted data.")
format_for_display(raw_data)
else
ui.warn("Unencrypted data bag detected, ignoring any provided secret options.")
diff --git a/lib/chef/knife/delete.rb b/lib/chef/knife/delete.rb
index d5d4a4c4bd..ac162342a6 100644
--- a/lib/chef/knife/delete.rb
+++ b/lib/chef/knife/delete.rb
@@ -31,7 +31,7 @@ class Chef
def run
if name_args.length == 0
show_usage
- ui.fatal("Must specify at least one argument. If you want to delete everything in this directory, type \"knife delete --recurse .\"")
+ ui.fatal("Must specify at least one argument. If you want to delete everything in this directory, type \"knife delete --recurse .\"")
exit 1
end
diff --git a/lib/chef/knife/deps.rb b/lib/chef/knife/deps.rb
index 99a24e405b..e773f65106 100644
--- a/lib/chef/knife/deps.rb
+++ b/lib/chef/knife/deps.rb
@@ -15,11 +15,11 @@ class Chef
option :recurse,
:long => "--[no-]recurse",
:boolean => true,
- :description => "List dependencies recursively (default: true). Only works with --tree."
+ :description => "List dependencies recursively (default: true). Only works with --tree."
option :tree,
:long => "--tree",
:boolean => true,
- :description => "Show dependencies in a visual tree. May show duplicates."
+ :description => "Show dependencies in a visual tree. May show duplicates."
option :remote,
:long => "--remote",
:boolean => true,
diff --git a/lib/chef/knife/index_rebuild.rb b/lib/chef/knife/index_rebuild.rb
index eb85b8d7be..206b7b0fbf 100644
--- a/lib/chef/knife/index_rebuild.rb
+++ b/lib/chef/knife/index_rebuild.rb
@@ -68,11 +68,11 @@ class Chef
end
def deprecated_server_message
- ui.warn("'knife index rebuild' has been removed for Chef 11+ servers. It will continue to work for prior versions, however.")
+ ui.warn("'knife index rebuild' has been removed for Chef 11+ servers. It will continue to work for prior versions, however.")
end
def nag
- ui.info("This operation is destructive. Rebuilding the index may take some time.")
+ ui.info("This operation is destructive. Rebuilding the index may take some time.")
ui.confirm("Continue")
end
diff --git a/lib/chef/knife/osc_user_create.rb b/lib/chef/knife/osc_user_create.rb
index 2e971365ec..74b50a4ef4 100644
--- a/lib/chef/knife/osc_user_create.rb
+++ b/lib/chef/knife/osc_user_create.rb
@@ -50,7 +50,7 @@ class Chef
option :user_key,
:long => "--user-key FILENAME",
- :description => "Public key for newly created user. By default a key will be created for you."
+ :description => "Public key for newly created user. By default a key will be created for you."
banner "knife osc_user create USER (options)"
diff --git a/lib/chef/knife/raw.rb b/lib/chef/knife/raw.rb
index 56527a00f2..549b337ddf 100644
--- a/lib/chef/knife/raw.rb
+++ b/lib/chef/knife/raw.rb
@@ -20,13 +20,13 @@ class Chef
:long => "--method METHOD",
:short => "-m METHOD",
:default => "GET",
- :description => "Request method (GET, POST, PUT or DELETE). Default: GET"
+ :description => "Request method (GET, POST, PUT or DELETE). Default: GET"
option :pretty,
:long => "--[no-]pretty",
:boolean => true,
:default => true,
- :description => "Pretty-print JSON output. Default: true"
+ :description => "Pretty-print JSON output. Default: true"
option :input,
:long => "--input FILE",
@@ -37,7 +37,7 @@ class Chef
:long => "--proxy-auth",
:boolean => true,
:default => false,
- :description => "Use webui proxy authentication. Client key must be the webui key."
+ :description => "Use webui proxy authentication. Client key must be the webui key."
class RawInputServerAPI < Chef::HTTP
def initialize(options = {})
diff --git a/lib/chef/knife/serve.rb b/lib/chef/knife/serve.rb
index f74a5c1d1d..95996e6d1e 100644
--- a/lib/chef/knife/serve.rb
+++ b/lib/chef/knife/serve.rb
@@ -9,7 +9,7 @@ class Chef
option :repo_mode,
:long => "--repo-mode MODE",
- :description => "Specifies the local repository layout. Values: static (only environments/roles/data_bags/cookbooks), everything (includes nodes/clients/users), hosted_everything (includes acls/groups/etc. for Enterprise/Hosted Chef). Default: everything/hosted_everything"
+ :description => "Specifies the local repository layout. Values: static (only environments/roles/data_bags/cookbooks), everything (includes nodes/clients/users), hosted_everything (includes acls/groups/etc. for Enterprise/Hosted Chef). Default: everything/hosted_everything"
option :chef_repo_path,
:long => "--chef-repo-path PATH",
diff --git a/lib/chef/knife/upload.rb b/lib/chef/knife/upload.rb
index d0bf89fa7f..e04a58a969 100644
--- a/lib/chef/knife/upload.rb
+++ b/lib/chef/knife/upload.rb
@@ -27,7 +27,7 @@ class Chef
:long => "--[no-]force",
:boolean => true,
:default => false,
- :description => "Force upload of files even if they match (quicker for many files). Will overwrite frozen cookbooks."
+ :description => "Force upload of files even if they match (quicker for many files). Will overwrite frozen cookbooks."
option :freeze,
:long => "--[no-]freeze",
diff --git a/lib/chef/knife/xargs.rb b/lib/chef/knife/xargs.rb
index 10e15a4257..6559ca2e74 100644
--- a/lib/chef/knife/xargs.rb
+++ b/lib/chef/knife/xargs.rb
@@ -21,7 +21,7 @@ class Chef
option :patterns,
:long => "--pattern [PATTERN]",
:short => "-p [PATTERN]",
- :description => "Pattern on command line (if these are not specified, a list of patterns is expected on standard input). Multiple patterns may be passed in this way.",
+ :description => "Pattern on command line (if these are not specified, a list of patterns is expected on standard input). Multiple patterns may be passed in this way.",
:arg_arity => [1, -1]
option :diff,
@@ -44,12 +44,12 @@ class Chef
option :replace_first,
:long => "--replace-first REPLACESTR",
:short => "-J REPLACESTR",
- :description => "String to replace with filenames. -J will only replace the FIRST occurrence of the replacement string."
+ :description => "String to replace with filenames. -J will only replace the FIRST occurrence of the replacement string."
option :replace_all,
:long => "--replace REPLACESTR",
:short => "-I REPLACESTR",
- :description => "String to replace with filenames. -I will replace ALL occurrence of the replacement string."
+ :description => "String to replace with filenames. -I will replace ALL occurrence of the replacement string."
option :max_arguments_per_command,
:long => "--max-args MAXARGS",
@@ -78,7 +78,7 @@ class Chef
Chef::ChefFS::FileSystem.list(config[:local] ? local_fs : chef_fs, pattern).each do |result|
if result.dir?
# TODO option to include directories
- ui.warn "#{format_path(result)}: is a directory. Will not run #{command} on it."
+ ui.warn "#{format_path(result)}: is a directory. Will not run #{command} on it."
else
files << result
ran = false