microwave 0.1006.33 → 1.0.0

data/lib/chef/provider/remote_directory.rb

@@ -1,136 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, 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/provider/file'
-require 'chef/provider/directory'
-require 'chef/resource/directory'
-require 'chef/platform'
-require 'uri'
-require 'tempfile'
-require 'net/https'
-require 'set'
-
-class Chef
-  class Provider
-    class RemoteDirectory < Chef::Provider::Directory
-
-      def action_create
-        super
-
-        files_to_purge = Set.new(
-          Dir.glob(::File.join(@new_resource.path, '**', '*'), ::File::FNM_DOTMATCH).select do |name|
-            name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
-          end
-        )
-        files_to_transfer.each do |cookbook_file_relative_path|
-          create_cookbook_file(cookbook_file_relative_path)
-          files_to_purge.delete(::File.dirname(::File.join(@new_resource.path, cookbook_file_relative_path)))
-          files_to_purge.delete(::File.join(@new_resource.path, cookbook_file_relative_path))
-        end
-        purge_unmanaged_files(files_to_purge)
-      end
-
-      def action_create_if_missing
-        # if this action is called, ignore the existing overwrite flag
-        @new_resource.overwrite = false
-        action_create
-      end
-
-      protected
-
-      def purge_unmanaged_files(unmanaged_files)
-        if @new_resource.purge
-          unmanaged_files.sort.reverse.each do |f|
-            if ::File.directory?(f)
-              Dir::rmdir(f)
-              Chef::Log.debug("#{@new_resource} removed directory #{f}")
-            else
-              ::File.delete(f)
-              Chef::Log.debug("#{@new_resource} deleted file #{f}")
-            end
-          end
-        end
-      end
-
-      def files_to_transfer
-        cookbook = run_context.cookbook_collection[resource_cookbook]
-        files = cookbook.relative_filenames_in_preferred_directory(node, :files, @new_resource.source)
-        files.sort.reverse
-      end
-
-      def directory_root_in_cookbook_cache
-        @directory_root_in_cookbook_cache ||= begin
-          cookbook = run_context.cookbook_collection[resource_cookbook]
-          cookbook.preferred_filename_on_disk_location(node, :files, @new_resource.source, @new_resource.path)
-        end
-      end
-
-      # Determine the cookbook to get the file from. If new resource sets an
-      # explicit cookbook, use it, otherwise fall back to the implicit cookbook
-      # i.e., the cookbook the resource was declared in.
-      def resource_cookbook
-        @new_resource.cookbook || @new_resource.cookbook_name
-      end
-
-      def create_cookbook_file(cookbook_file_relative_path)
-        full_path = ::File.join(@new_resource.path, cookbook_file_relative_path)
-
-        ensure_directory_exists(::File.dirname(full_path))
-
-        file_to_fetch = cookbook_file_resource(full_path, cookbook_file_relative_path)
-        if @new_resource.overwrite
-          file_to_fetch.run_action(:create)
-        else
-          file_to_fetch.run_action(:create_if_missing)
-        end
-        @new_resource.updated_by_last_action(true) if file_to_fetch.updated?
-      end
-
-      def cookbook_file_resource(target_path, relative_source_path)
-        cookbook_file = Chef::Resource::CookbookFile.new(target_path, run_context)
-        cookbook_file.cookbook_name = @new_resource.cookbook || @new_resource.cookbook_name
-        cookbook_file.source(::File.join(@new_resource.source, relative_source_path))
-        cookbook_file.mode(@new_resource.files_mode)    if @new_resource.files_mode
-        cookbook_file.group(@new_resource.files_group)  if @new_resource.files_group
-        cookbook_file.owner(@new_resource.files_owner)  if @new_resource.files_owner
-        cookbook_file.backup(@new_resource.files_backup) if @new_resource.files_backup
-
-        cookbook_file
-      end
-
-      def ensure_directory_exists(path)
-        unless ::File.directory?(path)
-          directory_to_create = resource_for_directory(path)
-          directory_to_create.run_action(:create)
-          @new_resource.updated_by_last_action(true) if directory_to_create.updated?
-        end
-      end
-
-      def resource_for_directory(path)
-        dir = Chef::Resource::Directory.new(path, run_context)
-        dir.cookbook_name = @new_resource.cookbook || @new_resource.cookbook_name
-        dir.mode(@new_resource.mode)
-        dir.group(@new_resource.group)
-        dir.owner(@new_resource.owner)
-        dir.recursive(true)
-        dir
-      end
-
-    end
-  end
-end

