chef 0.7.10 → 0.7.12

data/lib/chef/resource/deploy_revision.rb

@@ -0,0 +1,35 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Copyright:: Copyright (c) 2009 Daniel DeLeo
+# 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.
+#
+
+class Chef
+  class Resource
+    
+    # Convenience class for using the deploy resource with the revision
+    # deployment strategy (provider) 
+    class DeployRevision < Chef::Resource::Deploy
+      def initialize(*args, &block)
+        super
+        @provider = Chef::Provider::Deploy::Revision
+      end
+    end
+    
+    class DeployBranch < Chef::Resource::DeployRevision
+    end
+    
+  end
+end

data/lib/chef/resource/git.rb

@@ -0,0 +1,36 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.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/scm"
+
+class Chef
+  class Resource
+    class Git < Chef::Resource::Scm
+      
+      def initialize(name, collection=nil, node=nil)
+        super(name, collection, node)
+        @resource_name = :git
+        @provider = Chef::Provider::Git
+      end
+      
+      alias :branch :revision
+      alias :reference :revision
+      
+    end
+  end
+end

data/lib/chef/resource/group.rb

@@ -55,6 +55,8 @@ class Chef
           :kind_of => [ Array ]
         )
       end
+
+      alias_method :users, :members
  
       def append(arg=nil)
         set_or_return(

data/lib/chef/resource/scm.rb

@@ -0,0 +1,129 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.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'
+
+class Chef
+  class Resource
+    class Scm < Chef::Resource
+      
+      def initialize(name, collection=nil, node=nil)
+        super(name, collection, node)
+        @destination = name
+        @resource_name = :scm
+        @enable_submodules = false
+        @revision = "HEAD"
+        @remote = "origin"
+        @ssh_wrapper = nil
+        @depth = nil
+        @allowed_actions.push(:checkout, :export, :sync, :diff, :log)
+      end
+      
+      def destination(arg=nil)
+        set_or_return(
+          :destination,
+          arg,
+          :kind_of => String
+        )
+      end
+      
+      def repository(arg=nil)
+        set_or_return(
+          :repository,
+          arg,
+          :kind_of => String
+        )
+      end
+      
+      def revision(arg=nil)
+        set_or_return(
+          :revision,
+          arg,
+          :kind_of => String
+        )
+      end
+      
+      def user(arg=nil)
+        set_or_return(
+          :user,
+          arg,
+          :kind_of => [String, Integer]
+        )
+      end
+      
+      def svn_username(arg=nil)
+        set_or_return(
+          :svn_username,
+          arg,
+          :kind_of => String
+        )
+      end
+      
+      def svn_password(arg=nil)
+        set_or_return(
+          :svn_password,
+          arg,
+          :kind_of => String
+        )
+      end
+      
+      def svn_arguments(arg=nil)
+        set_or_return(
+          :svn_arguments,
+          arg,
+          :kind_of => String
+        )
+      end
+      
+      # Capistrano and git-deploy use ``shallow clone''
+      def depth(arg=nil)
+        set_or_return(
+          :depth,
+          arg,
+          :kind_of => Integer
+        )
+      end
+      
+      def enable_submodules(arg=nil)
+        set_or_return(
+          :enable_submodules,
+          arg,
+          :kind_of => [TrueClass, FalseClass]
+        )
+      end
+      
+      def remote(arg=nil)
+        set_or_return(
+          :remote,
+          arg,
+          :kind_of => String
+        )
+      end
+      
+      def ssh_wrapper(arg=nil)
+        set_or_return(
+          :ssh_wrapper,
+          arg,
+          :kind_of => String
+        )
+      end
+      
+    end
+  end
+end

data/lib/chef/resource/subversion.rb

@@ -0,0 +1,33 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.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/scm"
+
+class Chef
+  class Resource
+    class Subversion < Chef::Resource::Scm
+      
+      def initialize(name, collection=nil, node=nil)
+        super(name, collection, node)
+        @resource_name = :subversion
+        @provider = Chef::Provider::Subversion
+      end
+      
+    end
+  end
+end

data/lib/chef/resource/timestamped_deploy.rb

@@ -0,0 +1,31 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Copyright:: Copyright (c) 2009 Daniel DeLeo
+# 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.
+#
+
+class Chef
+  class Resource
+    
+    # Convenience class for using the deploy resource with the timestamped
+    # deployment strategy (provider) 
+    class TimestampedDeploy < Chef::Resource::Deploy
+      def initialize(*args, &block)
+        super(*args, &block)
+        @provider = Chef::Provider::Deploy::Timestamped
+      end
+    end
+  end
+end

data/lib/chef/resource_collection.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# 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");
@@ -21,10 +22,11 @@ require 'chef/resource'
 class Chef
   class ResourceCollection
     include Enumerable
-    
+
     def initialize
       @resources = Array.new
       @resources_by_name = Hash.new
+      @insert_after_idx = nil
     end
     
     def [](index)
@@ -36,7 +38,7 @@ class Chef
       @resources[index] = arg 
       @resources_by_name[arg.to_s] = index
     end
-    
+
     def <<(*args)
       args.flatten.each do |a|
         is_chef_resource(a)
@@ -44,6 +46,25 @@ class Chef
         @resources_by_name[a.to_s] = @resources.length - 1 
       end
     end
+
+    def insert(resource)
+      is_chef_resource(resource)
+      if @insert_after_idx
+        # in the middle of executing a run, so any resources inserted now should
+        # be placed after the most recent addition done by the currently executing
+        # resource
+        @resources.insert(@insert_after_idx + 1, resource)
+        # update name -> location mappings and register new resource
+        @resources_by_name.each_key do |key|
+          @resources_by_name[key] += 1 if @resources_by_name[key] > @insert_after_idx
+        end
+        @resources_by_name[resource.to_s] = @insert_after_idx + 1
+        @insert_after_idx += 1
+      else  
+        @resources << resource
+        @resources_by_name[resource.to_s] = @resources.length - 1
+      end
+    end
     
     def push(*args)
       args.flatten.each do |a|
@@ -58,6 +79,13 @@ class Chef
         yield r
       end
     end
+
+    def execute_each_resource
+      @resources.each_with_index do |r, idx|
+        @insert_after_idx = idx
+        yield r
+      end
+    end
     
     def each_index
       @resources.each_index do |i|
@@ -173,4 +201,4 @@ class Chef
         true
       end
   end
-end
+end

data/lib/chef/runner.rb

@@ -26,7 +26,7 @@ class Chef
     
     include Chef::Mixin::ParamsValidate
     
-    def initialize(node, collection)
+    def initialize(node, collection, definitions={}, cookbook_loader=nil)
       validate(
         {
           :node => node,
@@ -43,22 +43,49 @@ class Chef
       )
       @node = node
       @collection = collection
+      @definitions = definitions
+      @cookbook_loader = cookbook_loader
     end
     
     def build_provider(resource)
       provider_klass = resource.provider
       provider_klass ||= Chef::Platform.find_provider_for_node(@node, resource)
       Chef::Log.debug("#{resource} using #{provider_klass.to_s}")
-      provider = provider_klass.new(@node, resource)
+      provider = provider_klass.new(@node, resource, @collection, @definitions, @cookbook_loader)
       provider.load_current_resource
       provider
     end
-    
+
+    def run_action(resource, ra)
+      provider = build_provider(resource)
+      provider.send("action_#{ra}")
+
+      if resource.updated
+        resource.actions.each_key do |action|
+          if resource.actions[action].has_key?(:immediate)
+            resource.actions[action][:immediate].each do |r|
+              Chef::Log.info("#{resource} sending #{action} action to #{r} (immediate)")
+              run_action(r, action)
+            end
+          end
+          if resource.actions[action].has_key?(:delayed)
+            resource.actions[action][:delayed].each do |r|
+              @delayed_actions[r] = Hash.new unless @delayed_actions.has_key?(r)
+              @delayed_actions[r][action] = Array.new unless @delayed_actions[r].has_key?(action)
+              @delayed_actions[r][action] << lambda {
+                Chef::Log.info("#{resource} sending #{action} action to #{r} (delayed)")
+              } 
+            end
+          end
+        end
+      end
+    end
+
     def converge
 
-      delayed_actions = Hash.new
+      @delayed_actions = Hash.new
       
-      @collection.each do |resource|
+      @collection.execute_each_resource do |resource|
         begin
           Chef::Log.debug("Processing #{resource}")
           
@@ -81,27 +108,7 @@ class Chef
           # Walk the actions for this resource, building the provider and running each.
           action_list = resource.action.kind_of?(Array) ? resource.action : [ resource.action ]
           action_list.each do |ra|
-            provider = build_provider(resource)
-            provider.send("action_#{ra}")
-            if resource.updated
-              resource.actions.each_key do |action|
-                if resource.actions[action].has_key?(:immediate)
-                  resource.actions[action][:immediate].each do |r|
-                    Chef::Log.info("#{resource} sending #{action} action to #{r} (immediate)")
-                    build_provider(r).send("action_#{action}")
-                  end
-                end
-                if resource.actions[action].has_key?(:delayed)
-                  resource.actions[action][:delayed].each do |r|
-                    delayed_actions[r] = Hash.new unless delayed_actions.has_key?(r)
-                    delayed_actions[r][action] = Array.new unless delayed_actions[r].has_key?(action)
-                    delayed_actions[r][action] << lambda {
-                      Chef::Log.info("#{resource} sending #{action} action to #{r} (delayed)")
-                    } 
-                  end
-                end
-              end
-            end
+            run_action(resource, ra)
           end
         rescue => e
           Chef::Log.error("#{resource} (#{resource.source_line}) had an error:\n#{e}\n#{e.backtrace}")
@@ -110,10 +117,10 @@ class Chef
       end
       
       # Run all our :delayed actions
-      delayed_actions.each do |resource, action_hash| 
+      @delayed_actions.each do |resource, action_hash| 
         action_hash.each do |action, log_array|
           log_array.each { |l| l.call } # Call each log message
-          build_provider(resource).send("action_#{action}") 
+          run_action(resource, action)
         end
       end