Don't overwrite existing manifest

jruby · May 6, 2010 · a607a6e · a607a6e
1 parent 79ee189
commit a607a6e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/warbler/war.rb b/lib/warbler/war.rb
@@ -57,10 +57,12 @@ def add_webxml(config)
 
     # Add a manifest file either from config or by making a default manifest.
     def add_manifest(config)
-      if config.manifest_file
-        @files['META-INF/MANIFEST.MF'] = config.manifest_file
-      else
-        @files['META-INF/MANIFEST.MF'] = StringIO.new(%{Manifest-Version: 1.0\nCreated-By: Warbler #{VERSION}\n\n})
+      unless @files.keys.detect{|k| k =~ /^META-INF\/MANIFEST\.MF$/i}
+        if config.manifest_file
+          @files['META-INF/MANIFEST.MF'] = config.manifest_file
+        else
+          @files['META-INF/MANIFEST.MF'] = StringIO.new(%{Manifest-Version: 1.0\nCreated-By: Warbler #{VERSION}\n\n})
+        end
       end
     end
 

diff --git a/spec/warbler/war_spec.rb b/spec/warbler/war_spec.rb
@@ -158,6 +158,12 @@ def expand_webxml
     @war.files['META-INF/MANIFEST.MF'].should == "manifest"
   end
 
+  it "should not add a manifest if one already exists" do
+    @war.files['META-INF/MANIFEST.MF'] = 'manifest'
+    @war.add_manifest(@config)
+    @war.files['META-INF/MANIFEST.MF'].should == "manifest"
+  end
+
   it "should be able to exclude files from the .war" do
     @config.excludes += FileList['lib/tasks/utils.rake']
     @war.apply(@config)