chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/lib/chef/provider/user/useradd.rb

@@ -17,128 +17,124 @@
 #
 
 require 'pathname'
+require 'chef/mixin/shell_out'
 require 'chef/provider/user'
 
 class Chef
   class Provider
     class User
       class Useradd < Chef::Provider::User
+
+        include Chef::Mixin::ShellOut
+
         UNIVERSAL_OPTIONS = [[:comment, "-c"], [:gid, "-g"], [:password, "-p"], [:shell, "-s"], [:uid, "-u"]]
 
         def create_user
           command = compile_command("useradd") do |useradd|
-            useradd << universal_options
-            useradd << useradd_options
+            useradd.concat(universal_options)
+            useradd.concat(useradd_options)
           end
-          run_command(:command => command)
+          shell_out!(*command)
         end
 
         def manage_user
           if universal_options != ""
             command = compile_command("usermod") do |u|
-              u << universal_options
+              u.concat(universal_options)
             end
-            run_command(:command => command)
+            shell_out!(*command)
           end
         end
 
         def remove_user
-          command = "userdel"
-          command << " -r" if managing_home_dir?
-          command << " #{@new_resource.username}"
-          run_command(:command => command)
+          command = [ "userdel" ]
+          command << "-r" if managing_home_dir?
+          command << new_resource.username
+          shell_out!(*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(' ')
-            case status_line[1]
-            when /^P/
-              @locked = false
-            when /^N/
-              @locked = false
-            when /^L/
-              @locked = true
-            end
+          # we can get an exit code of 1 even when it's successful on
+          # rhel/centos (redhat bug 578534). See additional error checks below.
+          passwd_s = shell_out!("passwd", "-S", new_resource.username, :returns => [0,1])
+          status_line = passwd_s.stdout.split(' ')
+          case status_line[1]
+          when /^P/
+            @locked = false
+          when /^N/
+            @locked = false
+          when /^L/
+            @locked = true
           end
 
-          unless status.exitstatus == 0
+          unless passwd_s.exitstatus == 0
             raise_lock_error = false
-            # we can get an exit code of 1 even when it's successful on rhel/centos (redhat bug 578534)
-            if status.exitstatus == 1 && ['redhat', 'centos'].include?(node[:platform])
-              passwd_version_status = popen4('rpm -q passwd') do |pid, stdin, stdout, stderr|
-                passwd_version = stdout.gets.chomp
+            if ['redhat', 'centos'].include?(node[:platform])
+              passwd_version_check = shell_out!('rpm -q passwd')
+              passwd_version = passwd_version_check.stdout.chomp
 
-                unless passwd_version == 'passwd-0.73-1'
-                  raise_lock_error = true
-                end
+              unless passwd_version == 'passwd-0.73-1'
+                raise_lock_error = true
               end
             else
               raise_lock_error = true
             end
 
-            raise Chef::Exceptions::User, "Cannot determine if #{@new_resource} is locked!" if raise_lock_error
+            raise Chef::Exceptions::User, "Cannot determine if #{new_resource} is locked!" if raise_lock_error
           end
 
           @locked
         end
 
         def lock_user
-          run_command(:command => "usermod -L #{@new_resource.username}")
+          shell_out!("usermod", "-L", new_resource.username)
         end
 
         def unlock_user
-          run_command(:command => "usermod -U #{@new_resource.username}")
+          shell_out!("usermod", "-U", new_resource.username)
         end
 
         def compile_command(base_command)
+          base_command = Array(base_command)
           yield base_command
-          base_command << " #{@new_resource.username}"
+          base_command << new_resource.username
           base_command
         end
 
         def universal_options
           @universal_options ||=
             begin
-              opts = ''
+              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}'"
+                  Chef::Log.debug("#{new_resource} managing the users home directory")
+                  opts << "-d" << new_resource.home << "-m"
                 else
-                  Chef::Log.debug("#{@new_resource} setting home to #{@new_resource.home}")
-                  opts << " -d '#{@new_resource.home}'"
+                  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 << "-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)}'"
+          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).to_s
             end
           end
         end
 
         def useradd_options
-          opts = ''
-          opts << " -r" if @new_resource.system
+          opts = []
+          opts << "-r" if new_resource.system
           opts
         end
 
@@ -147,12 +143,12 @@ class Chef
           # Pathname#cleanpath does a better job than ::File::expand_path (on both unix and windows)
           # ::File.expand_path("///tmp") == ::File.expand_path("/tmp") => false
           # ::File.expand_path("\\tmp") => "C:/tmp"
-          return true if @current_resource.home.nil? && @new_resource.home
-          @new_resource.home and Pathname.new(@current_resource.home).cleanpath != Pathname.new(@new_resource.home).cleanpath
+          return true if @current_resource.home.nil? && new_resource.home
+          new_resource.home and Pathname.new(@current_resource.home).cleanpath != Pathname.new(new_resource.home).cleanpath
         end
 
         def managing_home_dir?
-          @new_resource.manage_home || @new_resource.supports[:manage_home]
+          new_resource.manage_home || new_resource.supports[:manage_home]
         end
 
       end

data/lib/chef/provider/windows_script.rb

@@ -0,0 +1,73 @@
+#
+# Author:: Adam Edwards (<adamed@opscode.com>)
+# Copyright:: Copyright (c) 2013 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/script'
+require 'chef/mixin/windows_architecture_helper'
+
+class Chef
+  class Provider
+    class WindowsScript < Chef::Provider::Script
+
+      protected
+      
+      include Chef::Mixin::WindowsArchitectureHelper
+
+      def initialize( new_resource, run_context, script_extension='')
+        super( new_resource, run_context )
+        @script_extension = script_extension
+
+        target_architecture = new_resource.architecture.nil? ?
+          node_windows_architecture(run_context.node) : new_resource.architecture
+
+        @is_wow64 = wow64_architecture_override_required?(run_context.node, target_architecture)
+
+        if ( target_architecture == :i386 ) && ! is_i386_windows_process?
+          raise Chef::Exceptions::Win32ArchitectureIncorrect,
+          "Support for the i386 architecture from a 64-bit Ruby runtime is not yet implemented"
+        end
+      end
+
+      public
+      
+      def action_run
+        wow64_redirection_state = nil
+
+        if @is_wow64
+          wow64_redirection_state = disable_wow64_file_redirection(@run_context.node)
+        end
+        
+        begin
+          super
+        rescue
+          raise
+        ensure
+          if ! wow64_redirection_state.nil?
+            restore_wow64_file_redirection(@run_context.node, wow64_redirection_state)
+          end
+        end
+      end
+        
+      def script_file
+        base_script_name = "chef-script"
+        temp_file_arguments = [ base_script_name, @script_extension ]
+        
+        @script_file ||= Tempfile.open(temp_file_arguments)
+      end
+    end
+  end
+end

data/lib/chef/providers.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'chef/provider/batch'
 require 'chef/provider/breakpoint'
 require 'chef/provider/cookbook_file'
 require 'chef/provider/cron'
@@ -36,6 +37,7 @@ require 'chef/provider/ohai'
 require 'chef/provider/mdadm'
 require 'chef/provider/mount'
 require 'chef/provider/package'
+require 'chef/provider/powershell_script'
 require 'chef/provider/remote_directory'
 require 'chef/provider/remote_file'
 require 'chef/provider/route'
@@ -45,7 +47,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'
 
@@ -100,3 +101,19 @@ require 'chef/provider/mount/windows'
 
 require 'chef/provider/deploy/revision'
 require 'chef/provider/deploy/timestamped'
+
+require 'chef/provider/remote_file/ftp'
+require 'chef/provider/remote_file/http'
+require 'chef/provider/remote_file/local_file'
+require 'chef/provider/remote_file/fetcher'
+
+require "chef/provider/lwrp_base"
+require 'chef/provider/registry_key'
+
+require 'chef/provider/file/content'
+require 'chef/provider/remote_file/content'
+require 'chef/provider/cookbook_file/content'
+require 'chef/provider/template/content'
+
+require 'chef/provider/ifconfig/redhat'
+require 'chef/provider/ifconfig/debian'

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

@@ -18,10 +18,12 @@
 #
 
 require 'chef/mixin/params_validate'
-require 'chef/mixin/check_helper'
-require 'chef/mixin/language'
+require 'chef/dsl/platform_introspection'
+require 'chef/dsl/data_query'
+require 'chef/dsl/registry_helper'
 require 'chef/mixin/convert_to_class_name'
 require 'chef/resource/conditional'
+require 'chef/resource/conditional_action_not_nothing'
 require 'chef/resource_collection'
 require 'chef/resource_platform_map'
 require 'chef/node'
@@ -119,6 +121,26 @@ 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]
 
+    include Chef::DSL::DataQuery
+    include Chef::Mixin::ParamsValidate
+    include Chef::DSL::PlatformIntrospection
+    include Chef::DSL::RegistryHelper
+    include Chef::Mixin::ConvertToClassName
+    include Chef::Mixin::Deprecation
+
+    extend Chef::Mixin::ConvertToClassName
+
+
+    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
+
     # 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
@@ -139,23 +161,6 @@ F
       resource_classes.first {|c| c.name == class_name }
     end
 
-
-    include Chef::Mixin::CheckHelper
-    include Chef::Mixin::ParamsValidate
-    include Chef::Mixin::Language
-    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
-
     # Set or return the list of "state attributes" implemented by the Resource
     # subclass. State attributes are attributes that describe the desired state
     # of the system, such as file permissions or ownership. In general, state
@@ -304,7 +309,7 @@ F
           end
         end
         true
-      rescue Chef::Exceptions::ResourceNotFound => e
+      rescue Chef::Exceptions::ResourceNotFound
         true
       end
     end
@@ -351,17 +356,19 @@ F
     end
 
     def name(name=nil)
-      set_if_args(@name, name) do
+      if !name.nil?
         raise ArgumentError, "name must be a string!" unless name.kind_of?(String)
         @name = name
       end
+      @name
     end
 
     def noop(tf=nil)
-      set_if_args(@noop, tf) do
+      if !tf.nil?
         raise ArgumentError, "noop must be true or false!" unless tf == true || tf == false
         @noop = tf
       end
+      @noop
     end
 
     def ignore_failure(arg=nil)
@@ -392,32 +399,15 @@ 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
+    # 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|
 
-      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
+        validate_resource_spec!(resource_spec)
 
-    def add_notification(action, resources, timing=:delayed)
-      resources = [resources].flatten
-      resources.each do |resource|
         case timing.to_s
         when 'delayed'
           notifies_delayed(action, resource)
@@ -469,11 +459,15 @@ 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
 
+    def validate_resource_spec!(resource_spec)
+      run_context.resource_collection.validate_lookup_spec!(resource_spec)
+    end
+
     def is(*args)
       if args.size == 1
         args.first
@@ -518,7 +512,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
       }
@@ -583,10 +577,14 @@ F
     end
 
     def defined_at
+      # The following regexp should match these two sourceline formats:
+      #   /some/path/to/file.rb:80:in `wombat_tears'
+      #   C:/some/path/to/file.rb:80 in 1`wombat_tears'
+      # extracting the path to the source file and the line number.
+      (file, line_no) = source_line.match(/(.*):(\d+):?.*$/).to_a[1,2] if source_line
       if cookbook_name && recipe_name && source_line
-        "#{cookbook_name}::#{recipe_name} line #{source_line.split(':')[1]}"
+        "#{cookbook_name}::#{recipe_name} line #{line_no}"
       elsif source_line
-        file, line_no = source_line.split(':')
         "#{file} line #{line_no}"
       else
         "dynamically defined"
@@ -675,10 +673,12 @@ F
     # "fails" its check. Subsequent conditionals are not evaluated, so in
     # general it's not a good idea to rely on side effects from not_if or
     # only_if commands/blocks being evaluated.
+    #
+    # Also skips conditional checking when the action is :nothing
     def should_skip?(action)
-      conditionals = only_if + not_if
-      return false if conditionals.empty?
+      conditional_action = ConditionalActionNotNothing.new(action)
 
+      conditionals = [ conditional_action ] + only_if + not_if
       conditionals.find do |conditional|
         if conditional.continue?
           false
@@ -716,100 +716,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: