chef 10.34.6 → 11.0.0.beta.0

data/lib/chef/provider/user/useradd.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.
@@ -21,7 +21,7 @@ require 'chef/provider/user'
 
 class Chef
   class Provider
-    class User
+    class User 
       class Useradd < Chef::Provider::User
         UNIVERSAL_OPTIONS = [[:comment, "-c"], [:gid, "-g"], [:password, "-p"], [:shell, "-s"], [:uid, "-u"]]
 
@@ -32,34 +32,24 @@ class Chef
           end
           run_command(:command => command)
         end
-
+        
         def manage_user
-          if universal_options != ""
-            command = compile_command("usermod") do |u|
-              u << universal_options
-            end
-            run_command(:command => command)
+          command = compile_command("usermod") do |u|
+            u << universal_options
           end
+          run_command(:command => command)
         end
-
+        
         def remove_user
           command = "userdel"
           command << " -r" if managing_home_dir?
           command << " #{@new_resource.username}"
           run_command(:command => command)
         end
-
+        
         def check_lock
           status = popen4("passwd -S #{@new_resource.username}") do |pid, stdin, stdout, stderr|
-            output = stdout.gets
-            if whyrun_mode? && output.nil? && stderr.gets.match(/does not exist/)
-              # if we're in whyrun mode and the user is not yet created we assume it would be
-              return false
-            end
-
-            raise Chef::Exceptions::User, "Cannot determine if #{@new_resource} is locked!" if output.nil?
-
-            status_line = output.split(' ')
+            status_line = stdout.gets.split(' ')
             case status_line[1]
             when /^P/
               @locked = false
@@ -90,11 +80,11 @@ class Chef
 
           @locked
         end
-
+        
         def lock_user
           run_command(:command => "usermod -L #{@new_resource.username}")
         end
-
+        
         def unlock_user
           run_command(:command => "usermod -U #{@new_resource.username}")
         end
@@ -104,36 +94,29 @@ class Chef
           base_command << " #{@new_resource.username}"
           base_command
         end
-
+        
         def universal_options
-          @universal_options ||=
-            begin
-              opts = ''
-              # magic allows UNIVERSAL_OPTIONS to be overridden in a subclass
-              self.class::UNIVERSAL_OPTIONS.each do |field, option|
-                update_options(field, option, opts)
-              end
-              if updating_home?
-                if managing_home_dir?
-                  Chef::Log.debug("#{@new_resource} managing the users home directory")
-                  opts << " -m -d '#{@new_resource.home}'"
-                else
-                  Chef::Log.debug("#{@new_resource} setting home to #{@new_resource.home}")
-                  opts << " -d '#{@new_resource.home}'"
-                end
+          opts = ''
+          
+          UNIVERSAL_OPTIONS.each do |field, option|
+            if @current_resource.send(field) != @new_resource.send(field)
+              if @new_resource.send(field)
+                Chef::Log.debug("#{@new_resource} setting #{field} to #{@new_resource.send(field)}")
+                opts << " #{option} '#{@new_resource.send(field)}'"
               end
-              opts << " -o" if @new_resource.non_unique || @new_resource.supports[:non_unique]
-              opts
             end
-        end
-
-        def update_options(field, option, opts)
-          if @current_resource.send(field) != @new_resource.send(field)
-            if @new_resource.send(field)
-              Chef::Log.debug("#{@new_resource} setting #{field} to #{@new_resource.send(field)}")
-              opts << " #{option} '#{@new_resource.send(field)}'"
+          end
+          if updating_home?
+            if managing_home_dir?
+              Chef::Log.debug("#{@new_resource} managing the users home directory")
+              opts << " -m -d '#{@new_resource.home}'"
+            else
+              Chef::Log.debug("#{@new_resource} setting home to #{@new_resource.home}")
+              opts << " -d '#{@new_resource.home}'"
             end
           end
+          opts << " -o" if @new_resource.non_unique || @new_resource.supports[:non_unique]
+          opts
         end
 
         def useradd_options

data/lib/chef/providers.rb

@@ -45,7 +45,6 @@ require 'chef/provider/service'
 require 'chef/provider/subversion'
 require 'chef/provider/template'
 require 'chef/provider/user'
-require 'chef/provider/whyrun_safe_ruby_block'
 
 require 'chef/provider/env/windows'
 
@@ -83,7 +82,6 @@ require 'chef/provider/user/dscl'
 require 'chef/provider/user/pw'
 require 'chef/provider/user/useradd'
 require 'chef/provider/user/windows'
-require 'chef/provider/user/solaris'
 
 require 'chef/provider/group/aix'
 require 'chef/provider/group/dscl'
@@ -100,3 +98,6 @@ require 'chef/provider/mount/windows'
 
 require 'chef/provider/deploy/revision'
 require 'chef/provider/deploy/timestamped'
+
+require "chef/provider/lwrp_base"
+require 'chef/provider/registry_key'

data/lib/chef/recipe.rb

@@ -18,10 +18,13 @@
 #
 
 
-require 'chef/mixin/recipe_definition_dsl_core'
+require 'chef/dsl/recipe'
+require 'chef/dsl/data_query'
+require 'chef/dsl/platform_introspection'
+require 'chef/dsl/include_recipe'
+require 'chef/dsl/registry_helper'
+
 require 'chef/mixin/from_file'
-require 'chef/mixin/language'
-require 'chef/mixin/language_include_recipe'
 
 require 'chef/mixin/deprecation'
 
@@ -30,10 +33,13 @@ class Chef
   # A Recipe object is the context in which Chef recipes are evaluated.
   class Recipe
 
+    include Chef::DSL::DataQuery
+    include Chef::DSL::PlatformIntrospection
+    include Chef::DSL::IncludeRecipe
+    include Chef::DSL::Recipe
+    include Chef::DSL::RegistryHelper
+
     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
@@ -89,7 +95,7 @@ class Chef
       if tags.length > 0
         tags.each do |tag|
           tag = tag.to_s
-          run_context.node[:tags] << tag unless run_context.node[:tags].include?(tag)
+          run_context.node.normal[:tags] << tag unless run_context.node[:tags].include?(tag)
         end
         run_context.node[:tags]
       else
@@ -121,7 +127,7 @@ class Chef
     # tags<Array>:: The current list of run_context.node[:tags]
     def untag(*tags)
       tags.each do |tag|
-        run_context.node[:tags].delete(tag)
+        run_context.node.normal[:tags].delete(tag)
       end
     end
 

data/lib/chef/resource.rb

@@ -19,7 +19,8 @@
 
 require 'chef/mixin/params_validate'
 require 'chef/mixin/check_helper'
-require 'chef/mixin/language'
+require 'chef/dsl/platform_introspection'
+require 'chef/dsl/registry_helper'
 require 'chef/mixin/convert_to_class_name'
 require 'chef/resource/conditional'
 require 'chef/resource_collection'
@@ -119,42 +120,14 @@ F
     FORBIDDEN_IVARS = [:@run_context, :@node, :@not_if, :@only_if, :@enclosing_provider]
     HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@node, :@not_if, :@only_if, :@elapsed_time, :@enclosing_provider]
 
-    # Track all subclasses of Resource. This is used so names can be looked up
-    # when attempting to deserialize from JSON. (See: json_compat)
-    def self.resource_classes
-      # Using a class variable here ensures we have one variable to track
-      # subclasses shared by the entire class hierarchy; without this, each
-      # subclass would have its own list of subclasses.
-      @@resource_classes ||= []
-    end
-
-    # Callback when subclass is defined. Adds subclass to list of subclasses.
-    def self.inherited(subclass)
-      resource_classes << subclass
-    end
-
-    # Look up a subclass by +class_name+ which should be a string that matches
-    # `Subclass.name`
-    def self.find_subclass_by_name(class_name)
-      resource_classes.first {|c| c.name == class_name }
-    end
-
-
     include Chef::Mixin::CheckHelper
     include Chef::Mixin::ParamsValidate
-    include Chef::Mixin::Language
+    include Chef::DSL::PlatformIntrospection
+    include Chef::DSL::RegistryHelper
     include Chef::Mixin::ConvertToClassName
     include Chef::Mixin::Deprecation
 
-    if Module.method(:const_defined?).arity == 1
-      def self.strict_const_defined?(const)
-        const_defined?(const)
-      end
-    else
-      def self.strict_const_defined?(const)
-        const_defined?(const, false)
-      end
-    end
+    extend Chef::Mixin::ConvertToClassName
 
     # Set or return the list of "state attributes" implemented by the Resource
     # subclass. State attributes are attributes that describe the desired state
@@ -304,7 +277,7 @@ F
           end
         end
         true
-      rescue Chef::Exceptions::ResourceNotFound => e
+      rescue Chef::Exceptions::ResourceNotFound
         true
       end
     end
@@ -392,31 +365,11 @@ F
       ignore_failure(arg)
     end
 
-    def notifies(*args)
-      unless ( args.size > 0 && args.size < 4)
-        raise ArgumentError, "Wrong number of arguments for notifies: should be 1-3 arguments, you gave #{args.inspect}"
-      end
-
-      if args.size > 1 # notifies(:action, resource) OR notifies(:action, resource, :immediately)
-        add_notification(*args)
-      else
-        # This syntax is so weird. surely people will just give us one hash?
-        notifications = args.flatten
-        notifications.each do |resources_notifications|
-          resources_notifications.each do |resource, notification|
-            action, timing = notification[0], notification[1]
-            Chef::Log.debug "Adding notification from resource #{self} to `#{resource.inspect}' => `#{notification.inspect}'"
-            add_notification(action, resource, timing)
-          end
-        end
-      end
-    rescue NoMethodError
-      Chef::Log.fatal("Error processing notifies(#{args.inspect}) on #{self}")
-      raise
-    end
-
-    def add_notification(action, resources, timing=:delayed)
-      resources = [resources].flatten
+    # Sets up a notification from this resource to the resource specified by +resource_spec+.
+    def notifies(action, resource_spec, timing=:delayed)
+      # when using old-style resources(:template => "/foo.txt") style, you
+      # could end up with multiple resources.
+      resources = [ resource_spec ].flatten
       resources.each do |resource|
         case timing.to_s
         when 'delayed'
@@ -469,7 +422,7 @@ F
         if resource.run_context.nil?
           resource.run_context = run_context
         end
-        resource.add_notification(action, self, timing)
+        resource.notifies(action, self, timing)
       end
       true
     end
@@ -518,7 +471,7 @@ F
       safe_ivars.each do |iv|
         instance_vars[iv.to_s.sub(/^@/, '')] = instance_variable_get(iv)
       end
-      results = {
+      {
         'json_class' => self.class.name,
         'instance_vars' => instance_vars
       }
@@ -716,100 +669,6 @@ F
       nil
     end
 
-    extend Chef::Mixin::ConvertToClassName
-
-    def self.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:
-      # define_method attr_name.to_sym do |arg=nil|
-      # etc.
-      shim_method=<<-SHIM
-      def #{attr_name}(arg=nil)
-        _set_or_return_#{attr_name}(arg)
-      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 self.build_from_file(cookbook_name, filename, run_context)
-      rname = filename_to_qualified_string(cookbook_name, filename)
-
-      # Add log entry if we override an existing light-weight resource.
-      class_name = convert_to_class_name(rname)
-      if Chef::Resource.strict_const_defined?(class_name)
-        Chef::Log.info("#{class_name} light-weight resource already initialized -- overriding!")
-        old_class = Chef::Resource.send(:remove_const, class_name)
-        Chef::Resource.resource_classes.delete(old_class)
-      end
-
-      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
-
-          attr_accessor :run_context
-          attr_reader :action_to_set_default
-
-          def node
-            self.run_context.node
-          end
-
-          def actions_to_create
-            @actions_to_create
-          end
-
-          define_method(:default_action) do |action_name|
-            actions_to_create.push(action_name)
-            @action_to_set_default = action_name
-          end
-
-          define_method(:actions) do |*action_names|
-            actions_to_create.push(*action_names)
-          end
-        end
-
-        # set the run context in the class instance variable
-        cls.run_context = run_context
-
-        # 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
-        alias_method :old_init, :initialize
-
-        new_init =<<INIT
-        def initialize(name, run_context=nil)
-          @resource_name = "#{rname}".to_sym
-          old_init(name, run_context)
-          @action = self.class.action_to_set_default || @action
-          allowed_actions.push(self.class.actions_to_create).flatten!
-       end
-INIT
-      class_eval(new_init)
-    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
     # Chef::Provider can set the namespace with +provider_base+
     # Ex:

data/lib/chef/resource/group.rb

@@ -31,7 +31,6 @@ class Chef
         @group_name = name
         @gid = nil
         @members = []
-        @excluded_members = []
         @action = :create
         @append = false
         @allowed_actions.push(:create, :remove, :modify, :manage)
@@ -63,16 +62,7 @@ class Chef
       end
 
       alias_method :users, :members
-
-      def excluded_members(arg=nil)
-        converted_members = arg.is_a?(String) ? [].push(arg) : arg
-        set_or_return(
-          :excluded_members,
-          converted_members,
-          :kind_of => [ Array ]
-        )
-      end
-
+ 
       def append(arg=nil)
         set_or_return(
           :append,

data/lib/chef/resource/http_request.rb

@@ -43,7 +43,8 @@ class Chef
         )
       end
       
-      def message(args=nil)
+      def message(args=nil, &block)
+        args = block if block_given?
         set_or_return(
           :message,
           args,