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:
		
							parent
							
								
									4dbe7e8087
								
							
						
					
					
						commit
						dce2fbc560
					
				
							
								
								
									
										2
									
								
								zip.rb
								
								
								
								
							
							
						
						
									
										2
									
								
								zip.rb
								
								
								
								
							| 
						 | 
				
			
			@ -5,7 +5,6 @@ require 'singleton'
 | 
			
		|||
require 'tempfile'
 | 
			
		||||
require 'ftools'
 | 
			
		||||
require 'zlib'
 | 
			
		||||
require 'zipfilesystem'
 | 
			
		||||
 | 
			
		||||
unless Enumerable.instance_methods(true).include?("inject")
 | 
			
		||||
  module Enumerable  #:nodoc:all
 | 
			
		||||
| 
						 | 
				
			
			@ -977,7 +976,6 @@ module Zip
 | 
			
		|||
  class ZipEntryNameError              < ZipError; end
 | 
			
		||||
 | 
			
		||||
  class ZipFile < ZipCentralDirectory
 | 
			
		||||
    include ZipFileSystem
 | 
			
		||||
 | 
			
		||||
    CREATE = 1
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,6 @@
 | 
			
		|||
#!/usr/bin/env ruby
 | 
			
		||||
 | 
			
		||||
require 'zip'
 | 
			
		||||
require 'filearchive'
 | 
			
		||||
 | 
			
		||||
module Zip
 | 
			
		||||
| 
						 | 
				
			
			@ -154,4 +155,9 @@ module Zip
 | 
			
		|||
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  class ZipFile
 | 
			
		||||
    include ZipFileSystem
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
 | 
			
		||||
$VERBOSE = true
 | 
			
		||||
 | 
			
		||||
require 'zip'
 | 
			
		||||
require 'zipfilesystem'
 | 
			
		||||
require 'rubyunit'
 | 
			
		||||
 | 
			
		||||
include Zip
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue