rubyzip 0.5.8 → 0.5.9

data/ChangeLog

@@ -1,3 +1,40 @@
+2005-08-07 14:27  thomas
+
+	* lib/zip/zip.rb, NEWS: [no log message]
+
+2005-08-06 11:12  thomas
+
+	* lib/zip/: ioextras.rb, zip.rb: [no log message]
+
+2005-08-03 18:54  thomas
+
+	* lib/zip/zip.rb: Read/write in chunks to preserve memory
+
+2005-07-02 15:08  thomas
+
+	* lib/zip/zip.rb: Applied received patch concerning FreeBSD 4.5
+	  issue
+
+2005-04-03 16:52  thomas
+
+	* samples/.cvsignore: [no log message]
+
+2005-04-03 16:50  thomas
+
+	* samples/: qtzip.rb, zipdialogui.ui: Added a qt example
+
+2005-03-31 21:58  thomas
+
+	* lib/zip/zip.rb, test/ziptest.rb: [no log message]
+
+2005-03-31 21:05  thomas
+
+	* test/zipfilesystemtest.rb: [no log message]
+
+2005-03-17 18:17  thomas
+
+	* Rakefile: [no log message]
+
 2005-03-17 18:11  thomas
 
 	* NEWS, README, lib/zip/zip.rb: [no log message]

data/NEWS

@@ -1,3 +1,7 @@
+= Version 0.5.9
+
+Fixed serious memory consumption issue
+
 = Version 0.5.8
 
 Fixed install script.

data/Rakefile

@@ -81,7 +81,7 @@ task :ppackage => [:package] do
     |ftpclient|
     ftpclient.passive = true
     ftpclient.chdir "incoming"
