diff options
Diffstat (limited to 'lib/chef/knife')
-rw-r--r-- | lib/chef/knife/node_policy_set.rb | 4 | ||||
-rw-r--r-- | lib/chef/knife/node_run_list_add.rb | 2 | ||||
-rw-r--r-- | lib/chef/knife/node_run_list_remove.rb | 2 | ||||
-rw-r--r-- | lib/chef/knife/node_run_list_set.rb | 2 | ||||
-rw-r--r-- | lib/chef/knife/role_env_run_list_add.rb | 2 | ||||
-rw-r--r-- | lib/chef/knife/role_env_run_list_set.rb | 2 | ||||
-rw-r--r-- | lib/chef/knife/role_run_list_add.rb | 2 | ||||
-rw-r--r-- | lib/chef/knife/role_run_list_set.rb | 2 | ||||
-rw-r--r-- | lib/chef/knife/ssh.rb | 4 | ||||
-rw-r--r-- | lib/chef/knife/tag_create.rb | 2 | ||||
-rw-r--r-- | lib/chef/knife/tag_delete.rb | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/lib/chef/knife/node_policy_set.rb b/lib/chef/knife/node_policy_set.rb index cfbae1ff6f..d34ebd9478 100644 --- a/lib/chef/knife/node_policy_set.rb +++ b/lib/chef/knife/node_policy_set.rb @@ -45,7 +45,7 @@ class Chef # Set policy name and group to node def set_policy(node) - policy_group, policy_name = @name_args[1..-1] + policy_group, policy_name = @name_args[1..] node.policy_name = policy_name node.policy_group = policy_group end @@ -70,7 +70,7 @@ class Chef # True if one of policy_name or policy_group was given, but not both def incomplete_policyfile_options? - policy_group, policy_name = @name_args[1..-1] + policy_group, policy_name = @name_args[1..] (policy_group.nil? || policy_name.nil? || @name_args[1..-1].size > 2) end diff --git a/lib/chef/knife/node_run_list_add.rb b/lib/chef/knife/node_run_list_add.rb index ac5f09bae9..40476371eb 100644 --- a/lib/chef/knife/node_run_list_add.rb +++ b/lib/chef/knife/node_run_list_add.rb @@ -43,7 +43,7 @@ class Chef node = Chef::Node.load(@name_args[0]) if @name_args.size > 2 # Check for nested lists and create a single plain one - entries = @name_args[1..-1].map do |entry| + entries = @name_args[1..].map do |entry| entry.split(",").map(&:strip) end.flatten else diff --git a/lib/chef/knife/node_run_list_remove.rb b/lib/chef/knife/node_run_list_remove.rb index 08f4e5d382..484e575475 100644 --- a/lib/chef/knife/node_run_list_remove.rb +++ b/lib/chef/knife/node_run_list_remove.rb @@ -34,7 +34,7 @@ class Chef if @name_args.size > 2 # Check for nested lists and create a single plain one - entries = @name_args[1..-1].map do |entry| + entries = @name_args[1..].map do |entry| entry.split(",").map(&:strip) end.flatten else diff --git a/lib/chef/knife/node_run_list_set.rb b/lib/chef/knife/node_run_list_set.rb index eae05003ff..f356b39d95 100644 --- a/lib/chef/knife/node_run_list_set.rb +++ b/lib/chef/knife/node_run_list_set.rb @@ -36,7 +36,7 @@ class Chef exit 1 elsif @name_args.size > 2 # Check for nested lists and create a single plain one - entries = @name_args[1..-1].map do |entry| + entries = @name_args[1..].map do |entry| entry.split(",").map(&:strip) end.flatten else diff --git a/lib/chef/knife/role_env_run_list_add.rb b/lib/chef/knife/role_env_run_list_add.rb index 1fc8ef1e74..b5753b46fc 100644 --- a/lib/chef/knife/role_env_run_list_add.rb +++ b/lib/chef/knife/role_env_run_list_add.rb @@ -68,7 +68,7 @@ class Chef if @name_args.size > 2 # Check for nested lists and create a single plain one - entries = @name_args[2..-1].map do |entry| + entries = @name_args[2..].map do |entry| entry.split(",").map(&:strip) end.flatten else diff --git a/lib/chef/knife/role_env_run_list_set.rb b/lib/chef/knife/role_env_run_list_set.rb index d9294b9bc4..0f1ce62a5d 100644 --- a/lib/chef/knife/role_env_run_list_set.rb +++ b/lib/chef/knife/role_env_run_list_set.rb @@ -51,7 +51,7 @@ class Chef exit 1 elsif @name_args.size > 2 # Check for nested lists and create a single plain one - entries = @name_args[2..-1].map do |entry| + entries = @name_args[2..].map do |entry| entry.split(",").map(&:strip) end.flatten else diff --git a/lib/chef/knife/role_run_list_add.rb b/lib/chef/knife/role_run_list_add.rb index 5ed91d5d49..76633ff5f6 100644 --- a/lib/chef/knife/role_run_list_add.rb +++ b/lib/chef/knife/role_run_list_add.rb @@ -68,7 +68,7 @@ class Chef if @name_args.size > 1 # Check for nested lists and create a single plain one - entries = @name_args[1..-1].map do |entry| + entries = @name_args[1..].map do |entry| entry.split(",").map(&:strip) end.flatten else diff --git a/lib/chef/knife/role_run_list_set.rb b/lib/chef/knife/role_run_list_set.rb index 7302797c33..ad1a5e2923 100644 --- a/lib/chef/knife/role_run_list_set.rb +++ b/lib/chef/knife/role_run_list_set.rb @@ -50,7 +50,7 @@ class Chef exit 1 elsif @name_args.size > 1 # Check for nested lists and create a single plain one - entries = @name_args[1..-1].map do |entry| + entries = @name_args[1..].map do |entry| entry.split(",").map(&:strip) end.flatten else diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb index a6428d9726..a586bf37c2 100644 --- a/lib/chef/knife/ssh.rb +++ b/lib/chef/knife/ssh.rb @@ -489,7 +489,7 @@ class Chef new_window_cmds = lambda do if session.servers_for.size > 1 - [""] + session.servers_for[1..-1].map do |server| + [""] + session.servers_for[1..].map do |server| if config[:tmux_split] "split-window #{ssh_dest.call(server)}; tmux select-layout tiled" else @@ -625,7 +625,7 @@ class Chef when "cssh" cssh else - ssh_command(@name_args[1..-1].join(" ")) + ssh_command(@name_args[1..].join(" ")) end session.close diff --git a/lib/chef/knife/tag_create.rb b/lib/chef/knife/tag_create.rb index fe357981b7..2f0d302e74 100644 --- a/lib/chef/knife/tag_create.rb +++ b/lib/chef/knife/tag_create.rb @@ -32,7 +32,7 @@ class Chef def run name = @name_args[0] - tags = @name_args[1..-1] + tags = @name_args[1..] if name.nil? || tags.nil? || tags.empty? show_usage diff --git a/lib/chef/knife/tag_delete.rb b/lib/chef/knife/tag_delete.rb index 1c9f2185d7..85fa6a9e27 100644 --- a/lib/chef/knife/tag_delete.rb +++ b/lib/chef/knife/tag_delete.rb @@ -32,7 +32,7 @@ class Chef def run name = @name_args[0] - tags = @name_args[1..-1] + tags = @name_args[1..] if name.nil? || tags.nil? || tags.empty? show_usage |