rubyzip 0.9.4 → 0.9.5

data/{README → README.md}

@@ -1,24 +1,22 @@
-= rubyzip
+rubyzip
+=======
 
 rubyzip is a ruby library for reading and writing zip files.
 
-= Install
-
-If you have rubygems you can install rubyzip directly from the gem
-repository
+Install
+-------
 
   gem install rubyzip
 
-Otherwise obtain the source (see below) and run
-
-  ruby install.rb
 
 To run the unit tests you need to have test::unit installed
 
   rake test
+[![Build Status](https://secure.travis-ci.org/aussiegeek/rubyzip.png)](http://travis-ci.org/aussiegeek/rubyzip)
 
+Documentation
+-------------
 
-= Documentation
 
 There is more than one way to access or create a zip archive with
 rubyzip. The basic API is modeled after the classes in
@@ -47,23 +45,24 @@ For details about the specific behaviour of classes and methods refer
 to the test suite. Finally you can generate the rdoc documentation or
 visit http://rubyzip.sourceforge.net.
 
-= License
+License
+-------
 
 rubyzip is distributed under the same license as ruby. See
 http://www.ruby-lang.org/en/LICENSE.txt
 
 
-= Website and Project Home
-
-http://rubyzip.sourceforge.net
+Website and Project Home
+------------------------
 
-http://sourceforge.net/projects/rubyzip
+http://github.com/aussiegeek/rubyzip
 
-== Download (tarballs and gems)
+http://rdoc.info/github/aussiegeek/rubyzip/master/frames
 
-http://sourceforge.net/project/showfiles.php?group_id=43107&package_id=35377
+Authors
+-------
 
-= Authors
+Alan Harper ( alan at aussiegeek.net)
 
 Thomas Sondergaard (thomas at sondergaard.cc)
 

data/Rakefile

@@ -1,111 +1,13 @@
-# Rakefile for RubyGems      -*- ruby -*-
-
 require 'rubygems'
-require 'rake/clean'
 require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/sshpublisher'
-require 'net/sftp'
-
-PKG_NAME = 'rubyzip'
-PKG_VERSION = File.read('lib/zip/zip.rb').match(/\s+VERSION\s*=\s*'(.*)'/)[1]
-
-PKG_FILES = FileList.new
-
-PKG_FILES.add %w{ README NEWS TODO ChangeLog install.rb Rakefile }
-PKG_FILES.add %w{ samples/*.rb }
-PKG_FILES.add %w{ test/*.rb }
-PKG_FILES.add %w{ test/data/* }
-PKG_FILES.exclude "test/data/generated"
-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 '.'
-clobberFromCvsIgnore 'samples'
-clobberFromCvsIgnore 'test'
-clobberFromCvsIgnore 'test/data'
-
-def rsystem(cmd)
-  system(cmd) or raise "system command failed: '#{cmd}"
-end
 
 task :default => [:test]
 
-desc "Run unit tests"
-task :test do
-  ruby %{-C test alltests.rb}
-end
-
-# Shortcuts for test targets
-task :ut => [:test]
-
-spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.author = "Thomas Sondergaard"
-  s.email = "thomas(at)sondergaard.cc"
-  s.homepage = "http://rubyzip.sourceforge.net/"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "rubyzip is a ruby module for reading and writing zip files"
-  s.files = PKG_FILES.to_a
-  s.require_path = 'lib'
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
-
-Rake::RDocTask.new do |rd|
-  rd.main = "README"
-  rd.rdoc_files.add %W{ lib/zip/*.rb README NEWS TODO ChangeLog }
-  rd.options << "-t 'rubyzip documentation' --webcvs http://cvs.sourceforge.net/viewcvs.py/rubyzip/rubyzip/"
-#  rd.options << "--all"
-end
-
-desc "Publish documentation"
-task :pdoc => [:rdoc] do
-  rsystem("rsync -avz --delete html/* thomas,rubyzip@frs.sourceforge.net:/home/groups/r/ru/rubyzip/htdocs")
-end
-
-desc "Publish package"
-task :ppackage => [:package] do
-  Net::SFTP.start("frs.sourceforge.net", "thomas,rubyzip") do
-    |ftpclient|
-    releasedir = File.join("/home/pfs/project/r/ru/rubyzip/rubyzip", PKG_VERSION)
-    ftpclient.mkdir releasedir
-    Dir['pkg/*.{tgz,zip,gem}'].each do
-      |e|
-      ftpclient.upload!(e, File.join(releasedir, File.basename(e)))
-    end
-  end
+Rake::TestTask.new(:test) do |test|
+  test.libs << File.join(File.dirname(__FILE__), 'lib')
+  test.libs << File.join(File.dirname(__FILE__), 'test')
+  test.pattern = File.join(File.dirname(__FILE__), 'test/alltests.rb')
+  test.verbose = true
+  Dir.chdir File.join(File.dirname(__FILE__), 'test')
 end
 
-desc "Generate the ChangeLog file"
-task :ChangeLog do
-  puts "Updating ChangeLog"
-  system %{cvs2cl}
-end
-
-desc "Make a release"
-task :release => [:tag_release, :pdoc, :ppackage] do
-end
-
-desc "Make a release tag"
-task :tag_release do
-  tag = "release-#{PKG_VERSION.gsub('.','-')}"
-
-  puts "Checking for tag '#{tag}'"
-  if (Regexp.new("^\\s+#{tag}") =~ `cvs log README`)
-    abort "Tag '#{tag}' already exists"
-  end
-  puts "Tagging module with '#{tag}'"
-  system("cvs tag #{tag}")
-end

data/lib/zip/compressor.rb

@@ -0,0 +1,10 @@
+module Zip
+  class Compressor #:nodoc:all
+    def finish
+    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.

data/lib/zip/constants.rb

@@ -0,0 +1,10 @@
+module Zip
+  VERSION = '0.9.4'
+  RUBY_MINOR_VERSION = RUBY_VERSION.split(".")[1].to_i
+  RUNNING_ON_WINDOWS = RbConfig::CONFIG['host_os'] =~ /^win|mswin/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.
+  #  not so in 1.7.x
+  EMPTY_FILE_RETURNS_EMPTY_STRING_FIRST = RUBY_MINOR_VERSION != 7
+end

data/lib/zip/decompressor.rb

@@ -0,0 +1,13 @@
+module Zip
+  class Decompressor  #:nodoc:all
+    CHUNK_SIZE=32768
+    def initialize(inputStream)
+      super()
+      @inputStream=inputStream
+    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.

data/lib/zip/deflater.rb

@@ -0,0 +1,30 @@
+module Zip
+  class Deflater < Compressor #:nodoc:all
+    def initialize(outputStream, level = Zlib::DEFAULT_COMPRESSION)
+      super()
+      @outputStream = outputStream
+      @zlibDeflater = Zlib::Deflate.new(level, -Zlib::MAX_WBITS)
+      @size = 0
+      @crc = Zlib::crc32
+    end
+    
+    def << (data)
+      val = data.to_s
+      @crc = Zlib::crc32(val, @crc)
+      @size += val.size
+      @outputStream << @zlibDeflater.deflate(data)
+    end
+
+    def finish
+      until @zlibDeflater.finished?
+        @outputStream << @zlibDeflater.finish
+      end
+    end
+
+    attr_reader :size, :crc
+  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/inflater.rb

@@ -0,0 +1,65 @@
+module Zip
+  class Inflater < Decompressor  #:nodoc:all
+    def initialize(inputStream)
+      super
+      @zlibInflater = Zlib::Inflate.new(-Zlib::MAX_WBITS)
+      @outputBuffer=""
+      @hasReturnedEmptyString = ! EMPTY_FILE_RETURNS_EMPTY_STRING_FIRST
+    end
+
+    def sysread(numberOfBytes = nil, buf = nil)
+      readEverything = numberOfBytes.nil?
+      while (readEverything || @outputBuffer.bytesize < numberOfBytes)
+        break if internal_input_finished?
+        @outputBuffer << internal_produce_input(buf)
+      end
+      return value_when_finished if @outputBuffer.bytesize == 0 && input_finished?
+      endIndex = numberOfBytes.nil? ? @outputBuffer.bytesize : numberOfBytes
+      return @outputBuffer.slice!(0...endIndex)
+    end
+
+    def produce_input
+      if (@outputBuffer.empty?)
+        return internal_produce_input
+      else
+        return @outputBuffer.slice!(0...(@outputBuffer.length))
+      end
+    end
+
+    # to be used with produce_input, not read (as read may still have more data cached)
+    # is data cached anywhere other than @outputBuffer?  the comment above may be wrong
+    def input_finished?
+      @outputBuffer.empty? && internal_input_finished?
+    end
+    alias :eof :input_finished?
+    alias :eof? :input_finished?
+
+    private
+
+    def internal_produce_input(buf = nil)
+      retried = 0
+      begin
+        @zlibInflater.inflate(@inputStream.read(Decompressor::CHUNK_SIZE, buf))
+      rescue Zlib::BufError
+        raise if (retried >= 5) # how many times should we retry?
+        retried += 1
+        retry
+      end
+    end
+
+    def internal_input_finished?
+      @zlibInflater.finished?
+    end
+
+    # TODO: Specialize to handle different behaviour in ruby > 1.7.0 ?
+    def value_when_finished   # mimic behaviour of ruby File object.
+      return if @hasReturnedEmptyString
+      @hasReturnedEmptyString = true
+      return ""
+    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.

data/lib/zip/ioextras.rb

@@ -45,11 +45,11 @@ module IOExtras  #:nodoc:
     def read(numberOfBytes = nil, buf = nil)
       tbuf = nil
 
-      if @outputBuffer.length > 0
-        if numberOfBytes <= @outputBuffer.length
+      if @outputBuffer.bytesize > 0
+        if numberOfBytes <= @outputBuffer.bytesize
           tbuf = @outputBuffer.slice!(0, numberOfBytes)
         else
-          numberOfBytes -= @outputBuffer.length if (numberOfBytes)
+          numberOfBytes -= @outputBuffer.bytesize if (numberOfBytes)
           rbuf = sysread(numberOfBytes, buf)
           tbuf = @outputBuffer
           tbuf << rbuf if (rbuf)
@@ -73,45 +73,45 @@ module IOExtras  #:nodoc:
     def readlines(aSepString = $/)
       retVal = []
       each_line(aSepString) { |line| retVal << line }
-      return retVal
+      retVal
     end
-    
-    def gets(aSepString=$/)
+
+    def gets(aSepString = $/)
       @lineno = @lineno.next
-      return read if aSepString == nil
-      aSepString="#{$/}#{$/}" if aSepString == ""
-      
-      bufferIndex=0
+      return read if aSepString.nil?
+      aSepString = "#{$/}#{$/}" if aSepString.empty?
+
+      bufferIndex = 0
       while ((matchIndex = @outputBuffer.index(aSepString, bufferIndex)) == nil)
-	bufferIndex=@outputBuffer.length
-	if input_finished?
-	  return @outputBuffer.empty? ? nil : flush 
-	end
-	@outputBuffer << produce_input
+        bufferIndex = @outputBuffer.bytesize
+        if input_finished?
+          return @outputBuffer.empty? ? nil : flush
+        end
+        @outputBuffer << produce_input
       end
-      sepIndex=matchIndex + aSepString.length
+      sepIndex = matchIndex + aSepString.bytesize
       return @outputBuffer.slice!(0...sepIndex)
     end
-    
+
     def flush
-      retVal=@outputBuffer
+      retVal = @outputBuffer
       @outputBuffer=""
       return retVal
     end
-    
+
     def readline(aSepString = $/)
       retVal = gets(aSepString)
       raise EOFError if retVal == nil
-      return retVal
+      retVal
     end
-    
+
     def each_line(aSepString = $/)
       while true
-	yield readline(aSepString)
+        yield readline(aSepString)
       end
     rescue EOFError
     end
-    
+
     alias_method :each, :each_line
   end
 
@@ -123,12 +123,12 @@ module IOExtras  #:nodoc:
 
     def write(data)
       self << data
-      data.to_s.length
+      data.to_s.bytesize
     end
 
 
     def print(*params)
-      self << params.to_s << $\.to_s
+      self << params.join($,) << $\.to_s
     end
 
     def printf(aFormatString, *params)
@@ -137,21 +137,20 @@ module IOExtras  #:nodoc:
 
     def putc(anObject)
       self << case anObject
-	      when Fixnum then anObject.chr
-	      when String then anObject
-	      else raise TypeError, "putc: Only Fixnum and String supported"
-	      end
+      when Fixnum then anObject.chr
+      when String then anObject
+      else raise TypeError, "putc: Only Fixnum and String supported"
+      end
       anObject
     end
-    
+
     def puts(*params)
       params << "\n" if params.empty?
-      params.flatten.each {
-	|element|
-	val = element.to_s
-	self << val
-	self << "\n" unless val[-1,1] == "\n"
-      }
+      params.flatten.each do |element|
+        val = element.to_s
+        self << val
+        self << "\n" unless val[-1,1] == "\n"
+      end
     end
 
   end

data/lib/zip/null_compressor.rb

@@ -0,0 +1,15 @@
+module Zip
+  class NullCompressor < Compressor #:nodoc:all
+    include Singleton
+
+    def << (data)
+      raise IOError, "closed stream"
+    end
+
+    attr_reader :size, :compressed_size
+  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.