chef 11.8.4.ohai7.0 → 11.10.0.alpha.1

data/lib/chef/provider/group/pw.rb

@@ -39,16 +39,28 @@ class Chef
         def create_group
           command = "pw groupadd"
           command << set_options
-          command << set_members_option
-          run_command(:command => command)
+          member_options = set_members_options
+          if member_options.empty?
+            run_command(:command => command)
+          else
+            member_options.each do |option|
+              run_command(:command => command + option)
+            end
+          end
         end
 
         # Manage the group when it already exists
         def manage_group
           command = "pw groupmod"
           command << set_options
-          command << set_members_option
-          run_command(:command => command)
+          member_options = set_members_options
+          if member_options.empty?
+            run_command(:command => command)
+          else
+            member_options.each do |option|
+              run_command(:command => command + option)
+            end
+          end
         end
 
         # Remove the group
@@ -70,21 +82,52 @@ class Chef
         end
 
         # Set the membership option depending on the current resource states
-        def set_members_option
-          opt = ""
-          unless @new_resource.members.empty?
-            opt << " -M #{@new_resource.members.join(',')}"
-            Chef::Log.debug("#{@new_resource} setting group members to #{@new_resource.members.join(', ')}")
+        def set_members_options
+          opts = [ ]
+          members_to_be_added = [ ]
+          members_to_be_removed = [ ]
+
+          if @new_resource.append
+            # Append is set so we will only add members given in the
+            # members list and remove members given in the
+            # excluded_members list.
+            if @new_resource.members && !@new_resource.members.empty?
+              @new_resource.members.each do |member|
+                members_to_be_added << member if !@current_resource.members.include?(member)
+              end
+            end
+
+            if @new_resource.excluded_members && !@new_resource.excluded_members.empty?
+              @new_resource.excluded_members.each do |member|
+                members_to_be_removed << member if @current_resource.members.include?(member)
+              end
+            end
           else
-            # New member list is empty so we should delete any old group members
-            unless @current_resource.members.empty?
-              opt << " -d #{@current_resource.members.join(',')}"
-              Chef::Log.debug("#{@new_resource} removing group members #{@current_resource.members.join(', ')}")
-            else
-              Chef::Log.debug("#{@new_resource} not changing group members, the group has no members")
+            # Append is not set so we're resetting the membership of
+            # the group to the given members.
+            members_to_be_added = @new_resource.members
+            @current_resource.members.each do |member|
+              # No need to re-add a member if it's present in the new
+              # list of members
+              if members_to_be_added.include? member
+                members_to_be_added.delete member
+              else
+                members_to_be_removed << member
+              end
             end
           end
-          opt
+
+          unless members_to_be_added.empty?
+            Chef::Log.debug("#{@new_resource} adding group members: #{members_to_be_added.join(',')}")
+            opts << " -m #{members_to_be_added.join(',')}"
+          end
+
+          unless members_to_be_removed.empty?
+            Chef::Log.debug("#{@new_resource} removing group members: #{members_to_be_removed.join(',')}")
+            opts << " -d #{members_to_be_removed.join(',')}"
+          end
+
+          opts
         end
 
       end

data/lib/chef/provider/group/suse.rb

@@ -39,21 +39,24 @@ class Chef
           end
         end
 
-        def modify_group_members
-          unless @new_resource.members.empty?
-            if(@new_resource.append)
-              @new_resource.members.each do |member|
-                Chef::Log.debug("#{@new_resource} appending member #{member} to group #{@new_resource.group_name}")
-                shell_out!("groupmod -A #{member} #{@new_resource.group_name}")
-              end
-            else
-              Chef::Log.debug("#{@new_resource} setting group members to #{@new_resource.members.join(', ')}")
-              shell_out!("groupmod -A #{@new_resource.members.join(',')} #{@new_resource.group_name}")
-            end
-          else
-            Chef::Log.debug("#{@new_resource} not changing group members, the group has no members")
+        def set_members(members)
+          unless @current_resource.members.empty?
+            shell_out!("groupmod -R #{@current_resource.members.join(',')} #{@new_resource.group_name}")
           end
+
+          unless members.empty?
+            shell_out!("groupmod -A #{members.join(',')} #{@new_resource.group_name}")
+          end
+        end
+
+        def add_member(member)
+          shell_out!("groupmod -A #{member} #{@new_resource.group_name}")
         end
+
+        def remove_member(member)
+          shell_out!("groupmod -R #{member} #{@new_resource.group_name}")
+        end
+
       end
     end
   end

data/lib/chef/provider/group/usermod.rb

@@ -17,12 +17,15 @@
 #
 
 require 'chef/provider/group/groupadd'
+require 'chef/mixin/shell_out'
 
 class Chef
   class Provider
     class Group
       class Usermod < Chef::Provider::Group::Groupadd
 
+        include Chef::Mixin::ShellOut
+
         def load_current_resource
           super
         end
@@ -36,32 +39,52 @@ class Chef
             # No whyrun alternative: this component should be available in the base install of any given system that uses it
           end
 
-          requirements.assert(:modify, :create) do |a|
+          requirements.assert(:modify, :manage) do |a|
             a.assertion { @new_resource.members.empty? || @new_resource.append }
             a.failure_message Chef::Exceptions::Group, "setting group members directly is not supported by #{self.to_s}, must set append true in group"
             # No whyrun alternative - this action is simply not supported.
           end
-        end
 
-        def modify_group_members
-          case node[:platform]
-          when "openbsd", "netbsd", "aix", "solaris2", "smartos"
-            append_flags = "-G"
-          when "solaris", "suse", "opensuse"
-            append_flags = "-a -G"
+          requirements.assert(:all_actions) do |a|
+            a.assertion { @new_resource.excluded_members.empty? }
+            a.failure_message Chef::Exceptions::Group, "excluded_members is not supported by #{self.to_s}"
+            # No whyrun alternative - this action is simply not supported.
           end
+        end
 
-          unless @new_resource.members.empty?
-            if(@new_resource.append)
-              @new_resource.members.each do |member|
-                Chef::Log.debug("#{@new_resource} appending member #{member} to group #{@new_resource.group_name}")
-                run_command(:command => "usermod #{append_flags} #{@new_resource.group_name} #{member}" )
-              end
+        def set_members(members)
+          return if members.empty?
+          # This provider only supports adding members with
+          # append. Only if the action is create we will go
+          # ahead and add members.
+          if @new_resource.action == :create
+            members.each do |member|
+              add_member(member)
             end
           else
-            Chef::Log.debug("#{@new_resource} not changing group members, the group has no members")
+            raise Chef::Exceptions::UnsupportedAction, "Setting members directly is not supported by #{self.to_s}"
           end
         end
+
+        def add_member(member)
+          shell_out!("usermod #{append_flags} #{@new_resource.group_name} #{member}")
+        end
+
+        def remove_member(member)
+          # This provider only supports adding members with
+          # append. This function should never be called.
+          raise Chef::Exceptions::UnsupportedAction, "Removing members members is not supported by #{self.to_s}"
+        end
+
+        def append_flags
+          case node[:platform]
+          when "openbsd", "netbsd", "aix", "solaris2", "smartos"
+            "-G"
+          when "solaris", "suse", "opensuse"
+            "-a -G"
+          end
+        end
+
       end
     end
   end

data/lib/chef/provider/group/windows.rb

@@ -57,13 +57,20 @@ class Chef
 
         def manage_group
           if @new_resource.append
-            begin
-              #ERROR_MEMBER_IN_ALIAS if a member already exists in the group
-              @net_group.local_add_members(@new_resource.members)
-            rescue
-              members = @new_resource.members + @current_resource.members
-              @net_group.local_set_members(members.uniq)
+            members_to_be_added = [ ]
+            @new_resource.members.each do |member|
+              members_to_be_added << member if !@current_resource.members.include?(member)
             end
+
+            # local_add_members will raise ERROR_MEMBER_IN_ALIAS if a
+            # member already exists in the group.
+            @net_group.local_add_members(members_to_be_added) unless members_to_be_added.empty?
+
+            members_to_be_removed = [ ]
+            @new_resource.excluded_members.each do |member|
+              members_to_be_removed << member if @current_resource.members.include?(member)
+            end
+            @net_group.local_delete_members(members_to_be_removed) unless members_to_be_removed.empty?
           else
             @net_group.local_set_members(@new_resource.members)
           end

data/lib/chef/provider/ohai.rb

@@ -33,12 +33,11 @@ class Chef
       def action_reload
         converge_by("re-run ohai and merge results into node attributes") do
           ohai = ::Ohai::System.new
-
-          # If @new_resource.plugin is nil, ohai will reload all the plugins
-          # Otherwise it will only reload the specified plugin
-          # Note that any changes to plugins, or new plugins placed on
-          # the path are picked up by ohai.
-          ohai.all_plugins @new_resource.plugin
+          if @new_resource.plugin
+            ohai.require_plugin @new_resource.plugin
+          else
+            ohai.all_plugins
+          end
           node.automatic_attrs.merge! ohai.data
           Chef::Log.info("#{@new_resource} reloaded")
         end

data/lib/chef/provider/remote_file.rb

@@ -39,6 +39,14 @@ class Chef
         super
       end
 
+      private
+
+      def managing_content?
+        return true if @new_resource.checksum
+        return true if !@new_resource.source.nil? && @action != :create_if_missing
+        false
+      end
+
     end
   end
 end

data/lib/chef/provider/template.rb

@@ -52,6 +52,14 @@ class Chef
         end
       end
 
+      private
+
+      def managing_content?
+        return true if @new_resource.checksum
+        return true if !@new_resource.source.nil? && @action != :create_if_missing
+        false
+      end
+
     end
   end
 end

data/lib/chef/provider/user.rb

@@ -63,11 +63,15 @@ class Chef
         if user_info
           @current_resource.uid(user_info.uid)
           @current_resource.gid(user_info.gid)
-          @current_resource.comment(user_info.gecos)
           @current_resource.home(user_info.dir)
           @current_resource.shell(user_info.shell)
           @current_resource.password(user_info.passwd)
 
+          if @new_resource.comment && user_info.gecos.respond_to?(:force_encoding)
+            user_info.gecos.force_encoding(@new_resource.comment.encoding)
+          end
+          @current_resource.comment(user_info.gecos)
+
           if @new_resource.password && @current_resource.password == 'x'
             begin
               require 'shadow'

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

@@ -57,6 +57,13 @@ class Chef
           # 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])
+          if whyrun_mode? && passwd_s.stdout.empty? && passwd_s.stderr.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 passwd_s.stdout.empty?
+
           status_line = passwd_s.stdout.split(' ')
           case status_line[1]
           when /^P/

data/lib/chef/provider/whyrun_safe_ruby_block.rb

@@ -0,0 +1,30 @@
+#
+# Author:: Phil Dibowitz (<phild@fb.com>)
+# Copyright:: Copyright (c) 2013 Facebook
+# 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 WhyrunSafeRubyBlock < Chef::Provider::RubyBlock
+      def action_create
+        @new_resource.block.call
+        @new_resource.updated_by_last_action(true)
+        @run_context.events.resource_update_applied(@new_resource, :create, "execute the whyrun_safe_ruby_block #{@new_resource.name}")
+        Chef::Log.info("#{@new_resource} called")
+      end
+    end
+  end
+end

data/lib/chef/providers.rb

@@ -48,6 +48,7 @@ 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'
 

data/lib/chef/resource/deploy.rb

@@ -81,6 +81,8 @@ class Chef
         @allowed_actions.push(:force_deploy, :deploy, :rollback)
         @additional_remotes = Hash[]
         @keep_releases = 5
+        @enable_checkout = true
+        @checkout_branch = "deploy"
       end
 
       # where the checked out/cloned code goes
@@ -398,6 +400,22 @@ class Chef
         )
       end
 
+      def enable_checkout(arg=nil)
+        set_or_return(
+          :enable_checkout,
+          arg,
+          :kind_of => [TrueClass, FalseClass]
+        )
+      end
+
+      def checkout_branch(arg=nil)
+        set_or_return(
+          :checkout_branch,
+          arg,
+          :kind_of => String
+        )
+      end
+
       # FIXME The Deploy resource may be passed to an SCM provider as its
       # resource.  The SCM provider knows that SCM resources can specify a
       # timeout for SCM operations. The deploy resource must therefore support

data/lib/chef/resource/group.rb

@@ -31,6 +31,7 @@ class Chef
         @group_name = name
         @gid = nil
         @members = []
+        @excluded_members = []
         @action = :create
         @append = false
         @non_unique = false
@@ -64,6 +65,16 @@ class Chef
 
       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/scm.rb

@@ -32,12 +32,14 @@ class Chef
         @destination = name
         @resource_name = :scm
         @enable_submodules = false
+        @enable_checkout = true
         @revision = "HEAD"
         @remote = "origin"
         @ssh_wrapper = nil
         @depth = nil
         @allowed_actions.push(:checkout, :export, :sync, :diff, :log)
         @action = [:sync]
+        @checkout_branch = "deploy"
       end
 
       def destination(arg=nil)
@@ -130,6 +132,14 @@ class Chef
         )
       end
 
+      def enable_checkout(arg=nil)
+        set_or_return(
+          :enable_checkout,
+          arg,
+          :kind_of => [TrueClass, FalseClass]
+        )
+      end
+
       def remote(arg=nil)
         set_or_return(
           :remote,
@@ -154,6 +164,14 @@ class Chef
         )
       end
 
+      def checkout_branch(arg=nil)
+        set_or_return(
+          :checkout_branch,
+          arg,
+          :kind_of => String
+        )
+      end
+
     end
   end
 end