-    Dir['pkg/*.{zip,gem}'].each {
+    Dir['pkg/*.{tgz,zip,gem}'].each {
       |e|
       ftpclient.putbinaryfile(e, File.basename(e))
     }

data/lib/zip/ioextras.rb

@@ -1,5 +1,13 @@
 module IOExtras  #:nodoc:
 
+  CHUNK_SIZE = 32768
+
+  def copy_stream(ostream, istream)
+    s = ''
+    ostream.write(istream.read(CHUNK_SIZE, s)) until istream.eof? 
+  end
+
+
   # Implements kind_of? in order to pretend to be an IO object
   module FakeIO
     def kind_of?(object)

data/lib/zip/zip.rb

@@ -19,10 +19,12 @@ end
 
 module Zip
 
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
 
   RUBY_MINOR_VERSION = RUBY_VERSION.split(".")[1].to_i
 
+  CHUNK_SIZE=32768
+
   # Ruby 1.7.x compatibility
   # In ruby 1.6.x and 1.8.0 reading from an empty stream returns 
   # an empty string the first time and then nil.
@@ -155,7 +157,6 @@ module Zip
   
   
   class Decompressor  #:nodoc:all
-    CHUNK_SIZE=32768
     def initialize(inputStream)
       super()
       @inputStream=inputStream
@@ -811,6 +812,13 @@ module Zip
       @entrySet[entry.parent_as_string]
     end
 
+    def glob(pattern, flags = File::FNM_PATHNAME|File::FNM_DOTMATCH)
+      entries.select { 
+	|entry| 
+	File.fnmatch(pattern, entry.name.chomp('/'), flags) 
+      } 
+    end	
+
 #TODO    attr_accessor :auto_create_directories
     protected
     attr_accessor :entrySet
@@ -898,10 +906,23 @@ module Zip
 	io.seek(-MAX_END_OF_CENTRAL_DIRECTORY_STRUCTURE_SIZE, IO::SEEK_END)
       rescue Errno::EINVAL
 	io.seek(0, IO::SEEK_SET)
-      rescue Errno::EFBIG # FreeBSD 4.9 returns Errno::EFBIG instead of Errno::EINVAL
+      rescue Errno::EFBIG # FreeBSD 4.9 raise Errno::EFBIG instead of Errno::EINVAL
 	io.seek(0, IO::SEEK_SET)
       end
-      buf = io.read
+      
+      # 'buf = io.read' substituted with lump of code to work around FreeBSD 4.5 issue
+      retried = false
+      buf = nil
+      begin
+        buf = io.read
+      rescue Errno::EFBIG # FreeBSD 4.5 may raise Errno::EFBIG
+        raise if (retried)
+        retried = true
+	
+        io.seek(0, IO::SEEK_SET)
+        retry
+      end
+
       sigIndex = buf.rindex([END_OF_CENTRAL_DIRECTORY_SIGNATURE].pack('V'))
       raise ZipError, "Zip end of central directory signature not found" unless sigIndex
       buf=buf.slice!((sigIndex+4)...(buf.size))
@@ -1258,7 +1279,7 @@ module Zip
     
     def write_to_zip_output_stream(aZipOutputStream)
       aZipOutputStream.put_next_entry(self)
-      aZipOutputStream << get_input_stream { |is| is.read }
+      get_input_stream { |is| copy_stream(aZipOutputStream, is) } 
     end
 
     def == (other)
@@ -1322,7 +1343,7 @@ module Zip
     
     def write_to_zip_output_stream(aZipOutputStream)
       aZipOutputStream.put_next_entry(self)
-      aZipOutputStream << get_input_stream { |is| is.read }
+      get_input_stream { |is| copy_stream(aZipOutputStream, is) } 
     end
   end
 

data/samples/qtzip.rb

@@ -0,0 +1,101 @@
+#!/usr/bin/env ruby
+
+$VERBOSE=true
+
+$: << "../lib"
+
+require 'Qt'
+system('rbuic -o zipdialogui.rb zipdialogui.ui')
+require 'zipdialogui.rb'
+require 'zip/zip'
+
+
+
+a = Qt::Application.new(ARGV)
+
+class ZipDialog < ZipDialogUI
+
+
+  def initialize()
+    super()
+    connect(child('add_button'), SIGNAL('clicked()'),
+            self, SLOT('add_files()'))
+    connect(child('extract_button'), SIGNAL('clicked()'),
+            self, SLOT('extract_files()'))
+  end
+
+  def zipfile(&proc)
+    Zip::ZipFile.open(@zip_filename, &proc)
+  end
+
+  def each(&proc)
+    Zip::ZipFile.foreach(@zip_filename, &proc)
+  end
+  
+  def refresh()
+    lv = child("entry_list_view")
+    lv.clear
+    each { 
+      |e|
+      lv.insert_item(Qt::ListViewItem.new(lv, e.name, e.size.to_s))
+    }
+  end
+
+    
+  def load(zipfile)
+    @zip_filename = zipfile
+    refresh
+  end
+
+  def add_files
+    l = Qt::FileDialog.getOpenFileNames(nil, nil, self)
+    zipfile { 
+      |zf| 
+      l.each { 
+        |path|
+        zf.add(File.basename(path), path)
+      }
+    }
+    refresh
+  end
+
+  def extract_files
+    selected_items = []
+    unselected_items = []
+    lv_item = entry_list_view.first_child
+    while (lv_item)
+      if entry_list_view.is_selected(lv_item)
+        selected_items << lv_item.text(0)
+      else
+        unselected_items << lv_item.text(0)
+      end
+      lv_item = lv_item.next_sibling
+    end
+    puts "selected_items.size = #{selected_items.size}"
+    puts "unselected_items.size = #{unselected_items.size}"
+    items = selected_items.size > 0 ? selected_items : unselected_items
+    puts "items.size = #{items.size}"
+
+    d = Qt::FileDialog.get_existing_directory(nil, self)
+    if (!d)
+      puts "No directory chosen"
+    else
+      zipfile { |zf| items.each { |e| zf.extract(e, File.join(d, e)) } }
+    end
+    
+  end
+
+  slots 'add_files()', 'extract_files()'
+end
+
+if !ARGV[0]
+  puts "usage: #{$0} zipname"
+  exit
+end
+
+zd = ZipDialog.new
+zd.load(ARGV[0])
+
+a.mainWidget = zd
+zd.show()
+a.exec()

data/samples/zipdialogui.rb

@@ -0,0 +1,80 @@
+# 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/zipfilesystemtest.rb

@@ -456,8 +456,10 @@ class ZipFsFileNonmutatingTest < Test::Unit::TestCase
   end
 
   def test_popen
-    assert_equal(File.popen("ls")          { |f| f.read }, 
-		  @zipFile.file.popen("ls") { |f| f.read })
+    cmd = /mswin/i =~ RUBY_PLATFORM ? 'dir' : 'ls'
+
+    assert_equal(File.popen(cmd)          { |f| f.read }, 
+		  @zipFile.file.popen(cmd) { |f| f.read })
   end
 
 # Can be added later

data/test/ziptest.rb

@@ -813,6 +813,28 @@ class ZipEntrySetTest < Test::Unit::TestCase
     assert_equal(entries[3], entrySet.parent(entries[4]))
     assert_equal(entries[3], entrySet.parent(entries[5]))
   end
+
+  def test_glob
+    res = @zipEntrySet.glob('name[2-4]')
+    assert_equal(3, res.size)
+    assert_equal(ZIP_ENTRIES[1,3], res)
+  end
+
+  def test_glob2
+    entries = [ 
+      ZipEntry.new("zf.zip", "a/"),
+      ZipEntry.new("zf.zip", "a/b/b1"),
+      ZipEntry.new("zf.zip", "a/b/c/"),
+      ZipEntry.new("zf.zip", "a/b/c/c1")
+    ]
+    entrySet = ZipEntrySet.new(entries)
+
+    assert_equal(entries[0,1], entrySet.glob("*"))
+#    assert_equal(entries[FIXME], entrySet.glob("**"))
+#    res = entrySet.glob('a*')
+#    assert_equal(entries.size, res.size)
+#    assert_equal(entrySet.map { |e| e.name }, res.map { |e| e.name })
+  end
 end
 
 

data/test/zlibtest.rb

@@ -0,0 +1,26 @@
+#!/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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.8
+rubygems_version: 0.8.11
 specification_version: 1
 name: rubyzip
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
-date: 2005-03-17
+  version: 0.5.9
+date: 2005-08-07 00:00:00 +02:00
 summary: rubyzip is a ruby module for reading and writing zip files
 require_paths: 
   - lib
@@ -24,6 +24,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
   - Thomas Sondergaard
 files: 
@@ -33,17 +35,20 @@ files:
   - ChangeLog
   - install.rb
   - Rakefile
+  - samples/zipdialogui.rb
   - samples/example.rb
   - samples/example_filesystem.rb
   - samples/gtkRubyzip.rb
   - samples/write_simple.rb
   - samples/zipfind.rb
+  - samples/qtzip.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
@@ -53,6 +58,7 @@ files:
   - test/data/rubycode2.zip
   - test/data/testDirectory.bin
   - test/data/zipWithDirs.zip
+  - test/data/file2.txt.other
   - lib/zip/ioextras.rb
   - lib/zip/stdrubyext.rb
   - lib/zip/tempfile_bugfixed.rb