rubyzip 0.9.5 → 0.9.6.1

data/TODO

@@ -4,7 +4,7 @@
 * 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
-* SUggestion: ZipInputStream/ZipOutputStream should accept an IO object in addition to a filename.
+* Suggestion: ZipInputStream/ZipOutputStream should accept an IO object in addition to a filename.
 * (is buffering used anywhere with write?)
 * Inflater.sysread should pass the buffer to produce_input.
 * Implement ZipFsDir.glob

data/lib/zip/constants.rb

@@ -1,7 +1,8 @@
 module Zip
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
   RUBY_MINOR_VERSION = RUBY_VERSION.split(".")[1].to_i
-  RUNNING_ON_WINDOWS = RbConfig::CONFIG['host_os'] =~ /^win|mswin/i
+  RUNNING_ON_WINDOWS = RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/i
+
   # 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.

data/lib/zip/{stdrubyext.rb → dos_time.rb}

@@ -1,37 +1,17 @@
-module Enumerable #:nodoc:all
-  # returns a new array of all the return values not equal to nil
-  # This implementation could be faster
-  def select_map(&aProc)
-    map(&aProc).reject { |e| e.nil? }
-  end
-end
-
-class String  #:nodoc:all
-
-  def ensure_end(aString)
-    end_with?(aString) ? self : self + aString
-  end
-
-  def lchop
-    slice(1, length)
-  end
-end
-
-class Time  #:nodoc:all
+class DOSTime < Time #:nodoc:all
 
   #MS-DOS File Date and Time format as used in Interrupt 21H Function 57H:
-  # 
+
   # Register CX, the Time:
   # Bits 0-4  2 second increments (0-29)
   # Bits 5-10 minutes (0-59)
   # bits 11-15 hours (0-24)
-  # 
+
   # Register DX, the Date:
   # Bits 0-4 day (1-31)
   # bits 5-8 month (1-12)
   # bits 9-15 year (four digit year minus 1980)
 
-
   def to_binary_dos_time
     (sec/2) +
     (min  << 5) +
@@ -57,21 +37,11 @@ class Time  #:nodoc:all
     month  = (       0b111100000 & binaryDosDate) >> 5
     year   = ((0b1111111000000000 & binaryDosDate) >> 9) + 1980
     begin
-      return Time.local(year, month, day, hour, minute, second)
-    end
-  end
-end
-
-class Module  #:nodoc:all
-  def forward_message(forwarder, *messagesToForward)
-    methodDefs = messagesToForward.map do |msg| 
-      "def #{msg}; #{forwarder}(:#{msg}); end"
+      return self.local(year, month, day, hour, minute, second)
     end
-    module_eval(methodDefs.join("\n"))
   end
 end
 
-
 # Copyright (C) 2002, 2003 Thomas Sondergaard
 # rubyzip is free software; you can redistribute it and/or
 # modify it under the terms of the ruby license.

data/lib/zip/tempfile_bugfixed.rb

@@ -9,183 +9,183 @@ require 'tmpdir'
 
 module BugFix  #:nodoc:all
 
-# A class for managing temporary files.  This library is written to be
-# thread safe.
-class Tempfile < DelegateClass(File)
-  MAX_TRY = 10
-  @@cleanlist = []
-
-  # Creates a temporary file of mode 0600 in the temporary directory
-  # whose name is basename.pid.n and opens with mode "w+".  A Tempfile
-  # object works just like a File object.
-  #
-  # If tmpdir is omitted, the temporary directory is determined by
-  # Dir::tmpdir provided by 'tmpdir.rb'.
-  # When $SAFE > 0 and the given tmpdir is tainted, it uses
-  # /tmp. (Note that ENV values are tainted by default)
-  def initialize(basename, tmpdir=Dir::tmpdir)
-    if $SAFE > 0 and tmpdir.tainted?
-      tmpdir = '/tmp'
-    end
+  # A class for managing temporary files.  This library is written to be
+  # thread safe.
+  class Tempfile < DelegateClass(File)
+    MAX_TRY = 10
+    @@cleanlist = []
+
+    # Creates a temporary file of mode 0600 in the temporary directory
+    # whose name is basename.pid.n and opens with mode "w+".  A Tempfile
+    # object works just like a File object.
+    #
+    # If tmpdir is omitted, the temporary directory is determined by
+    # Dir::tmpdir provided by 'tmpdir.rb'.
+    # When $SAFE > 0 and the given tmpdir is tainted, it uses
+    # /tmp. (Note that ENV values are tainted by default)
+    def initialize(basename, tmpdir=Dir::tmpdir)
+      if $SAFE > 0 and tmpdir.tainted?
+        tmpdir = '/tmp'
+      end
 
