diff options
Diffstat (limited to 'lib/chef/provider/directory.rb')
| -rw-r--r-- | lib/chef/provider/directory.rb | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/lib/chef/provider/directory.rb b/lib/chef/provider/directory.rb index 1cacc3fcb9..38ee1f241f 100644 --- a/lib/chef/provider/directory.rb +++ b/lib/chef/provider/directory.rb @@ -34,12 +34,12 @@ class Chef end def load_current_resource - @current_resource = Chef::Resource::Directory.new(@new_resource.name) - @current_resource.path(@new_resource.path) - if ::File.exists?(@current_resource.path) && @action != :create_if_missing - load_resource_attributes_from_file(@current_resource) + @current_resource = Chef::Resource::Directory.new(new_resource.name) + current_resource.path(new_resource.path) + if ::File.exists?(current_resource.path) && @action != :create_if_missing + load_resource_attributes_from_file(current_resource) end - @current_resource + current_resource end def define_resource_requirements @@ -49,9 +49,9 @@ class Chef requirements.assert(:create) do |a| # Make sure the parent dir exists, or else fail. # for why run, print a message explaining the potential error. - parent_directory = ::File.dirname(@new_resource.path) + parent_directory = ::File.dirname(new_resource.path) a.assertion do - if @new_resource.recursive + if new_resource.recursive does_parent_exist = lambda do |base_dir| base_dir = ::File.dirname(base_dir) if ::File.exist?(base_dir) @@ -60,20 +60,20 @@ class Chef does_parent_exist.call(base_dir) end end - does_parent_exist.call(@new_resource.path) + does_parent_exist.call(new_resource.path) else ::File.directory?(parent_directory) end end - a.failure_message(Chef::Exceptions::EnclosingDirectoryDoesNotExist, "Parent directory #{parent_directory} does not exist, cannot create #{@new_resource.path}") + a.failure_message(Chef::Exceptions::EnclosingDirectoryDoesNotExist, "Parent directory #{parent_directory} does not exist, cannot create #{new_resource.path}") a.whyrun("Assuming directory #{parent_directory} would have been created") end requirements.assert(:create) do |a| - parent_directory = ::File.dirname(@new_resource.path) + parent_directory = ::File.dirname(new_resource.path) a.assertion do - if @new_resource.recursive - # find the lowest-level directory in @new_resource.path that already exists + if new_resource.recursive + # find the lowest-level directory in new_resource.path that already exists # make sure we have write permissions to that directory is_parent_writable = lambda do |base_dir| base_dir = ::File.dirname(base_dir) @@ -89,7 +89,7 @@ class Chef is_parent_writable.call(base_dir) end end - is_parent_writable.call(@new_resource.path) + is_parent_writable.call(new_resource.path) else # in why run mode & parent directory does not exist no permissions check is required # If not in why run, permissions must be valid and we rely on prior assertion that dir exists @@ -97,7 +97,7 @@ class Chef if Chef::FileAccessControl.writable?(parent_directory) true elsif Chef::Util::PathHelper.is_sip_path?(parent_directory, node) - Chef::Util::PathHelper.writable_sip_path?(@new_resource.path) + Chef::Util::PathHelper.writable_sip_path?(new_resource.path) else false end @@ -107,18 +107,18 @@ class Chef end end a.failure_message(Chef::Exceptions::InsufficientPermissions, - "Cannot create #{@new_resource} at #{@new_resource.path} due to insufficient permissions") + "Cannot create #{new_resource} at #{new_resource.path} due to insufficient permissions") end requirements.assert(:delete) do |a| a.assertion do - if ::File.exists?(@new_resource.path) - ::File.directory?(@new_resource.path) && Chef::FileAccessControl.writable?(@new_resource.path) + if ::File.exists?(new_resource.path) + ::File.directory?(new_resource.path) && Chef::FileAccessControl.writable?(new_resource.path) else true end end - a.failure_message(RuntimeError, "Cannot delete #{@new_resource} at #{@new_resource.path}!") + a.failure_message(RuntimeError, "Cannot delete #{new_resource} at #{new_resource.path}!") # No why-run handling here: # * if we don't have permissions, this is unlikely to be changed earlier in the run # * if the target is a file (not a dir), there's no reasonable path by which this would have been changed @@ -126,32 +126,32 @@ class Chef end def action_create - unless ::File.exists?(@new_resource.path) - converge_by("create new directory #{@new_resource.path}") do - if @new_resource.recursive == true - ::FileUtils.mkdir_p(@new_resource.path) + unless ::File.exists?(new_resource.path) + converge_by("create new directory #{new_resource.path}") do + if new_resource.recursive == true + ::FileUtils.mkdir_p(new_resource.path) else - ::Dir.mkdir(@new_resource.path) + ::Dir.mkdir(new_resource.path) end - Chef::Log.info("#{@new_resource} created directory #{@new_resource.path}") + Chef::Log.info("#{new_resource} created directory #{new_resource.path}") end end do_acl_changes do_selinux(true) - load_resource_attributes_from_file(@new_resource) unless Chef::Config[:why_run] + load_resource_attributes_from_file(new_resource) unless Chef::Config[:why_run] end def action_delete - if ::File.exists?(@new_resource.path) - converge_by("delete existing directory #{@new_resource.path}") do - if @new_resource.recursive == true + if ::File.exists?(new_resource.path) + converge_by("delete existing directory #{new_resource.path}") do + if new_resource.recursive == true # we don't use rm_rf here because it masks all errors, including # IO errors or permission errors that would prvent the deletion - FileUtils.rm_r(@new_resource.path) - Chef::Log.info("#{@new_resource} deleted #{@new_resource.path} recursively") + FileUtils.rm_r(new_resource.path) + Chef::Log.info("#{new_resource} deleted #{new_resource.path} recursively") else - ::Dir.delete(@new_resource.path) - Chef::Log.info("#{@new_resource} deleted #{@new_resource.path}") + ::Dir.delete(new_resource.path) + Chef::Log.info("#{new_resource} deleted #{new_resource.path}") end end end |