zipfilesystem.rb is becoming big and not everyone will want to use that code. Therefore zip.rb no longer requires it. Instead you must require zipfilesystem.rb itself if you want to use it

This commit is contained in:
thomas 2003-08-13 08:00:52 +00:00
parent 4dbe7e8087
commit dce2fbc560
3 changed files with 7 additions and 3 deletions

2
zip.rb
View File

@ -5,7 +5,6 @@ require 'singleton'
require 'tempfile' require 'tempfile'
require 'ftools' require 'ftools'
require 'zlib' require 'zlib'
require 'zipfilesystem'
unless Enumerable.instance_methods(true).include?("inject") unless Enumerable.instance_methods(true).include?("inject")
module Enumerable #:nodoc:all module Enumerable #:nodoc:all
@ -977,7 +976,6 @@ module Zip
class ZipEntryNameError < ZipError; end class ZipEntryNameError < ZipError; end
class ZipFile < ZipCentralDirectory class ZipFile < ZipCentralDirectory
include ZipFileSystem
CREATE = 1 CREATE = 1

View File

@ -1,5 +1,6 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
require 'zip'
require 'filearchive' require 'filearchive'
module Zip module Zip
@ -154,4 +155,9 @@ module Zip
end end
end end
class ZipFile
include ZipFileSystem
end
end end

View File

@ -2,7 +2,7 @@
$VERBOSE = true $VERBOSE = true
require 'zip' require 'zipfilesystem'
require 'rubyunit' require 'rubyunit'
include Zip include Zip