-    lock = nil
-    n = failure = 0
-    
-    begin
-      Thread.critical = true
+      lock = nil
+      n = failure = 0
 
       begin
-	tmpname = sprintf('%s/%s%d.%d', tmpdir, basename, $$, n)
-	lock = tmpname + '.lock'
-	n += 1
-      end while @@cleanlist.include?(tmpname) or
-	File.exist?(lock) or File.exist?(tmpname)
-
-      Dir.mkdir(lock)
-    rescue
-      failure += 1
-      retry if failure < MAX_TRY
-      raise "cannot generate tempfile `%s'" % tmpname
-    ensure
-      Thread.critical = false
-    end
-
-    @data = [tmpname]
-    @clean_proc = Tempfile.callback(@data)
-    ObjectSpace.define_finalizer(self, @clean_proc)
+        Thread.critical = true
+
+        begin
+          tmpname = sprintf('%s/%s%d.%d', tmpdir, basename, $$, n)
+          lock = tmpname + '.lock'
+          n += 1
+        end while @@cleanlist.include?(tmpname) ||
+        ::File.exist?(lock) || ::File.exist?(tmpname)
+
+        Dir.mkdir(lock)
+      rescue
+        failure += 1
+        retry if failure < MAX_TRY
+        raise "cannot generate tempfile `%s'" % tmpname
+      ensure
+        Thread.critical = false
+      end
 
-    @tmpfile = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL, 0600)
-    @tmpname = tmpname
-    @@cleanlist << @tmpname
-    @data[1] = @tmpfile
-    @data[2] = @@cleanlist
+      @data = [tmpname]
+      @clean_proc = Tempfile.callback(@data)
+      ObjectSpace.define_finalizer(self, @clean_proc)
 
-    super(@tmpfile)
+      @tmpfile = ::File.open(tmpname, ::File::RDWR|::File::CREAT|::File::EXCL, 0600)
+      @tmpname = tmpname
+      @@cleanlist << @tmpname
+      @data[1] = @tmpfile
+      @data[2] = @@cleanlist
 
-    # Now we have all the File/IO methods defined, you must not
-    # carelessly put bare puts(), etc. after this.
+      super(@tmpfile)
 
-    Dir.rmdir(lock)
-  end
+      # Now we have all the File/IO methods defined, you must not
+      # carelessly put bare puts(), etc. after this.
 
-  # Opens or reopens the file with mode "r+".
-  def open
-    @tmpfile.close if @tmpfile
-    @tmpfile = File.open(@tmpname, 'r+')
-    @data[1] = @tmpfile
-    __setobj__(@tmpfile)
-  end
-
-  def _close	# :nodoc:
-    @tmpfile.close if @tmpfile
-    @data[1] = @tmpfile = nil
-  end    
-  protected :_close
-
-  # Closes the file.  If the optional flag is true, unlinks the file
-  # after closing.
-  #
-  # If you don't explicitly unlink the temporary file, the removal
-  # will be delayed until the object is finalized.
-  def close(unlink_now=false)
-    if unlink_now
-      close!
-    else
-      _close
+      Dir.rmdir(lock)
     end
-  end
 
-  # Closes and unlinks the file.
-  def close!
-    _close
-    @clean_proc.call
-    ObjectSpace.undefine_finalizer(self)
-  end
+    # Opens or reopens the file with mode "r+".
+    def open
+      @tmpfile.close if @tmpfile
+      @tmpfile = ::File.open(@tmpname, 'r+')
+      @data[1] = @tmpfile
+      __setobj__(@tmpfile)
+    end
 
-  # Unlinks the file.  On UNIX-like systems, it is often a good idea
-  # to unlink a temporary file immediately after creating and opening
-  # it, because it leaves other programs zero chance to access the
-  # file.
-  def unlink
-    # keep this order for thread safeness
-    File.unlink(@tmpname) if File.exist?(@tmpname)
-    @@cleanlist.delete(@tmpname) if @@cleanlist
-  end
-  alias delete unlink
+    def _close	# :nodoc:
+      @tmpfile.close if @tmpfile
+      @data[1] = @tmpfile = nil
+    end    
+    protected :_close
 
-  if RUBY_VERSION > '1.8.0'
-    def __setobj__(obj)
-      @_dc_obj = obj
+    # Closes the file.  If the optional flag is true, unlinks the file
+    # after closing.
+    #
+    # If you don't explicitly unlink the temporary file, the removal
+    # will be delayed until the object is finalized.
+    def close(unlink_now=false)
+      if unlink_now
+        close!
+      else
+        _close
+      end
     end
-  else
-    def __setobj__(obj)
-      @obj = obj
+
+    # Closes and unlinks the file.
+    def close!
+      _close
+      @clean_proc.call
+      ObjectSpace.undefine_finalizer(self)
     end
-  end
 
-  # Returns the full path name of the temporary file.
-  def path
-    @tmpname
-  end
+    # Unlinks the file.  On UNIX-like systems, it is often a good idea
+    # to unlink a temporary file immediately after creating and opening
+    # it, because it leaves other programs zero chance to access the
+    # file.
+    def unlink
+      # keep this order for thread safeness
+      ::File.unlink(@tmpname) if ::File.exist?(@tmpname)
+      @@cleanlist.delete(@tmpname) if @@cleanlist
+    end
+    alias :delete :unlink
 
-  # Returns the size of the temporary file.  As a side effect, the IO
-  # buffer is flushed before determining the size.
-  def size
-    if @tmpfile
-      @tmpfile.flush
-      @tmpfile.stat.size
+    if RUBY_VERSION > '1.8.0'
+      def __setobj__(obj)
+        @_dc_obj = obj
+      end
     else
-      0
+      def __setobj__(obj)
+        @obj = obj
+      end
+    end
+
+    # Returns the full path name of the temporary file.
+    def path
+      @tmpname
     end
-  end
-  alias length size
 
-  class << self
-    def callback(data)	# :nodoc:
-      pid = $$
-      lambda{
-	if pid == $$ 
-	  path, tmpfile, cleanlist = *data
+    # Returns the size of the temporary file.  As a side effect, the IO
+    # buffer is flushed before determining the size.
+    def size
+      if @tmpfile
+        @tmpfile.flush
+        @tmpfile.stat.size
+      else
+        0
+      end
+    end
+    alias length size
 
-	  print "removing ", path, "..." if $DEBUG
+    class << self
+      def callback(data)	# :nodoc:
+        pid = $$
+        lambda{
+          if pid == $$ 
+            path, tmpfile, cleanlist = *data
 
-	  tmpfile.close if tmpfile
+            print "removing ", path, "..." if $DEBUG
 
-	  # keep this order for thread safeness
-	  File.unlink(path) if File.exist?(path)
-	  cleanlist.delete(path) if cleanlist
+            tmpfile.close if tmpfile
 
-	  print "done\n" if $DEBUG
-	end
-      }
-    end
+            # keep this order for thread safeness
+            ::File.unlink(path) if ::File.exist?(path)
+            cleanlist.delete(path) if cleanlist
 
-    # If no block is given, this is a synonym for new().
-    #
-    # If a block is given, it will be passed tempfile as an argument,
-    # and the tempfile will automatically be closed when the block
-    # terminates.  In this case, open() returns nil.
-    def open(*args)
-      tempfile = new(*args)
-
-      if block_given?
-	begin
-	  yield(tempfile)
-	ensure
-	  tempfile.close
-	end
-
-	nil
-      else
-	tempfile
+            print "done\n" if $DEBUG
+          end
+        }
+      end
+
+      # If no block is given, this is a synonym for new().
+      #
+      # If a block is given, it will be passed tempfile as an argument,
+      # and the tempfile will automatically be closed when the block
+      # terminates.  In this case, open() returns nil.
+      def open(*args)
+        tempfile = new(*args)
+
+        if block_given?
+          begin
+            yield(tempfile)
+          ensure
+            tempfile.close
+          end
+
+          nil
+        else
+          tempfile
+        end
       end
     end
   end
