rake-delphi 0.0.17 → 0.0.18

data/lib/rake/common/ziptask.rb

@@ -60,10 +60,21 @@ module Rake
 
     private
         def zip_addfile(zipfile, file)
+            filename_set = false
+            if file.kind_of?(Hash)
+                filename = file.values.first
+                file = file.keys.first
+                filename_set = true
+                # if directory name given append filename to its path
+                if /\/$/.match(filename)
+                  filename += File.basename(file)
+                end
+            else
+                filename = File.basename(file)
+            end
             return if ! File.exists?(file)
-            filename = File.basename(file)
-            @task.out "Zipping #{file}..."
-            if @options[:preserve_paths]
+            @task.out "Zipping '#{file}' as '#{filename}'..."
+            if @options[:preserve_paths] && ! filename_set
                 dir = File.dirname(file)
                 # avoid "./<filename>" entries (instead of "<filename>")
                 filename = File.join(dir, filename) if dir != '.'

data/lib/rake/delphi/version.rb

@@ -2,6 +2,6 @@
 
 module Rake
   module Delphi
-    VERSION = '0.0.17'
+    VERSION = '0.0.18'
   end
 end

data/test/test-zip.rb

@@ -46,4 +46,22 @@ public
             assert_equal 2, z.entries.length, 'Files in an archive'
         end
     end
+
+    def test_add_to_zip_file_customname
+        test_add_to_zip_file
+        Rake::Delphi::ZipTask.new(@rake_task, @zip, [{__FILE__ => 'folder/custom_name'}], { :preserve_paths => true, :add => true })
+        assert(File.exists?(@zip))
+        Zip::ZipFile.open(@zip) do |z|
+            assert_equal 3, z.entries.length, 'Files in an archive'
+        end
+    end
+
+    def test_add_to_zip_file_customname_foldername
+        test_add_to_zip_file
+        Rake::Delphi::ZipTask.new(@rake_task, @zip, [{__FILE__ => 'folder/custom_name/'}], { :preserve_paths => true, :add => true })
+        assert(File.exists?(@zip))
+        Zip::ZipFile.open(@zip) do |z|
+            assert_equal 3, z.entries.length, 'Files in an archive'
+        end
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-delphi
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors: