chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/provider/service/simple.rb

@@ -49,7 +49,7 @@ class Chef
               @current_resource.running false
               nil
             end
-          else
+          elsif
             Chef::Log.debug "#{@new_resource}: falling back to process table inspection"
             if ps_cmd.nil? or ps_cmd.empty?
               raise Chef::Exceptions::Service, "#{@new_resource}: could not determine how to inspect the process table, please set this nodes 'command.ps' attribute"

data/lib/chef/provider/subversion.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,9 +25,9 @@ require 'fileutils'
 class Chef
   class Provider
     class Subversion < Chef::Provider
-      
+
       include Chef::Mixin::Command
-      
+
       def load_current_resource
         @current_resource = Chef::Resource::Subversion.new(@new_resource.name)
 
@@ -37,7 +37,7 @@ class Chef
           end
         end
       end
-      
+
       def action_checkout
         assert_target_directory_valid!
         if target_dir_non_existant_or_empty?
@@ -47,7 +47,7 @@ class Chef
           Chef::Log.info "Taking no action, checkout destination #{@new_resource.destination} already exists or is a non-empty directory"
         end
       end
-      
+
       def action_export
         assert_target_directory_valid!
         if target_dir_non_existant_or_empty?
@@ -57,13 +57,13 @@ class Chef
           Chef::Log.info "Taking no action, export destination #{@new_resource.destination} already exists or is a non-empty directory"
         end
       end
-      
+
       def action_force_export
         assert_target_directory_valid!
         run_command(run_options(:command => export_command))
         @new_resource.updated_by_last_action(true)
       end
-      
+
       def action_sync
         assert_target_directory_valid!
         if ::File.exist?(::File.join(@new_resource.destination, ".svn"))
@@ -79,18 +79,18 @@ class Chef
           @new_resource.updated_by_last_action(true)
         end
       end
-      
+
       def sync_command
         Chef::Log.info "Updating working copy #{@new_resource.destination} to revision #{@new_resource.revision}"
         scm :update, @new_resource.svn_arguments, verbose, authentication, "-r#{revision_int}", @new_resource.destination
       end
-      
+
       def checkout_command
         Chef::Log.info "checking out #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
-        scm :checkout, @new_resource.svn_arguments, verbose, authentication, 
+        scm :checkout, @new_resource.svn_arguments, verbose, authentication,
             "-r#{revision_int}", @new_resource.repository, @new_resource.destination
       end
-      
+
       def export_command
         Chef::Log.info "exporting #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
         args = ["--force"]
@@ -98,7 +98,7 @@ class Chef
             "-r#{revision_int}" << @new_resource.repository << @new_resource.destination
         scm :export, *args
       end
-      
+
       # If the specified revision isn't an integer ("HEAD" for example), look
       # up the revision id by asking the server
       # If the specified revision is an integer, trust it.
@@ -114,14 +114,14 @@ class Chef
           end
         end
       end
-      
+
       alias :revision_slug :revision_int
-      
+
       def find_current_revision
         return nil unless ::File.exist?(::File.join(@new_resource.destination, ".svn"))
         command = scm(:info)
         status, svn_info, error_message = output_of_command(command, run_options(:cwd => cwd))
-        
+
         unless [0,1].include?(status.exitstatus)
           handle_command_failures(status, "STDOUT: #{svn_info}\nSTDERR: #{error_message}")
         end
@@ -137,17 +137,17 @@ class Chef
         run_opts[:group] = @new_resource.group if @new_resource.group
         run_opts
       end
-      
+
       private
-      
+
       def cwd
         @new_resource.destination
       end
-      
+
       def verbose
         "-q"
       end
-      
+
       def extract_revision_info(svn_info)
         begin
           repo_attrs = YAML.load(svn_info)
@@ -160,7 +160,7 @@ class Chef
         Chef::Log.debug "Resolved revision #{@new_resource.revision} to #{rev}"
         rev
       end
-      
+
       # If a username is configured for the SCM, return the command-line
       # switches for that. Note that we don't need to return the password
       # switch, since Capistrano will check for that prompt in the output
@@ -171,7 +171,7 @@ class Chef
         result << "--password #{@new_resource.svn_password} "
         result
       end
-      
+
       def scm(*args)
         ['svn', *args].compact.join(" ")
       end

data/lib/chef/providers.rb

@@ -78,6 +78,7 @@ require 'chef/provider/user/pw'
 require 'chef/provider/user/useradd'
 require 'chef/provider/user/windows'
 
+require 'chef/provider/group/aix'
 require 'chef/provider/group/dscl'
 require 'chef/provider/group/gpasswd'
 require 'chef/provider/group/groupadd'

data/lib/chef/recipe.rb

@@ -7,9 +7,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.
@@ -29,13 +29,13 @@ class Chef
   # == Chef::Recipe
   # A Recipe object is the context in which Chef recipes are evaluated.
   class Recipe
-    
+
     include Chef::Mixin::FromFile
     include Chef::Mixin::Language
     include Chef::Mixin::LanguageIncludeRecipe
     include Chef::Mixin::RecipeDefinitionDSLCore
     include Chef::Mixin::Deprecation
-    
+
     attr_accessor :cookbook_name, :recipe_name, :recipe, :params, :run_context
 
     # Parses a potentially fully-qualified recipe name into its
@@ -63,20 +63,18 @@ class Chef
       @params = Hash.new
       @node = deprecated_ivar(run_context.node, :node, :warn)
     end
-    
+
     # Used in DSL mixins
     def node
       run_context.node
     end
-    
+
     # Used by the DSL to look up resources when executing in the context of a
     # recipe.
-    #--
-    # what does this do? and what is args? TODO 5-14-2010.
     def resources(*args)
       run_context.resource_collection.find(*args)
     end
-    
+
     # Sets a tag, or list of tags, for this node.  Syntactic sugar for
     # run_context.node[:tags].
     #
@@ -97,7 +95,7 @@ class Chef
         run_context.node[:tags]
       end
     end
-    
+
     # Returns true if the node is tagged with *all* of the supplied +tags+.
     #
     # === Parameters
@@ -112,7 +110,7 @@ class Chef
       end
       true
     end
-    
+
     # Removes the list of tags from the node.
     #
     # === Parameters
@@ -125,6 +123,6 @@ class Chef
         run_context.node[:tags].delete(tag)
       end
     end
-    
+
   end
 end

data/lib/chef/resource.rb

@@ -7,9 +7,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.
@@ -77,7 +77,7 @@ F
     include Chef::Mixin::Language
     include Chef::Mixin::ConvertToClassName
     include Chef::Mixin::Deprecation
-    
+
     attr_accessor :params
     attr_accessor :provider
     attr_accessor :allowed_actions
@@ -97,7 +97,7 @@ F
     # Struct with a #resource and #action member
     attr_reader :immediate_notifications
     attr_reader :delayed_notifications
-    
+
     def initialize(name, run_context=nil)
       @name = name
       @run_context = run_context
@@ -144,7 +144,7 @@ F
         raise NoMethodError, "undefined method `#{method_symbol.to_s}' for #{self.class.to_s}"
       end
     end
-    
+
     def load_prior_resource
       begin
         prior_resource = run_context.resource_collection.lookup(self.to_s)
@@ -159,7 +159,7 @@ F
         true
       end
     end
-    
+
     def supports(args={})
       if args.any?
         @supports = args
@@ -167,7 +167,7 @@ F
         @supports
       end
     end
-    
+
     def provider(arg=nil)
       klass = if arg.kind_of?(String) || arg.kind_of?(Symbol)
                 lookup_provider_constant(arg)
@@ -180,7 +180,7 @@ F
         :kind_of => [ Class ]
       )
     end
-    
+
     def action(arg=nil)
       if arg
         action_list = arg.kind_of?(Array) ? arg : [ arg ]
@@ -200,21 +200,21 @@ F
         @action
       end
     end
-    
+
     def name(name=nil)
       set_if_args(@name, name) do
         raise ArgumentError, "name must be a string!" unless name.kind_of?(String)
         @name = name
       end
     end
-    
+
     def noop(tf=nil)
-      set_if_args(@noop, tf) do 
+      set_if_args(@noop, tf) do
         raise ArgumentError, "noop must be true or false!" unless tf == true || tf == false
         @noop = tf
       end
     end
-    
+
     def ignore_failure(arg=nil)
       set_or_return(
         :ignore_failure,
@@ -222,7 +222,7 @@ F
         :kind_of => [ TrueClass, FalseClass ]
       )
     end
-    
+
     def epic_fail(arg=nil)
       ignore_failure(arg)
     end
@@ -243,7 +243,7 @@ F
             Chef::Log.debug "adding notification from resource #{self} to `#{resource.inspect}' => `#{notification.inspect}'"
             add_notification(action, resource, timing)
           end
-        end 
+        end
       end
     rescue NoMethodError
       Chef::Log.fatal("Error processing notifies(#{args.inspect}) on #{self}")
@@ -286,7 +286,7 @@ F
     def resources(*args)
       run_context.resource_collection.find(*args)
     end
-    
+
     def subscribes(action, resources, timing=:delayed)
       resources = [resources].flatten
       resources.each do |resource|
@@ -302,7 +302,7 @@ F
         return *args
       end
     end
-    
+
     def to_s
       "#{@resource_name}[#{@name}]"
     end
@@ -318,13 +318,20 @@ F
       end
       text << "end\n"
     end
-    
-    # Serialize this object as a hash 
+
+    def inspect
+      ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS
+      ivars.inject("<#{to_s}") do |str, ivar|
+        str << " #{ivar}: #{instance_variable_get(ivar).inspect}"
+      end << ">"
+    end
+
+    # Serialize this object as a hash
     def to_json(*a)
       instance_vars = Hash.new
       self.instance_variables.each do |iv|
         unless iv == "@run_context"
-          instance_vars[iv] = self.instance_variable_get(iv) 
+          instance_vars[iv] = self.instance_variable_get(iv)
         end
       end
       results = {
@@ -333,7 +340,7 @@ F
       }
       results.to_json(*a)
     end
-    
+
     def to_hash
       instance_vars = Hash.new
       self.instance_variables.each do |iv|
@@ -342,7 +349,7 @@ F
       end
       instance_vars
     end
-    
+
     def only_if(arg=nil, args = {}, &blk)
       if Kernel.block_given?
         @only_if = blk
@@ -353,7 +360,7 @@ F
       end
       @only_if
     end
-    
+
     def not_if(arg=nil, args = {}, &blk)
       if Kernel.block_given?
         @not_if = blk
@@ -364,7 +371,7 @@ F
       end
       @not_if
     end
-    
+
     def run_action(action)
       # ensure that we don't leave @updated_by_last_action set to true
       # on accident
@@ -403,13 +410,13 @@ F
     def updated_by_last_action?
       @updated_by_last_action
     end
-    
+
     def updated?
       updated
     end
 
     class << self
-      
+
       def json_create(o)
         resource = self.new(o["instance_vars"]["@name"])
         o["instance_vars"].each do |k,v|
@@ -417,9 +424,9 @@ F
         end
         resource
       end
-      
+
       include Chef::Mixin::ConvertToClassName
-      
+
       def attribute(attr_name, validation_opts={})
         # This atrocity is the only way to support 1.8 and 1.9 at the same time
         # When you're ready to drop 1.8 support, do this:
@@ -431,12 +438,12 @@ F
         end
         SHIM
         class_eval(shim_method)
-        
+
         define_method("_set_or_return_#{attr_name.to_s}".to_sym) do |arg|
           set_or_return(attr_name.to_sym, arg, validation_opts)
         end
       end
-      
+
       def build_from_file(cookbook_name, filename)
         rname = filename_to_qualified_string(cookbook_name, filename)
 
@@ -444,33 +451,33 @@ F
         class_name = convert_to_class_name(rname)
         overriding = Chef::Resource.const_defined?(class_name)
         Chef::Log.info("#{class_name} light-weight resource already initialized -- overriding!") if overriding
-          
+
         new_resource_class = Class.new self do |cls|
-          
+
           # 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, run_context)
             super(name, run_context)
           end
-          
+
           @actions_to_create = []
-          
+
           class << cls
             include Chef::Mixin::FromFile
-            
+
             def actions_to_create
               @actions_to_create
             end
-            
+
             define_method(:actions) do |*action_names|
               actions_to_create.push(*action_names)
             end
           end
-          
+
           # load resource definition from file
           cls.class_from_file(filename)
-          
+
           # create a new constructor that wraps the old one and adds the actions
           # specified in the DSL
           old_init = instance_method(:initialize)
@@ -482,16 +489,16 @@ F
             allowed_actions.push(self.class.actions_to_create).flatten!
           end
         end
-        
+
         # register new class as a Chef::Resource
         class_name = convert_to_class_name(rname)
         Chef::Resource.const_set(class_name, new_resource_class)
         Chef::Log.debug("Loaded contents of #{filename} into a resource named #{rname} defined in Chef::Resource::#{class_name}")
-        
+
         new_resource_class
       end
-      
-      # Resources that want providers namespaced somewhere other than 
+
+      # Resources that want providers namespaced somewhere other than
       # Chef::Provider can set the namespace with +provider_base+
       # Ex:
       #   class MyResource < Chef::Resource
@@ -502,7 +509,7 @@ F
         @provider_base ||= arg
         @provider_base ||= Chef::Provider
       end
-      
+
     end
 
     private