rubyzip 0.5.11 → 0.5.12

data/ChangeLog

@@ -1,3 +1,29 @@
+2005-09-06 21:19  thomas
+
+	* lib/zip/zip.rb: [no log message]
+
+2005-09-06 21:08  thomas
+
+	* NEWS: [no log message]
+
+2005-09-06 21:04  thomas
+
+	* lib/zip/zip.rb, test/gentestfiles.rb, test/ziptest.rb: Fixed
+	  problem on windows - tempfile has to be set to binmode again when
+	  it is reopened
+
+2005-09-04 16:45  thomas
+
+	* Rakefile: [no log message]
+
+2005-09-04 16:33  thomas
+
+	* TODO: [no log message]
+
+2005-09-04 15:43  thomas
+
+	* test/ziptest.rb: [no log message]
+
 2005-09-03 10:27  thomas
 
 	* NEWS: [no log message]

data/NEWS

@@ -1,3 +1,7 @@
+= Version 0.5.12
+
+Fixed problem with writing binary content to a ZipFile in MS Windows.
+
 = Version 0.5.11
 
 Fixed name clash file method copy_stream from fileutils.rb. Fixed

data/Rakefile

@@ -24,7 +24,7 @@ PKG_FILES.add %w{ lib/**/*.rb }
 def clobberFromCvsIgnore(path)
   CLOBBER.add File.readlines(path+'/.cvsignore').map { 
     |f| File.join(path, f.chomp) 
-  }
+  } rescue StandardError
 end
 
 clobberFromCvsIgnore '.'

data/TODO

@@ -1,4 +1,8 @@
 
+* Adjust rdoc stylesheet to advertise inherited methods if possible
+* Suggestion: Add ZipFile/ZipInputStream example that demonstrates extracting all entries.
+* Suggestion: ZipFile#extract destination should default to "."
+* Suggestion: ZipEntry should have extract(), get_input_stream() methods etc
 * rename write to syswrite
 * provide alias for write -> syswrite in ioextras.rb
 * (is buffering used anywhere with write?)

data/lib/zip/zip.rb

@@ -19,7 +19,7 @@ end
 
 module Zip
 
-  VERSION = '0.5.11'
+  VERSION = '0.5.12'
 
   RUBY_MINOR_VERSION = RUBY_VERSION.split(".")[1].to_i
 
@@ -1330,6 +1330,7 @@ module Zip
         raise StandardError, "cannot open entry for reading while its open for writing - #{name}"
       end
       @tempFile.open # reopens tempfile from top
+      @tempFile.binmode
       if block_given?
         begin
           yield(@tempFile)

data/test/gentestfiles.rb

@@ -113,7 +113,7 @@ class TestZipFile
       File.open("data/generated/longBinary.bin", "wb") {
 	|file|
 	while (file.tell < 3E5)
-	  file << testBinaryPattern << rand
+	  file << testBinaryPattern << rand << "\0"
 	end
       }
       raise "failed to create test zip '#{TEST_ZIP2.zip_name}'" unless 

data/test/ziptest.rb

@@ -468,8 +468,8 @@ class ZipInputStreamTest < Test::Unit::TestCase
     ZipInputStream.open(TestZipFile::TEST_ZIP2.zip_name) {
       |zis|
       e = zis.get_next_entry
-      assert_equal("#!/usr/bin/env ruby\n", zis.gets)
-      assert_equal("\n", zis.gets)
+      assert_equal("#!/usr/bin/env ruby", zis.gets.chomp)
+      assert_equal("", zis.gets.chomp)
       assert_equal("$VERBOSE =", zis.read(10))
     }
   end
@@ -1043,13 +1043,18 @@ class ZipFileTest < Test::Unit::TestCase
       assert_equal(entryCount+1, zf.size)
       assert_equal("Putting stuff in data/generated/empty.txt", zf.read("data/generated/empty.txt")) 
 
+      zf.get_output_stream('entry.bin') {
+	|os|
+	os.write(File.open('data/generated/4entry.zip', 'rb').read)
+      }
     }
     
     ZipFile.open(TEST_ZIP.zip_name) {
       |zf|
-      assert_equal(entryCount+1, zf.size)
+      assert_equal(entryCount+2, zf.size)
       assert_equal("Putting stuff in newEntry.txt", zf.read("newEntry.txt")) 
       assert_equal("Putting stuff in data/generated/empty.txt", zf.read("data/generated/empty.txt")) 
+      assert_equal(File.open('data/generated/4entry.zip', 'rb').read, zf.read("entry.bin")) 
     }
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rubyzip
 version: !ruby/object:Gem::Version 
-  version: 0.5.11
-date: 2005-09-03 00:00:00 +02:00
+  version: 0.5.12
+date: 2005-09-06 00:00:00 +02:00
 summary: rubyzip is a ruby module for reading and writing zip files
 require_paths: 
   - lib