use constants and refactor windows path processing.

1 files changed, 10 insertions, 10 deletions

diff --git a/providers/zipfile.rb b/providers/zipfile.rb
index 5b43dcf..c34abce 100644
--- a/providers/zipfile.rb
+++ b/providers/zipfile.rb
@@ -43,6 +43,9 @@ end
 
 action :zip do
   ensure_rubyzip_gem_installed
+  # sanitize paths for windows.
+  @new_resource.source.downcase.gsub!(::File::SEPARATOR, ::File::ALT_SEPARATOR)
+  @new_resource.path.downcase.gsub!(::File::SEPARATOR, ::File::ALT_SEPARATOR)
   Chef::Log.debug("zip #{@new_resource.source} => #{@new_resource.path} (overwrite=#{@new_resource.overwrite})")
 
   if @new_resource.overwrite == false && ::File.exists?(@new_resource.path)
@@ -52,21 +55,18 @@ action :zip do
     if ::File.exists?(@new_resource.path)
       ::File.unlink(@new_resource.path)
     end
-    # Only supporting compression of a single directory (recursively).
+    # only supporting compression of a single directory (recursively).
     if ::File.directory?(@new_resource.source)
       z = Zip::ZipFile.new(@new_resource.path, true)
-      unless @new_resource.source =~ /\/$/
-        @new_resource.source << '\\'
+      unless @new_resource.source =~ /::File::ALT_SEPARATOR$/
+        @new_resource.source << ::File::ALT_SEPARATOR
       end
       Find.find(@new_resource.source) do |f|
-        f = f.downcase.gsub(/\\/, '/')
-        source = @new_resource.source.downcase.gsub(/\\/, '/')
-        # ignore the root directory.
-        next if f == source
+        f.downcase.gsub!(::File::SEPARATOR, ::File::ALT_SEPARATOR)
+        # don't add root directory to the zipfile.
+        next if f == @new_resource.source
         # strip the root directory from the filename before adding it to the zipfile.
-        zip_fname = f.sub(/#{source}/, '')
-        zip_fname.gsub!(/\//, '\\') 
-        f = f.downcase.gsub(/\//, '\\')
+        zip_fname = f.sub(@new_resource.source, '')
         Chef::Log.debug("adding #{zip_fname} to archive, sourcefile is: #{f}")
         z.add(zip_fname, f)
       end