chef 0.7.16 → 0.8.2

data/lib/chef/openid_registration.rb

@@ -19,6 +19,7 @@
 require 'chef/config'
 require 'chef/mixin/params_validate'
 require 'chef/couchdb'
+require 'chef/index_queue'
 require 'digest/sha1'
 require 'rubygems'
 require 'json'
@@ -29,6 +30,7 @@ class Chef
     attr_accessor :name, :salt, :validated, :password, :couchdb_rev, :admin
     
     include Chef::Mixin::ParamsValidate
+    include Chef::IndexQueue::Indexable
     
     DESIGN_DOCUMENT = {
       "version" => 3,
@@ -138,6 +140,10 @@ class Chef
       end
     end
     
+    def self.cdb_list(*args)
+      list(*args)
+    end
+    
     # Load an OpenIDRegistration by name from CouchDB
     def self.load(name)
       Chef::CouchDB.new.load("openid_registration", name)
@@ -148,20 +154,21 @@ class Chef
       Chef::CouchDB.new.has_key?("openid_registration", name)
     end
     
-    # Remove this node from the CouchDB
+    # Remove this OpenIDRegistration from the CouchDB
     def destroy
       @couchdb.delete("openid_registration", @name, @couchdb_rev)
     end
     
-    # Save this node to the CouchDB
+    # Save this OpenIDRegistration to the CouchDB
     def save
       results = @couchdb.store("openid_registration", @name, self)
       @couchdb_rev = results["rev"]
     end
     
     # Set up our CouchDB design document
-    def self.create_design_document
-      Chef::CouchDB.new.create_design_document("registrations", DESIGN_DOCUMENT)
+    def self.create_design_document(couchdb=nil)
+      couchdb ||= Chef::CouchDB.new
+      couchdb.create_design_document("registrations", DESIGN_DOCUMENT)
     end
     
     protected
@@ -178,4 +185,4 @@ class Chef
       end
     
   end
-end
+end

data/lib/chef/platform.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -25,19 +25,22 @@ Dir[File.join(File.dirname(__FILE__), 'provider/**/*.rb')].sort.each { |lib| req
 
 class Chef
   class Platform
-        
+
     @platforms = {
       :mac_os_x => {
         :default => {
-          :package => Chef::Provider::Package::Macports
+          :package => Chef::Provider::Package::Macports,
+          :user => Chef::Provider::User::Dscl,
+          :group => Chef::Provider::Group::Dscl
         }
       },
       :freebsd => {
         :default => {
-          :group => Chef::Provider::Group::Pw,
+          :group   => Chef::Provider::Group::Pw,
           :package => Chef::Provider::Package::Freebsd,
           :service => Chef::Provider::Service::Freebsd,
-          :user => Chef::Provider::User::Pw
+          :user    => Chef::Provider::User::Pw,
+          :cron    => Chef::Provider::Cron
         }
       },
       :ubuntu   => {
@@ -45,6 +48,7 @@ class Chef
           :package => Chef::Provider::Package::Apt,
           :service => Chef::Provider::Service::Debian,
           :cron => Chef::Provider::Cron,
+          :mdadm => Chef::Provider::Mdadm
         }
       },
       :debian => {
@@ -52,20 +56,30 @@ class Chef
           :package => Chef::Provider::Package::Apt,
           :service => Chef::Provider::Service::Debian,
           :cron => Chef::Provider::Cron,
+          :mdadm => Chef::Provider::Mdadm
         }
       },
       :centos   => {
         :default => {
           :service => Chef::Provider::Service::Redhat,
           :cron => Chef::Provider::Cron,
-          :package => Chef::Provider::Package::Yum
+          :package => Chef::Provider::Package::Yum,
+          :mdadm => Chef::Provider::Mdadm
+        }
+      },
+       :suse   => {
+        :default => {
+          :service => Chef::Provider::Service::Redhat,
+          :cron => Chef::Provider::Cron,
+          :package => Chef::Provider::Package::Zypper
         }
       },
       :redhat   => {
         :default => {
           :service => Chef::Provider::Service::Redhat,
           :cron => Chef::Provider::Cron,
-          :package => Chef::Provider::Package::Yum
+          :package => Chef::Provider::Package::Yum,
+          :mdadm => Chef::Provider::Mdadm
         }
       },
       :gentoo   => {
@@ -73,6 +87,15 @@ class Chef
           :package => Chef::Provider::Package::Portage,
           :service => Chef::Provider::Service::Gentoo,
           :cron => Chef::Provider::Cron,
+          :mdadm => Chef::Provider::Mdadm
+        }
+      },
+      :arch   => {
+        :default => {
+          :package => Chef::Provider::Package::Pacman,
+          :service => Chef::Provider::Service::Arch,
+          :cron => Chef::Provider::Cron,
+          :mdadm => Chef::Provider::Mdadm
         }
       },
       :solaris  => {},
@@ -97,27 +120,29 @@ class Chef
         :http_request => Chef::Provider::HttpRequest,
         :route => Chef::Provider::Route,
         :ifconfig => Chef::Provider::Ifconfig,
-        :ruby_block => Chef::Provider::RubyBlock
+        :ruby_block => Chef::Provider::RubyBlock,
+        :erl_call => Chef::Provider::ErlCall,
+        :log => Chef::Provider::Log::ChefLog
       }
     }
 
     class << self
       attr_accessor :platforms
-      
+
       include Chef::Mixin::ParamsValidate
-            
+
       def find(name, version)
         provider_map = @platforms[:default].clone
-        
+
         name_sym = name
         if name.kind_of?(String)
           name.downcase!
           name.gsub!(/\s/, "_")
           name_sym = name.to_sym
         end
-        
+
         if @platforms.has_key?(name_sym)
-          if @platforms[name_sym].has_key?(version) 
+          if @platforms[name_sym].has_key?(version)
             Chef::Log.debug("Platform #{name.to_s} version #{version} found")
             if @platforms[name_sym].has_key?(:default)
               provider_map.merge!(@platforms[name_sym][:default])
@@ -131,37 +156,19 @@ class Chef
         end
         provider_map
       end
-      
-      def find_provider(platform, version, resource_type)
-        pmap = Chef::Platform.find(platform, version)
-        rtkey = resource_type
-        if resource_type.kind_of?(Chef::Resource)
-          return resource_type.provider if resource_type.provider
-          rtkey = resource_type.resource_name.to_sym
-        end
-        if pmap.has_key?(rtkey)
-          pmap[rtkey]
-        else
-          Chef::Log.error("#{rtkey.inspect} #{pmap.inspect}")
-          raise(
-            ArgumentError, 
-            "Cannot find a provider for #{resource_type} on #{platform} version #{version}"
-          )
-        end
-      end
-      
+
       def find_platform_and_version(node)
         platform = nil
         version = nil
-        
+
         if node[:platform]
           platform = node[:platform]
         elsif node.attribute?("os")
           platform = node[:os]
         end
-        
+
         raise ArgumentError, "Cannot find a platform for #{node}" unless platform
-        
+
         if node[:platform_version]
           version = node[:platform_version]
         elsif node[:os_version]
@@ -169,21 +176,21 @@ class Chef
         elsif node[:os_release]
           version = node[:os_release]
         end
-        
+
         raise ArgumentError, "Cannot find a version for #{node}" unless version
-        
+
         return platform, version
       end
-      
+
       def provider_for_node(node, resource_type)
         find_provider_for_node(node, resource_type).new(node, resource_type)
       end
 
       def find_provider_for_node(node, resource_type)
-        platform, version = find_platform_and_version(node)        
+        platform, version = find_platform_and_version(node)
         provider = find_provider(platform, version, resource_type)
       end
-      
+
       def set(args)
         validate(
           args,
@@ -204,14 +211,14 @@ class Chef
             }
           }
         )
-        if args.has_key?(:platform)          
+        if args.has_key?(:platform)
           if args.has_key?(:version)
             if @platforms.has_key?(args[:platform])
               if @platforms[args[:platform]].has_key?(args[:version])
                 @platforms[args[:platform]][args[:version]][args[:resource].to_sym] = args[:provider]
               else
                 @platforms[args[:platform]][args[:version]] = {
-                  args[:resource].to_sym => args[:provider] 
+                  args[:resource].to_sym => args[:provider]
                 }
               end
             else
@@ -222,7 +229,7 @@ class Chef
               }
             end
           else
-            if @platforms.has_key?(args[:platform])            
+            if @platforms.has_key?(args[:platform])
               if @platforms[args[:platform]].has_key?(:default)
                 @platforms[args[:platform]][:default][args[:resource].to_sym] = args[:provider]
               else
@@ -246,8 +253,43 @@ class Chef
           end
         end
       end
-            
-    end    
-    
+
+      def find_provider(platform, version, resource_type)
+        pmap = Chef::Platform.find(platform, version)
+        provider_klass = explicit_provider(platform, version, resource_type) || 
+                         platform_provider(platform, version, resource_type) || 
+                         resource_matching_provider(platform, version, resource_type)
+
+        raise ArgumentError, "Cannot find a provider for #{resource_type} on #{platform} version #{version}" if provider_klass.nil?
+
+        provider_klass
+      end
+
+      private
+
+        def explicit_provider(platform, version, resource_type)
+          resource_type.kind_of?(Chef::Resource) ? resource_type.provider : nil
+        end
+
+        def platform_provider(platform, version, resource_type)
+          pmap = Chef::Platform.find(platform, version)
+          rtkey = resource_type.kind_of?(Chef::Resource) ? resource_type.resource_name.to_sym : resource_type
+          pmap.has_key?(rtkey) ? pmap[rtkey] : nil
+        end
+
+        def resource_matching_provider(platform, version, resource_type)
+          if resource_type.kind_of?(Chef::Resource)
+            begin
+              Chef::Provider.const_get(resource_type.class.to_s.split('::').last) 
+            rescue NameError 
+              nil
+            end
+          else
+            nil
+          end
+        end
+
+    end
+
   end
 end

data/lib/chef/provider/breakpoint.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.
+#
+
+class Chef
+  class Provider
+    class Breakpoint < Chef::Provider
+      
+      def load_current_resource
+      end
+      
+      def action_break
+        if defined?(Shef) && Shef.running?
+          @collection.iterator.pause
+          @new_resource.updated = true
+          @collection.iterator
+        end
+      end
+      
+    end
+  end
+end

data/lib/chef/provider/cron.rb

@@ -25,6 +25,8 @@ class Chef
     class Cron < Chef::Provider
       include Chef::Mixin::Command
 
+      CRON_PATTERN = /([0-9\*\-\,\/]+)\s*([0-9\*\-\,\/]+)\s*([0-9\*\-\,\/]+)\s*([0-9\*\-\,\/]+)\s*([0-9\*\-\,\/]+)\s*(.*)/
+
       def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
         super(node, new_resource, collection, definitions, cookbook_loader)
         @cron_exists = false
@@ -62,7 +64,7 @@ class Chef
             when /^HOME=(\S*)/
               @current_resource.home($1) if cron_found
               next
