Merge branch 'master' of github.com:nicksieger/warbler

Gemfile.lock

@@ -2,10 +2,10 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    hoe (2.6.2)
+    hoe (2.7.0)
       rake (>= 0.8.7)
       rubyforge (>= 2.0.4)
-    jruby-jars (1.5.3)
+    jruby-jars (1.5.5)
     jruby-rack (1.0.3)
     json_pure (1.4.6)
     rake (0.8.7)

Rakefile

@@ -20,7 +20,7 @@ MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "Gemfile",
                    ].to_a.reject{|f| f=~%r{spec/sample/(MANIFEST|link|web.xml)}}.sort.uniq
 
 begin
-  File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
+  File.open("Manifest.txt", "wb") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
   require 'hoe'
   require File.dirname(__FILE__) + '/lib/warbler/version'
   hoe = Hoe.spec("warbler") do |p|

spec/warbler/task_spec.rb

@@ -114,7 +114,7 @@ def run_task(t)
 
   context "where symlinks are available" do
     begin
-      ln_s "README.txt", "r.txt.symlink"
+      ln_s "README.txt", "r.txt.symlink", :verbose => false
       it "should process symlinks by storing a file in the archive that has the same contents as the source" do
         File.open("config/special.txt", "wb") {|f| f << "special"}
         Dir.chdir("config") { ln_s "special.txt", "link.txt" }