chef 11.6.2 → 11.8.0.rc.1

data/lib/chef/provider/cron/unix.rb

@@ -0,0 +1,76 @@
+#
+# Author:: Bryan McLellan (btm@loftninjas.org)
+# Author:: Toomas Pelberg (toomasp@gmx.net)
+# Copyright:: Copyright (c) 2009 Bryan McLellan
+# Copyright:: Copyright (c) 2010 Toomas Pelberg
+# 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/log'
+require 'chef/provider'
+
+class Chef
+  class Provider
+    class Cron
+      class Unix < Chef::Provider::Cron
+
+        private
+
+        def read_crontab
+          crontab = nil
+          status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
+            crontab = stdout.read
+          end
+          if status.exitstatus > 1
+            raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
+          end
+          crontab
+        end
+
+        def write_crontab(crontab)
+          tempcron = Tempfile.new("chef-cron")
+          tempcron << crontab
+          tempcron.flush
+          tempcron.chmod(0644)
+          exit_status = 0
+          error_message = ""
+          begin
+            status, stdout, stderr = run_command_and_return_stdout_stderr(:command => "/usr/bin/crontab #{tempcron.path}",:user => @new_resource.user)
+            exit_status = status.exitstatus
+            # solaris9, 10 on some failures for example invalid 'mins' in crontab fails with exit code of zero :(
+            if stderr && stderr.include?("errors detected in input, no crontab file generated")
+              error_message = stderr
+              exit_status = 1
+            end
+          rescue Chef::Exceptions::Exec => e
+            Chef::Log.debug(e.message)
+            exit_status = 1
+            error_message = e.message
+          rescue ArgumentError => e
+            # usually raised on invalid user.
+            Chef::Log.debug(e.message)
+            exit_status = 1
+            error_message = e.message
+          end
+          tempcron.close!
+          if exit_status > 0
+            raise Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: #{exit_status}, message: #{error_message}"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/provider/deploy/timestamped.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.
@@ -20,9 +20,9 @@ class Chef
   class Provider
     class Deploy
       class Timestamped < Chef::Provider::Deploy
-        
+
         protected
-        
+
         def release_slug
           Time.now.utc.strftime("%Y%m%d%H%M%S")
         end

data/lib/chef/provider/erl_call.rb

@@ -32,7 +32,7 @@ class Chef
       def whyrun_supported?
         true
       end
-      
+
       def load_current_resource
         true
       end

data/lib/chef/provider/execute.rb

@@ -29,7 +29,7 @@ class Chef
       def load_current_resource
         true
       end
-      
+
       def whyrun_supported?
         true
       end
@@ -56,7 +56,7 @@ class Chef
         if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.info?
           opts[:live_stream] = STDOUT
         end
-        converge_by("execute #{@new_resource.command}") do 
+        converge_by("execute #{@new_resource.command}") do
           result = shell_out!(@new_resource.command, opts)
           Chef::Log.info("#{@new_resource} ran successfully")
         end

data/lib/chef/provider/git.rb

@@ -273,6 +273,7 @@ class Chef
         run_opts[:group] = @new_resource.group if @new_resource.group
         run_opts[:environment] = {"GIT_SSH" => @new_resource.ssh_wrapper} if @new_resource.ssh_wrapper
         run_opts[:log_tag] = @new_resource.to_s
+        run_opts[:timeout] = @new_resource.timeout if @new_resource.timeout
         run_opts
       end
 

data/lib/chef/provider/group.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.
@@ -35,11 +35,11 @@ class Chef
         super
         @group_exists = true
       end
-      
+
       def load_current_resource
         @current_resource = Chef::Resource::Group.new(@new_resource.name)
         @current_resource.group_name(@new_resource.group_name)
-        
+
         group_info = nil
         begin
           group_info = Etc.getgrnam(@new_resource.group_name)
@@ -47,26 +47,26 @@ class Chef
           @group_exists = false
           Chef::Log.debug("#{@new_resource} group does not exist")
         end
