svn commit: r1392103 - in /buildr/trunk: CHANGELOG buildr.gemspec spec/packaging/archive_spec.rb

[do...@apache.org]

Author: donaldp
Date: Sun Sep 30 20:35:50 2012
New Revision: 1392103

URL: http://svn.apache.org/viewvc?rev=1392103&view=rev
Log:
Upgrade the rubyzip dependency version

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/buildr.gemspec
    buildr/trunk/spec/packaging/archive_spec.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1392103&r1=1392102&r2=1392103&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Sep 30 20:35:50 2012
@@ -12,6 +12,7 @@
           - rspec-mocks (2.11.3)
           - rspec-core (2.11.1)
           - rspec (2.11.0)
+          - rubyzip (0.9.9)
 * Added:  BUILDR-652 Generate buildfile from Eclipse workspace. (Niklaus Giger)
 * Fixed:  BUILDR-627 Support explicitly listed source files in buildr cc task. (Christopher Tiwald)
 * Fixed:  BUILDR-606 Transitive artifact resolution should not include artifacts in 'provided' scope in poms to

Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1392103&r1=1392102&r2=1392103&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Sun Sep 30 20:35:50 2012
@@ -58,7 +58,7 @@ for those one-off tasks, with a language
   spec.add_dependency 'builder',              '3.1.3'
   spec.add_dependency 'net-ssh',              '2.6.0'
   spec.add_dependency 'net-sftp',             '2.0.5'
-  spec.add_dependency 'rubyzip',              '0.9.4'
+  spec.add_dependency 'rubyzip',              '0.9.9'
   spec.add_dependency 'highline',             '1.6.15'
   spec.add_dependency 'json_pure',            '1.7.5'
   spec.add_dependency 'rubyforge',            '2.0.4'

Modified: buildr/trunk/spec/packaging/archive_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/archive_spec.rb?rev=1392103&r1=1392102&r2=1392103&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/archive_spec.rb (original)
+++ buildr/trunk/spec/packaging/archive_spec.rb Sun Sep 30 20:35:50 2012
@@ -490,8 +490,14 @@ describe "ZipTask" do
     entries = {}
     Zip::ZipFile.open @archive do |zip|
       zip.entries.each do |entry|
-        # Ignore the / directory created for empty ZIPs when using java.util.zip.
-        entries[entry.name.to_s] = zip.read(entry.name) unless entry.name.to_s == '/'
+        if entry.directory?
+          # Ignore the / directory created for empty ZIPs when using java.util.zip.
+          if entry.name.to_s != '/'
+            entries[entry.name.to_s] = nil
+          end
+        else
+          entries[entry.name.to_s] = zip.read(entry.name)
+        end
       end
     end
     yield entries if block_given?