microwave 0.1006.31 → 0.1006.32

data/VERSION

@@ -1 +1 @@
-0.1006.31
+0.1006.32

data/lib/chef/cookbook/cookbook_version_loader.rb

@@ -45,6 +45,7 @@ class Chef
 
       def load_cookbooks
         load_as(:attribute_filenames, 'attributes', '*.rb')
+        load_as(:definition_filenames, 'definitions', '*.rb')
         load_as(:recipe_filenames, 'recipes', '*.rb')
         load_as(:library_filenames, 'libraries', '*.rb')
         load_recursively_as(:template_filenames, "templates", "*")

data/lib/chef/cookbook_version.rb

@@ -22,6 +22,7 @@
 require 'chef/log'
 require 'chef/client'
 require 'chef/node'
+require 'chef/resource_definition_list'
 require 'chef/recipe'
 require 'chef/cookbook/file_vendor'
 require 'chef/checksum'
@@ -91,7 +92,7 @@ class Chef
   class CookbookVersion
     include Comparable
 
-    COOKBOOK_SEGMENTS = [ :resources, :providers, :recipes, :libraries, :attributes, :files, :templates, :root_files ]
+    COOKBOOK_SEGMENTS = [ :resources, :providers, :recipes, :definitions, :libraries, :attributes, :files, :templates, :root_files ]
 
     attr_accessor :root_dir
     attr_accessor :definition_filenames
@@ -342,6 +343,8 @@ class Chef
         @recipe_filenames
       when :libraries
         @library_filenames
+      when :definitions
+        @definition_filenames
       when :attributes
         @attribute_filenames
       when :files
@@ -588,6 +591,7 @@ class Chef
     def generate_manifest
       manifest = Mash.new({
         :recipes => Array.new,
+        :definitions => Array.new,
         :libraries => Array.new,
         :attributes => Array.new,
         :files => Array.new,

data/lib/chef/mixin/recipe_definition_dsl_core.rb

@@ -34,27 +34,43 @@ class Chef
       include Chef::Mixin::Language
       
       def method_missing(method_symbol, *args, &block)
-        # Otherwise, we're rocking the regular resource call route.
-        method_name = method_symbol.to_s
-        rname = convert_to_class_name(method_name)
+        # If we have a definition that matches, we want to use that instead.  This should
+        # let you do some really crazy over-riding of "native" types, if you really want
+        # to. 
+        if run_context.definitions.has_key?(method_symbol)
+          # This dupes the high level object, but we still need to dup the params
+          new_def = run_context.definitions[method_symbol].dup
+          new_def.params = new_def.params.dup
+          new_def.node = run_context.node
+          # This sets up the parameter overrides
+          new_def.instance_eval(&block) if block
+          new_recipe = Chef::Recipe.new(cookbook_name, @recipe_name, run_context)
+          new_recipe.params = new_def.params
+          new_recipe.params[:name] = args[0]
+          new_recipe.instance_eval(&new_def.recipe)
+        else
+          # Otherwise, we're rocking the regular resource call route.
+          method_name = method_symbol.to_s
+          rname = convert_to_class_name(method_name)
 
-        super unless Chef::Resource.const_defined?(rname)
-        raise ArgumentError, "You must supply a name when declaring a #{method_name} resource" unless args.size > 0
+          super unless Chef::Resource.const_defined?(rname)
+          raise ArgumentError, "You must supply a name when declaring a #{method_name} resource" unless args.size > 0
 
-        # If we have a resource like this one, we want to steal its state
-        args << run_context
-        resource = Chef::Resource.const_get(rname).new(*args)
-        resource.load_prior_resource
-        resource.cookbook_name = cookbook_name
-        resource.recipe_name = @recipe_name
-        resource.params = @params
-        resource.source_line = caller[0]
-        # Determine whether this resource is being created in the context of an enclosing Provider
-        resource.enclosing_provider = self.is_a?(Chef::Provider) ? self : nil
-        resource.instance_eval(&block) if block
+          # If we have a resource like this one, we want to steal its state
+          args << run_context
+          resource = Chef::Resource.const_get(rname).new(*args)
+          resource.load_prior_resource
+          resource.cookbook_name = cookbook_name
+          resource.recipe_name = @recipe_name
+          resource.params = @params
+          resource.source_line = caller[0]
+          # Determine whether this resource is being created in the context of an enclosing Provider
+          resource.enclosing_provider = self.is_a?(Chef::Provider) ? self : nil
+          resource.instance_eval(&block) if block
 
-        run_context.resource_collection.insert(resource)
-        resource
+          run_context.resource_collection.insert(resource)
+          resource
+        end
       end
       
     end

data/lib/chef/resource_definition.rb

@@ -0,0 +1,67 @@
+#
+# 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/mixin/from_file'
+require 'chef/mixin/params_validate'
+
+class Chef
+  class ResourceDefinition
+    
+    include Chef::Mixin::FromFile
+    include Chef::Mixin::ParamsValidate
+    
+    attr_accessor :name, :params, :recipe, :node
+    
+    def initialize(node=nil)
+      @name = nil
+      @params = Hash.new
+      @recipe = nil
+      @node = node
+    end
+    
+    def define(resource_name, prototype_params=nil, &block)
+      unless resource_name.kind_of?(Symbol)
+        raise ArgumentError, "You must use a symbol when defining a new resource!"
+      end
+      @name = resource_name
+      if prototype_params
+        unless prototype_params.kind_of?(Hash)
+          raise ArgumentError, "You must pass a hash as the prototype parameters for a definition."
+        end
+        @params = prototype_params
+      end
+      if Kernel.block_given?
+        @recipe = block
+      else
+        raise ArgumentError, "You must pass a block to a definition."
+      end
+      true
+    end
+    
+    # When we do the resource definition, we're really just setting new values for
+    # the paramaters we prototyped at the top.  This method missing is as simple as
+    # it gets.
+    def method_missing(symbol, *args)
+      @params[symbol] = args.length == 1 ? args[0] : args
+    end
+    
+    def to_s
+      "#{name.to_s}"
+    end
+  end
+end

data/lib/chef/resource_definition_list.rb

@@ -0,0 +1,38 @@
+#
+# 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/mixin/from_file'
+require 'chef/resource_definition'
+
+class Chef
+  class ResourceDefinitionList
+    include Chef::Mixin::FromFile
+
+    attr_accessor :defines
+
+    def initialize
+      @defines = Hash.new
+    end
+
+    def define(resource_name, prototype_params=nil, &block)
+      @defines[resource_name] = ResourceDefinition.new
+      @defines[resource_name].define(resource_name, prototype_params, &block)
+      true
+    end
+  end
+end

data/lib/chef/run_context.rb

@@ -31,7 +31,7 @@ class Chef
     # Used to load the node's recipes after expanding its run list
     include Chef::Mixin::LanguageIncludeRecipe
 
-    attr_reader :node, :cookbook_collection
+    attr_reader :node, :cookbook_collection, :definitions
 
     # Needs to be settable so deploy can run a resource_collection independent
     # of any cookbooks.
@@ -46,6 +46,7 @@ class Chef
       @node = node
       @cookbook_collection = cookbook_collection
       @resource_collection = Chef::ResourceCollection.new
+      @definitions = Hash.new
 
       # TODO: 5/18/2010 cw/timh - See note on Chef::Node's
       # cookbook_collection attr_accessor
@@ -57,6 +58,7 @@ class Chef
       load_lwrp_providers
       load_lwrp_resources
       load_attributes
+      load_resource_definitions
 
       # Precendence rules state that roles' attributes come after
       # cookbooks. Now we've loaded attributes from cookbooks with
@@ -99,6 +101,18 @@ class Chef
       node.load_attributes
     end
 
+    def load_resource_definitions
+      foreach_cookbook_load_segment(:definitions) do |cookbook_name, filename|
+        Chef::Log.debug("Loading cookbook #{cookbook_name}'s definitions from #{filename}")
+        resourcelist = Chef::ResourceDefinitionList.new
+        resourcelist.from_file(filename)
+        definitions.merge!(resourcelist.defines) do |key, oldval, newval|
+          Chef::Log.info("Overriding duplicate definition #{key}, new definition found in #{filename}")
+          newval
+        end
+      end
+    end
+
     def foreach_cookbook_load_segment(segment, &block)
       cookbook_collection.each do |cookbook_name, cookbook|
         segment_filenames = cookbook.segment_filenames(segment)

data/lib/chef/tasks/chef_repo.rake

@@ -88,6 +88,7 @@ def create_cookbook(dir)
   puts "** Creating cookbook #{ENV["COOKBOOK"]}"
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "attributes")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "recipes")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "definitions")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "libraries")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "resources")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "providers")}" 

metadata

@@ -1,203 +1,208 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: microwave
-version: !ruby/object:Gem::Version 
-  hash: 3993
-  prerelease: false
-  segments: 
-  - 0
-  - 1006
-  - 31
-  version: 0.1006.31
+version: !ruby/object:Gem::Version
+  version: 0.1006.32
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Tom Bombadil
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-09 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mixlib-config
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mixlib-cli
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: mixlib-cli
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mixlib-log
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: mixlib-log
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
     - - <=
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 5
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.5.4
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hike
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.5.4
+- !ruby/object:Gem::Dependency
+  name: hike
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: surface
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: surface
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: erubis
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: moneta
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: moneta
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: sdoc
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: fast_xs
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fast_xs
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id011
-description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure, forked from Opscode Chef
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A systems integration framework, built to bring the benefits of configuration
+  management to your entire infrastructure, forked from Opscode Chef
 email: amanibhavam@destructuring.org
-executables: 
+executables:
 - chef-solo
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - LICENSE
 - README.rdoc
 - VERSION
@@ -282,6 +287,8 @@ files:
 - lib/chef/resource.rb
 - lib/chef/resource_collection/stepable_iterator.rb
 - lib/chef/resource_collection.rb
+- lib/chef/resource_definition.rb
+- lib/chef/resource_definition_list.rb
 - lib/chef/resources.rb
 - lib/chef/role.rb
 - lib/chef/run_context.rb
@@ -302,39 +309,29 @@ files:
 - lib/chef/version_constraint.rb
 - lib/chef.rb
 - bin/chef-solo
-has_rdoc: true
 homepage: https://github.com/HeSYINUvSBZfxqA/microwave
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure, forked from Opscode Chef
+summary: A systems integration framework, built to bring the benefits of configuration
+  management to your entire infrastructure, forked from Opscode Chef
 test_files: []
-