chef 0.8.10 → 0.8.14

data/lib/chef/providers.rb

@@ -0,0 +1,80 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 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/breakpoint'
+require 'chef/provider/cron'
+require 'chef/provider/deploy'
+require 'chef/provider/directory'
+require 'chef/provider/erl_call'
+require 'chef/provider/execute'
+require 'chef/provider/file'
+require 'chef/provider/git'
+require 'chef/provider/group'
+require 'chef/provider/http_request'
+require 'chef/provider/ifconfig'
+require 'chef/provider/link'
+require 'chef/provider/log'
+require 'chef/provider/mdadm'
+require 'chef/provider/mount'
+require 'chef/provider/package'
+require 'chef/provider/remote_directory'
+require 'chef/provider/remote_file'
+require 'chef/provider/route'
+require 'chef/provider/ruby_block'
+require 'chef/provider/script'
+require 'chef/provider/service'
+require 'chef/provider/subversion'
+require 'chef/provider/template'
+require 'chef/provider/user'
+
+require 'chef/provider/package/apt'
+require 'chef/provider/package/dpkg'
+require 'chef/provider/package/easy_install'
+require 'chef/provider/package/freebsd'
+require 'chef/provider/package/macports'
+require 'chef/provider/package/pacman'
+require 'chef/provider/package/portage'
+require 'chef/provider/package/rpm'
+require 'chef/provider/package/rubygems'
+require 'chef/provider/package/yum'
+require 'chef/provider/package/zypper'
+
+require 'chef/provider/service/arch'
+require 'chef/provider/service/debian'
+require 'chef/provider/service/freebsd'
+require 'chef/provider/service/gentoo'
+require 'chef/provider/service/init'
+require 'chef/provider/service/redhat'
+require 'chef/provider/service/simple'
+require 'chef/provider/service/upstart'
+require 'chef/provider/service/windows'
+
+require 'chef/provider/user/dscl'
+require 'chef/provider/user/pw'
+require 'chef/provider/user/useradd'
+
+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/mount/mount'
+
+require 'chef/provider/deploy/revision'
+require 'chef/provider/deploy/timestamped'

data/lib/chef/recipe.rb

@@ -17,15 +17,13 @@
 # limitations under the License.
 #
 
-require 'chef/resource'
-Dir[File.join(File.dirname(__FILE__), 'resource/**/*.rb')].sort.each { |lib| require lib }
+
+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/recipe_definition_dsl_core'
 require 'chef/resource_collection'
 require 'chef/cookbook_loader'
-require 'chef/rest'
 
 class Chef
   class Recipe

data/lib/chef/resource.rb

@@ -80,7 +80,7 @@ class Chef
         prior_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 == "@source_line" || iv == "@action"
+          unless iv.to_sym == :@source_line || iv.to_sym == :@action
             self.instance_variable_set(iv, prior_resource.instance_variable_get(iv))
           end
         end
@@ -162,10 +162,18 @@ class Chef
       if args.size > 1
         notifies_helper(*args)
       else
-        resources_array = *args
-        resources_array.each do |resource|
-          resource.each do |key, value|
-            notifies_helper(value[0], key, value[1])    
+        # This syntax is so weird. surely people will just give us one hash?
+        notifications = args.flatten
+        notifications.each do |resources_notifications|
+          begin
+            resources_notifications.each do |resource, notification|
+              Chef::Log.error "resource KV: `#{resource.inspect}' => `#{notification.inspect}'"
+              notifies_helper(notification[0], resource, notification[1])    
+            end
+          rescue NoMethodError
+            Chef::Log.fatal("encountered NME processing resource #{resources_notifications.inspect}")
+            Chef::Log.fatal("incoming args: #{args.inspect}")
+            raise
           end
         end 
       end
@@ -193,7 +201,11 @@ class Chef
     end
     
     def is(*args)
-      return *args
+      if args.size == 1
+        args.first
+      else
+        return *args
+      end
     end
     
     def to_s
@@ -216,7 +228,9 @@ class Chef
     def to_hash
       instance_vars = Hash.new
       self.instance_variables.each do |iv|
-        instance_vars[iv.sub(/^@/,'').to_sym] = self.instance_variable_get(iv) unless iv == "@collection"
+        iv = iv.to_s
+        next if iv == "@collection"
+        instance_vars[iv.sub(/^@/,'').to_sym] = self.instance_variable_get(iv)
       end
       instance_vars
     end

data/lib/chef/resource/cron.rb

@@ -47,7 +47,7 @@ class Chef
           converted_arg = arg
         end
         begin
-          if Integer(arg) > 59 then raise RangeError end
+          if integerize(arg) > 59 then raise RangeError end
         rescue ArgumentError
         end
         set_or_return(
@@ -64,7 +64,7 @@ class Chef
           converted_arg = arg
         end
         begin
-          if Integer(arg) > 23 then raise RangeError end
+          if integerize(arg) > 23 then raise RangeError end
         rescue ArgumentError
         end
         set_or_return(
@@ -81,7 +81,7 @@ class Chef
           converted_arg = arg
         end
         begin
-          if Integer(arg) > 31 then raise RangeError end
+          if integerize(arg) > 31 then raise RangeError end
         rescue ArgumentError
         end
         set_or_return(
@@ -98,7 +98,7 @@ class Chef
           converted_arg = arg
         end
         begin
-          if Integer(arg) > 12 then raise RangeError end
+          if integerize(arg) > 12 then raise RangeError end
         rescue ArgumentError
         end
         set_or_return(
@@ -115,7 +115,7 @@ class Chef
           converted_arg = arg
         end
         begin
-          if Integer(arg) > 7 then raise RangeError end
+          if integerize(arg) > 7 then raise RangeError end
         rescue ArgumentError
         end
         set_or_return(
@@ -172,6 +172,15 @@ class Chef
           :kind_of => String
         )
       end
+      
+      private
+      
+      # On Ruby 1.8, Kernel#Integer will happily do this for you. On 1.9, no.
+      def integerize(integerish)
+        Integer(integerish)
+      rescue TypeError
+        0
+      end
     end
   end
 end

data/lib/chef/resource/deploy.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.
@@ -38,20 +38,20 @@ require "chef/resource/scm"
 
 class Chef
   class Resource
-    
+
     # Deploy: Deploy apps from a source control repository.
     #
     # Callbacks:
     # Callbacks can be a block or a string. If given a block, the code
     # is evaluated as an embedded recipe, and run at the specified
     # point in the deploy process. If given a string, the string is taken as
-    # a path to a callback file/recipe. Paths are evaluated relative to the 
+    # a path to a callback file/recipe. Paths are evaluated relative to the
     # release directory. Callback files can contain chef code (resources, etc.)
     #
     class Deploy < Chef::Resource
-      
+
       provider_base Chef::Provider::Deploy
-      
+
       def initialize(name, collection=nil, node=nil)
         super(name, collection, node)
         @resource_name = :deploy
@@ -74,26 +74,26 @@ class Chef
         @provider = Chef::Provider::Deploy::Timestamped
         @allowed_actions.push(:force_deploy, :deploy, :rollback)
       end
-      
+
       # where the checked out/cloned code goes
       def destination
         @destination ||= shared_path + "/#{@repository_cache}"
       end
-      
+
       # where shared stuff goes, i.e., logs, tmp, etc. goes here
       def shared_path
         @shared_path ||= @deploy_to + "/shared"
       end
-      
+
       # where the deployed version of your code goes
       def current_path
         @current_path ||= @deploy_to + "/current"
       end
-      
+
       def depth
         @shallow_clone ? "5" : nil
       end
-      
+
       # note: deploy_to is your application "meta-root."
       def deploy_to(arg=nil)
         set_or_return(
@@ -102,7 +102,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def repo(arg=nil)
         set_or_return(
           :repo,
@@ -111,7 +111,7 @@ class Chef
         )
       end
       alias :repository :repo
-      
+
       def remote(arg=nil)
         set_or_return(
           :remote,
@@ -119,7 +119,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def role(arg=nil)
         set_or_return(
           :role,
@@ -127,7 +127,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def restart_command(arg=nil, &block)
         arg ||= block
         set_or_return(
@@ -137,7 +137,7 @@ class Chef
         )
       end
       alias :restart :restart_command
-      
+
       def migrate(arg=nil)
         set_or_return(
           :migrate,
@@ -145,7 +145,7 @@ class Chef
           :kind_of => [ TrueClass, FalseClass ]
         )
       end
-      
+
       def migration_command(arg=nil)
         set_or_return(
           :migration_command,
@@ -153,7 +153,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def user(arg=nil)
         set_or_return(
           :user,
@@ -161,15 +161,15 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def group(arg=nil)
         set_or_return(
           :group,
           arg,
           :kind_of => [ String ]
         )
-      end      
-      
+      end
+
       def enable_submodules(arg=nil)
         set_or_return(
           :enable_submodules,
@@ -177,7 +177,7 @@ class Chef
           :kind_of => [ TrueClass, FalseClass ]
         )
       end
-      
+
       def shallow_clone(arg=nil)
         set_or_return(
           :shallow_clone,
@@ -193,7 +193,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def copy_exclude(arg=nil)
         set_or_return(
           :copy_exclude,
@@ -201,7 +201,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def revision(arg=nil)
         set_or_return(
           :revision,
@@ -210,7 +210,7 @@ class Chef
         )
       end
       alias :branch :revision
-            
+
       def git_ssh_wrapper(arg=nil)
         set_or_return(
           :git_ssh_wrapper,
@@ -219,7 +219,7 @@ class Chef
         )
       end
       alias :ssh_wrapper :git_ssh_wrapper
-      
+
       def svn_username(arg=nil)
         set_or_return(
           :svn_username,
@@ -227,7 +227,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
- 
+
       def svn_password(arg=nil)
         set_or_return(
           :svn_password,
@@ -235,7 +235,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def svn_arguments(arg=nil)
         set_or_return(
           :svn_arguments,
@@ -243,7 +243,14 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
+      def svn_info_args(arg=nil)
+        set_or_return(
+          :svn_arguments,
+          arg,
+          :kind_of => [ String ])
+      end
+
       def scm_provider(arg=nil)
         klass = if arg.kind_of?(String) || arg.kind_of?(Symbol)
                   lookup_provider_constant(arg)
@@ -256,7 +263,7 @@ class Chef
           :kind_of => [ Class ]
         )
       end
-      
+
       def svn_force_export(arg=nil)
         set_or_return(
           :svn_force_export,
@@ -264,7 +271,7 @@ class Chef
           :kind_of => [ TrueClass, FalseClass ]
         )
       end
-      
+
       def environment(arg=nil)
         if arg.is_a?(String)
           Chef::Log.info "Setting RAILS_ENV, RACK_ENV, and MERB_ENV to `#{arg}'"
@@ -277,8 +284,8 @@ class Chef
           :kind_of => [ Hash ]
         )
       end
-      
-      # An array of paths, relative to your app's root, to be purged from a 
+
+      # An array of paths, relative to your app's root, to be purged from a
       # SCM clone/checkout before symlinking. Use this to get rid of files and
       # directories you want to be shared between releases.
       # Default: ["log", "tmp/pids", "public/system"]
@@ -289,12 +296,12 @@ class Chef
           :kind_of => Array
         )
       end
-      
+
       # An array of paths, relative to your app's root, where you expect dirs to
       # exist before symlinking. This runs after #purge_before_symlink, so you
       # can use this to recreate dirs that you had previously purged.
-      # For example, if you plan to use a shared directory for pids, and you 
-      # want it to be located in $APP_ROOT/tmp/pids, you could purge tmp, 
+      # For example, if you plan to use a shared directory for pids, and you
+      # want it to be located in $APP_ROOT/tmp/pids, you could purge tmp,
       # then specify tmp here so that the tmp directory will exist when you
       # symlink the pids directory in to the current release.
       # Default: ["tmp", "public", "config"]
@@ -305,10 +312,10 @@ class Chef
           :kind_of => Array
         )
       end
-      
+
       # A Hash of shared/dir/path => release/dir/path. This attribute determines
       # which files and dirs in the shared directory get symlinked to the current
-      # release directory, and where they go. If you have a directory 
+      # release directory, and where they go. If you have a directory
       # $shared/pids that you would like to symlink as $current_release/tmp/pids
       # you specify it as "pids" => "tmp/pids"
       # Default {"system" => "public/system", "pids" => "tmp/pids", "log" => "log"}
@@ -319,8 +326,8 @@ class Chef
           :kind_of => Hash
         )
       end
-      
-      # A Hash of shared/dir/path => release/dir/path. This attribute determines 
+
+      # A Hash of shared/dir/path => release/dir/path. This attribute determines
       # which files in the shared directory get symlinked to the current release
       # directory and where they go. Unlike map_shared_files, these are symlinked
       # *before* any migration is run.
@@ -334,31 +341,31 @@ class Chef
           :kind_of => Hash
         )
       end
-      
+
       # Callback fires before migration is run.
       def before_migrate(arg=nil, &block)
         arg ||= block
         set_or_return(:before_migrate, arg, :kind_of => [Proc, String])
       end
-      
+
       # Callback fires before symlinking
       def before_symlink(arg=nil, &block)
         arg ||= block
         set_or_return(:before_symlink, arg, :kind_of => [Proc, String])
       end
-      
+
       # Callback fires before restart
       def before_restart(arg=nil, &block)
         arg ||= block
         set_or_return(:before_restart, arg, :kind_of => [Proc, String])
       end
-      
+
       # Callback fires after restart
       def after_restart(arg=nil, &block)
         arg ||= block
         set_or_return(:after_restart, arg, :kind_of => [Proc, String])
       end
-      
+
     end
   end
 end