rubyzip 0.9.9 → 1.0.0.beta1

data/samples/zipfind.rb

@@ -15,7 +15,7 @@ module Zip
 	yield(fileName)
 	if zipFilePattern.match(fileName)  && File.file?(fileName)
 	  begin
-	    Zip::ZipFile.foreach(fileName)  {
+	    Zip::File.foreach(fileName)  {
 	      |zipEntry|
 	      yield(fileName + File::SEPARATOR + zipEntry.to_s)
 	    }

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 0.9.9
-  prerelease: 
+  version: 1.0.0.beta1
 platform: ruby
 authors:
-- Alan Harper
+- Alexander Simonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-17 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies: []
 description: 
-email: alan@aussiegeek.net
+email:
+- alex@simonov.me
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -24,57 +24,59 @@ files:
 - samples/qtzip.rb
 - samples/write_simple.rb
 - samples/zipfind.rb
+- lib/zip/central_directory.rb
 - lib/zip/compressor.rb
 - lib/zip/constants.rb
 - lib/zip/decompressor.rb
 - lib/zip/deflater.rb
 - lib/zip/dos_time.rb
+- lib/zip/entry.rb
+- lib/zip/entry_set.rb
+- lib/zip/errors.rb
+- lib/zip/extra_field/generic.rb
+- lib/zip/extra_field/universal_time.rb
+- lib/zip/extra_field/unix.rb
+- lib/zip/extra_field.rb
+- lib/zip/file.rb
+- lib/zip/filesystem.rb
 - lib/zip/inflater.rb
+- lib/zip/input_stream.rb
 - lib/zip/ioextras.rb
 - lib/zip/null_compressor.rb
 - lib/zip/null_decompressor.rb
 - lib/zip/null_input_stream.rb
+- lib/zip/output_stream.rb
 - lib/zip/pass_thru_compressor.rb
 - lib/zip/pass_thru_decompressor.rb
-- lib/zip/settings.rb
-- lib/zip/tempfile_bugfixed.rb
-- lib/zip/zip.rb
-- lib/zip/zip_central_directory.rb
-- lib/zip/zip_entry.rb
-- lib/zip/zip_entry_set.rb
-- lib/zip/zip_extra_field.rb
-- lib/zip/zip_file.rb
-- lib/zip/zip_input_stream.rb
-- lib/zip/zip_output_stream.rb
-- lib/zip/zip_streamable_directory.rb
-- lib/zip/zip_streamable_stream.rb
-- lib/zip/zipfilesystem.rb
+- lib/zip/streamable_directory.rb
+- lib/zip/streamable_stream.rb
+- lib/zip/version.rb
+- lib/zip.rb
 - README.md
 - NEWS
 - TODO
 - Rakefile
-homepage: http://github.com/aussiegeek/rubyzip
+homepage: http://github.com/rubyzip/rubyzip
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: rubyzip is a ruby module for reading and writing zip files
 test_files: []

data/lib/zip/settings.rb

@@ -1,10 +0,0 @@
-module Zip
-  class << self
-    def options
-      @options ||= {
-        :on_exists_proc => false,
-        :continue_on_exists_proc => false
-      }
-    end
-  end
-end

data/lib/zip/tempfile_bugfixed.rb

@@ -1,195 +0,0 @@
-#
-# tempfile - manipulates temporary files
-#
-# $Id: tempfile_bugfixed.rb,v 1.2 2005/02/19 20:30:33 thomas Exp $
-#
-
-require 'delegate'
-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
-
-      lock = nil
-      n = failure = 0
-
-      begin
-        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
-
-      @data = [tmpname]
-      @clean_proc = Tempfile.callback(@data)
-      ObjectSpace.define_finalizer(self, @clean_proc)
-
-      @tmpfile = ::File.open(tmpname, ::File::RDWR|::File::CREAT|::File::EXCL, 0600)
-      @tmpname = tmpname
-      @@cleanlist << @tmpname
-      @data[1] = @tmpfile
-      @data[2] = @@cleanlist
-
-      super(@tmpfile)
-
-      # Now we have all the File/IO methods defined, you must not
-      # carelessly put bare puts(), etc. after this.
-
-      Dir.rmdir(lock)
-    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
-
-    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
-      end
-    end
-
-    # Closes and unlinks the file.
-    def close!
-      _close
-      @clean_proc.call
-      ObjectSpace.undefine_finalizer(self)
-    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
-
-    if RUBY_VERSION > '1.8.0'
-      def __setobj__(obj)
-        @_dc_obj = obj
-      end
-    else
-      def __setobj__(obj)
-        @obj = obj
-      end
-    end
-
-    # Returns the full path name of the temporary file.
-    def path
-      @tmpname
-    end
-
-    # 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
-
-    class << self
-      def callback(data)	# :nodoc:
-        pid = $$
-        lambda{
-          if pid == $$ 
-            path, tmpfile, cleanlist = *data
-
-            print "removing ", path, "..." if $DEBUG
-
-            tmpfile.close if tmpfile
-
-            # keep this order for thread safeness
-            ::File.unlink(path) if ::File.exist?(path)
-            cleanlist.delete(path) if cleanlist
-
-            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 # module BugFix
-if __FILE__ == $0
-  #  $DEBUG = true
-  f = Tempfile.new("foo")
-  f.print("foo\n")
-  f.close
-  f.open
-  p f.gets # => "foo\n"
-  f.close!
-end

data/lib/zip/zip.rb

@@ -1,56 +0,0 @@
-require 'delegate'
-require 'singleton'
-require 'tempfile'
-require 'fileutils'
-require 'stringio'
-require 'zlib'
-require 'zip/dos_time'
-require 'zip/ioextras'
-require 'rbconfig'
-
-require 'zip/zip_entry'
-require 'zip/zip_extra_field'
-require 'zip/zip_entry_set'
-require 'zip/zip_central_directory'
-require 'zip/zip_file'
-require 'zip/zip_input_stream'
-require 'zip/zip_output_stream'
-require 'zip/decompressor'
-require 'zip/compressor'
-require 'zip/null_decompressor'
-require 'zip/null_compressor'
-require 'zip/null_input_stream'
-require 'zip/pass_thru_compressor'
-require 'zip/pass_thru_decompressor'
-require 'zip/inflater'
-require 'zip/deflater'
-require 'zip/zip_streamable_stream'
-require 'zip/zip_streamable_directory'
-require 'zip/constants'
-
-require 'zip/settings'
-
-if Tempfile.superclass == SimpleDelegator
-  require 'zip/tempfile_bugfixed'
-  Tempfile = BugFix::Tempfile
-end
-
-module Zlib  #:nodoc:all
-  if !const_defined?(:MAX_WBITS)
-    MAX_WBITS = Zlib::Deflate.MAX_WBITS
-  end
-end
-
-module Zip
-  class ZipError < StandardError ; end
-
-  class ZipEntryExistsError            < ZipError; end
-  class ZipDestinationFileExistsError  < ZipError; end
-  class ZipCompressionMethodError      < ZipError; end
-  class ZipEntryNameError              < ZipError; end
-  class ZipInternalError               < ZipError; 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/zip_central_directory.rb

@@ -1,135 +0,0 @@
-module Zip
-  class ZipCentralDirectory
-    include Enumerable
-
-    END_OF_CENTRAL_DIRECTORY_SIGNATURE = 0x06054b50
-    MAX_END_OF_CENTRAL_DIRECTORY_STRUCTURE_SIZE = 65536 + 18
-    STATIC_EOCD_SIZE = 22
-
-    attr_reader :comment
-
-    # Returns an Enumerable containing the entries.
-    def entries
-      @entrySet.entries
-    end
-
-    def initialize(entries = ZipEntrySet.new, comment = "")  #:nodoc:
-      super()
-      @entrySet = entries.kind_of?(ZipEntrySet) ? entries : ZipEntrySet.new(entries)
-      @comment = comment
-    end
-
-    def write_to_stream(io)  #:nodoc:
-      offset = io.tell
-      @entrySet.each { |entry| entry.write_c_dir_entry(io) }
-      write_e_o_c_d(io, offset)
-    end
-
-    def write_e_o_c_d(io, offset)  #:nodoc:
-      tmp = [
-        END_OF_CENTRAL_DIRECTORY_SIGNATURE,
-        0                                  , # @numberOfThisDisk
-        0                                  , # @numberOfDiskWithStartOfCDir
-        @entrySet? @entrySet.size : 0      ,
-        @entrySet? @entrySet.size : 0      ,
-        cdir_size                          ,
-        offset                             ,
-        @comment ? @comment.length : 0
-      ]
-      io << tmp.pack('VvvvvVVv')
-      io << @comment
-    end
-    
-    private :write_e_o_c_d
-
-    def cdir_size  #:nodoc:
-      # does not include eocd
-      @entrySet.inject(0) do |value, entry|
-        entry.cdir_header_size + value
-      end
-    end
-    
-    private :cdir_size
-
-    def read_e_o_c_d(io) #:nodoc:
-      buf = get_e_o_c_d(io)
-      @numberOfThisDisk                     = ZipEntry.read_zip_short(buf)
-      @numberOfDiskWithStartOfCDir          = ZipEntry.read_zip_short(buf)
-      @totalNumberOfEntriesInCDirOnThisDisk = ZipEntry.read_zip_short(buf)
-      @size                                 = ZipEntry.read_zip_short(buf)
-      @sizeInBytes                          = ZipEntry.read_zip_long(buf)
-      @cdirOffset                           = ZipEntry.read_zip_long(buf)
-      commentLength                         = ZipEntry.read_zip_short(buf)
-      if commentLength <= 0
-        @comment                            = buf.slice!(0, buf.size)
-      else
-        @comment                            = buf.read(commentLength)
-      end
-      raise ZipError, "Zip consistency problem while reading eocd structure" unless buf.size == 0
-    end
-
-    def read_central_directory_entries(io)  #:nodoc:
-      begin
-        io.seek(@cdirOffset, IO::SEEK_SET)
-      rescue Errno::EINVAL
-        raise ZipError, "Zip consistency problem while reading central directory entry"
-      end
-      @entrySet = ZipEntrySet.new
-      @size.times do
-        tmp = ZipEntry.read_c_dir_entry(io)
-        @entrySet << tmp
-      end
-    end
-
-    def read_from_stream(io)  #:nodoc:
-      read_e_o_c_d(io)
-      read_central_directory_entries(io)
-    end
-
-    def get_e_o_c_d(io)  #:nodoc:
-      begin
-        io.seek(-MAX_END_OF_CENTRAL_DIRECTORY_STRUCTURE_SIZE, IO::SEEK_END)
-      rescue Errno::EINVAL
-        io.seek(0, IO::SEEK_SET)
-      end
-      buf = io.read
-      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.bytesize))
-
-      def buf.read(count)
-        slice!(0, count)
-      end
-
-      buf
-    end
-
-    # For iterating over the entries.
-    def each(&proc)
-      @entrySet.each(&proc)
-    end
-
-    # Returns the number of entries in the central directory (and 
-    # consequently in the zip archive).
-    def size
-      @entrySet.size
-    end
-
-    def ZipCentralDirectory.read_from_stream(io)  #:nodoc:
-      cdir  = new
-      cdir.read_from_stream(io)
-      return cdir
-    rescue ZipError
-      return nil
-    end
-
-    def ==(other) #:nodoc:
-      return false unless other.kind_of?(ZipCentralDirectory)
-      @entrySet.entries.sort == other.entries.sort && comment == other.comment
-    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.