knife 18.6.13 → 18.7.9

data/lib/chef/knife/role_env_run_list_add.rb

@@ -1,87 +1,87 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: William Albenzi (<walbenzi@gmail.com>)
-# 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 RoleEnvRunListAdd < Knife
-
-      deps do
-        require "chef/role" unless defined?(Chef::Role)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife role env_run_list add [ROLE] [ENVIRONMENT] [ENTRY [ENTRY]] (options)"
-
-      option :after,
-        short: "-a ITEM",
-        long: "--after ITEM",
-        description: "Place the ENTRY in the run list after ITEM."
-
-      def add_to_env_run_list(role, environment, entries, after = nil)
-        if after
-          nlist = []
-          unless role.env_run_lists.key?(environment)
-            role.env_run_lists_add(environment => nlist)
-          end
-          role.run_list_for(environment).each do |entry|
-            nlist << entry
-            if entry == after
-              entries.each { |e| nlist << e }
-            end
-          end
-          role.env_run_lists_add(environment => nlist)
-        else
-          nlist = []
-          unless role.env_run_lists.key?(environment)
-            role.env_run_lists_add(environment => nlist)
-          end
-          role.run_list_for(environment).each do |entry|
-            nlist << entry
-          end
-          entries.each { |e| nlist << e }
-          role.env_run_lists_add(environment => nlist)
-        end
-      end
-
-      def run
-        role = Chef::Role.load(@name_args[0])
-        role.name(@name_args[0])
-        environment = @name_args[1]
-
-        if @name_args.size > 2
-          # Check for nested lists and create a single plain one
-          entries = @name_args[2..].map do |entry|
-            entry.split(",").map(&:strip)
-          end.flatten
-        else
-          # Convert to array and remove the extra spaces
-          entries = @name_args[2].split(",").map(&:strip)
-        end
-
-        add_to_env_run_list(role, environment, entries, config[:after])
-        role.save
-        config[:env_run_list] = true
-        output(format_for_display(role))
-      end
-
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: William Albenzi (<walbenzi@gmail.com>)
+# 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 RoleEnvRunListAdd < Knife
+
+      deps do
+        require "chef/role" unless defined?(Chef::Role)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife role env_run_list add [ROLE] [ENVIRONMENT] [ENTRY [ENTRY]] (options)"
+
+      option :after,
+        short: "-a ITEM",
+        long: "--after ITEM",
+        description: "Place the ENTRY in the run list after ITEM."
+
+      def add_to_env_run_list(role, environment, entries, after = nil)
+        if after
+          nlist = []
+          unless role.env_run_lists.key?(environment)
+            role.env_run_lists_add(environment => nlist)
+          end
+          role.run_list_for(environment).each do |entry|
+            nlist << entry
+            if entry == after
+              entries.each { |e| nlist << e }
+            end
+          end
+          role.env_run_lists_add(environment => nlist)
+        else
+          nlist = []
+          unless role.env_run_lists.key?(environment)
+            role.env_run_lists_add(environment => nlist)
+          end
+          role.run_list_for(environment).each do |entry|
+            nlist << entry
+          end
+          entries.each { |e| nlist << e }
+          role.env_run_lists_add(environment => nlist)
+        end
+      end
+
+      def run
+        role = Chef::Role.load(@name_args[0])
+        role.name(@name_args[0])
+        environment = @name_args[1]
+
+        if @name_args.size > 2
+          # Check for nested lists and create a single plain one
+          entries = @name_args[2..].map do |entry|
+            entry.split(",").map(&:strip)
+          end.flatten
+        else
+          # Convert to array and remove the extra spaces
+          entries = @name_args[2].split(",").map(&:strip)
+        end
+
+        add_to_env_run_list(role, environment, entries, config[:after])
+        role.save
+        config[:env_run_list] = true
+        output(format_for_display(role))
+      end
+
+    end
+  end
+end

data/lib/chef/knife/role_env_run_list_clear.rb

