Replace zip/zip by zip in samples

samples/example.rb

@@ -3,7 +3,7 @@
 $: << "../lib"
 system("zip example.zip example.rb gtkRubyzip.rb")
 
-require 'zip/zip'
+require 'zip'
 
 ####### Using ZipInputStream alone: #######
 
@@ -23,7 +23,7 @@
 zf = Zip::File.new("example.zip")
 zf.each_with_index {
   |entry, index|
-  
+
   puts "entry #{index} is #{entry.name}, size = #{entry.size}, compressed size = #{entry.compressed_size}"
   # use zf.get_input_stream(entry) to get a ZipInputStream for the entry
   # entry can be the ZipEntry object or any object which has a to_s method that

samples/example_recursive.rb

@@ -1,4 +1,4 @@
-require 'zip/zip'
+require 'zip'
 
 # This is a simple example which uses rubyzip to
 # recursively generate a zip file from the contents of
@@ -7,7 +7,7 @@
 #
 # Usage:
 #   directoryToZip = "/tmp/input"
-#   outputFile = "/tmp/out.zip"   
+#   outputFile = "/tmp/out.zip"
 #   zf = ZipFileGenerator.new(directoryToZip, outputFile)
 #   zf.write()
 class ZipFileGenerator
@@ -20,7 +20,7 @@ def initialize(inputDir, outputFile)
 
   # Zip the input directory.
   def write()
-    entries = Dir.entries(@inputDir); entries.delete("."); entries.delete("..") 
+    entries = Dir.entries(@inputDir); entries.delete("."); entries.delete("..")
     io = Zip::File.open(@outputFile, Zip::File::CREATE);
 
     writeEntries(entries, "", io)
@@ -30,20 +30,19 @@ def write()
   # A helper method to make the recursion work.
   private
   def writeEntries(entries, path, io)
-    
+
     entries.each { |e|
       zipFilePath = path == "" ? e : File.join(path, e)
       diskFilePath = File.join(@inputDir, zipFilePath)
       puts "Deflating " + diskFilePath
       if  File.directory?(diskFilePath)
         io.mkdir(zipFilePath)
-        subdir =Dir.entries(diskFilePath); subdir.delete("."); subdir.delete("..") 
+        subdir =Dir.entries(diskFilePath); subdir.delete("."); subdir.delete("..")
         writeEntries(subdir, zipFilePath, io)
       else
         io.get_output_stream(zipFilePath) { |f| f.puts(File.open(diskFilePath, "rb").read())}
       end
     }
   end
-
-end
 
+end

samples/gtkRubyzip.rb

@@ -5,7 +5,7 @@
 $VERBOSE = true
 
 require 'gtk'
-require 'zip/zip'
+require 'zip'
 
 class MainApp < Gtk::Window
   def initialize
@@ -26,7 +26,7 @@ def initialize
       puts "Not implemented!"
     }
     box.pack_start(@buttonPanel, false, false, 0)
-    
+
     sw = Gtk::ScrolledWindow.new
     sw.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
     box.pack_start(sw, true, true, 0)
@@ -70,10 +70,10 @@ def show_file_selector
   def open_zip(filename)
     @zipfile = Zip::File.open(filename)
     @clist.clear
-    @zipfile.each { 
+    @zipfile.each {
       |entry|
-      @clist.append([ entry.name, 
-		      entry.size.to_s, 
+      @clist.append([ entry.name,
+		      entry.size.to_s,
 		      (100.0*entry.compressedSize/entry.size).to_s+"%" ])
     }
   end

samples/qtzip.rb

@@ -7,7 +7,7 @@
 require 'Qt'
 system('rbuic -o zipdialogui.rb zipdialogui.ui')
 require 'zipdialogui.rb'
-require 'zip/zip'
+require 'zip'
 
 
 
@@ -31,27 +31,27 @@ def zipfile(&proc)
   def each(&proc)
     Zip::File.foreach(@zip_filename, &proc)
   end
-  
+
   def refresh()
     lv = child("entry_list_view")
     lv.clear
-    each { 
+    each {
       |e|
       lv.insert_item(Qt::ListViewItem.new(lv, e.name, e.size.to_s))
     }
   end
 
-    
+
   def load(zipfile)
     @zip_filename = zipfile
     refresh
   end
 
   def add_files
     l = Qt::FileDialog.getOpenFileNames(nil, nil, self)
-    zipfile { 
-      |zf| 
-      l.each { 
+    zipfile {
+      |zf|
+      l.each {
         |path|
         zf.add(File.basename(path), path)
       }
@@ -82,7 +82,7 @@ def extract_files
     else
       zipfile { |zf| items.each { |e| zf.extract(e, File.join(d, e)) } }
     end
-    
+
   end
 
   slots 'add_files()', 'extract_files()'

samples/write_simple.rb

@@ -2,7 +2,7 @@
 
 $: << "../lib"
 
-require 'zip/zip'
+require 'zip'
 
 include Zip
 

samples/zipfind.rb

@@ -4,7 +4,7 @@
 
 $: << "../lib"
 
-require 'zip/zip'
+require 'zip'
 require 'find'
 
 module Zip
@@ -38,21 +38,21 @@ def self.find_file(path, fileNamePattern, zipFilePattern = /\.zip$/i)
 
 if __FILE__ == $0
   module ZipFindConsoleRunner
-    
+
     PATH_ARG_INDEX = 0;
     FILENAME_PATTERN_ARG_INDEX = 1;
     ZIPFILE_PATTERN_ARG_INDEX = 2;
-    
+
     def self.run(args)
       check_args(args)
-      Zip::ZipFind.find_file(args[PATH_ARG_INDEX], 
+      Zip::ZipFind.find_file(args[PATH_ARG_INDEX],
 			    args[FILENAME_PATTERN_ARG_INDEX],
 			    args[ZIPFILE_PATTERN_ARG_INDEX]) {
 	|fileName|
 	report_entry_found fileName
       }
     end
-    
+
     def self.check_args(args)
       if (args.size != 3)
 	usage
@@ -63,11 +63,11 @@ def self.check_args(args)
     def self.usage
       puts "Usage: #{$0} PATH ZIPFILENAME_PATTERN FILNAME_PATTERN"
     end
-    
+
     def self.report_entry_found(fileName)
       puts fileName
     end
-    
+
   end
 
   ZipFindConsoleRunner.run(ARGV)