rubyzip 0.5.12 → 0.9.1

data/lib/zip/zipfilesystem.rb

@@ -482,7 +482,7 @@ module Zip
       alias rmdir  delete
       alias unlink delete
       
-      def mkdir(entryName, permissionInt = 0)
+      def mkdir(entryName, permissionInt = 0755)
         @mappedZip.mkdir(entryName, permissionInt)
       end
       
@@ -571,7 +571,7 @@ module Zip
                         &continueOnExistsProc)
       end
 
-      def mkdir(fileName, permissionInt = 0)
+      def mkdir(fileName, permissionInt = 0755)
         @zipFile.mkdir(expand_to_entry(fileName), permissionInt)
       end
 

data/test/gentestfiles.rb

@@ -86,6 +86,7 @@ class TestZipFile
 	       files.index(File.basename(TEST_ZIP3.zip_name)) &&
 	       files.index(File.basename(TEST_ZIP4.zip_name)) &&
 	       files.index("empty.txt")      &&
+	       files.index("empty_chmod640.txt")      &&
 	       files.index("short.txt")      &&
 	       files.index("longAscii.txt")  &&
 	       files.index("longBinary.bin") ))
@@ -95,6 +96,7 @@ class TestZipFile
 	system("zip #{TEST_ZIP1.zip_name} -d data/file2.txt")
       
       File.open("data/generated/empty.txt", "w") {}
+      File.open("data/generated/empty_chmod640.txt", "w") { |f| f.chmod(0640) }
       
       File.open("data/generated/short.txt", "w") { |file| file << "ABCDEF" }
       ziptestTxt=""
@@ -138,7 +140,7 @@ class TestZipFile
   end
 
   TEST_ZIP1 = TestZipFile.new("data/generated/empty.zip", [])
-  TEST_ZIP2 = TestZipFile.new("data/generated/4entry.zip", %w{ data/generated/longAscii.txt data/generated/empty.txt data/generated/short.txt data/generated/longBinary.bin}, 
+  TEST_ZIP2 = TestZipFile.new("data/generated/5entry.zip", %w{ data/generated/longAscii.txt data/generated/empty.txt data/generated/empty_chmod640.txt data/generated/short.txt data/generated/longBinary.bin}, 
 			      "my zip comment")
   TEST_ZIP3 = TestZipFile.new("data/generated/test1.zip", %w{ data/file1.txt })
   TEST_ZIP4 = TestZipFile.new("data/generated/zipWithDir.zip", [ "data/file1.txt", 

data/test/zipfilesystemtest.rb

@@ -270,7 +270,7 @@ class ZipFsFileNonmutatingTest < Test::Unit::TestCase
     assert(! @zipFile.file.zero?("file1"))
     assert(@zipFile.file.zero?("dir1"))
     blockCalled = false
-    ZipFile.open("data/generated/4entry.zip") {
+    ZipFile.open("data/generated/5entry.zip") {
       |zf|
       blockCalled = true
       assert(zf.file.zero?("data/generated/empty.txt"))
@@ -280,7 +280,7 @@ class ZipFsFileNonmutatingTest < Test::Unit::TestCase
     assert(! @zipFile.file.stat("file1").zero?)
     assert(@zipFile.file.stat("dir1").zero?)
     blockCalled = false
-    ZipFile.open("data/generated/4entry.zip") {
+    ZipFile.open("data/generated/5entry.zip") {
       |zf|
       blockCalled = true
       assert(zf.file.stat("data/generated/empty.txt").zero?)

data/test/ziptest.rb

@@ -94,8 +94,6 @@ class ZipEntryTest < Test::Unit::TestCase
 
     assert(entry7 != "hello")
     assert(entry7 != 12)
-
-    assert(entry7 != ZipStreamableFile.new(entry7, "aPath"))
   end
 
   def test_compare
@@ -403,6 +401,7 @@ class ZipInputStreamTest < Test::Unit::TestCase
   def test_new
     zis = ZipInputStream.new(TestZipFile::TEST_ZIP2.zip_name)
     assert_stream_contents(zis, TestZipFile::TEST_ZIP2)
+    assert_equal(true, zis.eof?)
     zis.close    
   end
 
@@ -410,6 +409,7 @@ class ZipInputStreamTest < Test::Unit::TestCase
     ZipInputStream.open(TestZipFile::TEST_ZIP2.zip_name) {
       |zis|
       assert_stream_contents(zis, TestZipFile::TEST_ZIP2)
+      assert_equal(true, zis.eof?)
     }
   end
 
@@ -421,19 +421,27 @@ class ZipInputStreamTest < Test::Unit::TestCase
   def test_incompleteReads
     ZipInputStream.open(TestZipFile::TEST_ZIP2.zip_name) {
       |zis|
-      entry = zis.get_next_entry
+      entry = zis.get_next_entry # longAscii.txt
+      assert_equal(false, zis.eof?)
       assert_equal(TestZipFile::TEST_ZIP2.entry_names[0], entry.name)
       assert zis.gets.length > 0
-      entry = zis.get_next_entry
+      assert_equal(false, zis.eof?)
+      entry = zis.get_next_entry # empty.txt
       assert_equal(TestZipFile::TEST_ZIP2.entry_names[1], entry.name)
       assert_equal(0, entry.size)
       assert_equal(nil, zis.gets)
-      entry = zis.get_next_entry
+      assert_equal(true, zis.eof?)
+      entry = zis.get_next_entry # empty_chmod640.txt
       assert_equal(TestZipFile::TEST_ZIP2.entry_names[2], entry.name)
-      assert zis.gets.length > 0
-      entry = zis.get_next_entry
+      assert_equal(0, entry.size)
+      assert_equal(nil, zis.gets)
+      assert_equal(true, zis.eof?)
+      entry = zis.get_next_entry # short.txt
       assert_equal(TestZipFile::TEST_ZIP2.entry_names[3], entry.name)
       assert zis.gets.length > 0
+      entry = zis.get_next_entry # longBinary.bin
+      assert_equal(TestZipFile::TEST_ZIP2.entry_names[4], entry.name)
+      assert zis.gets.length > 0
     }
   end
 
@@ -448,6 +456,7 @@ class ZipInputStreamTest < Test::Unit::TestCase
       buf << zis.read(100)
       buf << (zis.gets || "")
       buf << (zis.gets || "")
+      assert_equal(false, zis.eof?)
 
       zis.rewind
 
@@ -459,6 +468,7 @@ class ZipInputStreamTest < Test::Unit::TestCase
       assert_equal(buf, buf2)
 
       zis.rewind
+      assert_equal(false, zis.eof?)
 
       assert_entry(e.name, zis, e.name)
     }
@@ -469,8 +479,11 @@ class ZipInputStreamTest < Test::Unit::TestCase
       |zis|
       e = zis.get_next_entry
       assert_equal("#!/usr/bin/env ruby", zis.gets.chomp)
+      assert_equal(false, zis.eof?)
       assert_equal("", zis.gets.chomp)
+      assert_equal(false, zis.eof?)
       assert_equal("$VERBOSE =", zis.read(10))
+      assert_equal(false, zis.eof?)
     }
   end
   
@@ -999,7 +1012,7 @@ module CommonZipFileFixture
   EMPTY_FILENAME = "emptyZipFile.zip"
 
   TEST_ZIP = TestZipFile::TEST_ZIP2.clone
-  TEST_ZIP.zip_name = "4entry_copy.zip"
+  TEST_ZIP.zip_name = "5entry_copy.zip"
 
   def setup
     File.delete(EMPTY_FILENAME) if File.exists?(EMPTY_FILENAME)
@@ -1045,7 +1058,7 @@ class ZipFileTest < Test::Unit::TestCase
 
       zf.get_output_stream('entry.bin') {
 	|os|
-	os.write(File.open('data/generated/4entry.zip', 'rb').read)
+	os.write(File.open('data/generated/5entry.zip', 'rb').read)
       }
     }
     
@@ -1054,7 +1067,7 @@ class ZipFileTest < Test::Unit::TestCase
       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")) 
+      assert_equal(File.open('data/generated/5entry.zip', 'rb').read, zf.read("entry.bin")) 
     }
   end
 
@@ -1386,6 +1399,17 @@ class ZipFileExtractTest < Test::Unit::TestCase
       assert(File.exists?(EXTRACTED_FILENAME))
       AssertEntry::assert_contents(EXTRACTED_FILENAME, 
 				  zf.get_input_stream(ENTRY_TO_EXTRACT) { |is| is.read })
+
+
+      File::unlink(EXTRACTED_FILENAME)
+
+      entry = zf.get_entry(ENTRY_TO_EXTRACT)
+      entry.extract(EXTRACTED_FILENAME)
+
+      assert(File.exists?(EXTRACTED_FILENAME))
+      AssertEntry::assert_contents(EXTRACTED_FILENAME, 
+				  entry.get_input_stream() { |is| is.read })
+
     }
   end
 
@@ -1502,25 +1526,6 @@ class ZipFileExtractDirectoryTest < Test::Unit::TestCase
   end
 end
 
-class ZipStreamableFileTest < Test::Unit::TestCase
-  def test_equality
-    zipEntry1 = ZipEntry.new("zf.zip", "entryname1", "comment")
-    zipEntry2 = ZipEntry.new("zf.zip", "entryname2", "comment")
-
-    zipStreamableFile1 = ZipStreamableFile.new(zipEntry1, "path")
-    zipStreamableFile2 = ZipStreamableFile.new(zipEntry1, "path")
-    zipStreamableFile3 = ZipStreamableFile.new(zipEntry1, "anotherPath")
-    zipStreamableFile4 = ZipStreamableFile.new(zipEntry2, "path")
-    
-    assert_equal(zipStreamableFile1, zipStreamableFile1)
-    assert_equal(zipStreamableFile1, zipStreamableFile2)
-    assert(zipStreamableFile1 != zipStreamableFile3)
-    assert(zipStreamableFile1 != zipStreamableFile4)
-    assert(zipStreamableFile1 != zipEntry1)
-    assert(zipStreamableFile1 != "hej")
-  end
-end
-
 class ZipExtraFieldTest < Test::Unit::TestCase
   def test_new
     extra_pure    = ZipExtraField.new("")

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.8.6
 specification_version: 1
 name: rubyzip
 version: !ruby/object:Gem::Version 
-  version: 0.5.12
-date: 2005-09-06 00:00:00 +02:00
+  version: 0.9.1
+date: 2006-07-29
 summary: rubyzip is a ruby module for reading and writing zip files
 require_paths: 
   - lib
@@ -12,7 +12,7 @@ email: thomas(at)sondergaard.cc
 homepage: http://rubyzip.sourceforge.net/
 rubyforge_project: 
 description: 
-autorequire: zip/zip
+autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: false
@@ -24,8 +24,6 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
   - Thomas Sondergaard
 files: 
@@ -35,21 +33,19 @@ files:
   - ChangeLog
   - install.rb
   - Rakefile
-  - samples/zipdialogui.rb
   - samples/example.rb
   - samples/example_filesystem.rb
   - samples/gtkRubyzip.rb
+  - samples/qtzip.rb
   - samples/write_simple.rb
   - samples/zipfind.rb
-  - samples/qtzip.rb
+  - test/alltests.rb
   - test/gentestfiles.rb
   - test/ioextrastest.rb
   - test/stdrubyexttest.rb
   - test/zipfilesystemtest.rb
   - test/ziprequiretest.rb
   - test/ziptest.rb
-  - test/zlibtest.rb
-  - test/alltests.rb
   - test/data/file1.txt
   - test/data/file1.txt.deflatedData
   - test/data/file2.txt
@@ -58,13 +54,40 @@ files:
   - test/data/rubycode2.zip
   - test/data/testDirectory.bin
   - test/data/zipWithDirs.zip
-  - test/data/file2.txt.other
+  - lib/download_quizzes.rb
+  - lib/zip/ioextras.rb
   - lib/zip/stdrubyext.rb
   - lib/zip/tempfile_bugfixed.rb
   - lib/zip/zip.rb
   - lib/zip/zipfilesystem.rb
   - lib/zip/ziprequire.rb
-  - lib/zip/ioextras.rb
+  - lib/quiz1/t/solutions/Bill Guindon/solitaire.rb
+  - lib/quiz1/t/solutions/Carlos/solitaire.rb
+  - lib/quiz1/t/solutions/Dennis Ranke/solitaire.rb
+  - lib/quiz1/t/solutions/Florian Gross/solitaire.rb
+  - lib/quiz1/t/solutions/Glen M. Lewis/solitaire.rb
+  - lib/quiz1/t/solutions/James Edward Gray II/solitaire.rb
+  - lib/quiz1/t/solutions/Jamis Buck/bin/main.rb
+  - lib/quiz1/t/solutions/Jamis Buck/lib/cipher.rb
+  - lib/quiz1/t/solutions/Jamis Buck/lib/cli.rb
+  - lib/quiz1/t/solutions/Jamis Buck/test/tc_deck.rb
+  - lib/quiz1/t/solutions/Jamis Buck/test/tc_key-stream.rb
+  - lib/quiz1/t/solutions/Jamis Buck/test/tc_keying-algorithms.rb
+  - lib/quiz1/t/solutions/Jamis Buck/test/tc_solitaire-cipher.rb
+  - lib/quiz1/t/solutions/Jamis Buck/test/tc_unkeyed-algorithm.rb
+  - lib/quiz1/t/solutions/Jamis Buck/test/tests.rb
+  - lib/quiz1/t/solutions/Jim Menard/solitaire_cypher.rb
+  - lib/quiz1/t/solutions/Jim Menard/test.rb
+  - lib/quiz1/t/solutions/Moses Hohman/cipher.rb
+  - lib/quiz1/t/solutions/Moses Hohman/deck.rb
+  - lib/quiz1/t/solutions/Moses Hohman/solitaire.rb
+  - lib/quiz1/t/solutions/Moses Hohman/test_cipher.rb
+  - lib/quiz1/t/solutions/Moses Hohman/test_deck.rb
+  - lib/quiz1/t/solutions/Moses Hohman/test_util.rb
+  - lib/quiz1/t/solutions/Moses Hohman/testsuite.rb
+  - lib/quiz1/t/solutions/Moses Hohman/util.rb
+  - lib/quiz1/t/solutions/Niklas Frykholm/solitaire.rb
+  - lib/quiz1/t/solutions/Thomas Leitner/solitaire.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []

data/samples/zipdialogui.rb

@@ -1,80 +0,0 @@
-# Form implementation generated from reading ui file 'zipdialogui.ui'
-#
-# Created: Sun Apr 3 16:49:38 2005
-#      by: The QtRuby User Interface Compiler (rbuic)
-#
-# WARNING! All changes made in this file will be lost!
-
-
-require 'Qt'
-
-class ZipDialogUI < Qt::Dialog
-
-    attr_reader :entry_list_view
-    attr_reader :add_button
-    attr_reader :extract_button
-    attr_reader :close_button
-
-
-    def initialize(*k)
-        super(*k)
-
-        if name.nil?
-        	setName("ZipDialogUI")
-        end
-        setSizeGripEnabled(true)
-
-        @ZipDialogUILayout = Qt::HBoxLayout.new(self, 11, 6, 'ZipDialogUILayout')
-
-        @entry_list_view = Qt::ListView.new(self, "entry_list_view")
-        @entry_list_view.addColumn(trUtf8("Entry"))
-        @entry_list_view.addColumn(trUtf8("Size"))
-        @entry_list_view.setMinimumSize( Qt::Size.new(150, 200) )
-        @entry_list_view.setResizePolicy( Qt::ScrollView::Manual )
-        @entry_list_view.setSelectionMode( Qt::ListView::Extended )
-        @entry_list_view.setResizeMode( Qt::ListView::AllColumns )
-        @ZipDialogUILayout.addWidget(@entry_list_view)
-
-        @layout2 = Qt::VBoxLayout.new(nil, 0, 6, 'layout2')
-
-        @add_button = Qt::PushButton.new(self, "add_button")
-        @add_button.setAutoDefault( true )
-        @layout2.addWidget(@add_button)
-
-        @extract_button = Qt::PushButton.new(self, "extract_button")
-        @extract_button.setAutoDefault( true )
-        @layout2.addWidget(@extract_button)
-        @Spacer1 = Qt::SpacerItem.new(20, 160, Qt::SizePolicy::Minimum, Qt::SizePolicy::Expanding)
-        @layout2.addItem(@Spacer1)
-
-        @close_button = Qt::PushButton.new(self, "close_button")
-        @close_button.setAutoDefault( true )
-        @close_button.setDefault( true )
-        @layout2.addWidget(@close_button)
-        @ZipDialogUILayout.addLayout(@layout2)
-        languageChange()
-        resize( Qt::Size.new(416, 397).expandedTo(minimumSizeHint()) )
-        clearWState( WState_Polished )
-
-        Qt::Object.connect(@close_button, SIGNAL("clicked()"), self, SLOT("accept()") )
-    end
-
-    #
-    #  Sets the strings of the subwidgets using the current
-    #  language.
-    #
-    def languageChange()
-        setCaption(trUtf8("Rubyzip"))
-        @entry_list_view.header().setLabel( 0, trUtf8("Entry") )
-        @entry_list_view.header().setLabel( 1, trUtf8("Size") )
-        @add_button.setText( trUtf8("&Add...") )
-        @add_button.setAccel( Qt::KeySequence.new(trUtf8("Alt+A")) )
-        @extract_button.setText( trUtf8("&Extract...") )
-        @extract_button.setAccel( Qt::KeySequence.new(trUtf8("Alt+E")) )
-        @close_button.setText( trUtf8("&Close") )
-        @close_button.setAccel( Qt::KeySequence.new(trUtf8("Alt+C")) )
-    end
-    protected :languageChange
-
-
-end

data/test/zlibtest.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-$VERBOSE = true
-
-$: << "../lib"
-
-require 'test/unit'
-require 'zlib'
-
-include Zlib
-
-class ZLibTest < Test::Unit::TestCase
-
-  def test_BufError
-    inflater = Zlib::Inflate.new(-Zlib::MAX_WBITS)
-    s = ""
-    File.open("data/file1.txt.deflatedData") {
-      |is|
-      while (!inflater.finished?)
-        s += inflater.inflate(is.read(1))
-      end
-    }
-    puts s
-    assert_equal(File.read("data/file1.txt"), s)
-  end
-end