fixing merge_file and merge_dir; adding test cases

lib/iron_worker_ng/feature/common/merge_dir.rb

@@ -11,7 +11,8 @@ class Feature < IronWorkerNG::Feature::Base
           def initialize(path, dest)
             raise 'No such directory - ' + path unless Dir.exist? path
             @path = File.expand_path(path)
-            @dest = Pathname.new(dest).cleanpath.to_s
+            @dest = dest
+            @dest = Pathname.new(dest).cleanpath.to_s + '/' unless @dest.empty?
           end
 
           def hash_string
@@ -28,7 +29,7 @@ def bundle(zip)
             IronWorkerNG::Logger.debug "Bundling dir with path='#{@path}' and dest='#{@dest}'"
 
             Dir.glob(@path + '/**/**') do |path|
-              zip.add(@dest + '/' + File.basename(@path) + path[@path.length .. -1], path)
+              zip.add(@dest + File.basename(@path) + path[@path.length .. -1], path)
             end
           end
         end

lib/iron_worker_ng/feature/common/merge_file.rb

@@ -9,6 +9,7 @@ class Feature < IronWorkerNG::Feature::Base
           def initialize(path, dest)
             @path = File.expand_path(path)
             @dest = dest
+            @dest += '/' unless @dest.empty? or @dest.end_with? '/'
           end
 
           def hash_string
@@ -18,7 +19,7 @@ def hash_string
           def bundle(zip)
             IronWorkerNG::Logger.debug "Bundling file with path='#{@path}' and dest='#{@dest}'"
 
-            zip.add(@dest + '/' + File.basename(@path), @path)
+            zip.add(@dest + File.basename(@path), @path)
           end
         end
 

test/test_common_features.rb

@@ -14,6 +14,17 @@ def test_merge_file
     end
   end
 
+  def test_merge_file_no_dest
+    code = code_bundle('test') do
+      merge_file('Gemfile')
+      merge_worker('test/hello.rb')
+    end
+
+    inspect_zip(code) do |zip|
+      assert zip.find_entry('Gemfile')
+    end
+  end
+
   def test_merge_dir_check
     assert_raise RuntimeError, "should check if merged dir exists" do
       code_bundle('test') do
@@ -33,6 +44,17 @@ def test_merge_dir
     end
   end
 
+  def test_merge_dir_no_dest
+    code = code_bundle('test') do
+      merge_dir('test')
+      merge_worker('test/hello.rb')
+    end
+
+    inspect_zip(code) do |zip|
+      assert zip.find_entry('test/hello.rb')
+    end
+  end
+
   def test_symlinks
     File.unlink 'test/data/dir1/dir2' if
       File.symlink? 'test/data/dir1/dir2'