-end
 
 end # module BugFix
 if __FILE__ == $0
-#  $DEBUG = true
+  #  $DEBUG = true
   f = Tempfile.new("foo")
   f.print("foo\n")
   f.close

data/lib/zip/zip.rb

@@ -5,7 +5,7 @@ require 'tempfile'
 require 'fileutils'
 require 'stringio'
 require 'zlib'
-require 'zip/stdrubyext'
+require 'zip/dos_time'
 require 'zip/ioextras'
 require 'rbconfig'
 
@@ -34,7 +34,7 @@ if Tempfile.superclass == SimpleDelegator
 end
 
 module Zlib  #:nodoc:all
-  if ! const_defined? :MAX_WBITS
+  if !const_defined?(:MAX_WBITS)
     MAX_WBITS = Zlib::Deflate.MAX_WBITS
   end
 end

data/lib/zip/zip_entry.rb

@@ -62,7 +62,7 @@ module Zip
 
     # Returns the character encoding used for name and comment
     def name_encoding
-      (@gp_flags & 0b100000000000) != 0 ? "utf8" : "CP437//"
+      (@gp_flags & 0b100000000000) != 0 ? "UTF-8" : "CP437//"
     end
 
     # Returns the name in the encoding specified by enc
@@ -82,7 +82,7 @@ module Zip
     def initialize(zipfile = "", name = "", comment = "", extra = "", 
                    compressed_size = 0, crc = 0, 
        compression_method = ZipEntry::DEFLATED, size = 0,
-       time  = Time.now)
+       time  = DOSTime.now)
       super()
       if name.start_with?("/")
         raise ZipEntryNameError, "Illegal ZipEntry name '#{name}', name must not start with /"
@@ -140,7 +140,7 @@ module Zip
       if @extra["UniversalTime"]
         @extra["UniversalTime"].mtime
       else
-        # Atandard time field in central directory has local time
+        # Standard time field in central directory has local time
         # under archive creator. Then, we can't get timezone.
         @time
       end
@@ -485,10 +485,9 @@ module Zip
       elsif @filepath
         case @ftype
         when :file
-          return File.open(@filepath, "rb", &aProc)
-
+          return ::File.open(@filepath, "rb", &aProc)
         when :symlink
-          linkpath = File::readlink(@filepath)
+          linkpath = ::File::readlink(@filepath)
           stringio = StringIO.new(linkpath)
           return yield(stringio) if block_given?
           return stringio
@@ -558,23 +557,23 @@ module Zip
     end
 
     def get_raw_input_stream(&aProc)
-      File.open(@zipfile, "rb", &aProc)
+      ::File.open(@zipfile, "rb", &aProc)
     end
 
     private
 
     def set_time(binaryDosDate, binaryDosTime)
-      @time = Time.parse_binary_dos_format(binaryDosDate, binaryDosTime)
+      @time = DOSTime.parse_binary_dos_format(binaryDosDate, binaryDosTime)
     rescue ArgumentError
       puts "Invalid date/time in zip entry"
     end
 
     def write_file(destPath, continueOnExistsProc = proc { false })