@@ -1,55 +1,55 @@
-#
-# Author:: Mike Fiedler (<miketheman@gmail.com>)
-# Author:: William Albenzi (<walbenzi@gmail.com>)
-# Copyright:: Copyright 2013-2016, Mike Fiedler
-# 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 RoleEnvRunListClear < Knife
-
-      deps do
-        require "chef/role" unless defined?(Chef::Role)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife role env_run_list clear [ROLE] [ENVIRONMENT] (options)"
-      def clear_env_run_list(role, environment)
-        nlist = []
-        role.env_run_lists_add(environment => nlist)
-      end
-
-      def run
-        if @name_args.size > 2
-          ui.fatal "You must not supply an environment run list."
-          show_usage
-          exit 1
-        end
-        role = Chef::Role.load(@name_args[0])
-        role.name(@name_args[0])
-        environment = @name_args[1]
-
-        clear_env_run_list(role, environment)
-        role.save
-        config[:env_run_list] = true
-        output(format_for_display(role))
-      end
-
-    end
-  end
-end
+#
+# Author:: Mike Fiedler (<miketheman@gmail.com>)
+# Author:: William Albenzi (<walbenzi@gmail.com>)
+# Copyright:: Copyright 2013-2016, Mike Fiedler
+# 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 RoleEnvRunListClear < Knife
+
+      deps do
+        require "chef/role" unless defined?(Chef::Role)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife role env_run_list clear [ROLE] [ENVIRONMENT] (options)"
+      def clear_env_run_list(role, environment)
+        nlist = []
+        role.env_run_lists_add(environment => nlist)
+      end
+
+      def run
+        if @name_args.size > 2
+          ui.fatal "You must not supply an environment run list."
+          show_usage
+          exit 1
+        end
+        role = Chef::Role.load(@name_args[0])
+        role.name(@name_args[0])
+        environment = @name_args[1]
+
+        clear_env_run_list(role, environment)
+        role.save
+        config[:env_run_list] = true
+        output(format_for_display(role))
+      end
+
+    end
+  end
+end

data/lib/chef/knife/role_env_run_list_remove.rb

@@ -1,57 +1,57 @@
-#
-# 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 RoleEnvRunListRemove < Knife
-
-      deps do
-        require "chef/role" unless defined?(Chef::Role)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife role env_run_list remove [ROLE] [ENVIRONMENT] [ENTRIES] (options)"
-
-      def remove_from_env_run_list(role, environment, item_to_remove)
-        nlist = []
-        role.run_list_for(environment).each do |entry|
-          nlist << entry unless entry == item_to_remove
-          # unless entry == @name_args[2]
-          #  nlist << entry
-          # end
-        end
-        role.env_run_lists_add(environment => nlist)
-      end
-
-      def run
-        role = Chef::Role.load(@name_args[0])
-        role.name(@name_args[0])
-        environment = @name_args[1]
-        item_to_remove = @name_args[2]
-
-        remove_from_env_run_list(role, environment, item_to_remove)
-        role.save
-        config[:env_run_list] = true
-        output(format_for_display(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 RoleEnvRunListRemove < Knife
+
+      deps do
+        require "chef/role" unless defined?(Chef::Role)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife role env_run_list remove [ROLE] [ENVIRONMENT] [ENTRIES] (options)"
+
+      def remove_from_env_run_list(role, environment, item_to_remove)
+        nlist = []
+        role.run_list_for(environment).each do |entry|
+          nlist << entry unless entry == item_to_remove
+          # unless entry == @name_args[2]
+          #  nlist << entry
+          # end
+        end
+        role.env_run_lists_add(environment => nlist)
+      end
+
+      def run
+        role = Chef::Role.load(@name_args[0])
+        role.name(@name_args[0])
+        environment = @name_args[1]
+        item_to_remove = @name_args[2]
+
+        remove_from_env_run_list(role, environment, item_to_remove)
+        role.save
+        config[:env_run_list] = true
+        output(format_for_display(role))
+      end
+
+    end
+  end
+end

data/lib/chef/knife/role_env_run_list_replace.rb

@@ -1,60 +1,60 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: William Albenzi (<walbenzi@gmail.com>)
-# 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 RoleEnvRunListReplace < Knife
-
-      deps do
-        require "chef/role" unless defined?(Chef::Role)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife role env_run_list replace [ROLE] [ENVIRONMENT] [OLD_ENTRY] [NEW_ENTRY] (options)"
-
-      def replace_in_env_run_list(role, environment, old_entry, new_entry)
-        nlist = []
-        role.run_list_for(environment).each do |entry|
-          if entry == old_entry
-            nlist << new_entry
-          else
-            nlist << entry
-          end
-        end
-        role.env_run_lists_add(environment => nlist)
-      end
-
-      def run
-        role = Chef::Role.load(@name_args[0])
-        role.name(@name_args[0])
-        environment = @name_args[1]
-        old_entry = @name_args[2]
-        new_entry = @name_args[3]
-
-        replace_in_env_run_list(role, environment, old_entry, new_entry)
-        role.save
-        config[:env_run_list] = true
-        output(format_for_display(role))
-      end
-
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: William Albenzi (<walbenzi@gmail.com>)
+# 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 RoleEnvRunListReplace < Knife
+
+      deps do
+        require "chef/role" unless defined?(Chef::Role)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife role env_run_list replace [ROLE] [ENVIRONMENT] [OLD_ENTRY] [NEW_ENTRY] (options)"
+
+      def replace_in_env_run_list(role, environment, old_entry, new_entry)
+        nlist = []
+        role.run_list_for(environment).each do |entry|
+          if entry == old_entry
+            nlist << new_entry
+          else
+            nlist << entry
+          end
+        end
+        role.env_run_lists_add(environment => nlist)
+      end
+
+      def run
+        role = Chef::Role.load(@name_args[0])
+        role.name(@name_args[0])
+        environment = @name_args[1]
+        old_entry = @name_args[2]
+        new_entry = @name_args[3]
+
+        replace_in_env_run_list(role, environment, old_entry, new_entry)
+        role.save
+        config[:env_run_list] = true
+        output(format_for_display(role))
+      end
+
+    end
+  end
+end

data/lib/chef/knife/role_env_run_list_set.rb

@@ -1,70 +1,70 @@
-#
-# Author:: Mike Fiedler (<miketheman@gmail.com>)
-# Author:: William Albenzi (<walbenzi@gmail.com>)
-# Copyright:: Copyright 2013-2016, Mike Fiedler
-# 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 RoleEnvRunListSet < Knife
-
-      deps do
-        require "chef/role" unless defined?(Chef::Role)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife role env_run_list set [ROLE] [ENVIRONMENT] [ENTRIES] (options)"
-
-      # Clears out any existing env_run_list_items and sets them to the
-      # specified entries
-      def set_env_run_list(role, environment, entries)
-        nlist = []
-        unless role.env_run_lists.key?(environment)
-          role.env_run_lists_add(environment => nlist)
-        end
-        entries.each { |e| nlist << e }
-        role.env_run_lists_add(environment => nlist)
-      end
-
-      def run
-        role = Chef::Role.load(@name_args[0])
-        role.name(@name_args[0])
-        environment = @name_args[1]
-        if @name_args.size < 2
-          ui.fatal "You must supply both a role name and an environment run list."
-          show_usage
-          exit 1
-        elsif @name_args.size > 2
-          # Check for nested lists and create a single plain one
-          entries = @name_args[2..].map do |entry|
-            entry.split(",").map(&:strip)
-          end.flatten
-        else
-          # Convert to array and remove the extra spaces
-          entries = @name_args[2].split(",").map(&:strip)
-        end
-
-        set_env_run_list(role, environment, entries )
-        role.save
-        config[:env_run_list] = true
-        output(format_for_display(role))
-      end
-
-    end
-  end
-end
+#
+# Author:: Mike Fiedler (<miketheman@gmail.com>)
+# Author:: William Albenzi (<walbenzi@gmail.com>)
+# Copyright:: Copyright 2013-2016, Mike Fiedler
+# 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 RoleEnvRunListSet < Knife
+
+      deps do
+        require "chef/role" unless defined?(Chef::Role)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife role env_run_list set [ROLE] [ENVIRONMENT] [ENTRIES] (options)"
+
+      # Clears out any existing env_run_list_items and sets them to the
+      # specified entries
+      def set_env_run_list(role, environment, entries)
+        nlist = []
+        unless role.env_run_lists.key?(environment)
+          role.env_run_lists_add(environment => nlist)
+        end
+        entries.each { |e| nlist << e }
+        role.env_run_lists_add(environment => nlist)
+      end
+
+      def run
+        role = Chef::Role.load(@name_args[0])
+        role.name(@name_args[0])
+        environment = @name_args[1]
+        if @name_args.size < 2
+          ui.fatal "You must supply both a role name and an environment run list."
+          show_usage
+          exit 1
+        elsif @name_args.size > 2
+          # Check for nested lists and create a single plain one
+          entries = @name_args[2..].map do |entry|
+            entry.split(",").map(&:strip)
+          end.flatten
+        else
+          # Convert to array and remove the extra spaces
+          entries = @name_args[2].split(",").map(&:strip)
+        end
+
+        set_env_run_list(role, environment, entries )
+        role.save
+        config[:env_run_list] = true
+        output(format_for_display(role))
+      end
+
+    end
+  end
+end