diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-08-26 15:09:22 -0700 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-08-26 18:01:43 -0700 |
commit | 40f94ffb901fcc7ded3d04833fda16c982932c30 (patch) | |
tree | 337eb513ab4f437766873986ee519d6f561b70ff | |
parent | 59f0cd9f47e9b66428965d8bb459ced84c9d5e34 (diff) | |
download | chef-40f94ffb901fcc7ded3d04833fda16c982932c30.tar.gz |
Stop using @instance_variablejdm/win-volume-ffi
-rw-r--r-- | lib/chef/util/windows/volume.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/chef/util/windows/volume.rb b/lib/chef/util/windows/volume.rb index 0d26d5937e..6e45594ba6 100644 --- a/lib/chef/util/windows/volume.rb +++ b/lib/chef/util/windows/volume.rb @@ -22,16 +22,16 @@ require 'chef/win32/api/file' require 'chef/util/windows' class Chef::Util::Windows::Volume < Chef::Util::Windows - public + attr_reader :mount_point def initialize(name) name += "\\" unless name =~ /\\$/ #trailing slash required - @name = name + @mount_point = name end def device begin - Chef::ReservedNames::Win32::File.get_volume_name_for_volume_mount_point(@name) + Chef::ReservedNames::Win32::File.get_volume_name_for_volume_mount_point(mount_point) rescue Chef::Exceptions::Win32APIError => e raise ArgumentError, e end @@ -39,7 +39,7 @@ class Chef::Util::Windows::Volume < Chef::Util::Windows def delete begin - Chef::ReservedNames::Win32::File.delete_volume_mount_point(@name) + Chef::ReservedNames::Win32::File.delete_volume_mount_point(mount_point) rescue Chef::Exceptions::Win32APIError => e raise ArgumentError, e end @@ -47,9 +47,13 @@ class Chef::Util::Windows::Volume < Chef::Util::Windows def add(args) begin - Chef::ReservedNames::Win32::File.set_volume_mount_point(@name, args[:remote]) + Chef::ReservedNames::Win32::File.set_volume_mount_point(mount_point, args[:remote]) rescue Chef::Exceptions::Win32APIError => e raise ArgumentError, e end end + + def mount_point + @mount_point + end end |