-      if File.exists?(destPath) && ! yield(self, destPath)
+      if ::File.exists?(destPath) && ! yield(self, destPath)
         raise ZipDestinationFileExistsError,
           "Destination '#{destPath}' already exists"
       end
-      File.open(destPath, "wb") do |os|
+      ::File.open(destPath, "wb") do |os|
         get_input_stream do |is|
           set_extra_attributes_on_path(destPath)
 
@@ -587,9 +586,9 @@ module Zip
     end
 
     def create_directory(destPath)
-      if File.directory? destPath
+      if ::File.directory?(destPath)
         return
-      elsif File.exists? destPath
+      elsif ::File.exists?(destPath)
         if block_given? && yield(self, destPath)
           FileUtils::rm_f destPath
         else
@@ -606,7 +605,7 @@ module Zip
     def create_symlink(destPath)
       stat = nil
       begin
-        stat = File::lstat(destPath)
+        stat = ::File::lstat(destPath)
       rescue Errno::ENOENT
       end
 
@@ -615,7 +614,7 @@ module Zip
 
       if stat
         if stat.symlink?
-          if File::readlink(destPath) == linkto
+          if ::File::readlink(destPath) == linkto
             return
           else
             raise ZipDestinationFileExistsError,
@@ -629,11 +628,11 @@ module Zip
         end
       end
 
-      File::symlink(linkto, destPath)
+      ::File::symlink(linkto, destPath)
     end
   end
 end
 
 # Copyright (C) 2002, 2003 Thomas Sondergaard
 # rubyzip is free software; you can redistribute it and/or
-# modify it under the terms of the ruby license.
+# modify it under the terms of the ruby license.

data/lib/zip/zip_entry_set.rb

@@ -20,6 +20,7 @@ module Zip
     def size
       @entrySet.size
     end
+    
     alias :length :size
 
     def delete(entry)
@@ -36,23 +37,22 @@ module Zip
 
     # deep clone
     def dup
-      newZipEntrySet = ZipEntrySet.new(@entrySet.values.map { |e| e.dup })
+      ZipEntrySet.new(@entrySet.values.map { |e| e.dup })
     end
 
-    def == (other)
+    def ==(other)
       return false unless other.kind_of?(ZipEntrySet)
-      return @entrySet == other.entrySet      
+      @entrySet == other.entrySet      
     end
 
     def parent(entry)
       @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)
-      } 
+    def glob(pattern, flags = ::File::FNM_PATHNAME|::File::FNM_DOTMATCH)
+      entries.select do |entry|
+        ::File.fnmatch(pattern, entry.name.chomp('/'), flags)
+      end
     end	
 
 #TODO    attr_accessor :auto_create_directories

data/lib/zip/zip_extra_field.rb

@@ -64,9 +64,9 @@ module Zip
         size, content = initial_parse(binstr)
         size or return
         @flag, mtime, atime, ctime = content.unpack("CVVV")
-        mtime and @mtime ||= Time.at(mtime)
-        atime and @atime ||= Time.at(atime)
-        ctime and @ctime ||= Time.at(ctime)
+        mtime and @mtime ||= DOSTime.at(mtime)
+        atime and @atime ||= DOSTime.at(atime)
+        ctime and @ctime ||= DOSTime.at(ctime)
       end
 
       def ==(other)

data/lib/zip/zip_file.rb

@@ -61,8 +61,8 @@ module Zip
       super()
       @name = fileName
       @comment = ""
-      if (File.exists?(fileName)) and !buffer
-        File.open(name, "rb") { |f| read_from_stream(f) }
+      if (::File.exists?(fileName)) and !buffer
+        ::File.open(name, "rb") { |f| read_from_stream(f) }
       elsif (create)
         @entrySet = ZipEntrySet.new
       else