-        
+
         if group_info
           @new_resource.gid(group_info.gid) unless @new_resource.gid
           @current_resource.gid(group_info.gid)
           @current_resource.members(group_info.mem)
         end
-        
+
         @current_resource
       end
 
       def define_resource_requirements
-        requirements.assert(:modify) do |a| 
-          a.assertion { @group_exists } 
+        requirements.assert(:modify) do |a|
+          a.assertion { @group_exists }
           a.failure_message(Chef::Exceptions::Group, "Cannot modify #{@new_resource} - group does not exist!")
           a.whyrun("Group #{@new_resource} does not exist. Unless it would have been created earlier in this run, this attempt to modify it would fail.")
         end
       end
-      
-      # Check to see if a group needs any changes. Populate 
-      # @change_desc with a description of why a change must occur 
+
+      # Check to see if a group needs any changes. Populate
+      # @change_desc with a description of why a change must occur
       #
       # ==== Returns
       # <true>:: If a change is required
@@ -77,7 +77,7 @@ class Chef
           @change_desc = "change gid #{@current_resource.gid} to #{@new_resource.gid}"
           return true
         end
-        
+
         if(@new_resource.append)
           missing_members = []
           @new_resource.members.each do |member|
@@ -96,24 +96,24 @@ class Chef
         end
         return false
       end
-      
+
       def action_create
         case @group_exists
         when false
-          converge_by("create #{@new_resource}") do 
+          converge_by("create #{@new_resource}") do
             create_group
             Chef::Log.info("#{@new_resource} created")
           end
-        else 
+        else
           if compare_group
-            converge_by(["alter group #{@new_resource}", @change_desc ]) do 
+            converge_by(["alter group #{@new_resource}", @change_desc ]) do
               manage_group
               Chef::Log.info("#{@new_resource} altered")
             end
           end
         end
       end
-      
+
       def action_remove
         if @group_exists
           converge_by("remove group #{@new_resource}") do
@@ -122,16 +122,16 @@ class Chef
           end
         end
       end
-      
+
       def action_manage
         if @group_exists && compare_group
           converge_by(["manage group #{@new_resource}", @change_desc]) do
-            manage_group 
+            manage_group
             Chef::Log.info("#{@new_resource} managed")
           end
         end
       end
-      
+
       def action_modify
         if compare_group
           converge_by(["modify group #{@new_resource}", @change_desc]) do
@@ -140,7 +140,7 @@ class Chef
           end
         end
       end
-      
+
       def create_group
         raise NotImplementedError, "subclasses of Chef::Provider::Group should define #create_group"
       end

data/lib/chef/provider/group/dscl.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,7 +38,7 @@ class Chef
           raise(Chef::Exceptions::Group,"dscl error: #{result.inspect}") if result[2] =~ /No such key: /
           return result[2]
         end
-        
+
         # This is handled in providers/group.rb by Etc.getgrnam()
         # def group_exists?(group)
         #   groups = safe_dscl("list /Groups")
@@ -86,8 +86,8 @@ class Chef
 
         def define_resource_requirements
           super
-          requirements.assert(:all_actions) do |a| 
-            a.assertion { ::File.exists?("/usr/bin/dscl") } 
+          requirements.assert(:all_actions) do |a|
+            a.assertion { ::File.exists?("/usr/bin/dscl") }
             a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/bin/dscl for #{@new_resource.name}"
             # No whyrun alternative: this component should be available in the base install of any given system that uses it
           end
@@ -96,13 +96,13 @@ class Chef
         def load_current_resource
           super
         end
-        
+
         def create_group
           dscl_create_group
           set_gid
           set_members
         end
-        
+
         def manage_group
           if @new_resource.group_name && (@current_resource.group_name != @new_resource.group_name)
             dscl_create_group
@@ -114,12 +114,12 @@ class Chef
             set_members
           end
         end
-        
+
         def dscl_create_group
           safe_dscl("create /Groups/#{@new_resource.group_name}")
           safe_dscl("create /Groups/#{@new_resource.group_name} Password '*'")
         end
-        
+
         def remove_group
           safe_dscl("delete /Groups/#{@new_resource.group_name}")
         end

data/lib/chef/provider/group/gpasswd.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.
@@ -32,9 +32,9 @@ class Chef
 
         def define_resource_requirements
           super
-          requirements.assert(:all_actions) do |a| 
-            a.assertion { ::File.exists?("/usr/bin/gpasswd") } 
-            a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/bin/gpasswd for #{@new_resource}" 
+          requirements.assert(:all_actions) do |a|
+            a.assertion { ::File.exists?("/usr/bin/gpasswd") }
+            a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/bin/gpasswd for #{@new_resource}"
             # No whyrun alternative: this component should be available in the base install of any given system that uses it
           end
         end

data/lib/chef/provider/group/groupadd.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.
@@ -20,7 +20,7 @@ class Chef
   class Provider
     class Group
       class Groupadd < Chef::Provider::Group
-        
+
         def required_binaries
           [ "/usr/sbin/groupadd",
             "/usr/sbin/groupmod",
@@ -34,9 +34,9 @@ class Chef
         def define_resource_requirements
           super
           required_binaries.each do |required_binary|
-            requirements.assert(:all_actions) do |a| 
-              a.assertion { ::File.exists?(required_binary) } 
-              a.failure_message Chef::Exceptions::Group, "Could not find binary #{required_binary} for #{@new_resource}" 
+            requirements.assert(:all_actions) do |a|
+              a.assertion { ::File.exists?(required_binary) }
+              a.failure_message Chef::Exceptions::Group, "Could not find binary #{required_binary} for #{@new_resource}"
               # No whyrun alternative: this component should be available in the base install of any given system that uses it
             end
           end
@@ -48,9 +48,9 @@ class Chef
           command << set_options
           command << groupadd_options
           run_command(:command => command)
-          modify_group_members    
+          modify_group_members
         end
-        
+
         # Manage the group when it already exists
         def manage_group
           command = "groupmod"
@@ -58,12 +58,12 @@ class Chef
           run_command(:command => command)
           modify_group_members
         end
-        
+
         # Remove the group
         def remove_group
           run_command(:command => "groupdel #{@new_resource.group_name}")
         end
-        
+
         def modify_group_members
           raise Chef::Exceptions::Group, "you must override modify_group_members in #{self.to_s}"
         end
@@ -87,6 +87,7 @@ class Chef
         def groupadd_options
           opts = ''
           opts << " -r" if @new_resource.system
+          opts << " -o" if @new_resource.non_unique
           opts
         end
 

data/lib/chef/provider/group/pw.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.
@@ -20,21 +20,21 @@ class Chef
   class Provider
     class Group
       class Pw < Chef::Provider::Group
-        
+
         def load_current_resource
           super
         end
-        
+
         def define_resource_requirements
           super
 
-          requirements.assert(:all_actions) do |a| 
-            a.assertion { ::File.exists?("/usr/sbin/pw") } 
+          requirements.assert(:all_actions) do |a|
+            a.assertion { ::File.exists?("/usr/sbin/pw") }
             a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/sbin/pw for #{@new_resource}"
             # No whyrun alternative: this component should be available in the base install of any given system that uses it
           end
         end
-        
+
         # Create the group
         def create_group
           command = "pw groupadd"
@@ -42,7 +42,7 @@ class Chef
           command << set_members_option
           run_command(:command => command)
         end
-        
+
         # Manage the group when it already exists
         def manage_group
           command = "pw groupmod"
@@ -50,12 +50,12 @@ class Chef
           command << set_members_option
           run_command(:command => command)
         end
-        
+
         # Remove the group
         def remove_group
           run_command(:command => "pw groupdel #{@new_resource.group_name}")
         end
-        
+
         # Little bit of magic as per Adam's useradd provider to pull and assign the command line flags
         #
         # ==== Returns
@@ -86,7 +86,7 @@ class Chef
           end
           opt
         end
-        
+
       end
     end
   end