knife 18.2.7 → 18.3.0

data/lib/chef/knife/rehash.rb

@@ -1,50 +1,50 @@
-#
-# Author:: Steven Danna <steve@chef.io>
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require_relative "../knife"
-
-class Chef
-  class Knife
-    class Rehash < Chef::Knife
-      banner "knife rehash"
-
-      deps do
-        require_relative "core/subcommand_loader"
-      end
-
-      def run
-        if ! Chef::Knife::SubcommandLoader.autogenerated_manifest?
-          ui.msg "Using knife-rehash will speed up knife's load time by caching the location of subcommands on disk."
-          ui.msg "However, you will need to update the cache by running `knife rehash` anytime you install a new knife plugin."
-        else
-          reload_plugins
-        end
-
-        ui.msg "Knife subcommands are cached in #{Chef::Knife::SubcommandLoader.plugin_manifest_path}. Delete this file to disable the caching."
-        Chef::Knife::SubcommandLoader.write_hash(Chef::Knife::SubcommandLoader.generate_hash)
-      end
-
-      def reload_plugins
-        # The subcommand_loader for this knife command should _always_ be the GemGlobLoader.  The GemGlobLoader loads
-        # plugins from disc and ensures the hash we write is always correct.  By this point it should also already have
-        # loaded plugins and `load_commands` shouldn't have an effect.
-        Chef::Knife.subcommand_loader.load_commands
-      end
-    end
-  end
-end
+#
+# Author:: Steven Danna <steve@chef.io>
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../knife"
+
+class Chef
+  class Knife
+    class Rehash < Chef::Knife
+      banner "knife rehash"
+
+      deps do
+        require_relative "core/subcommand_loader"
+      end
+
+      def run
+        if ! Chef::Knife::SubcommandLoader.autogenerated_manifest?
+          ui.msg "Using knife-rehash will speed up knife's load time by caching the location of subcommands on disk."
+          ui.msg "However, you will need to update the cache by running `knife rehash` anytime you install a new knife plugin."
+        else
+          reload_plugins
+        end
+
+        ui.msg "Knife subcommands are cached in #{Chef::Knife::SubcommandLoader.plugin_manifest_path}. Delete this file to disable the caching."
+        Chef::Knife::SubcommandLoader.write_hash(Chef::Knife::SubcommandLoader.generate_hash)
+      end
+
+      def reload_plugins
+        # The subcommand_loader for this knife command should _always_ be the GemGlobLoader.  The GemGlobLoader loads
+        # plugins from disc and ensures the hash we write is always correct.  By this point it should also already have
+        # loaded plugins and `load_commands` shouldn't have an effect.
+        Chef::Knife.subcommand_loader.load_commands
+      end
+    end
+  end
+end

data/lib/chef/knife/role_bulk_delete.rb

@@ -1,66 +1,66 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require_relative "../knife"
-
-class Chef
-  class Knife
-    class RoleBulkDelete < Knife
-
-      deps do
-        require "chef/role" unless defined?(Chef::Role)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife role bulk delete REGEX (options)"
-
-      def run
-        if @name_args.length < 1
-          ui.error("You must supply a regular expression to match the results against")
-          exit 1
-        end
-
-        all_roles = Chef::Role.list(true)
-
-        matcher = /#{@name_args[0]}/
-        roles_to_delete = {}
-        all_roles.each do |name, role|
-          next unless name&.match?(matcher)
-
-          roles_to_delete[role.name] = role
-        end
-
-        if roles_to_delete.empty?
-          ui.info "No roles match the expression /#{@name_args[0]}/"
-          exit 0
-        end
-
-        ui.msg("The following roles will be deleted:")
-        ui.msg("")
-        ui.msg(ui.list(roles_to_delete.keys.sort, :columns_down))
-        ui.msg("")
-        ui.confirm("Are you sure you want to delete these roles")
-
-        roles_to_delete.sort.each do |name, role|
-          role.destroy
-          ui.msg("Deleted role #{name}")
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../knife"
+
+class Chef
+  class Knife
+    class RoleBulkDelete < Knife
+
+      deps do
+        require "chef/role" unless defined?(Chef::Role)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife role bulk delete REGEX (options)"
+
+      def run
+        if @name_args.length < 1
+          ui.error("You must supply a regular expression to match the results against")
+          exit 1
+        end
+
+        all_roles = Chef::Role.list(true)
+
+        matcher = /#{@name_args[0]}/
+        roles_to_delete = {}
+        all_roles.each do |name, role|
+          next unless name&.match?(matcher)
+
+          roles_to_delete[role.name] = role
+        end
+
+        if roles_to_delete.empty?
+          ui.info "No roles match the expression /#{@name_args[0]}/"
+          exit 0
+        end
+
+        ui.msg("The following roles will be deleted:")
+        ui.msg("")
+        ui.msg(ui.list(roles_to_delete.keys.sort, :columns_down))
+        ui.msg("")
+        ui.confirm("Are you sure you want to delete these roles")
+
+        roles_to_delete.sort.each do |name, role|
+          role.destroy
+          ui.msg("Deleted role #{name}")
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/role_create.rb

@@ -1,53 +1,53 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require_relative "../knife"
-
-class Chef
-  class Knife
-    class RoleCreate < Knife
-
-      deps do
-        require "chef/role" unless defined?(Chef::Role)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife role create ROLE (options)"
-
-      option :description,
-        short: "-d DESC",
-        long: "--description DESC",
-        description: "The role description."
-
-      def run
-        @role_name = @name_args[0]
-
-        if @role_name.nil?
-          show_usage
-          ui.fatal("You must specify a role name")
-          exit 1
-        end
-
-        role = Chef::Role.new
-        role.name(@role_name)
-        role.description(config[:description]) if config[:description]
-        create_object(role, object_class: Chef::Role)
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../knife"
+
+class Chef
+  class Knife
+    class RoleCreate < Knife
+
+      deps do
+        require "chef/role" unless defined?(Chef::Role)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife role create ROLE (options)"
+
+      option :description,
+        short: "-d DESC",
+        long: "--description DESC",
+        description: "The role description."
+
+      def run
+        @role_name = @name_args[0]
+
+        if @role_name.nil?
+          show_usage
+          ui.fatal("You must specify a role name")
+          exit 1
+        end
+
+        role = Chef::Role.new
+        role.name(@role_name)
+        role.description(config[:description]) if config[:description]
+        create_object(role, object_class: Chef::Role)
+      end
+    end
+  end
+end

data/lib/chef/knife/role_delete.rb

@@ -1,46 +1,46 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require_relative "../knife"
-
-class Chef
-  class Knife
-    class RoleDelete < Knife
-
-      deps do
-        require "chef/role" unless defined?(Chef::Role)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife role delete ROLE (options)"
-
-      def run
-        @role_name = @name_args[0]
-
-        if @role_name.nil?
-          show_usage
-          ui.fatal("You must specify a role name")
-          exit 1
-        end
-
-        delete_object(Chef::Role, @role_name)
-      end
-
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../knife"
+
+class Chef
+  class Knife
+    class RoleDelete < Knife
+
+      deps do
+        require "chef/role" unless defined?(Chef::Role)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife role delete ROLE (options)"
+
+      def run
+        @role_name = @name_args[0]
+
+        if @role_name.nil?
+          show_usage
+          ui.fatal("You must specify a role name")
+          exit 1
+        end
+
+        delete_object(Chef::Role, @role_name)
+      end
+
+    end
+  end
+end

data/lib/chef/knife/role_edit.rb

@@ -1,45 +1,45 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require_relative "../knife"
-
-class Chef
-  class Knife
-    class RoleEdit < Knife
-
-      deps do
-        require "chef/role" unless defined?(Chef::Role)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife role edit ROLE (options)"
-
-      def run
-        @role_name = @name_args[0]
-
-        if @role_name.nil?
-          show_usage
-          ui.fatal("You must specify a role name")
-          exit 1
-        end
-
-        ui.edit_object(Chef::Role, @role_name)
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../knife"
+
+class Chef
+  class Knife
+    class RoleEdit < Knife
+
+      deps do
+        require "chef/role" unless defined?(Chef::Role)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife role edit ROLE (options)"
+
+      def run
+        @role_name = @name_args[0]
+
+        if @role_name.nil?
+          show_usage
+          ui.fatal("You must specify a role name")
+          exit 1
+        end
+
+        ui.edit_object(Chef::Role, @role_name)
+      end
+    end
+  end
+end