chef 14.5.27-universal-mingw32 → 14.5.33-universal-mingw32

data/lib/chef/resource/lwrp_base.rb

@@ -1,123 +1,123 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Christopher Walters (<cw@chef.io>)
-# Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2008-2018, 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 "chef/resource"
-require "chef/resource_resolver"
-require "chef/node"
-require "chef/log"
-require "chef/exceptions"
-require "chef/mixin/convert_to_class_name"
-require "chef/mixin/from_file"
-require "chef/mixin/params_validate" # for DelayedEvaluator
-
-class Chef
-  class Resource
-
-    # == Chef::Resource::LWRPBase
-    # Base class for LWRP resources. Adds DSL sugar on top of Chef::Resource,
-    # so attributes, default action, etc. can be defined with pleasing syntax.
-    class LWRPBase < Resource
-
-      # Class methods
-      class <<self
-
-        include Chef::Mixin::ConvertToClassName
-        include Chef::Mixin::FromFile
-
-        def build_from_file(cookbook_name, filename, run_context)
-          if LWRPBase.loaded_lwrps[filename]
-            Chef::Log.trace("Custom resource #{filename} from cookbook #{cookbook_name} has already been loaded!  Skipping the reload.")
-            return loaded_lwrps[filename]
-          end
-
-          resource_name = filename_to_qualified_string(cookbook_name, filename)
-
-          resource_class = Class.new(self)
-          resource_class.run_context = run_context
-          resource_class.class_from_file(filename)
-
-          # Make a useful string for the class (rather than <Class:312894723894>)
-          resource_class.instance_eval do
-            define_singleton_method(:to_s) do
-              "Custom resource #{resource_name} from cookbook #{cookbook_name}"
-            end
-            define_singleton_method(:inspect) { to_s }
-          end
-
-          Chef::Log.trace("Loaded contents of #{filename} into resource #{resource_name} (#{resource_class})")
-
-          LWRPBase.loaded_lwrps[filename] = true
-
-          # wire up the default resource name after the class is parsed only if we haven't declared one.
-          # (this ordering is important for MapCollision deprecation warnings)
-          resource_class.resource_name resource_name.to_sym if resource_class.resource_name.nil?
-
-          resource_class
-        end
-
-        alias :attribute :property
-
-        # Adds +action_names+ to the list of valid actions for this resource.
-        # Does not include superclass's action list when appending.
-        def actions(*action_names)
-          action_names = action_names.flatten
-          if !action_names.empty? && !@allowed_actions
-            self.allowed_actions = ([ :nothing ] + action_names).uniq
-          else
-            allowed_actions(*action_names)
-          end
-        end
-        alias :actions= :allowed_actions=
-
-        # @deprecated
-        def valid_actions(*args)
-          Chef::Log.warn("`valid_actions' is deprecated, please use allowed_actions `instead'!")
-          allowed_actions(*args)
-        end
-
-        # Set the run context on the class. Used to provide access to the node
-        # during class definition.
-        attr_accessor :run_context
-
-        def node
-          run_context ? run_context.node : nil
-        end
-
-        protected
-
-        attr_writer :loaded_lwrps
-        def loaded_lwrps
-          @loaded_lwrps ||= {}
-        end
-
-        private
-
-        # Get the value from the superclass, if it responds, otherwise return
-        # +nil+. Since class instance variables are **not** inherited upon
-        # subclassing, this is a required check to ensure Chef pulls the
-        # +default_action+ and other DSL-y methods when extending LWRP::Base.
-        def from_superclass(m, default = nil)
-          return default if superclass == Chef::Resource::LWRPBase
-          superclass.respond_to?(m) ? superclass.send(m) : default
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Christopher Walters (<cw@chef.io>)
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2008-2018, 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 "chef/resource"
+require "chef/resource_resolver"
+require "chef/node"
+require "chef/log"
+require "chef/exceptions"
+require "chef/mixin/convert_to_class_name"
+require "chef/mixin/from_file"
+require "chef/mixin/params_validate" # for DelayedEvaluator
+
+class Chef
+  class Resource
+
+    # == Chef::Resource::LWRPBase
+    # Base class for LWRP resources. Adds DSL sugar on top of Chef::Resource,
+    # so attributes, default action, etc. can be defined with pleasing syntax.
+    class LWRPBase < Resource
+
+      # Class methods
+      class <<self
+
+        include Chef::Mixin::ConvertToClassName
+        include Chef::Mixin::FromFile
+
+        def build_from_file(cookbook_name, filename, run_context)
+          if LWRPBase.loaded_lwrps[filename]
+            Chef::Log.trace("Custom resource #{filename} from cookbook #{cookbook_name} has already been loaded!  Skipping the reload.")
+            return loaded_lwrps[filename]
+          end
+
+          resource_name = filename_to_qualified_string(cookbook_name, filename)
+
+          resource_class = Class.new(self)
+          resource_class.run_context = run_context
+          resource_class.class_from_file(filename)
+
+          # Make a useful string for the class (rather than <Class:312894723894>)
+          resource_class.instance_eval do
+            define_singleton_method(:to_s) do
+              "Custom resource #{resource_name} from cookbook #{cookbook_name}"
+            end
+            define_singleton_method(:inspect) { to_s }
+          end
+
+          Chef::Log.trace("Loaded contents of #{filename} into resource #{resource_name} (#{resource_class})")
+
+          LWRPBase.loaded_lwrps[filename] = true
+
+          # wire up the default resource name after the class is parsed only if we haven't declared one.
+          # (this ordering is important for MapCollision deprecation warnings)
+          resource_class.resource_name resource_name.to_sym if resource_class.resource_name.nil?
+
+          resource_class
+        end
+
+        alias :attribute :property
+
+        # Adds +action_names+ to the list of valid actions for this resource.
+        # Does not include superclass's action list when appending.
+        def actions(*action_names)
+          action_names = action_names.flatten
+          if !action_names.empty? && !@allowed_actions
+            self.allowed_actions = ([ :nothing ] + action_names).uniq
+          else
+            allowed_actions(*action_names)
+          end
+        end
+        alias :actions= :allowed_actions=
+
+        # @deprecated
+        def valid_actions(*args)
+          Chef::Log.warn("`valid_actions' is deprecated, please use allowed_actions `instead'!")
+          allowed_actions(*args)
+        end
+
+        # Set the run context on the class. Used to provide access to the node
+        # during class definition.
+        attr_accessor :run_context
+
+        def node
+          run_context ? run_context.node : nil
+        end
+
+        protected
+
+        attr_writer :loaded_lwrps
+        def loaded_lwrps
+          @loaded_lwrps ||= {}
+        end
+
+        private
+
+        # Get the value from the superclass, if it responds, otherwise return
+        # +nil+. Since class instance variables are **not** inherited upon
+        # subclassing, this is a required check to ensure Chef pulls the
+        # +default_action+ and other DSL-y methods when extending LWRP::Base.
+        def from_superclass(m, default = nil)
+          return default if superclass == Chef::Resource::LWRPBase
+          superclass.respond_to?(m) ? superclass.send(m) : default
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/macos_userdefaults.rb

