chef 14.3.37-universal-mingw32 → 14.4.56-universal-mingw32

data/lib/chef/resource/sysctl.rb

@@ -1,121 +1,151 @@
-#
-# Copyright:: 2018, Webb Agile Solutions Ltd.
-# Copyright:: 2018-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 Sysctl < Chef::Resource
-      resource_name :sysctl
-      provides(:sysctl) { true }
-      provides(:sysctl_param) { true }
-
-      description "Use the sysctl resource to set kernel parameters using the sysctl"\
-                  " command line tool and configuration files in the system's sysctl.d directory."\
-                  "Configuration files managed by this resource are named 99-chef-KEYNAME.conf. If"\
-                  " an existing value was already set for the value it will be backed up to the node"\
-                  " and restored if the :remove action is used later."
-
-      introduced "14.0"
-
-      property :key, String,
-               description: "The kernel parameter key in dotted format.",
-               name_property: true
-
-      property :ignore_error, [TrueClass, FalseClass],
-               description: "Ignore any errors when setting the value on the command line.",
-               default: false, desired_state: false
-
-      property :value, [Array, String, Integer, Float],
-               description: "The value to set.",
-               coerce: proc { |v| coerce_value(v) },
-               required: true
-
-      property :conf_dir, String,
-               description: "The configuration directory to write the config to.",
-               default: "/etc/sysctl.d"
-
-      def after_created
-        raise "The sysctl resource requires Linux as it needs sysctl and the sysctl.d directory functionality." unless node["os"] == "linux"
-        raise "The sysctl resource does not support SLES releases less than 12 as it requires a sysctl.d directory" if platform_family?("suse") && node["platform_version"].to_i < 12
-      end
-
-      def coerce_value(v)
-        case v
-        when Array
-          v.join(" ")
-        else
-          v.to_s
-        end
-      end
-
-      # shellout to sysctl to get the current value
-      # ignore missing keys by using '-e'
-      # convert tabs to spaces since sysctl tab deliminates multivalue parameters
-      # strip the newline off the end of the output as well
-      load_current_value do
-        value shell_out!("sysctl -n -e #{key}").stdout.tr("\t", " ").strip
-      end
-
-      action :apply do
-        description "Apply a sysctl value."
-
-        converge_if_changed do
-          # set it temporarily
-          set_sysctl_param(new_resource.key, new_resource.value)
-
-          directory new_resource.conf_dir
-
-          file "#{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf" do
-            content "#{new_resource.key} = #{new_resource.value}"
-          end
-
-          execute "Load sysctl values" do
-            command "sysctl #{'-e ' if new_resource.ignore_error}-p"
-            default_env true
-            action :run
-          end
-        end
-      end
-
-      action :remove do
-        description "Remove a sysctl value."
-
-        # only converge the resource if the file actually exists to delete
-        if ::File.exist?("#{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf")
-          converge_by "removing sysctl config at #{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf" do
-            file "#{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf" do
-              action :delete
-            end
-
-            execute "Load sysctl values" do
-              default_env true
-              command "sysctl -p"
-              action :run
-            end
-          end
-        end
-      end
-
-      action_class do
-        def set_sysctl_param(key, value)
-          shell_out!("sysctl #{'-e ' if new_resource.ignore_error}-w \"#{key}=#{value}\"")
-        end
-      end
-    end
-  end
-end
+#
+# Copyright:: 2018, Webb Agile Solutions Ltd.
+# Copyright:: 2018-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 Sysctl < Chef::Resource
+      resource_name :sysctl
+      provides(:sysctl) { true }
+      provides(:sysctl_param) { true }
+
+      description "Use the sysctl resource to set kernel parameters using the sysctl"\
+                  " command line tool and configuration files in the system's sysctl.d directory."\
+                  "Configuration files managed by this resource are named 99-chef-KEYNAME.conf. If"\
+                  " an existing value was already set for the value it will be backed up to the node"\
+                  " and restored if the :remove action is used later."
+
+      introduced "14.0"
+
+      property :key, String,
+               description: "The kernel parameter key in dotted format.",
+               name_property: true
+
+      property :ignore_error, [TrueClass, FalseClass],
+               description: "Ignore any errors when setting the value on the command line.",
+               default: false, desired_state: false
+
+      property :value, [Array, String, Integer, Float],
+               description: "The value to set.",
+               coerce: proc { |v| coerce_value(v) },
+               required: true
+
+      property :conf_dir, String,
+               description: "The configuration directory to write the config to.",
+               default: "/etc/sysctl.d"
+
+      def after_created
+        raise "The sysctl resource requires Linux as it needs sysctl and the sysctl.d directory functionality." unless node["os"] == "linux"
+        raise "The sysctl resource does not support SLES releases less than 12 as it requires a sysctl.d directory" if platform_family?("suse") && node["platform_version"].to_i < 12
+      end
+
+      def coerce_value(v)
+        case v
+        when Array
+          v.join(" ")
+        else
+          v.to_s
+        end
+      end
+
+      load_current_value do
+        begin
+          value get_sysctl_value(key)
+        rescue
+          current_value_does_not_exist!
+        end
+      end
+
+      action :apply do
+        description "Apply a sysctl value."
+
+        converge_if_changed do
+          # set it temporarily
+          set_sysctl_param(new_resource.key, new_resource.value)
+
+          directory new_resource.conf_dir
+
+          file "#{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf" do
+            content "#{new_resource.key} = #{new_resource.value}"
+          end
+
+          execute "Load sysctl values" do
+            command "sysctl #{'-e ' if new_resource.ignore_error}-p"
+            default_env true
+            action :run
+          end
+        end
+      end
+
+      action :remove do
+        description "Remove a sysctl value."
+
+        # only converge the resource if the file actually exists to delete
+        if ::File.exist?("#{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf")
+          converge_by "removing sysctl config at #{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf" do
+            file "#{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf" do
+              action :delete
+            end
+
+            execute "Load sysctl values" do
+              default_env true
+              command "sysctl -p"
+              action :run
+            end
+          end
+        end
+      end
+
+      action_class do
+        def set_sysctl_param(key, value)
+          shell_out!("sysctl #{'-e ' if new_resource.ignore_error}-w \"#{key}=#{value}\"")
+        end
+      end
+
+      private
+
+      # shellout to sysctl to get the current value
+      # ignore missing keys by using '-e'
+      # convert tabs to spaces since sysctl tab deliminates multivalue parameters
+      # strip the newline off the end of the output as well
+      #
+      # Chef creates a file in sysctld with parameter configuration
+      # Thus this config will persists even after rebooting the system
+      # User can be in a half configured state, where he has already updated the value
+      # which he wants to be configured from the resource
+      # Therefore we need an extra check with sysctld to ensure a correct idempotency
+      #
+      def get_sysctl_value(key)
+        val = shell_out!("sysctl -n -e #{key}").stdout.tr("\t", " ").strip
+        raise unless val == get_sysctld_value(key)
+        val
+      end
+
+      # Check if chef has already configured a value for the given key and
+      # return the value. Raise in case this conf file needs to be created
+      # or updated
+      def get_sysctld_value(key)
+        raise unless ::File.exist?("/etc/sysctl.d/99-chef-#{key}.conf")
+        k, v = ::File.read("/etc/sysctl.d/99-chef-#{key}.conf").match(/(.*) = (.*)/).captures
+        raise "Unknown sysctl key!" if k.nil?
+        raise "Unknown sysctl value!" if v.nil?
+        v
+      end
+    end
+  end
+end

data/lib/chef/resource/systemd_unit.rb

@@ -1,75 +1,77 @@
-#
-# Author:: Nathan Williams (<nath.e.will@gmail.com>)
-# Copyright:: Copyright 2016-2018, Nathan Williams
-# 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 "iniparse"
-
-class Chef
-  class Resource
-    class SystemdUnit < Chef::Resource
-      resource_name(:systemd_unit) { true }
-
-      description "Use the systemd_unit resource to create, manage, and run systemd units."
-      introduced "12.11"
-
-      default_action :nothing
-      allowed_actions :create, :delete,
-                      :preset, :revert,
-                      :enable, :disable, :reenable,
-                      :mask, :unmask,
-                      :start, :stop,
-                      :restart, :reload,
-                      :try_restart, :reload_or_restart,
-                      :reload_or_try_restart
-
-      # Internal provider-managed properties
-      property :enabled, [TrueClass, FalseClass]
-      property :active, [TrueClass, FalseClass]
-      property :masked, [TrueClass, FalseClass]
-      property :static, [TrueClass, FalseClass]
-
-      # User-provided properties
-      property :user, String, desired_state: false
-      property :content, [String, Hash]
-      property :triggers_reload, [TrueClass, FalseClass],
-                                 default: true, desired_state: false
-      property :verify, [TrueClass, FalseClass],
-                        default: true, desired_state: false
-      property :unit_name, String, desired_state: false,
-                                   identity: true,
-                                   name_property: true
-
-      def to_ini
-        case content
-        when Hash
-          IniParse.gen do |doc|
-            content.each_pair do |sect, opts|
-              doc.section(sect) do |section|
-                opts.each_pair do |opt, val|
-                  section.option(opt, val)
-                end
-              end
-            end
-          end.to_s
-        else
-          content.to_s
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Nathan Williams (<nath.e.will@gmail.com>)
+# Copyright:: Copyright 2016-2018, Nathan Williams
+# 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 "iniparse"
+
+class Chef
+  class Resource
+    class SystemdUnit < Chef::Resource
+      resource_name(:systemd_unit) { true }
+
+      description "Use the systemd_unit resource to create, manage, and run systemd units."
+      introduced "12.11"
+
+      default_action :nothing
+      allowed_actions :create, :delete,
+                      :preset, :revert,
+                      :enable, :disable, :reenable,
+                      :mask, :unmask,
+                      :start, :stop,
+                      :restart, :reload,
+                      :try_restart, :reload_or_restart,
+                      :reload_or_try_restart
+
+      # Internal provider-managed properties
+      property :enabled, [TrueClass, FalseClass]
+      property :active, [TrueClass, FalseClass]
+      property :masked, [TrueClass, FalseClass]
+      property :static, [TrueClass, FalseClass]
+
+      # User-provided properties
+      property :user, String, desired_state: false
+      property :content, [String, Hash]
+      property :triggers_reload, [TrueClass, FalseClass],
+                                 default: true, desired_state: false
+      property :verify, [TrueClass, FalseClass],
+                        default: true, desired_state: false
+      property :unit_name, String, desired_state: false,
+                                   identity: true,
+                                   name_property: true
+
+      def to_ini
+        case content
+        when Hash
+          IniParse.gen do |doc|
+            content.each_pair do |sect, opts|
+              doc.section(sect) do |section|
+                opts.each_pair do |opt, val|
+                  [val].flatten.each do |v|
+                    section.option(opt, v)
+                  end
+                end
+              end
+            end
+          end.to_s
+        else
+          content.to_s
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/template.rb

@@ -1,203 +1,203 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Seth Chisamore (<schisamo@chef.io>)
-# Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright 2008-2016, 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/file"
-require "chef/mixin/securable"
-
-class Chef
-  class Resource
-    # A cookbook template is an Embedded Ruby (ERB) template that is used to dynamically generate static text files.
-    # Templates may contain Ruby expressions and statements, and are a great way to manage configuration files. Use the
-    # template resource to add cookbook templates to recipes; place the corresponding Embedded Ruby (ERB) template file
-    # in a cookbook’s /templates directory.
-    #
-    # Use the template resource to manage the contents of a file using an Embedded Ruby (ERB) template by transferring
-    # files from a sub-directory of COOKBOOK_NAME/templates/ to a specified path located on a host that is running the
-    # chef-client. This resource includes actions and properties from the file resource. Template files managed by the
-    # template resource follow the same file specificity rules as the remote_file and file resources.
-    class Template < Chef::Resource::File
-      resource_name :template
-      provides :template
-
-      include Chef::Mixin::Securable
-
-      attr_reader :inline_helper_blocks
-      attr_reader :inline_helper_modules
-
-      def initialize(name, run_context = nil)
-        super
-        @source = "#{::File.basename(name)}.erb"
-        @inline_helper_blocks = {}
-        @inline_helper_modules = []
-        @helper_modules = []
-      end
-
-      def source(file = nil)
-        set_or_return(
-          :source,
-          file,
-          kind_of: [ String, Array ]
-        )
-      end
-
-      property :variables, Hash, default: lazy { Hash.new }
-      property :cookbook, String
-      property :local, [ TrueClass, FalseClass ], default: false
-
-      # Declares a helper method to be defined in the template context when
-      # rendering.
-      #
-      # === Example:
-      #
-      # ==== Basic usage:
-      # Given the following helper:
-      #   helper(:static_value) { "hello from helper" }
-      # A template with the following code:
-      #   <%= static_value %>
-      # Will render as;
-      #   hello from helper
-      #
-      # ==== Referencing Instance Variables:
-      # Any instance variables available to the template can be referenced in
-      # the method body. For example, you can simplify accessing app-specific
-      # node attributes like this:
-      #   helper(:app) { @node[:my_app_attributes] }
-      # And use it in a template like this:
-      #   <%= app[:listen_ports] %>
-      # This is equivalent to the non-helper template code:
-      #   <%= @node[:my_app_attributes][:listen_ports] %>
-      #
-      # ==== Method Arguments:
-      # Helper methods can also take arguments. The syntax available for
-      # argument specification supports full syntax available for method
-      # definition.
-      #
-      # Continuing the above example of simplifying attribute access, we can
-      # define a helper to look up app-specific attributes like this:
-      #   helper(:app) { |setting| @node[:my_app_attributes][setting] }
-      # The template can then look up attributes like this:
-      #   <%= app(:listen_ports) %>
-      def helper(method_name, &block)
-        unless block_given?
-          raise Exceptions::ValidationFailed,
-            "`helper(:method)` requires a block argument (e.g., `helper(:method) { code }`)"
-        end
-
-        unless method_name.kind_of?(Symbol)
-          raise Exceptions::ValidationFailed,
-            "method_name argument to `helper(method_name)` must be a symbol (e.g., `helper(:method) { code }`)"
-        end
-
-        @inline_helper_blocks[method_name] = block
-      end
-
-      # Declares a module to define helper methods in the template's context
-      # when rendering. There are two primary forms.
-      #
-      # === Inline Module Definition
-      # When a block is given, the block is used to define a module which is
-      # then mixed in to the template context w/ `extend`.
-      #
-      # ==== Inline Module Example
-      # Given the following code in the template resource:
-      #   helpers do
-      #     # Add "syntax sugar" for referencing app-specific attributes
-      #     def app(attribute)
-      #       @node[:my_app_attributes][attribute]
-      #     end
-      #   end
-      # You can use it in the template like so:
-      #   <%= app(:listen_ports) %>
-      # Which is equivalent to:
-      #   <%= @node[:my_app_attributes][:listen_ports] %>
-      #
-      # === External Module Form
-      # When a module name is given, the template context will be extended with
-      # that module. This is the recommended way to customize template contexts
-      # when you need to define more than an handful of helper functions (but
-      # also try to keep your template helpers from getting out of hand--if you
-      # have very complex logic in your template helpers, you should further
-      # extract your code into separate libraries).
-      #
-      # ==== External Module Example
-      # To extract the above inline module code to a library, you'd create a
-      # library file like this:
-      #   module MyTemplateHelper
-      #     # Add "syntax sugar" for referencing app-specific attributes
-      #     def app(attribute)
-      #       @node[:my_app_attributes][attribute]
-      #     end
-      #   end
-      # And in the template resource:
-      #   helpers(MyTemplateHelper)
-      # The template code in the above example will work unmodified.
-      def helpers(module_name = nil, &block)
-        if block_given? && !module_name.nil?
-          raise Exceptions::ValidationFailed,
-            "Passing both a module and block to #helpers is not supported. Call #helpers multiple times instead"
-        elsif block_given?
-          @inline_helper_modules << block
-        elsif module_name.kind_of?(::Module)
-          @helper_modules << module_name
-        elsif module_name.nil?
-          raise Exceptions::ValidationFailed,
-            "#helpers requires either a module name or inline module code as a block.\n" +
-            "e.g.: helpers do; helper_code; end;\n" +
-            "OR: helpers(MyHelpersModule)"
-        else
-          raise Exceptions::ValidationFailed,
-            "Argument to #helpers must be a module. You gave #{module_name.inspect} (#{module_name.class})"
-        end
-      end
-
-      # Compiles all helpers from inline method definitions, inline module
-      # definitions, and external modules into an Array of Modules. The context
-      # object for the template is extended with these modules to provide
-      # per-resource template logic.
-      def helper_modules
-        compiled_helper_methods + compiled_helper_modules + @helper_modules
-      end
-
-      private
-
-      # compiles helper methods into a module that can be included in template context
-      def compiled_helper_methods
-        if inline_helper_blocks.empty?
-          []
-        else
-          resource_helper_blocks = inline_helper_blocks
-          helper_mod = Module.new do
-            resource_helper_blocks.each do |method_name, method_body|
-              define_method(method_name, &method_body)
-            end
-          end
-          [ helper_mod ]
-        end
-      end
-
-      def compiled_helper_modules
-        @inline_helper_modules.map do |module_body|
-          Module.new(&module_body)
-        end
-      end
-
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Author:: Tyler Cloke (<tyler@chef.io>)
+# Copyright:: Copyright 2008-2016, 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/file"
+require "chef/mixin/securable"
+
+class Chef
+  class Resource
+    # A cookbook template is an Embedded Ruby (ERB) template that is used to dynamically generate static text files.
+    # Templates may contain Ruby expressions and statements, and are a great way to manage configuration files. Use the
+    # template resource to add cookbook templates to recipes; place the corresponding Embedded Ruby (ERB) template file
+    # in a cookbook's /templates directory.
+    #
+    # Use the template resource to manage the contents of a file using an Embedded Ruby (ERB) template by transferring
+    # files from a sub-directory of COOKBOOK_NAME/templates/ to a specified path located on a host that is running the
+    # chef-client. This resource includes actions and properties from the file resource. Template files managed by the
+    # template resource follow the same file specificity rules as the remote_file and file resources.
+    class Template < Chef::Resource::File
+      resource_name :template
+      provides :template
+
+      include Chef::Mixin::Securable
+
+      attr_reader :inline_helper_blocks
+      attr_reader :inline_helper_modules
+
+      def initialize(name, run_context = nil)
+        super
+        @source = "#{::File.basename(name)}.erb"
+        @inline_helper_blocks = {}
+        @inline_helper_modules = []
+        @helper_modules = []
+      end
+
+      def source(file = nil)
+        set_or_return(
+          :source,
+          file,
+          kind_of: [ String, Array ]
+        )
+      end
+
+      property :variables, Hash, default: lazy { Hash.new }
+      property :cookbook, String
+      property :local, [ TrueClass, FalseClass ], default: false
+
+      # Declares a helper method to be defined in the template context when
+      # rendering.
+      #
+      # === Example:
+      #
+      # ==== Basic usage:
+      # Given the following helper:
+      #   helper(:static_value) { "hello from helper" }
+      # A template with the following code:
+      #   <%= static_value %>
+      # Will render as;
+      #   hello from helper
+      #
+      # ==== Referencing Instance Variables:
+      # Any instance variables available to the template can be referenced in
+      # the method body. For example, you can simplify accessing app-specific
+      # node attributes like this:
+      #   helper(:app) { @node[:my_app_attributes] }
+      # And use it in a template like this:
+      #   <%= app[:listen_ports] %>
+      # This is equivalent to the non-helper template code:
+      #   <%= @node[:my_app_attributes][:listen_ports] %>
+      #
+      # ==== Method Arguments:
+      # Helper methods can also take arguments. The syntax available for
+      # argument specification supports full syntax available for method
+      # definition.
+      #
+      # Continuing the above example of simplifying attribute access, we can
+      # define a helper to look up app-specific attributes like this:
+      #   helper(:app) { |setting| @node[:my_app_attributes][setting] }
+      # The template can then look up attributes like this:
+      #   <%= app(:listen_ports) %>
+      def helper(method_name, &block)
+        unless block_given?
+          raise Exceptions::ValidationFailed,
+            "`helper(:method)` requires a block argument (e.g., `helper(:method) { code }`)"
+        end
+
+        unless method_name.kind_of?(Symbol)
+          raise Exceptions::ValidationFailed,
+            "method_name argument to `helper(method_name)` must be a symbol (e.g., `helper(:method) { code }`)"
+        end
+
+        @inline_helper_blocks[method_name] = block
+      end
+
+      # Declares a module to define helper methods in the template's context
+      # when rendering. There are two primary forms.
+      #
+      # === Inline Module Definition
+      # When a block is given, the block is used to define a module which is
+      # then mixed in to the template context w/ `extend`.
+      #
+      # ==== Inline Module Example
+      # Given the following code in the template resource:
+      #   helpers do
+      #     # Add "syntax sugar" for referencing app-specific attributes
+      #     def app(attribute)
+      #       @node[:my_app_attributes][attribute]
+      #     end
+      #   end
+      # You can use it in the template like so:
+      #   <%= app(:listen_ports) %>
+      # Which is equivalent to:
+      #   <%= @node[:my_app_attributes][:listen_ports] %>
+      #
+      # === External Module Form
+      # When a module name is given, the template context will be extended with
+      # that module. This is the recommended way to customize template contexts
+      # when you need to define more than an handful of helper functions (but
+      # also try to keep your template helpers from getting out of hand--if you
+      # have very complex logic in your template helpers, you should further
+      # extract your code into separate libraries).
+      #
+      # ==== External Module Example
+      # To extract the above inline module code to a library, you'd create a
+      # library file like this:
+      #   module MyTemplateHelper
+      #     # Add "syntax sugar" for referencing app-specific attributes
+      #     def app(attribute)
+      #       @node[:my_app_attributes][attribute]
+      #     end
+      #   end
+      # And in the template resource:
+      #   helpers(MyTemplateHelper)
+      # The template code in the above example will work unmodified.
+      def helpers(module_name = nil, &block)
+        if block_given? && !module_name.nil?
+          raise Exceptions::ValidationFailed,
+            "Passing both a module and block to #helpers is not supported. Call #helpers multiple times instead"
+        elsif block_given?
+          @inline_helper_modules << block
+        elsif module_name.kind_of?(::Module)
+          @helper_modules << module_name
+        elsif module_name.nil?
+          raise Exceptions::ValidationFailed,
+            "#helpers requires either a module name or inline module code as a block.\n" +
+            "e.g.: helpers do; helper_code; end;\n" +
+            "OR: helpers(MyHelpersModule)"
+        else
+          raise Exceptions::ValidationFailed,
+            "Argument to #helpers must be a module. You gave #{module_name.inspect} (#{module_name.class})"
+        end
+      end
+
+      # Compiles all helpers from inline method definitions, inline module
+      # definitions, and external modules into an Array of Modules. The context
+      # object for the template is extended with these modules to provide
+      # per-resource template logic.
+      def helper_modules
+        compiled_helper_methods + compiled_helper_modules + @helper_modules
+      end
+
+      private
+
+      # compiles helper methods into a module that can be included in template context
+      def compiled_helper_methods
+        if inline_helper_blocks.empty?
+          []
+        else
+          resource_helper_blocks = inline_helper_blocks
+          helper_mod = Module.new do
+            resource_helper_blocks.each do |method_name, method_body|
+              define_method(method_name, &method_body)
+            end
+          end
+          [ helper_mod ]
+        end
+      end
+
+      def compiled_helper_modules
+        @inline_helper_modules.map do |module_body|
+          Module.new(&module_body)
+        end
+      end
+
+    end
+  end
+end