-            when /([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*(.*)/
+            when CRON_PATTERN
               if cron_found
                 @current_resource.minute($1) 
                 @current_resource.hour($2) 
@@ -114,7 +116,7 @@ class Chef
               when /^# Chef Name: #{@new_resource.name}\n/
                 cron_found = true
                 next
-              when /([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*(.*)/
+              when CRON_PATTERN
                 if cron_found
                   cron_found = false
                   crontab << newcron
@@ -129,7 +131,6 @@ class Chef
 
           status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
             crontab.each { |line| stdin.puts "#{line}" }
-            stdin.close rescue nil
           end
           Chef::Log.info("Updated cron '#{@new_resource.name}'")
           @new_resource.updated = true
@@ -144,7 +145,6 @@ class Chef
 
           status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
             crontab.each { |line| stdin.puts "#{line}" }
-            stdin.close rescue nil
           end
           Chef::Log.info("Added cron '#{@new_resource.name}'")
           @new_resource.updated = true
@@ -161,7 +161,7 @@ class Chef
               when /^# Chef Name: #{@new_resource.name}\n/
                 cron_found = true
                 next
-              when /([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*(.*)/
+              when CRON_PATTERN
                 if cron_found
                   cron_found = false
                   next
@@ -175,7 +175,6 @@ class Chef
 
           status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
             crontab.each { |line| stdin.puts "#{line}" }
-            stdin.close rescue nil
           end
           Chef::Log.debug("Deleted cron '#{@new_resource.name}'")
           @new_resource.updated = true

data/lib/chef/provider/deploy.rb

@@ -61,9 +61,15 @@ class Chef
       
       def action_deploy
         if all_releases.include?(release_path)
-          Chef::Log.info("Already deployed app at #{release_path}, skipping. Use action :force_deploy to force.")
+          if all_releases[-1] == release_path
+            Chef::Log.debug("Already deployed app at #{release_path}, and it is the latest revision.  Use action :force_deploy to re-deploy this revision.")
+          else
+            Chef::Log.info("Already deployed app at #{release_path}.  Rolling back to it - use action :force_deploy to re-checkout this revision.")
+            action_rollback
+          end
         else
           deploy
+          @new_resource.updated = true
         end
       end
       
@@ -73,18 +79,31 @@ class Chef
           FileUtils.rm_rf(release_path)
         end
         deploy
+        @new_resource.updated = true
       end
       
       def action_rollback
-        @release_path = all_releases[-2]
-        raise RuntimeError, "There is no release to rollback to!" unless @release_path
-        release_to_nuke = all_releases.last
+        if release_path
+          rp_index = all_releases.index(release_path)
+          raise RuntimeError, "There is no release to rollback to!" unless rp_index
+          rp_index += 1
+          releases_to_nuke = all_releases[rp_index..-1]
+        else
+          @release_path = all_releases[-2] 
+          raise RuntimeError, "There is no release to rollback to!" unless @release_path
+          releases_to_nuke = [ all_releases.last ]
+        end
+
         Chef::Log.info "rolling back to previous release: #{release_path}"
         symlink
-        Chef::Log.info "removing last release: #{release_to_nuke}"
-        FileUtils.rm_rf release_to_nuke
         Chef::Log.info "restarting with previous release"
         restart
+        releases_to_nuke.each do |i|
+          Chef::Log.info "Removing release: #{i}"
+          FileUtils.rm_rf i 
+          release_deleted(i)
+        end
+        @new_resource.updated = true
       end
       
       def deploy
@@ -124,9 +143,10 @@ class Chef
       end
       
       def migrate
+        run_symlinks_before_migrate
+        
         if @new_resource.migrate
           enforce_ownership
-          link_shared_db_config_to_current_release
           
           environment = @new_resource.environment
           env_info = environment && environment.map do |key_and_val| 
@@ -171,14 +191,27 @@ class Chef
       end
       
       def update_cached_repo
+        if @new_resource.svn_force_export
+          svn_force_export
+        else
+          run_scm_sync
+        end
+      end
+      
+      def run_scm_sync
         Chef::Log.info "updating the cached checkout"
         @scm_provider.action_sync
       end
       
+      def svn_force_export
+        Chef::Log.info "exporting source repository to #{@new_resource.destination}"
+        @scm_provider.action_force_export
+      end
+      
       def copy_cached_repo
         Chef::Log.info "copying the cached checkout to #{release_path}"
         FileUtils.mkdir_p(@new_resource.deploy_to + "/releases")
-        FileUtils.cp_r("#{@new_resource.destination}.", release_path, :preserve => true)
+        FileUtils.cp_r(::File.join(@new_resource.destination, "."), release_path, :preserve => true)
         release_created(release_path)
       end
       
@@ -194,7 +227,7 @@ class Chef
         enforce_ownership
       end
       
-      def link_shared_db_config_to_current_release
+      def run_symlinks_before_migrate
         links_info = @new_resource.symlink_before_migrate.map { |src, dst| "#{src} => #{dst}" }.join(", ")
         Chef::Log.info "Making pre-migration symlinks: #{links_info}"
         @new_resource.symlink_before_migrate.each do |src, dest|
@@ -212,7 +245,7 @@ class Chef
         @new_resource.symlinks.each do |src, dest|
           FileUtils.ln_sf(@new_resource.shared_path + "/#{src}",  release_path + "/#{dest}")
         end
-        link_shared_db_config_to_current_release
+        run_symlinks_before_migrate
         enforce_ownership
       end