data/lib/chef/provider/template.rb

@@ -1,104 +0,0 @@
-#--
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2008, 2010 Opscode, 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/provider/file'
-require 'chef/mixin/template'
-require 'chef/mixin/checksum'
-require 'chef/file_access_control'
-
-class Chef
-  class Provider
-
-    class Template < Chef::Provider::File
-
-      include Chef::Mixin::Checksum
-      include Chef::Mixin::Template
-
-      def load_current_resource
-        super
-        @current_resource.checksum(checksum(@current_resource.path)) if ::File.exist?(@current_resource.path)
-      end
-
-      def action_create
-        render_with_context(template_location) do |rendered_template|
-          rendered(rendered_template)
-          if ::File.exist?(@new_resource.path) && content_matches?
-            Chef::Log.debug("#{@new_resource} content has not changed.")
-            set_all_access_controls(@new_resource.path)
-          else
-            backup
-            set_all_access_controls(rendered_template.path)
-            FileUtils.mv(rendered_template.path, @new_resource.path)
-            Chef::Log.info("#{@new_resource} updated content")
-            @new_resource.updated_by_last_action(true)
-          end
-        end
-      end
-
-      def action_create_if_missing
-        if ::File.exists?(@new_resource.path)
-          Chef::Log.debug("#{@new_resource} exists - taking no action")
-        else
-          action_create
-        end
-      end
-
-      def template_location
-        @template_file_cache_location ||= begin
-          if @new_resource.local
-            @new_resource.source
-          else
-            cookbook = run_context.cookbook_collection[resource_cookbook]
-            cookbook.preferred_filename_on_disk_location(node, :templates, @new_resource.source)
-          end
-        end
-      end
-      
-      def resource_cookbook
-        @new_resource.cookbook || @new_resource.cookbook_name
-      end
-
-      def rendered(rendered_template)
-        @new_resource.checksum(checksum(rendered_template.path))
-        Chef::Log.debug("Current content's checksum:  #{@current_resource.checksum}")
-        Chef::Log.debug("Rendered content's checksum: #{@new_resource.checksum}")
-      end
-
-      def content_matches?
-        @current_resource.checksum == @new_resource.checksum
-      end
-
-      def set_all_access_controls(file)
-        access_controls = Chef::FileAccessControl.new(@new_resource, file)
-        access_controls.set_all
-        @new_resource.updated_by_last_action(access_controls.modified?)
-      end
-
-      private
-
-      def render_with_context(template_location, &block)
-        context = {}
-        context.merge!(@new_resource.variables)
-        context[:node] = node
-        render_template(IO.read(template_location), context, &block)
-      end
-
-    end
-  end
-end

data/lib/chef/recipe.rb

@@ -1,129 +0,0 @@
-#--
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Christopher Walters (<cw@opscode.com>)
-# Copyright:: Copyright (c) 2008, 2009 Opscode, 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/mixin/recipe_definition_dsl_core'
-require 'chef/mixin/from_file'
-require 'chef/mixin/language'
-require 'chef/mixin/language_include_recipe'
-
-require 'chef/mixin/deprecation'
-
-class Chef
-  # == Chef::Recipe
-  # A Recipe object is the context in which Chef recipes are evaluated.
-  class Recipe
-
-    include Chef::Mixin::FromFile
-    include Chef::Mixin::Language
-    include Chef::Mixin::LanguageIncludeRecipe
-    include Chef::Mixin::RecipeDefinitionDSLCore
-    include Chef::Mixin::Deprecation
-
-    attr_accessor :cookbook_name, :recipe_name, :recipe, :params, :run_context
-
-    # Parses a potentially fully-qualified recipe name into its
-    # cookbook name and recipe short name.
-    #
-    # For example:
-    #   "aws::elastic_ip" returns [:aws, "elastic_ip"]
-    #   "aws" returns [:aws, "default"]
-    #--
-    # TODO: Duplicates functionality of RunListItem
-    def self.parse_recipe_name(recipe_name)
-      rmatch = recipe_name.match(/(.+?)::(.+)/)
-      if rmatch
-        [ rmatch[1].to_sym, rmatch[2] ]
-      else
-        [ recipe_name.to_sym, "default" ]
-      end
-    end
-
-    def initialize(cookbook_name, recipe_name, run_context)
-      @cookbook_name = cookbook_name
-      @recipe_name = recipe_name
-      @run_context = run_context
-      # TODO: 5/19/2010 cw/tim: determine whether this can be removed
-      @params = Hash.new
-      @node = deprecated_ivar(run_context.node, :node, :warn)
-    end
-
-    # Used in DSL mixins
-    def node
-      run_context.node
-    end
-
-    # Used by the DSL to look up resources when executing in the context of a
-    # recipe.
-    def resources(*args)
-      run_context.resource_collection.find(*args)
-    end
-
-    # Sets a tag, or list of tags, for this node.  Syntactic sugar for
-    # run_context.node[:tags].
-    #
-    # With no arguments, returns the list of tags.
-    #
-    # === Parameters
-    # tags<Array>:: A list of tags to add - can be a single string
-    #
-    # === Returns
-    # tags<Array>:: The contents of run_context.node[:tags]
-    def tag(*tags)
-      if tags.length > 0
-        tags.each do |tag|
-          tag = tag.to_s
-          run_context.node[:tags] << tag unless run_context.node[:tags].include?(tag)
-        end
-        run_context.node[:tags]
-      else
-        run_context.node[:tags]
-      end
-    end
-
-    # Returns true if the node is tagged with *all* of the supplied +tags+.
-    #
-    # === Parameters
-    # tags<Array>:: A list of tags
-    #
-    # === Returns
-    # true<TrueClass>:: If all the parameters are present
-    # false<FalseClass>:: If any of the parameters are missing
-    def tagged?(*tags)
-      tags.each do |tag|
-        return false unless run_context.node[:tags].include?(tag)
-      end
-      true
-    end
-
-    # Removes the list of tags from the node.
-    #
-    # === Parameters
-    # tags<Array>:: A list of tags
-    #
-    # === Returns
-    # tags<Array>:: The current list of run_context.node[:tags]
-    def untag(*tags)
-      tags.each do |tag|
-        run_context.node[:tags].delete(tag)
-      end
-    end
-
-  end
-end

data/lib/chef/resource.rb

@@ -1,609 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Christopher Walters (<cw@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, 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/mixin/params_validate'
-require 'chef/mixin/check_helper'
-require 'chef/mixin/language'
-require 'chef/mixin/convert_to_class_name'
-require 'chef/resource/conditional'
-require 'chef/resource_collection'
-require 'chef/node'
-
-require 'chef/mixin/deprecation'
-
-class Chef
-  class Resource
-    class Notification < Struct.new(:resource, :action, :notifying_resource)
-
-      def duplicates?(other_notification)
-        unless other_notification.respond_to?(:resource) && other_notification.respond_to?(:action)
-          msg = "only duck-types of Chef::Resource::Notification can be checked for duplication "\
-                "you gave #{other_notification.inspect}"
-          raise ArgumentError, msg
-        end
-        other_notification.resource == resource && other_notification.action == action
-      end
-
-      def resolve_resource_reference(resource_collection)
-        return resource if resource.kind_of?(Chef::Resource)
-
-        matching_resource = resource_collection.find(resource)
-        if Array(matching_resource).size > 1
-          msg = "Notification #{self} from #{notifying_resource} was created with a reference to multiple resources, "\
-                "but can only notify one resource. Notifying resource was defined on #{notifying_resource.source_line}"
-          raise Chef::Exceptions::InvalidResourceReference, msg
-        end
-        self.resource = matching_resource
-      rescue Chef::Exceptions::ResourceNotFound => e
-        err = Chef::Exceptions::ResourceNotFound.new(<<-FAIL)
-Resource #{notifying_resource} is configured to notify resource #{resource} with action #{action}, \
-but #{resource} cannot be found in the resource collection. #{notifying_resource} is defined in \
-#{notifying_resource.source_line}
-FAIL
-        err.set_backtrace(e.backtrace)
-        raise err
-      rescue Chef::Exceptions::InvalidResourceSpecification => e
-          err = Chef::Exceptions::InvalidResourceSpecification.new(<<-F)
-Resource #{notifying_resource} is configured to notify resource #{resource} with action #{action}, \
-but #{resource.inspect} is not valid syntax to look up a resource in the resource collection. Notification \
-is defined near #{notifying_resource.source_line}
-F
-          err.set_backtrace(e.backtrace)
-        raise err
-      end
-
-    end
-
-    FORBIDDEN_IVARS = [:@run_context, :@node, :@not_if, :@only_if]
-    HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@node]
-
-    include Chef::Mixin::CheckHelper
-    include Chef::Mixin::ParamsValidate
-    include Chef::Mixin::Language
-    include Chef::Mixin::ConvertToClassName
-    include Chef::Mixin::Deprecation
-
-    attr_accessor :params
-    attr_accessor :provider
-    attr_accessor :allowed_actions
-    attr_accessor :run_context
-    attr_accessor :cookbook_name
-    attr_accessor :recipe_name
-    attr_accessor :enclosing_provider
-    attr_accessor :source_line
-    attr_accessor :retries
-    attr_accessor :retry_delay
-
-    attr_reader :updated
-
-    attr_reader :resource_name
-    attr_reader :not_if_args
-    attr_reader :only_if_args
-
-    # Each notify entry is a resource/action pair, modeled as an
-    # Struct with a #resource and #action member
-    attr_reader :immediate_notifications
-    attr_reader :delayed_notifications
-
-    def initialize(name, run_context=nil)
-      @name = name
-      @run_context = run_context
-      @noop = nil
-      @before = nil
-      @params = Hash.new
-      @provider = nil
-      @allowed_actions = [ :nothing ]
-      @action = :nothing
-      @updated = false
-      @updated_by_last_action = false
-      @supports = {}
-      @ignore_failure = false
-      @retries = 0
-      @retry_delay = 2
-      @not_if = []
-      @only_if = []
-      @immediate_notifications = Array.new
-      @delayed_notifications = Array.new
-      @source_line = nil
-
-      @node = run_context ? deprecated_ivar(run_context.node, :node, :warn) : nil
-    end
-
-    def updated=(true_or_false)
-      Chef::Log.warn("Chef::Resource#updated=(true|false) is deprecated. Please call #updated_by_last_action(true|false) instead.")
-      Chef::Log.warn("Called from:")
-      caller[0..3].each {|line| Chef::Log.warn(line)}
-      updated_by_last_action(true_or_false)
-      @updated = true_or_false
-    end
-
-    def node
-      run_context && run_context.node
-    end
-
-    # If an unknown method is invoked, determine whether the enclosing Provider's
-    # lexical scope can fulfill the request. E.g. This happens when the Resource's
-    # block invokes new_resource.
-    def method_missing(method_symbol, *args, &block)
-      if enclosing_provider && enclosing_provider.respond_to?(method_symbol)
-        enclosing_provider.send(method_symbol, *args, &block)
-      else
-        raise NoMethodError, "undefined method `#{method_symbol.to_s}' for #{self.class.to_s}"
-      end
-    end
-
-    def load_prior_resource
-      begin
-        prior_resource = run_context.resource_collection.lookup(self.to_s)
-        Chef::Log.debug("Setting #{self.to_s} to the state of the prior #{self.to_s}")
-        prior_resource.instance_variables.each do |iv|
-          unless iv.to_sym == :@source_line || iv.to_sym == :@action
-            self.instance_variable_set(iv, prior_resource.instance_variable_get(iv))
-          end
-        end
-        true
-      rescue Chef::Exceptions::ResourceNotFound => e
-        true
-      end
-    end
-
-    def supports(args={})
-      if args.any?
-        @supports = args
-      else
-        @supports
-      end
-    end
-
-    def provider(arg=nil)
-      klass = if arg.kind_of?(String) || arg.kind_of?(Symbol)
-                lookup_provider_constant(arg)
-              else
-                arg
-              end
-      set_or_return(
-        :provider,
-        klass,
-        :kind_of => [ Class ]
-      )
-    end
-
-    def action(arg=nil)
-      if arg
-        action_list = arg.kind_of?(Array) ? arg : [ arg ]
-        action_list = action_list.collect { |a| a.to_sym }
-        action_list.each do |action|
-          validate(
-            {
-              :action => action,
-            },
-            {
-              :action => { :kind_of => Symbol, :equal_to => @allowed_actions },
-            }
-          )
-        end
-        @action = action_list
-      else
-        @action
-      end
-    end
-
-    def name(name=nil)
-      set_if_args(@name, name) do
-        raise ArgumentError, "name must be a string!" unless name.kind_of?(String)
-        @name = name
-      end
-    end
-
-    def noop(tf=nil)
-      set_if_args(@noop, tf) do
-        raise ArgumentError, "noop must be true or false!" unless tf == true || tf == false
-        @noop = tf
-      end
-    end
-
-    def ignore_failure(arg=nil)
-      set_or_return(
-        :ignore_failure,
-        arg,
-        :kind_of => [ TrueClass, FalseClass ]
-      )
-    end
-
-    def retries(arg=nil)
-      set_or_return(
-        :retries,
-        arg,
-        :kind_of => Integer
-      )
-    end
-
-    def retry_delay(arg=nil)
-      set_or_return(
-        :retry_delay,
-        arg,
-        :kind_of => Integer
-      )
-    end
-
-    def epic_fail(arg=nil)
-      ignore_failure(arg)
-    end
-
-    def notifies(*args)
-      unless ( args.size > 0 && args.size < 4)
-        raise ArgumentError, "Wrong number of arguments for notifies: should be 1-3 arguments, you gave #{args.inspect}"
-      end
-
-      if args.size > 1 # notifies(:action, resource) OR notifies(:action, resource, :immediately)
-        add_notification(*args)
-      else
-        # This syntax is so weird. surely people will just give us one hash?
-        notifications = args.flatten
-        notifications.each do |resources_notifications|
-          resources_notifications.each do |resource, notification|
-            action, timing = notification[0], notification[1]
-            Chef::Log.debug "Adding notification from resource #{self} to `#{resource.inspect}' => `#{notification.inspect}'"
-            add_notification(action, resource, timing)
-          end
-        end
-      end
-    rescue NoMethodError
-      Chef::Log.fatal("Error processing notifies(#{args.inspect}) on #{self}")
-      raise
-    end
-
-    def add_notification(action, resources, timing=:delayed)
-      resources = [resources].flatten
-      resources.each do |resource|
-        case timing.to_s
-        when 'delayed'
-          notifies_delayed(action, resource)
-        when 'immediate', 'immediately'
-          notifies_immediately(action, resource)
-        else
-          raise ArgumentError,  "invalid timing: #{timing} for notifies(#{action}, #{resources.inspect}, #{timing}) resource #{self} "\
-                                "Valid timings are: :delayed, :immediate, :immediately"
-        end
-      end
-
-      true
-    end
-
-    # Iterates over all immediate and delayed notifications, calling
-    # resolve_resource_reference on each in turn, causing them to
-    # resolve lazy/forward references.
-    def resolve_notification_references
-      @immediate_notifications.each { |n| n.resolve_resource_reference(run_context.resource_collection) }
-      @delayed_notifications.each {|n| n.resolve_resource_reference(run_context.resource_collection) }
-    end
-
-    def notifies_immediately(action, resource_spec)
-      @immediate_notifications << Notification.new(resource_spec, action, self)
-    end
-
-    def notifies_delayed(action, resource_spec)
-      @delayed_notifications << Notification.new(resource_spec, action, self)
-    end
-
-    def resources(*args)
-      run_context.resource_collection.find(*args)
-    end
-
-    def subscribes(action, resources, timing=:delayed)
-      resources = [resources].flatten
-      resources.each do |resource|
-        resource.notifies(action, self, timing)
-      end
-      true
-    end
-
-    def is(*args)
-      if args.size == 1
-        args.first
-      else
-        return *args
-      end
-    end
-
-    def to_s
-      "#{@resource_name}[#{@name}]"
-    end
-
-    def to_text
-      ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS
-      text = "# Declared in #{@source_line}\n"
-      text << convert_to_snake_case(self.class.name, 'Chef::Resource') + "(\"#{name}\") do\n"
-      ivars.each do |ivar|
-        if (value = instance_variable_get(ivar)) && !(value.respond_to?(:empty?) && value.empty?)
-          text << "  #{ivar.to_s.sub(/^@/,'')}(#{value.inspect})\n"
-        end
-      end
-      text << "end\n"
-    end
-
-    def inspect
-      ivars = instance_variables.map { |ivar| ivar.to_sym } - FORBIDDEN_IVARS
-      ivars.inject("<#{to_s}") do |str, ivar|
-        str << " #{ivar}: #{instance_variable_get(ivar).inspect}"
-      end << ">"
-    end
-
-    # Serialize this object as a hash
-    def to_json(*a)
-      safe_ivars = instance_variables.map { |ivar| ivar.to_sym } - FORBIDDEN_IVARS
-      instance_vars = Hash.new
-      safe_ivars.each do |iv|
-        instance_vars[iv.to_s.sub(/^@/, '')] = instance_variable_get(iv)
-      end
-      results = {
-        'json_class' => self.class.name,
-        'instance_vars' => instance_vars
-      }
-      results.to_json(*a)
-    end
-
-    def to_hash
-      safe_ivars = instance_variables.map { |ivar| ivar.to_sym } - FORBIDDEN_IVARS
-      instance_vars = Hash.new
-      safe_ivars.each do |iv|
-        key = iv.to_s.sub(/^@/,'').to_sym
-        instance_vars[key] = instance_variable_get(iv)
-      end
-      instance_vars
-    end
-
-    # If command is a block, returns true if the block returns true, false if it returns false.
-    # ("Only run this resource if the block is true")
-    #
-    # If the command is not a block, executes the command.  If it returns any status other than
-    # 0, it returns false (clearly, a 0 status code is true)
-    #
-    # === Parameters
-    # command<String>:: A a string to execute.
-    # opts<Hash>:: Options control the execution of the command
-    # block<Proc>:: A ruby block to run. Ignored if a command is given.
-    #
-    # === Evaluation
-    # * evaluates to true if the block is true, or if the command returns 0
-    # * evaluates to false if the block is false, or if the command returns a non-zero exit code.
-    def only_if(command=nil, opts={}, &block)
-      if command || block_given?
-        @only_if << Conditional.only_if(command, opts, &block)
-      end
-      @only_if
-    end
-
-    # If command is a block, returns false if the block returns true, true if it returns false.
-    # ("Do not run this resource if the block is true")
-    #
-    # If the command is not a block, executes the command.  If it returns a 0 exitstatus, returns false.
-    # ("Do not run this resource if the command returns 0")
-    #
-    # === Parameters
-    # command<String>:: A a string to execute.
-    # opts<Hash>:: Options control the execution of the command
-    # block<Proc>:: A ruby block to run. Ignored if a command is given.
-    #
-    # === Evaluation
-    # * evaluates to true if the block is false, or if the command returns a non-zero exit status.
-    # * evaluates to false if the block is true, or if the command returns a 0 exit status.
-    def not_if(command=nil, opts={}, &block)
-      if command || block_given?
-        @not_if << Conditional.not_if(command, opts, &block)
-      end
-      @not_if
-    end
-
-    def defined_at
-      if cookbook_name && recipe_name && source_line
-        "#{cookbook_name}::#{recipe_name} line #{source_line.split(':')[1]}"
-      elsif source_line
-        file, line_no = source_line.split(':')
-        "#{file} line #{line_no}"
-      else
-        "dynamically defined"
-      end
-    end
-
-    def run_action(action)
-      if Chef::Config[:verbose_logging] || Chef::Log.level == :debug
-        # This can be noisy
-        Chef::Log.info("Processing #{self} action #{action} (#{defined_at})")
-      end
-
-      # ensure that we don't leave @updated_by_last_action set to true
-      # on accident
-      updated_by_last_action(false)
-
-      begin
-        return if should_skip?
-
-        provider = Chef::Platform.provider_for_resource(self)
-        provider.load_current_resource
-        provider.send("action_#{action}")
-      rescue => e
-        if ignore_failure
-          Chef::Log.error("#{self} (#{defined_at}) had an error: #{e.message}")
-        else
-          Chef::Log.error("#{self} (#{defined_at}) has had an error")
-          new_exception = e.exception("#{self} (#{defined_at}) had an error: #{e.class.name}: #{e.message}")
-          new_exception.set_backtrace(e.backtrace)
-          raise new_exception
-        end
-      end
-    end
-
-    # Evaluates not_if and only_if conditionals. Returns a falsey value if any
-    # of the conditionals indicate that this resource should be skipped, i.e.,
-    # if an only_if evaluates to false or a not_if evaluates to true.
-    #
-    # If this resource should be skipped, returns the first conditional that
-    # "fails" its check. Subsequent conditionals are not evaluated, so in
-    # general it's not a good idea to rely on side effects from not_if or
-    # only_if commands/blocks being evaluated.
-    def should_skip?
-      conditionals = only_if + not_if
-      return false if conditionals.empty?
-
-      conditionals.find do |conditional|
-        if conditional.continue?
-          false
-        else
-          Chef::Log.debug("Skipping #{self} due to #{conditional.description}")
-          true
-        end
-      end
-    end
-
-    def updated_by_last_action(true_or_false)
-      @updated ||= true_or_false
-      @updated_by_last_action = true_or_false
-    end
-
-    def updated_by_last_action?
-      @updated_by_last_action
-    end
-
-    def updated?
-      updated
-    end
-
-    class << self
-
-      def json_create(o)
-        resource = self.new(o["instance_vars"]["@name"])
-        o["instance_vars"].each do |k,v|
-          resource.instance_variable_set("@#{k}".to_sym, v)
-        end
-        resource
-      end
-
-      include Chef::Mixin::ConvertToClassName
-
-      def attribute(attr_name, validation_opts={})
-        # This atrocity is the only way to support 1.8 and 1.9 at the same time
-        # When you're ready to drop 1.8 support, do this:
-        # define_method attr_name.to_sym do |arg=nil|
-        # etc.
-        shim_method=<<-SHIM
-        def #{attr_name}(arg=nil)
-          _set_or_return_#{attr_name}(arg)
-        end
-        SHIM
-        class_eval(shim_method)
-
-        define_method("_set_or_return_#{attr_name.to_s}".to_sym) do |arg|
-          set_or_return(attr_name.to_sym, arg, validation_opts)
-        end
-      end
-      
-      def build_from_file(cookbook_name, filename, run_context)
-        rname = filename_to_qualified_string(cookbook_name, filename)
-
-        # Add log entry if we override an existing light-weight resource.
-        class_name = convert_to_class_name(rname)
-        overriding = Chef::Resource.const_defined?(class_name)
-        Chef::Log.info("#{class_name} light-weight resource already initialized -- overriding!") if overriding
-
-        new_resource_class = Class.new self do |cls|
-
-          # default initialize method that ensures that when initialize is finally
-          # wrapped (see below), super is called in the event that the resource
-          # definer does not implement initialize
-          def initialize(name, run_context)
-            super(name, run_context)
-          end
-
-          @actions_to_create = []
-
-          class << cls
-            include Chef::Mixin::FromFile
-            
-            attr_accessor :run_context
-
-            def node
-              self.run_context.node
-            end
-
-            def actions_to_create
-              @actions_to_create
-            end
-
-            define_method(:actions) do |*action_names|
-              actions_to_create.push(*action_names)
-            end
-          end
-
-          # set the run context in the class instance variable
-          cls.run_context = run_context
-          
-          # load resource definition from file
-          cls.class_from_file(filename)
-
-          # create a new constructor that wraps the old one and adds the actions
-          # specified in the DSL
-          old_init = instance_method(:initialize)
-
-          define_method(:initialize) do |name, *optional_args|
-            args_run_context = optional_args.shift
-            @resource_name = rname.to_sym
-            old_init.bind(self).call(name, args_run_context)
-            allowed_actions.push(self.class.actions_to_create).flatten!
-          end
-        end
-
-        # register new class as a Chef::Resource
-        class_name = convert_to_class_name(rname)
-        Chef::Resource.const_set(class_name, new_resource_class)
-        Chef::Log.debug("Loaded contents of #{filename} into a resource named #{rname} defined in Chef::Resource::#{class_name}")
-
-        new_resource_class
-      end
-
-      # Resources that want providers namespaced somewhere other than
-      # Chef::Provider can set the namespace with +provider_base+
-      # Ex:
-      #   class MyResource < Chef::Resource
-      #     provider_base Chef::Provider::Deploy
-      #     # ...other stuff
-      #   end
-      def provider_base(arg=nil)
-        @provider_base ||= arg
-        @provider_base ||= Chef::Provider
-      end
-
-    end
-
-    private
-
-    def lookup_provider_constant(name)
-      begin
-        self.class.provider_base.const_get(convert_to_class_name(name.to_s))
-      rescue NameError => e
-        if e.to_s =~ /#{Regexp.escape(self.class.provider_base.to_s)}/
-          raise ArgumentError, "No provider found to match '#{name}'"
-        else
-          raise e
-        end
-      end
-    end
-
-  end
-end