knife 18.6.13 → 18.7.9

data/lib/chef/knife/core/node_presenter.rb

@@ -1,133 +1,133 @@
-#
-# Author:: Daniel DeLeo (<dan@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 "text_formatter"
-require_relative "generic_presenter"
-
-class Chef
-  class Knife
-    module Core
-
-      # A customized presenter for Chef::Node objects. Supports variable-length
-      # output formats for displaying node data
-      class NodePresenter < GenericPresenter
-
-        def format(data)
-          if parse_format_option == :json
-            summarize_json(data)
-          else
-            super
-          end
-        end
-
-        def summarize_json(data)
-          if data.is_a?(Chef::Node)
-            node = data
-            result = {}
-
-            result["name"] = node.name
-            if node.policy_name.nil? && node.policy_group.nil?
-              result["chef_environment"] = node.chef_environment
-            else
-              result["policy_name"] = node.policy_name
-              result["policy_group"] = node.policy_group
-            end
-            result["run_list"] = node.run_list
-            result["normal"] = node.normal_attrs
-
-            if config[:long_output]
-              result["default"]   = node.default_attrs
-              result["override"]  = node.override_attrs
-              result["automatic"] = node.automatic_attrs
-            end
-
-            Chef::JSONCompat.to_json_pretty(result)
-          else
-            Chef::JSONCompat.to_json_pretty(data)
-          end
-        end
-
-        # Converts a Chef::Node object to a string suitable for output to a
-        # terminal. If config[:medium_output] or config[:long_output] are set
-        # the volume of output is adjusted accordingly. Uses colors if enabled
-        # in the ui object.
-        def summarize(data)
-          if data.is_a?(Chef::Node)
-            node = data
-            # special case clouds with their split horizon thing.
-            ip = (node[:cloud] && node[:cloud][:public_ipv4_addrs] && node[:cloud][:public_ipv4_addrs].first) || node[:ipaddress]
-
-            summarized = <<~SUMMARY
-              #{ui.color("Node Name:", :bold)}   #{ui.color(node.name, :bold)}
-            SUMMARY
-            show_policy = !(node.policy_name.nil? && node.policy_group.nil?)
-            if show_policy
-              summarized << <<~POLICY
-                #{key("Policy Name:")}  #{node.policy_name}
-                #{key("Policy Group:")} #{node.policy_group}
-              POLICY
-            else
-              summarized << <<~ENV
-                #{key("Environment:")} #{node.chef_environment}
-              ENV
-            end
-            summarized << <<~SUMMARY
-              #{key("FQDN:")}        #{node[:fqdn]}
-              #{key("IP:")}          #{ip}
-              #{key("Run List:")}    #{node.run_list}
-            SUMMARY
-            unless show_policy
-              summarized << <<~ROLES
-                #{key("Roles:")}       #{Array(node[:roles]).join(", ")}
-              ROLES
-            end
-            summarized << <<~SUMMARY
-              #{key("Recipes:")}     #{Array(node[:recipes]).join(", ")}
-              #{key("Platform:")}    #{node[:platform]} #{node[:platform_version]}
-              #{key("Tags:")}        #{node.tags.join(", ")}
-            SUMMARY
-            if config[:medium_output] || config[:long_output]
-              summarized += <<~MORE
-                #{key("Attributes:")}
-                #{text_format(node.normal_attrs)}
-              MORE
-            end
-            if config[:long_output]
-              summarized += <<~MOST
-                #{key("Default Attributes:")}
-                #{text_format(node.default_attrs)}
-                #{key("Override Attributes:")}
-                #{text_format(node.override_attrs)}
-                #{key("Automatic Attributes (Ohai Data):")}
-                #{text_format(node.automatic_attrs)}
-              MOST
-            end
-            summarized
-          else
-            super
-          end
-        end
-
-        def key(key_text)
-          ui.color(key_text, :cyan)
-        end
-
-      end
-    end
-  end
-end
+#
+# Author:: Daniel DeLeo (<dan@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 "text_formatter"
+require_relative "generic_presenter"
+
+class Chef
+  class Knife
+    module Core
+
+      # A customized presenter for Chef::Node objects. Supports variable-length
+      # output formats for displaying node data
+      class NodePresenter < GenericPresenter
+
+        def format(data)
+          if parse_format_option == :json
+            summarize_json(data)
+          else
+            super
+          end
+        end
+
+        def summarize_json(data)
+          if data.is_a?(Chef::Node)
+            node = data
+            result = {}
+
+            result["name"] = node.name
+            if node.policy_name.nil? && node.policy_group.nil?
+              result["chef_environment"] = node.chef_environment
+            else
+              result["policy_name"] = node.policy_name
+              result["policy_group"] = node.policy_group
+            end
+            result["run_list"] = node.run_list
+            result["normal"] = node.normal_attrs
+
+            if config[:long_output]
+              result["default"]   = node.default_attrs
+              result["override"]  = node.override_attrs
+              result["automatic"] = node.automatic_attrs
+            end
+
+            Chef::JSONCompat.to_json_pretty(result)
+          else
+            Chef::JSONCompat.to_json_pretty(data)
+          end
+        end
+
+        # Converts a Chef::Node object to a string suitable for output to a
+        # terminal. If config[:medium_output] or config[:long_output] are set
+        # the volume of output is adjusted accordingly. Uses colors if enabled
+        # in the ui object.
+        def summarize(data)
+          if data.is_a?(Chef::Node)
+            node = data
+            # special case clouds with their split horizon thing.
+            ip = (node[:cloud] && node[:cloud][:public_ipv4_addrs] && node[:cloud][:public_ipv4_addrs].first) || node[:ipaddress]
+
+            summarized = <<~SUMMARY
+              #{ui.color("Node Name:", :bold)}   #{ui.color(node.name, :bold)}
+            SUMMARY
+            show_policy = !(node.policy_name.nil? && node.policy_group.nil?)
+            if show_policy
+              summarized << <<~POLICY
+                #{key("Policy Name:")}  #{node.policy_name}
+                #{key("Policy Group:")} #{node.policy_group}
+              POLICY
+            else
+              summarized << <<~ENV
+                #{key("Environment:")} #{node.chef_environment}
+              ENV
+            end
+            summarized << <<~SUMMARY
+              #{key("FQDN:")}        #{node[:fqdn]}
+              #{key("IP:")}          #{ip}
+              #{key("Run List:")}    #{node.run_list}
+            SUMMARY
+            unless show_policy
+              summarized << <<~ROLES
+                #{key("Roles:")}       #{Array(node[:roles]).join(", ")}
+              ROLES
+            end
+            summarized << <<~SUMMARY
+              #{key("Recipes:")}     #{Array(node[:recipes]).join(", ")}
+              #{key("Platform:")}    #{node[:platform]} #{node[:platform_version]}
+              #{key("Tags:")}        #{node.tags.join(", ")}
+            SUMMARY
+            if config[:medium_output] || config[:long_output]
+              summarized += <<~MORE
+                #{key("Attributes:")}
+                #{text_format(node.normal_attrs)}
+              MORE
+            end
+            if config[:long_output]
+              summarized += <<~MOST
+                #{key("Default Attributes:")}
+                #{text_format(node.default_attrs)}
+                #{key("Override Attributes:")}
+                #{text_format(node.override_attrs)}
+                #{key("Automatic Attributes (Ohai Data):")}
+                #{text_format(node.automatic_attrs)}
+              MOST
+            end
+            summarized
+          else
+            super
+          end
+        end
+
+        def key(key_text)
+          ui.color(key_text, :cyan)
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/knife/core/object_loader.rb

@@ -1,115 +1,115 @@
-#
-# Author:: Daniel DeLeo (<dan@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.
-#
-
-autoload :FFI_Yajl, "ffi_yajl"
-require "chef-config/path_helper" unless defined?(ChefConfig::PathHelper)
-require "chef/data_bag_item" unless defined?(Chef::DataBagItem)
-
-class Chef
-  class Knife
-    module Core
-      class ObjectLoader
-
-        attr_reader :ui
-        attr_reader :klass
-
-        class ObjectType
-          FILE = 1
-          FOLDER = 2
-        end
-
-        def initialize(klass, ui)
-          @klass = klass
-          @ui = ui
-        end
-
-        def load_from(repo_location, *components)
-          unless object_file = find_file(repo_location, *components)
-            ui.error "Could not find or open file '#{components.last}' in current directory or in '#{repo_location}/#{components.join("/")}'"
-            exit 1
-          end
-          object_from_file(object_file)
-        end
-
-        # When someone makes this awesome, please update the above error message.
-        def find_file(repo_location, *components)
-          if file_exists_and_is_readable?(File.expand_path( components.last ))
-            File.expand_path( components.last )
-          else
-            relative_path = File.join(Dir.pwd, repo_location, *components)
-            if file_exists_and_is_readable?(relative_path)
-              relative_path
-            else
-              nil
-            end
-          end
-        end
-
-        # Find all objects in the given location
-        # If the object type is File it will look for all *.{json,rb}
-        # files, otherwise it will lookup for folders only (useful for
-        # data_bags)
-        #
-        # @param [String] path - base look up location
-        #
-        # @return [Array<String>] basenames of the found objects
-        #
-        # @api public
-        def find_all_objects(path)
-          path = File.join(ChefConfig::PathHelper.escape_glob_dir(File.expand_path(path)), "*")
-          path << ".{json,rb}"
-          objects = Dir.glob(path)
-          objects.map { |o| File.basename(o) }
-        end
-
-        def find_all_object_dirs(path)
-          path = File.join(ChefConfig::PathHelper.escape_glob_dir(File.expand_path(path)), "*")
-          objects = Dir.glob(path)
-          objects.delete_if { |o| !File.directory?(o) }
-          objects.map { |o| File.basename(o) }
-        end
-
-        def object_from_file(filename)
-          case filename
-          when /\.(js|json)$/
-            r = FFI_Yajl::Parser.parse(IO.read(filename))
-
-            # Chef::DataBagItem doesn't work well with the json_create method
-            if @klass == Chef::DataBagItem
-              r
-            else
-              @klass.from_hash(r)
-            end
-          when /\.rb$/
-            r = klass.new
-            r.from_file(filename)
-            r
-          else
-            ui.fatal("File must end in .js, .json, or .rb")
-            exit 30
-          end
-        end
-
-        def file_exists_and_is_readable?(file)
-          File.exist?(file) && File.readable?(file)
-        end
-
-      end
-    end
-  end
-end
+#
+# Author:: Daniel DeLeo (<dan@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.
+#
+
+autoload :FFI_Yajl, "ffi_yajl"
+require "chef-config/path_helper" unless defined?(ChefConfig::PathHelper)
+require "chef/data_bag_item" unless defined?(Chef::DataBagItem)
+
+class Chef
+  class Knife
+    module Core
+      class ObjectLoader
+
+        attr_reader :ui
+        attr_reader :klass
+
+        class ObjectType
+          FILE = 1
+          FOLDER = 2
+        end
+
+        def initialize(klass, ui)
+          @klass = klass
+          @ui = ui
+        end
+
+        def load_from(repo_location, *components)
+          unless object_file = find_file(repo_location, *components)
+            ui.error "Could not find or open file '#{components.last}' in current directory or in '#{repo_location}/#{components.join("/")}'"
+            exit 1
+          end
+          object_from_file(object_file)
+        end
+
+        # When someone makes this awesome, please update the above error message.
+        def find_file(repo_location, *components)
+          if file_exists_and_is_readable?(File.expand_path( components.last ))
+            File.expand_path( components.last )
+          else
+            relative_path = File.join(Dir.pwd, repo_location, *components)
+            if file_exists_and_is_readable?(relative_path)
+              relative_path
+            else
+              nil
+            end
+          end
+        end
+
+        # Find all objects in the given location
+        # If the object type is File it will look for all *.{json,rb}
+        # files, otherwise it will lookup for folders only (useful for
+        # data_bags)
+        #
+        # @param [String] path - base look up location
+        #
+        # @return [Array<String>] basenames of the found objects
+        #
+        # @api public
+        def find_all_objects(path)
+          path = File.join(ChefConfig::PathHelper.escape_glob_dir(File.expand_path(path)), "*")
+          path << ".{json,rb}"
+          objects = Dir.glob(path)
+          objects.map { |o| File.basename(o) }
+        end
+
+        def find_all_object_dirs(path)
+          path = File.join(ChefConfig::PathHelper.escape_glob_dir(File.expand_path(path)), "*")
+          objects = Dir.glob(path)
+          objects.delete_if { |o| !File.directory?(o) }
+          objects.map { |o| File.basename(o) }
+        end
+
+        def object_from_file(filename)
+          case filename
+          when /\.(js|json)$/
+            r = FFI_Yajl::Parser.parse(IO.read(filename))
+
+            # Chef::DataBagItem doesn't work well with the json_create method
+            if @klass == Chef::DataBagItem
+              r
+            else
+              @klass.from_hash(r)
+            end
+          when /\.rb$/
+            r = klass.new
+            r.from_file(filename)
+            r
+          else
+            ui.fatal("File must end in .js, .json, or .rb")
+            exit 30
+          end
+        end
+
+        def file_exists_and_is_readable?(file)
+          File.exist?(file) && File.readable?(file)
+        end
+
+      end
+    end
+  end
+end