rubyzip 0.9.8 → 0.9.9

data/NEWS

@@ -1,3 +1,9 @@
+= Version 0.9.9
+
+Added support for backslashes in zip files (generated by the default Windows
+zip packer for example) and comment sections with the comment length set to zero
+even though there is actually a comment.
+
 = Version 0.9.8
 
 Fixed: "Unitialized constant NullInputStream" error

data/README.md

@@ -1,10 +1,8 @@
-rubyzip [![Build Status](https://secure.travis-ci.org/aussiegeek/rubyzip.png)](http://travis-ci.org/aussiegeek/rubyzip)
-=======
+# rubyzip [![Build Status](https://secure.travis-ci.org/aussiegeek/rubyzip.png)](http://travis-ci.org/aussiegeek/rubyzip)
 
 rubyzip is a ruby library for reading and writing zip files.
 
-Installation
-------------
+## Installation
 rubyzip is available on RubyGems, so:
 
 ```
@@ -17,37 +15,30 @@ Or in your Gemfile:
 gem 'rubyzip'
 ```
 
-Developing
-----------
+## Usage
 
-To run tests you need run next commands:
-
-```
-bundle install
-rake
-```
-
-Configuration
--------------
-
-By default, rubyzip will not overwrite files if they already exist inside of the extracted path.  To change this behavior, you may specify a configuration option like so:
-
-```
-Zip.options[:on_exists_proc] = true
-```
+### Basic zip archive creation
 
-If you're using rubyzip with rails, consider placing this snippet of code in an initializer file such as `config/initializers/rubyzip.rb`
-
-Additionally, if you want to configure rubyzip to overwrite existing files while creating a .zip file, you can do so with the following:
-
-```
-Zip.options[:continue_on_exists_proc] = true
+```ruby
+require 'rubygems'
+require 'zip/zip'
+ 
+folder = "Users/me/Desktop/stuff_to_zip"
+input_filenames = ['image.jpg', 'description.txt', 'stats.csv']
+ 
+zipfile_name = "/Users/me/Desktop/archive.zip"
+ 
+Zip::ZipFile.open(zipfile_name, Zip::ZipFile::CREATE) do |zipfile|
+  input_filenames.each do |filename|
+    # Two arguments:
+    # - The name of the file as it will appear in the archive
+    # - The original file, including the path to find it
+    zipfile.add(filename, folder + '/' + filename)
+  end
+end
 ```
 
-
-Documentation
--------------
-
+## Further 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
@@ -76,22 +67,39 @@ 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
--------
 
-rubyzip is distributed under the same license as ruby. See
-http://www.ruby-lang.org/en/LICENSE.txt
+## Configuration
 
+By default, rubyzip will not overwrite files if they already exist inside of the extracted path.  To change this behavior, you may specify a configuration option like so:
 
-Website and Project Home
-------------------------
+```
+Zip.options[:on_exists_proc] = true
+```
+
+If you're using rubyzip with rails, consider placing this snippet of code in an initializer file such as `config/initializers/rubyzip.rb`
+
+Additionally, if you want to configure rubyzip to overwrite existing files while creating a .zip file, you can do so with the following:
+
+```
+Zip.options[:continue_on_exists_proc] = true
+```
+
+## Developing
+
+To run tests you need run next commands:
+
+```
+bundle install
+rake
+```
+
+## Website and Project Home
 
 http://github.com/aussiegeek/rubyzip
 
 http://rdoc.info/github/aussiegeek/rubyzip/master/frames
 
-Authors
--------
+## Authors
 
 Alexander Simonov ( alex at simonov.me)
 
@@ -102,3 +110,8 @@ Thomas Sondergaard (thomas at sondergaard.cc)
 Technorama Ltd. (oss-ruby-zip at technorama.net)
 
 extra-field support contributed by Tatsuki Sugiura (sugi at nemui.org)
+
+## License
+
+rubyzip is distributed under the same license as ruby. See
+http://www.ruby-lang.org/en/LICENSE.txt

data/lib/zip/zip.rb

@@ -1,5 +1,4 @@
 require 'delegate'
-require 'iconv' unless RUBY_VERSION >= '1.9'
 require 'singleton'
 require 'tempfile'
 require 'fileutils'

data/lib/zip/zip_central_directory.rb

@@ -60,7 +60,11 @@ module Zip
       @sizeInBytes                          = ZipEntry.read_zip_long(buf)
       @cdirOffset                           = ZipEntry.read_zip_long(buf)
       commentLength                         = ZipEntry.read_zip_short(buf)
-      @comment                              = buf.read(commentLength)
+      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
 
@@ -87,25 +91,11 @@ 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 raise Errno::EFBIG instead of Errno::EINVAL
-        io.seek(0, IO::SEEK_SET)
       end
-
-      # '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
-
+      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))
+      buf = buf.slice!((sigIndex + 4)..(buf.bytesize))
 
       def buf.read(count)
         slice!(0, count)

data/lib/zip/zip_entry.rb

@@ -260,7 +260,7 @@ module Zip
 
       @name              = io.read(nameLength)
       extra              = io.read(extraLength)
-
+      until @name.sub!('\\', '/') == nil do end # some zip files use backslashes instead of slashes as path separators
       if (extra && extra.bytesize != extraLength)
         raise ZipError, "Truncated local zip entry header"
       else
@@ -332,6 +332,7 @@ module Zip
       set_time(lastModDate, lastModTime)
 
       @name = io.read(nameLength)
+      until @name.sub!('\\', '/') == nil do end # some zip files use backslashes instead of slashes as path separators
       if ZipExtraField === @extra
         @extra.merge(io.read(extraLength))
       else

data/lib/zip/zip_entry_set.rb

@@ -54,9 +54,11 @@ module Zip
     end
 
     def glob(pattern, flags = ::File::FNM_PATHNAME|::File::FNM_DOTMATCH)
-      entries.select do |entry|
-        ::File.fnmatch(pattern, entry.name.chomp('/'), flags)
-      end
+      entries.map do |entry|
+        next nil unless ::File.fnmatch(pattern, entry.name.chomp('/'), flags)
+        yield(entry) if block_given?
+        entry
+      end.compact
     end	
 
 #TODO    attr_accessor :auto_create_directories

data/lib/zip/zip_file.rb

@@ -103,6 +103,24 @@ module Zip
         zf.write_buffer
       end
 
+      # Like #open, but reads zip archive contents from a String or open IO
+      # stream, and outputs data to a buffer.
+      # (This can be used to extract data from a 
+      # downloaded zip archive without first saving it to disk.)
+      def open_buffer(io)
+        zf = ZipFile.new('',true,true)
+        if io.is_a? IO
+          zf.read_from_stream(io)
+        elsif io.is_a? String
+          require 'stringio'
+          zf.read_from_stream(StringIO.new(io))
+        else
+          raise "Zip::ZipFile.open_buffer expects an argument of class String or IO. Found: #{io.class}"
+        end
+        yield zf
+        zf.write_buffer
+      end
+
       # Iterates over the contents of the ZipFile. This is more efficient
       # than using a ZipInputStream since this methods simply iterates
       # through the entries in the central directory structure in the archive
@@ -239,6 +257,11 @@ module Zip
       @entrySet.find_entry(entry_name)
     end
 
+    # Searches for entries given a glob
+    def glob(*args,&block)
+      @entrySet.glob(*args,&block)
+    end
+
     # Searches for an entry just as find_entry, but throws Errno::ENOENT
     # if no entry is found.
     def get_entry(entry)

data/lib/zip/zipfilesystem.rb

@@ -467,6 +467,10 @@ module Zip
         entries
       end
 
+      def glob(*args,&block)
+        @mappedZip.glob(*args,&block)
+      end
+
       def foreach(aDirectoryName)
         unless @file.stat(aDirectoryName).directory?
           raise Errno::ENOTDIR, aDirectoryName

metadata

@@ -1,27 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubyzip
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.9
   prerelease: 
-  version: 0.9.8
 platform: ruby
-authors: 
+authors:
 - Alan Harper
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-26 00:00:00 Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: alan@aussiegeek.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - samples/example.rb
 - samples/example_filesystem.rb
 - samples/example_recursive.rb
@@ -60,31 +55,26 @@ files:
 - Rakefile
 homepage: http://github.com/aussiegeek/rubyzip
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: rubyzip is a ruby module for reading and writing zip files
 test_files: []
-
-has_rdoc: