chef 0.8.16 → 0.9.0.a3

data/lib/chef/providers.rb

@@ -17,9 +17,11 @@
 #
 
 require 'chef/provider/breakpoint'
+require 'chef/provider/cookbook_file'
 require 'chef/provider/cron'
 require 'chef/provider/deploy'
 require 'chef/provider/directory'
+require 'chef/provider/env'
 require 'chef/provider/erl_call'
 require 'chef/provider/execute'
 require 'chef/provider/file'
@@ -42,6 +44,8 @@ require 'chef/provider/subversion'
 require 'chef/provider/template'
 require 'chef/provider/user'
 
+require 'chef/provider/env/windows'
+
 require 'chef/provider/package/apt'
 require 'chef/provider/package/dpkg'
 require 'chef/provider/package/easy_install'
@@ -63,16 +67,19 @@ require 'chef/provider/service/redhat'
 require 'chef/provider/service/simple'
 require 'chef/provider/service/upstart'
 require 'chef/provider/service/windows'
+require 'chef/provider/service/solaris'
 
 require 'chef/provider/user/dscl'
 require 'chef/provider/user/pw'
 require 'chef/provider/user/useradd'
+require 'chef/provider/user/windows'
 
 require 'chef/provider/group/dscl'
 require 'chef/provider/group/gpasswd'
 require 'chef/provider/group/groupadd'
 require 'chef/provider/group/pw'
 require 'chef/provider/group/usermod'
+require 'chef/provider/group/windows'
 
 require 'chef/provider/mount/mount'
 

data/lib/chef/recipe.rb

@@ -22,8 +22,6 @@ require 'chef/mixin/recipe_definition_dsl_core'
 require 'chef/mixin/from_file'
 require 'chef/mixin/language'
 require 'chef/mixin/language_include_recipe'
-require 'chef/resource_collection'
-require 'chef/cookbook_loader'
 
 class Chef
   class Recipe
@@ -33,25 +31,46 @@ class Chef
     include Chef::Mixin::LanguageIncludeRecipe
     include Chef::Mixin::RecipeDefinitionDSLCore
     
-    attr_accessor :cookbook_name, :recipe_name, :recipe, :node, :collection, 
-                  :definitions, :params, :cookbook_loader
-    
-    def initialize(cookbook_name, recipe_name, node, collection=nil, definitions=nil, cookbook_loader=nil)
+    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"]
+    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
-      @node = node
-      @collection = collection || Chef::ResourceCollection.new
-      @definitions = definitions || Hash.new
-      @cookbook_loader = cookbook_loader || Chef::CookbookLoader.new
-      @params = Hash.new      
+      @run_context = run_context
+      # TODO: 5/19/2010 cw/tim: determine whether this can be removed
+      @params = Hash.new
     end
     
+    # Used in DSL mixins
+    def node
+      run_context.node
+    end
+    
+    # what does this do? and what is args? TODO 5-14-2010.
+    #
+    # We believe this is used by the DSL when it's executing in the
+    # context of a recipe in order to look up resources.
     def resources(*args)
-      @collection.resources(*args)
+      run_context.resource_collection.find(*args)
     end
     
     # Sets a tag, or list of tags, for this node.  Syntactic sugar for
-    # @node[:tags].  
+    # run_context.node[:tags].
     #
     # With no arguments, returns the list of tags.
     #
@@ -59,15 +78,15 @@ class Chef
     # tags<Array>:: A list of tags to add - can be a single string
     #
     # === Returns
-    # tags<Array>:: The contents of @node[:tags]
+    # tags<Array>:: The contents of run_context.node[:tags]
     def tag(*args)
       if args.length > 0
         args.each do |tag|
-          @node[:tags] << tag unless @node[:tags].include?(tag)
+          run_context.node[:tags] << tag unless run_context.node[:tags].include?(tag)
         end
-        @node[:tags]
+        run_context.node[:tags]
       else
-        @node[:tags]
+        run_context.node[:tags]
       end
     end
     
@@ -81,7 +100,7 @@ class Chef
     # false<FalseClass>:: If any of the parameters are missing
     def tagged?(*args)
       args.each do |tag|
-        return false unless @node[:tags].include?(tag)
+        return false unless run_context.node[:tags].include?(tag)
       end
       true
     end
@@ -92,10 +111,10 @@ class Chef
     # tags<Array>:: A list of tags
     #
     # === Returns
-    # tags<Array>:: The current list of @node[:tags]
+    # tags<Array>:: The current list of run_context.node[:tags]
     def untag(*args)
       args.each do |tag|
-        @node[:tags].delete(tag)
+        run_context.node[:tags].delete(tag)
       end
     end
     

data/lib/chef/resource.rb

@@ -32,20 +32,18 @@ class Chef
     include Chef::Mixin::Language
     include Chef::Mixin::ConvertToClassName
     
-    attr_accessor :actions, :params, :provider, :updated, :allowed_actions, :collection, :cookbook_name, :recipe_name, :enclosing_provider
-    attr_reader :resource_name, :source_line, :node, :not_if_args, :only_if_args
+    attr_accessor :params, :provider, :updated, :allowed_actions, :run_context, :cookbook_name, :recipe_name, :enclosing_provider
+    attr_reader :resource_name, :source_line, :not_if_args, :only_if_args
+
+    # Each notify entry is a resource/action pair, modeled as an
+    # OpenStruct with a .resource and .action member
+    attr_reader :notifies_immediate, :notifies_delayed
     
-    def initialize(name, collection=nil, node=nil)
+    def initialize(name, run_context=nil)
       @name = name
-      if collection
-        @collection = collection
-      else
-        @collection = Chef::ResourceCollection.new()
-      end      
-      @node = node ? node : Chef::Node.new
+      @run_context = run_context
       @noop = nil
       @before = nil
-      @actions = Hash.new
       @params = Hash.new
       @provider = nil
       @allowed_actions = [ :nothing ]
@@ -57,12 +55,18 @@ class Chef
       @not_if_args = {}
       @only_if = nil
       @only_if_args = {}
+      @notifies_immediate = Array.new
+      @notifies_delayed = Array.new
       sline = caller(4).shift
       if sline
         @source_line = sline.gsub!(/^(.+):(.+):.+$/, '\1 line \2')
         @source_line = ::File.expand_path(@source_line) if @source_line
       end
     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
@@ -77,7 +81,7 @@ class Chef
     
     def load_prior_resource
       begin
-        prior_resource = @collection.lookup(self.to_s)
+        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
@@ -178,24 +182,15 @@ class Chef
         end 
       end
     end
-  
+    
     def resources(*args)
-      @collection.resources(*args)
+      run_context.resource_collection.resources(*args)
     end
     
     def subscribes(action, resources, timing=:delayed)
-      timing = check_timing(timing)
-      rarray = resources.kind_of?(Array) ? resources : [ resources ]
-      rarray.each do |resource|
-        action_sym = action.to_sym
-        if resource.actions.has_key?(action_sym)
-          resource.actions[action_sym][timing] << self
-        else       
-          resource.actions[action_sym] = Hash.new
-          resource.actions[action_sym][:delayed] = Array.new
-          resource.actions[action_sym][:immediate] = Array.new   
-          resource.actions[action_sym][timing] << self
-        end
+      resources = [resources].flatten
+      resources.each do |resource|
+        resource.notifies(action, self, timing)
       end
       true
     end
@@ -216,7 +211,9 @@ class Chef
     def to_json(*a)
       instance_vars = Hash.new
       self.instance_variables.each do |iv|
-        instance_vars[iv] = self.instance_variable_get(iv) unless iv == "@collection"
+        unless iv == "@run_context"
+          instance_vars[iv] = self.instance_variable_get(iv) 
+        end
       end
       results = {
         'json_class' => self.class.name,
@@ -229,7 +226,7 @@ class Chef
       instance_vars = Hash.new
       self.instance_variables.each do |iv|
         iv = iv.to_s
-        next if iv == "@collection"
+        next if iv == "@run_context"
         instance_vars[iv.sub(/^@/,'').to_sym] = self.instance_variable_get(iv)
       end
       instance_vars
@@ -258,11 +255,15 @@ class Chef
     end
     
     def run_action(action)
-      provider = Chef::Platform.provider_for_node(@node, self)
+      provider = Chef::Platform.provider_for_resource(self)
       provider.load_current_resource
       provider.send("action_#{action}")
     end
     
+    def updated?
+      updated
+    end
+
     class << self
       
       def json_create(o)
@@ -300,8 +301,8 @@ class Chef
           # 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, collection=nil, node=nil)
-            super(name, collection, node)
+          def initialize(name, run_context)
+            super(name, run_context)
           end
           
           @actions_to_create = []
@@ -326,10 +327,9 @@ class Chef
           old_init = instance_method(:initialize)
 
           define_method(:initialize) do |name, *optional_args|
-            collection = optional_args.shift
-            node = optional_args.shift
+            args_run_context = optional_args.shift
             @resource_name = rname.to_sym
-            old_init.bind(self).call(name, collection, node)
+            old_init.bind(self).call(name, args_run_context)
             allowed_actions.push(self.class.actions_to_create).flatten!
           end
         end
@@ -370,31 +370,26 @@ class Chef
         end
       end
       
-      def check_timing(timing)
-        unless timing == :delayed || timing == :immediate || timing == :immediately
-          raise ArgumentError, "Timing must be :delayed or :immediate(ly), you said #{timing}"
-        end
-        if timing == :immediately
-          timing = :immediate
-        end
-        timing
+      def validate_timing(timing)
+        timing = timing.to_sym
+        raise ArgumentError, "invalid timing: #{timing}; must be one of: :delayed, :immediate, :immediately" unless (timing == :delayed || timing == :immediate || timing == :immediately)
+        timing == :immediately ? :immediate : timing
       end
       
       def notifies_helper(action, resources, timing=:delayed)
-        timing = check_timing(timing)
-        rarray = resources.kind_of?(Array) ? resources : [ resources ]
-        rarray.each do |resource|
-          action_sym = action.to_sym
-          if @actions.has_key?(action_sym)
-            @actions[action_sym][timing] << resource
+        timing = validate_timing(timing)
+        
+        resource_array = [resources].flatten
+        resource_array.each do |resource|
+          new_notify = OpenStruct.new(:resource => resource, :action => action)
+          if timing == :delayed
+            notifies_delayed << new_notify
           else
-            @actions[action_sym] = Hash.new
-            @actions[action_sym][:delayed] = Array.new
-            @actions[action_sym][:immediate] = Array.new   
-            @actions[action_sym][timing] << resource
+            notifies_immediate << new_notify
           end
         end
+        
         true
       end
-  end
+    end
 end

data/lib/chef/resource/apt_package.rb

@@ -22,13 +22,13 @@ require 'chef/provider/package/apt'
 class Chef
   class Resource
     class AptPackage < Chef::Resource::Package
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :apt_package
         @provider = Chef::Provider::Package::Apt
       end
       
     end
   end
-end
+end

data/lib/chef/resource/bash.rb

@@ -21,13 +21,13 @@ require 'chef/resource/script'
 class Chef
   class Resource
     class Bash < Chef::Resource::Script
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :bash
         @interpreter = "bash"
       end
 
     end
   end
-end
+end

data/lib/chef/resource/cookbook_file.rb

@@ -0,0 +1,45 @@
+#
+# 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/resource/file'
+require 'chef/provider/cookbook_file'
+
+class Chef
+  class Resource
+    class CookbookFile < Chef::Resource::File
+      
+      def initialize(name, run_context=nil)
+        super
+        @provider = Chef::Provider::CookbookFile
+        @resource_name = :cookbook_file
+        @action = "create"
+        @source = ::File.basename(name)
+        @cookbook = nil
+      end
+      
+      def source(source_filename=nil)
+        set_or_return(:source, source_filename, :kind_of => String)
+      end
+      
+      def cookbook(cookbook_name=nil)
+        set_or_return(:cookbook, cookbook_name, :kind_of => String)
+      end
+
+    end
+  end
+end

data/lib/chef/resource/cron.rb

@@ -21,9 +21,9 @@ require 'chef/resource'
 class Chef
   class Resource
     class Cron < Chef::Resource
-
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :cron
         @action = :create
         @allowed_actions.push(:create, :delete)

data/lib/chef/resource/csh.rb

@@ -21,13 +21,13 @@ require 'chef/resource/script'
 class Chef
   class Resource
     class Csh < Chef::Resource::Script
-        
-      def initialize(name, collection=nil, node=nil)
-        super(name, collection, node)
+      
+      def initialize(name, run_context=nil)
+        super
         @resource_name = :csh
         @interpreter = "csh"
       end
 
     end
   end
-end
+end