diff options
Diffstat (limited to 'lib/chef/util/windows/volume.rb')
| -rw-r--r-- | lib/chef/util/windows/volume.rb | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/lib/chef/util/windows/volume.rb b/lib/chef/util/windows/volume.rb index a18644cece..e197604c34 100644 --- a/lib/chef/util/windows/volume.rb +++ b/lib/chef/util/windows/volume.rb @@ -16,44 +16,34 @@ # limitations under the License. # -#simple wrapper around Volume APIs. might be possible with WMI, but possibly more complex. +# simple wrapper around Volume APIs. might be possible with WMI, but possibly more complex. -require "chef/win32/api/file" -require "chef/util/windows" +require_relative "../../win32/api/file" +require_relative "../windows" class Chef::Util::Windows::Volume < Chef::Util::Windows attr_reader :mount_point def initialize(name) - name += "\\" unless name =~ /\\$/ #trailing slash required + name += "\\" unless /\\$/.match?(name) # trailing slash required @mount_point = name end def device - begin - Chef::ReservedNames::Win32::File.get_volume_name_for_volume_mount_point(mount_point) - rescue Chef::Exceptions::Win32APIError => e - raise ArgumentError, e - end + Chef::ReservedNames::Win32::File.get_volume_name_for_volume_mount_point(mount_point) + rescue Chef::Exceptions::Win32APIError => e + raise ArgumentError, e end def delete - begin - Chef::ReservedNames::Win32::File.delete_volume_mount_point(mount_point) - rescue Chef::Exceptions::Win32APIError => e - raise ArgumentError, e - end + Chef::ReservedNames::Win32::File.delete_volume_mount_point(mount_point) + rescue Chef::Exceptions::Win32APIError => e + raise ArgumentError, e end def add(args) - begin - 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 + Chef::ReservedNames::Win32::File.set_volume_mount_point(mount_point, args[:remote]) + rescue Chef::Exceptions::Win32APIError => e + raise ArgumentError, e end end |