@@ -113,10 +113,9 @@ module Zip
     # local entry headers (which contain the same information as the
     # central directory).
     def ZipFile.foreach(aZipFileName, &block)
-      ZipFile.open(aZipFileName) {
-        |zipFile|
+      ZipFile.open(aZipFileName) do |zipFile|
         zipFile.each(&block)
-      }
+      end
     end
 
     # Returns an input stream to the specified entry. If a block is passed
@@ -178,7 +177,8 @@ module Zip
     # the file system).
     def replace(entry, srcPath)
       check_file(srcPath)
-      add(remove(entry), srcPath)
+      remove(entry)
+      add(entry, srcPath)
     end
 
     # Extracts entry to file destPath.
@@ -251,8 +251,7 @@ module Zip
       selectedEntry.restore_ownership = @restore_ownership
       selectedEntry.restore_permissions = @restore_permissions
       selectedEntry.restore_times = @restore_times
-
-      return selectedEntry
+      selectedEntry
     end
 
     # Creates a directory
@@ -260,21 +259,23 @@ module Zip
       if find_entry(entryName)
         raise Errno::EEXIST, "File exists - #{entryName}"
       end
-      @entrySet << ZipStreamableDirectory.new(@name, entryName.to_s.ensure_end("/"), nil, permissionInt)
+      entryName = entryName.to_s
+      entryName << '/' unless entryName.end_with?('/')
+      @entrySet << ZipStreamableDirectory.new(@name, entryName, nil, permissionInt)
     end
 
     private
 
     def is_directory(newEntry, srcPath)
-      srcPathIsDirectory = File.directory?(srcPath)
+      srcPathIsDirectory = ::File.directory?(srcPath)
       if newEntry.is_directory && ! srcPathIsDirectory
         raise ArgumentError,
           "entry name '#{newEntry}' indicates directory entry, but "+
           "'#{srcPath}' is not a directory"
-            elsif ! newEntry.is_directory && srcPathIsDirectory
+      elsif !newEntry.is_directory && srcPathIsDirectory
         newEntry.name += "/"
       end
-      return newEntry.is_directory && srcPathIsDirectory
+      newEntry.is_directory && srcPathIsDirectory
     end
 
     def check_entry_exists(entryName, continueOnExistsProc, procedureName)
@@ -284,13 +285,13 @@ module Zip
           remove get_entry(entryName)
         else
           raise ZipEntryExistsError,
-            procedureName+" failed. Entry #{entryName} already exists"
+            procedureName + " failed. Entry #{entryName} already exists"
         end
       end
     end
 
     def check_file(path)
-      unless File.readable? path
+      unless ::File.readable?(path)
         raise Errno::ENOENT, path
       end
     end
@@ -300,12 +301,12 @@ module Zip
       tmpFilename = tmpfile.path
       tmpfile.close
       if yield tmpFilename
-        File.rename(tmpFilename, name)
+        ::File.rename(tmpFilename, name)
       end
     end
 
     def get_tempfile
-      tempFile = Tempfile.new(File.basename(name), File.dirname(name))
+      tempFile = Tempfile.new(::File.basename(name), ::File.dirname(name))
       tempFile.binmode
       tempFile
     end

data/lib/zip/zip_input_stream.rb

@@ -46,10 +46,14 @@ module Zip
     # Opens the indicated zip file. An exception is thrown
     # if the specified offset in the specified filename is
     # not a local zip entry header.
-    def initialize(filename, offset = 0)
+    def initialize(filename, offset = 0, io = nil)
       super()
-      @archiveIO = File.open(filename, "rb")
-      @archiveIO.seek(offset, IO::SEEK_SET)
+      if (io.nil?) 
+        @archiveIO = ::File.open(filename, "rb")
+        @archiveIO.seek(offset, IO::SEEK_SET)
+      else
+        @archiveIO = io
+      end
       @decompressor = NullDecompressor.instance
       @currentEntry = nil
     end
@@ -70,14 +74,21 @@ module Zip
       zio.close if zio
     end
 
+    def ZipInputStream.open_buffer(io)
+      return new('',0,io) unless block_given?
+      zio = new('',0,io)
+      yield zio
+    ensure
+      zio.close if zio
+    end
+
     # Returns a ZipEntry object. It is necessary to call this
     # method on a newly created ZipInputStream before reading from 
     # the first entry in the archive. Returns nil when there are 
     # no more entries.
 
     def get_next_entry
-      @archiveIO.seek(@currentEntry.next_header_offset, 
-                      IO::SEEK_SET) if @currentEntry
+      @archiveIO.seek(@currentEntry.next_header_offset, IO::SEEK_SET) if @currentEntry
       open_entry
     end
 
@@ -104,16 +115,15 @@ module Zip
 
     def open_entry
       @currentEntry = ZipEntry.read_local_entry(@archiveIO)
-      if (@currentEntry == nil) 
-	@decompressor = NullDecompressor.instance
+      if @currentEntry.nil?
+	      @decompressor = NullDecompressor.instance
       elsif @currentEntry.compression_method == ZipEntry::STORED
-	@decompressor = PassThruDecompressor.new(@archiveIO, 
-						 @currentEntry.size)
+	      @decompressor = PassThruDecompressor.new(@archiveIO, @currentEntry.size)
       elsif @currentEntry.compression_method == ZipEntry::DEFLATED
-	@decompressor = Inflater.new(@archiveIO)
+	      @decompressor = Inflater.new(@archiveIO)
       else
-	raise ZipCompressionMethodError,
-	  "Unsupported compression method #{@currentEntry.compression_method}"
+	      raise ZipCompressionMethodError,
+              "Unsupported compression method #{@currentEntry.compression_method}"
       end
       flush
       return @currentEntry
@@ -131,4 +141,4 @@ end
 
 # Copyright (C) 2002, 2003 Thomas Sondergaard
 # rubyzip is free software; you can redistribute it and/or
-# modify it under the terms of the ruby license.
+# modify it under the terms of the ruby license.

data/lib/zip/zip_output_stream.rb

@@ -30,7 +30,7 @@ module Zip
       if stream
         @outputStream = StringIO.new
       else
-        @outputStream = File.new(@fileName, "wb")
+        @outputStream = ::File.new(@fileName, "wb")
       end
       @entrySet = ZipEntrySet.new
       @compressor = NullCompressor.instance
@@ -101,11 +101,10 @@ module Zip
       src_pos = entry.local_entry_offset
       entry.write_local_entry(@outputStream)
       @compressor = NullCompressor.instance
-      entry.get_raw_input_stream {
-        |is|
+      entry.get_raw_input_stream do |is|
         is.seek(src_pos, IO::SEEK_SET)
         IOExtras.copy_stream_n(@outputStream, is, entry.compressed_size)
-      }
+      end
       @compressor = NullCompressor.instance
       @currentEntry = nil
     end

data/lib/zip/zip_streamable_stream.rb

@@ -2,7 +2,7 @@ module Zip
   class ZipStreamableStream < DelegateClass(ZipEntry) #nodoc:all
     def initialize(entry)
       super(entry)
-      @tempFile = Tempfile.new(File.basename(name), File.dirname(zipfile))
+      @tempFile = Tempfile.new(::File.basename(name), ::File.dirname(zipfile))
       @tempFile.binmode
     end
 

data/lib/zip/zipfilesystem.rb

@@ -70,29 +70,34 @@ module Zip
 #      protected :dir
 
       class ZipFsStat
+
+        class << self
+
+          def delegate_to_fs_file(*methods)
+            methods.each do |method|
+              self.class_eval <<-end_eval, __FILE__, __LINE__ + 1
+                def #{method}                      # def file?
+                  @zipFsFile.#{method}(@entryName) #   @zipFsFile.file?(@entryName)
+                end                                # end
+              end_eval
+            end
+          end
+
+        end
+
         def initialize(zipFsFile, entryName)
           @zipFsFile = zipFsFile
           @entryName = entryName
         end
 
-        def forward_invoke(msg)
-          @zipFsFile.send(msg, @entryName)
-        end
-
         def kind_of?(t)
           super || t == ::File::Stat 
         end
 
-        forward_message :forward_invoke, :file?, :directory?, :pipe?, :chardev?
-        forward_message :forward_invoke, :symlink?, :socket?, :blockdev?
-        forward_message :forward_invoke, :readable?, :readable_real?
-        forward_message :forward_invoke, :writable?, :writable_real?
-        forward_message :forward_invoke, :executable?, :executable_real?
-        forward_message :forward_invoke, :sticky?, :owned?, :grpowned?
-        forward_message :forward_invoke, :setuid?, :setgid?
-        forward_message :forward_invoke, :zero?
-        forward_message :forward_invoke, :size, :size?
-        forward_message :forward_invoke, :mtime, :atime, :ctime
+        delegate_to_fs_file :file?, :directory?, :pipe?, :chardev?, :symlink?,
+          :socket?, :blockdev?, :readable?, :readable_real?, :writable?, :ctime,
+          :writable_real?, :executable?, :executable_real?, :sticky?, :owned?,
+          :grpowned?, :setuid?, :setgid?, :zero?, :size, :size?, :mtime, :atime
 
         def blocks; nil; end
 
@@ -466,7 +471,8 @@ module Zip
         unless @file.stat(aDirectoryName).directory?
           raise Errno::ENOTDIR, aDirectoryName
         end
-        path = @file.expand_path(aDirectoryName).ensure_end("/")
+        path = @file.expand_path(aDirectoryName)
+        path << '/' unless path.end_with?('/')
         path = Regexp.escape(path)
         subDirEntriesRegex = Regexp.new("^#{path}([^/]+)$")
         @mappedZip.each { 
@@ -588,7 +594,7 @@ module Zip
       end
 
       def expand_path(aPath)
-        expanded = aPath.start_with?("/") ? aPath : @pwd.ensure_end("/") + aPath
+        expanded = aPath.start_with?("/") ? aPath : ::File.join(@pwd, aPath)
         expanded.gsub!(/\/\.(\/|$)/, "")
         expanded.gsub!(/[^\/]+\/\.\.(\/|$)/, "")
         expanded.empty? ? "/" : expanded
@@ -597,7 +603,7 @@ module Zip
       private
 
       def expand_to_entry(aPath)
-        expand_path(aPath).lchop
+        expand_path(aPath)[1..-1]
       end
     end
   end

data/samples/example_recursive.rb

@@ -8,7 +8,7 @@ require 'zip/zip'
 # Usage:
 #   directoryToZip = "/tmp/input"
 #   outputFile = "/tmp/out.zip"   
-#   zf = ZipFileGenerator(directoryToZip, outputFile)
+#   zf = ZipFileGenerator.new(directoryToZip, outputFile)
 #   zf.write()
 class ZipFileGenerator
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000 Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies: []
 description: 
 email: alan@aussiegeek.net
@@ -28,6 +28,7 @@ files:
 - lib/zip/constants.rb
 - lib/zip/decompressor.rb
 - lib/zip/deflater.rb
+- lib/zip/dos_time.rb
 - lib/zip/inflater.rb
 - lib/zip/ioextras.rb
 - lib/zip/null_compressor.rb
@@ -35,7 +36,6 @@ files:
 - lib/zip/null_input_stream.rb
 - lib/zip/pass_thru_compressor.rb
 - lib/zip/pass_thru_decompressor.rb
-- lib/zip/stdrubyext.rb
 - lib/zip/tempfile_bugfixed.rb
 - lib/zip/zip.rb
 - lib/zip/zip_central_directory.rb
@@ -77,3 +77,4 @@ signing_key:
 specification_version: 3
 summary: rubyzip is a ruby module for reading and writing zip files
 test_files: []
+has_rdoc: