lib/tasks/zip.rb in buildr-0.21.0 vs lib/tasks/zip.rb in buildr-0.22.0

@@ -76,18 +76,14 @@
         self
       end
 
       # Documented in ZipTask.
       def merge(*files)
-        if Hash === files.last
-          options = files.pop
-        else
-          options = {}
-        end
+        options = files.pop if Hash === files.last
 
-        if options[:path]
+        if options && options[:path]
           path(options[:path]).merge *files +[ options.reject { |k,v| k == :path } ]
-        elsif options.keys.empty?
+        elsif options.nil? || options.keys.empty?
           files.collect do |file|
             @sources << proc { file.to_s }
             expander = ZipExpander.new(file)
             @actions << proc { |zip| expander.expand(zip, @path) }
             expander