@@ -1,131 +1,131 @@
-#
-# Copyright:: 2011-2018, Joshua Timberman
-# Copyright:: 2018, Chef Software, Inc.
-#
-# 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 "chef/resource"
-
-class Chef
-  class Resource
-    class MacosUserDefaults < Chef::Resource
-      # align with apple's marketing department
-      resource_name :macos_userdefaults
-      provides(:mac_os_x_userdefaults) { true }
-      provides(:macos_userdefaults) { true }
-
-      description "Use the macos_userdefaults resource to manage the macOS user defaults system. The properties of this resource are passed to the defaults command, and the parameters follow the convention of that command. See the defaults(1) man page for details on how the tool works."
-      introduced "14.0"
-
-      property :domain, String,
-               description: "The domain the defaults belong to.",
-               required: true
-
-      property :global, [TrueClass, FalseClass],
-               description: "Whether the domain is global.",
-               default: false
-
-      property :key, String,
-               description: "The preference key."
-
-      property :value, [Integer, Float, String, TrueClass, FalseClass, Hash, Array],
-               description: "The value of the key.",
-               required: true
-
-      property :type, String,
-               description: "Value type of the preference key.",
-               default: ""
-
-      property :user, String,
-               description: "User for which to set the default."
-
-      property :sudo, [TrueClass, FalseClass],
-               description: "Set to true if the setting requires privileged access to modify.",
-               default: false,
-               desired_state: false
-
-      # @todo this should get refactored away: https://github.com/chef/chef/issues/7622
-      property :is_set, [TrueClass, FalseClass],
-               default: false,
-               desired_state: false
-
-       # coerce various ways of representing a boolean into either 0 (false) or 1 (true)
-       # which is what the defaults CLI expects. Why? Well defaults itself accepts a few
-       # different formats, but when you do a read command it all comes back as 1 or 0.
-      def coerce_booleans(val)
-        return 1 if [true, "TRUE", "1", "true", "YES", "yes"].include?(val)
-        return 0 if [false, "FALSE", "0", "false", "NO", "no"].include?(val)
-        val
-      end
-
-      load_current_value do |desired|
-        value = coerce_booleans(desired.value)
-        drcmd = "defaults read '#{desired.domain}' "
-        drcmd << "'#{desired.key}' " if desired.key
-        shell_out_opts = {}
-        shell_out_opts[:user] = desired.user unless desired.user.nil?
-        vc = shell_out("#{drcmd} | grep -qx '#{value}'", shell_out_opts)
-        is_set vc.exitstatus == 0 ? true : false
-      end
-
-      action :write do
-        description "Write the setting to the specified domain"
-
-        unless current_resource.is_set
-          cmd = ["defaults write"]
-          cmd.unshift("sudo") if new_resource.sudo
-
-          cmd << if new_resource.global
-                   "NSGlobalDomain"
-                 else
-                   "'#{new_resource.domain}'"
-                 end
-
-          cmd << "'#{new_resource.key}'" if new_resource.key
-          value = new_resource.value
-          type = new_resource.type.empty? ? value_type(value) : new_resource.type
-          # creates a string of Key1 Value1 Key2 Value2...
-          value = value.map { |k, v| "\"#{k}\" \"#{v}\"" }.join(" ") if type == "dict"
-          if type == "array"
-            value = value.join("' '")
-            value = "'#{value}'"
-          end
-          cmd << "-#{type}" if type
-          cmd << value
-
-          declare_resource(:execute, cmd.join(" ")) do
-            user new_resource.user unless new_resource.user.nil?
-          end
-        end
-      end
-
-      action_class do
-        def value_type(value)
-          case value
-          when true, false
-            "bool"
-          when Integer
-            "int"
-          when Float
-            "float"
-          when Hash
-            "dict"
-          when Array
-            "array"
-          end
-        end
-      end
-    end
-  end
-end
+#
+# Copyright:: 2011-2018, Joshua Timberman
+# Copyright:: 2018, Chef Software, Inc.
+#
+# 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 "chef/resource"
+
+class Chef
+  class Resource
+    class MacosUserDefaults < Chef::Resource
+      # align with apple's marketing department
+      resource_name :macos_userdefaults
+      provides(:mac_os_x_userdefaults) { true }
+      provides(:macos_userdefaults) { true }
+
+      description "Use the macos_userdefaults resource to manage the macOS user defaults system. The properties of this resource are passed to the defaults command, and the parameters follow the convention of that command. See the defaults(1) man page for details on how the tool works."
+      introduced "14.0"
+
+      property :domain, String,
+               description: "The domain the defaults belong to.",
+               required: true
+
+      property :global, [TrueClass, FalseClass],
+               description: "Whether the domain is global.",
+               default: false
+
+      property :key, String,
+               description: "The preference key."
+
+      property :value, [Integer, Float, String, TrueClass, FalseClass, Hash, Array],
+               description: "The value of the key.",
+               required: true
+
+      property :type, String,
+               description: "Value type of the preference key.",
+               default: ""
+
+      property :user, String,
+               description: "User for which to set the default."
+
+      property :sudo, [TrueClass, FalseClass],
+               description: "Set to true if the setting requires privileged access to modify.",
+               default: false,
+               desired_state: false
+
+      # @todo this should get refactored away: https://github.com/chef/chef/issues/7622
+      property :is_set, [TrueClass, FalseClass],
+               default: false,
+               desired_state: false
+
+       # coerce various ways of representing a boolean into either 0 (false) or 1 (true)
+       # which is what the defaults CLI expects. Why? Well defaults itself accepts a few
+       # different formats, but when you do a read command it all comes back as 1 or 0.
+      def coerce_booleans(val)
+        return 1 if [true, "TRUE", "1", "true", "YES", "yes"].include?(val)
+        return 0 if [false, "FALSE", "0", "false", "NO", "no"].include?(val)
+        val
+      end
+
+      load_current_value do |desired|
+        value = coerce_booleans(desired.value)
+        drcmd = "defaults read '#{desired.domain}' "
+        drcmd << "'#{desired.key}' " if desired.key
+        shell_out_opts = {}
+        shell_out_opts[:user] = desired.user unless desired.user.nil?
+        vc = shell_out("#{drcmd} | grep -qx '#{value}'", shell_out_opts)
+        is_set vc.exitstatus == 0 ? true : false
+      end
+
+      action :write do
+        description "Write the setting to the specified domain"
+
+        unless current_resource.is_set
+          cmd = ["defaults write"]
+          cmd.unshift("sudo") if new_resource.sudo
+
+          cmd << if new_resource.global
+                   "NSGlobalDomain"
+                 else
+                   "'#{new_resource.domain}'"
+                 end
+
+          cmd << "'#{new_resource.key}'" if new_resource.key
+          value = new_resource.value
+          type = new_resource.type.empty? ? value_type(value) : new_resource.type
+          # creates a string of Key1 Value1 Key2 Value2...
+          value = value.map { |k, v| "\"#{k}\" \"#{v}\"" }.join(" ") if type == "dict"
+          if type == "array"
+            value = value.join("' '")
+            value = "'#{value}'"
+          end
+          cmd << "-#{type}" if type
+          cmd << value
+
+          declare_resource(:execute, cmd.join(" ")) do
+            user new_resource.user unless new_resource.user.nil?
+          end
+        end
+      end
+
+      action_class do
+        def value_type(value)
+          case value
+          when true, false
+            "bool"
+          when Integer
+            "int"
+          when Float
+            "float"
+          when Hash
+            "dict"
+          when Array
+            "array"
+          end
+        end
+      end
+    end
+  end
+end