rubyzip 1.1.7 → 1.2.1

data/samples/example_filesystem.rb

@@ -1,30 +1,28 @@
 #!/usr/bin/env ruby
 
-$: << "../lib"
+$: << '../lib'
 
-require 'zip/zipfilesystem'
+require 'zip/filesystem'
 
-EXAMPLE_ZIP = "filesystem.zip"
+EXAMPLE_ZIP = 'filesystem.zip'
 
-File.delete(EXAMPLE_ZIP) if File.exists?(EXAMPLE_ZIP)
+File.delete(EXAMPLE_ZIP) if File.exist?(EXAMPLE_ZIP)
 
-Zip::File.open(EXAMPLE_ZIP, Zip::File::CREATE) {
-  |zf|
-  zf.file.open("file1.txt", "w") { |os| os.write "first file1.txt" }
-  zf.dir.mkdir("dir1")
-  zf.dir.chdir("dir1")
-  zf.file.open("file1.txt", "w") { |os| os.write "second file1.txt" }
-  puts zf.file.read("file1.txt")
-  puts zf.file.read("../file1.txt")
-  zf.dir.chdir("..")
-  zf.file.open("file2.txt", "w") { |os| os.write "first file2.txt" }
+Zip::File.open(EXAMPLE_ZIP, Zip::File::CREATE) do |zf|
+  zf.file.open('file1.txt', 'w') { |os| os.write 'first file1.txt' }
+  zf.dir.mkdir('dir1')
+  zf.dir.chdir('dir1')
+  zf.file.open('file1.txt', 'w') { |os| os.write 'second file1.txt' }
+  puts zf.file.read('file1.txt')
+  puts zf.file.read('../file1.txt')
+  zf.dir.chdir('..')
+  zf.file.open('file2.txt', 'w') { |os| os.write 'first file2.txt' }
   puts "Entries:                   #{zf.entries.join(', ')}"
-}
+end
 
-Zip::File.open(EXAMPLE_ZIP) {
-  |zf|
+Zip::File.open(EXAMPLE_ZIP) do |zf|
   puts "Entries from reloaded zip: #{zf.entries.join(', ')}"
-}
+end
 
 # For other examples, look at zip.rb and ziptest.rb
 

data/samples/example_recursive.rb

@@ -6,43 +6,50 @@ require 'zip'
 # included in the archive, rather just its contents.
 #
 # Usage:
-#   directoryToZip = "/tmp/input"
-#   outputFile = "/tmp/out.zip"
-#   zf = ZipFileGenerator.new(directoryToZip, outputFile)
+#   directory_to_zip = "/tmp/input"
+#   output_file = "/tmp/out.zip"
+#   zf = ZipFileGenerator.new(directory_to_zip, output_file)
 #   zf.write()
 class ZipFileGenerator
-
   # Initialize with the directory to zip and the location of the output archive.
-  def initialize(inputDir, outputFile)
-    @inputDir = inputDir
-    @outputFile = outputFile
+  def initialize(input_dir, output_file)
+    @input_dir = input_dir
+    @output_file = output_file
   end
 
   # Zip the input directory.
-  def write()
-    entries = Dir.entries(@inputDir); entries.delete("."); entries.delete("..")
-    io = Zip::File.open(@outputFile, Zip::File::CREATE);
+  def write
+    entries = Dir.entries(@input_dir) - %w(. ..)
 
-    writeEntries(entries, "", io)
-    io.close();
+    ::Zip::File.open(@output_file, ::Zip::File::CREATE) do |io|
+      write_entries entries, '', io
+    end
   end
 
-  # 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("..")
-        writeEntries(subdir, zipFilePath, io)
+
+  # A helper method to make the recursion work.
+  def write_entries(entries, path, io)
+    entries.each do |e|
+      zip_file_path = path == '' ? e : File.join(path, e)
+      disk_file_path = File.join(@input_dir, zip_file_path)
+      puts "Deflating #{disk_file_path}"
+
+      if File.directory? disk_file_path
+        recursively_deflate_directory(disk_file_path, io, zip_file_path)
       else
-        io.get_output_stream(zipFilePath) { |f| f.puts(File.open(diskFilePath, "rb").read())}
+        put_into_archive(disk_file_path, io, zip_file_path)
       end
-    }
+    end
+  end
+
+  def recursively_deflate_directory(disk_file_path, io, zip_file_path)
+    io.mkdir zip_file_path
+    subdir = Dir.entries(disk_file_path) - %w(. ..)
+    write_entries subdir, zip_file_path, io
   end
 
+  def put_into_archive(disk_file_path, io, zip_file_path)
+    io.add(zip_file_path, disk_file_path)
+  end
 end

data/samples/{gtkRubyzip.rb → gtk_ruby_zip.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << "../lib"
+$: << '../lib'
 
 $VERBOSE = true
 
@@ -11,7 +11,7 @@ class MainApp < Gtk::Window
   def initialize
     super()
     set_usize(400, 256)
-    set_title("rubyzip")
+    set_title('rubyzip')
     signal_connect(Gtk::Window::SIGNAL_DESTROY) { Gtk.main_quit }
 
     box = Gtk::VBox.new(false, 0)
@@ -19,26 +19,25 @@ class MainApp < Gtk::Window
 
     @zipfile = nil
     @buttonPanel = ButtonPanel.new
-    @buttonPanel.openButton.signal_connect(Gtk::Button::SIGNAL_CLICKED) {
+    @buttonPanel.openButton.signal_connect(Gtk::Button::SIGNAL_CLICKED) do
       show_file_selector
-    }
-    @buttonPanel.extractButton.signal_connect(Gtk::Button::SIGNAL_CLICKED) {
-      puts "Not implemented!"
-    }
+    end
+    @buttonPanel.extractButton.signal_connect(Gtk::Button::SIGNAL_CLICKED) do
+      puts 'Not implemented!'
+    end
     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)
 
-    @clist = Gtk::CList.new(["Name", "Size", "Compression"])
+    @clist = Gtk::CList.new(%w(Name Size Compression))
     @clist.set_selection_mode(Gtk::SELECTION_BROWSE)
     @clist.set_column_width(0, 120)
     @clist.set_column_width(1, 120)
-    @clist.signal_connect(Gtk::CList::SIGNAL_SELECT_ROW) {
-      |w, row, column, event|
+    @clist.signal_connect(Gtk::CList::SIGNAL_SELECT_ROW) do |_w, row, _column, _event|
       @selected_row = row
-    }
+    end
     sw.add(@clist)
   end
 
@@ -48,38 +47,37 @@ class MainApp < Gtk::Window
       super
       set_layout(Gtk::BUTTONBOX_START)
       set_spacing(0)
-      @openButton = Gtk::Button.new("Open archive")
-      @extractButton = Gtk::Button.new("Extract entry")
+      @openButton = Gtk::Button.new('Open archive')
+      @extractButton = Gtk::Button.new('Extract entry')
       pack_start(@openButton)
       pack_start(@extractButton)
     end
   end
 
   def show_file_selector
-    @fileSelector = Gtk::FileSelection.new("Open zip file")
+    @fileSelector = Gtk::FileSelection.new('Open zip file')
     @fileSelector.show
-    @fileSelector.ok_button.signal_connect(Gtk::Button::SIGNAL_CLICKED) {
+    @fileSelector.ok_button.signal_connect(Gtk::Button::SIGNAL_CLICKED) do
       open_zip(@fileSelector.filename)
       @fileSelector.destroy
-    }
-    @fileSelector.cancel_button.signal_connect(Gtk::Button::SIGNAL_CLICKED) {
+    end
+    @fileSelector.cancel_button.signal_connect(Gtk::Button::SIGNAL_CLICKED) do
       @fileSelector.destroy
-    }
+    end
   end
 
   def open_zip(filename)
     @zipfile = Zip::File.open(filename)
     @clist.clear
-    @zipfile.each {
-      |entry|
-      @clist.append([ entry.name,
-		      entry.size.to_s,
-		      (100.0*entry.compressedSize/entry.size).to_s+"%" ])
-    }
+    @zipfile.each do |entry|
+      @clist.append([entry.name,
+                     entry.size.to_s,
+                     (100.0 * entry.compressedSize / entry.size).to_s + '%'])
+    end
   end
 end
 
-mainApp = MainApp.new()
+mainApp = MainApp.new
 
 mainApp.show_all
 

data/samples/qtzip.rb

@@ -1,22 +1,18 @@
 #!/usr/bin/env ruby
 
-$VERBOSE=true
+$VERBOSE = true
 
-$: << "../lib"
+$: << '../lib'
 
 require 'Qt'
 system('rbuic -o zipdialogui.rb zipdialogui.ui')
 require 'zipdialogui.rb'
 require 'zip'
 
-
-
 a = Qt::Application.new(ARGV)
 
 class ZipDialog < ZipDialogUI
-
-
-  def initialize()
+  def initialize
     super()
     connect(child('add_button'), SIGNAL('clicked()'),
             self, SLOT('add_files()'))
@@ -32,16 +28,14 @@ class ZipDialog < ZipDialogUI
     Zip::File.foreach(@zip_filename, &proc)
   end
 
-  def refresh()
-    lv = child("entry_list_view")
+  def refresh
+    lv = child('entry_list_view')
     lv.clear
-    each {
-      |e|
+    each do |e|
       lv.insert_item(Qt::ListViewItem.new(lv, e.name, e.size.to_s))
-    }
+    end
   end
 
-
   def load(zipfile)
     @zip_filename = zipfile
     refresh
@@ -49,13 +43,11 @@ class ZipDialog < ZipDialogUI
 
   def add_files
     l = Qt::FileDialog.getOpenFileNames(nil, nil, self)
-    zipfile {
-      |zf|
-      l.each {
-        |path|
+    zipfile do |zf|
+      l.each do |path|
         zf.add(File.basename(path), path)
-      }
-    }
+      end
+    end
     refresh
   end
 
@@ -63,7 +55,7 @@ class ZipDialog < ZipDialogUI
     selected_items = []
     unselected_items = []
     lv_item = entry_list_view.first_child
-    while (lv_item)
+    while lv_item
       if entry_list_view.is_selected(lv_item)
         selected_items << lv_item.text(0)
       else
@@ -77,18 +69,17 @@ class ZipDialog < ZipDialogUI
     puts "items.size = #{items.size}"
 
     d = Qt::FileDialog.get_existing_directory(nil, self)
-    if (!d)
-      puts "No directory chosen"
+    if !d
+      puts 'No directory chosen'
     else
       zipfile { |zf| items.each { |e| zf.extract(e, File.join(d, e)) } }
     end
-
   end
 
   slots 'add_files()', 'extract_files()'
 end
 
-if !ARGV[0]
+unless ARGV[0]
   puts "usage: #{$0} zipname"
   exit
 end
@@ -97,5 +88,5 @@ zd = ZipDialog.new
 zd.load(ARGV[0])
 
 a.mainWidget = zd
-zd.show()
-a.exec()
+zd.show
+a.exec

data/samples/write_simple.rb

@@ -1,13 +1,12 @@
-#!/usr/bin/env ruby
-
-$: << "../lib"
-
-require 'zip'
-
-include Zip
-
-OutputStream.open('simple.zip') {
-  |zos|
-  ze = zos.put_next_entry 'entry.txt'
-  zos.puts "Hello world"
-}
+#!/usr/bin/env ruby
+
+$: << '../lib'
+
+require 'zip'
+
+include Zip
+
+OutputStream.open('simple.zip') do |zos|
+  zos.put_next_entry 'entry.txt'
+  zos.puts 'Hello world'
+end

data/samples/zipfind.rb

@@ -2,7 +2,7 @@
 
 $VERBOSE = true
 
-$: << "../lib"
+$: << '../lib'
 
 require 'zip'
 require 'find'
@@ -10,53 +10,46 @@ require 'find'
 module Zip
   module ZipFind
     def self.find(path, zipFilePattern = /\.zip$/i)
-      Find.find(path) {
-	|fileName|
-	yield(fileName)
-	if zipFilePattern.match(fileName)  && File.file?(fileName)
-	  begin
-	    Zip::File.foreach(fileName)  {
-	      |zipEntry|
-	      yield(fileName + File::SEPARATOR + zipEntry.to_s)
-	    }
-	  rescue Errno::EACCES => ex
-	    puts ex
-	  end
-	end
-      }
+      Find.find(path) do |fileName|
+        yield(fileName)
+        next unless zipFilePattern.match(fileName) && File.file?(fileName)
+        begin
+          Zip::File.foreach(fileName) do |zipEntry|
+            yield(fileName + File::SEPARATOR + zipEntry.to_s)
+          end
+        rescue Errno::EACCES => ex
+          puts ex
+        end
+      end
     end
 
     def self.find_file(path, fileNamePattern, zipFilePattern = /\.zip$/i)
-      self.find(path, zipFilePattern) {
-	|fileName|
-	yield(fileName) if fileNamePattern.match(fileName)
-      }
+      find(path, zipFilePattern) do |fileName|
+        yield(fileName) if fileNamePattern.match(fileName)
+      end
     end
-
   end
 end
 
 if __FILE__ == $0
   module ZipFindConsoleRunner
-
-    PATH_ARG_INDEX = 0;
-    FILENAME_PATTERN_ARG_INDEX = 1;
-    ZIPFILE_PATTERN_ARG_INDEX = 2;
+    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],
-			    args[FILENAME_PATTERN_ARG_INDEX],
-			    args[ZIPFILE_PATTERN_ARG_INDEX]) {
-	|fileName|
-	report_entry_found fileName
-      }
+                             args[FILENAME_PATTERN_ARG_INDEX],
+                             args[ZIPFILE_PATTERN_ARG_INDEX]) do |fileName|
+        report_entry_found fileName
+      end
     end
 
     def self.check_args(args)
       if (args.size != 3)
-	usage
-	exit
+        usage
+        exit
       end
     end
 
@@ -67,7 +60,6 @@ if __FILE__ == $0
     def self.report_entry_found(fileName)
       puts fileName
     end
-
   end
 
   ZipFindConsoleRunner.run(ARGV)

data/test/basic_zip_file_test.rb

@@ -5,7 +5,7 @@ class BasicZipFileTest < MiniTest::Test
 
   def setup
     @zip_file = ::Zip::File.new(TestZipFile::TEST_ZIP2.zip_name)
-    @testEntryNameIndex=0
+    @testEntryNameIndex = 0
   end
 
   def test_entries
@@ -16,26 +16,24 @@ class BasicZipFileTest < MiniTest::Test
   def test_each
     count = 0
     visited = {}
-    @zip_file.each {
-        |entry|
+    @zip_file.each do |entry|
       assert(TestZipFile::TEST_ZIP2.entry_names.include?(entry.name))
       assert(!visited.include?(entry.name))
       visited[entry.name] = nil
       count = count.succ
-    }
+    end
     assert_equal(TestZipFile::TEST_ZIP2.entry_names.length, count)
   end
 
   def test_foreach
     count = 0
     visited = {}
-    ::Zip::File.foreach(TestZipFile::TEST_ZIP2.zip_name) {
-        |entry|
+    ::Zip::File.foreach(TestZipFile::TEST_ZIP2.zip_name) do |entry|
       assert(TestZipFile::TEST_ZIP2.entry_names.include?(entry.name))
       assert(!visited.include?(entry.name))
       visited[entry.name] = nil
       count = count.succ
-    }
+    end
     assert_equal(TestZipFile::TEST_ZIP2.entry_names.length, count)
   end
 
@@ -51,14 +49,12 @@ class BasicZipFileTest < MiniTest::Test
     assert_equal(TestZipFile::TEST_ZIP2.entry_names.length, count)
   end
 
-  def test_get_input_streamBlock
+  def test_get_input_stream_block
     fileAndEntryName = @zip_file.entries.first.name
-    @zip_file.get_input_stream(fileAndEntryName) {
-        |zis|
-      assert_entryContentsForStream(fileAndEntryName,
-                                    zis,
-                                    fileAndEntryName)
-    }
+    @zip_file.get_input_stream(fileAndEntryName) do |zis|
+      assert_entry_contents_for_stream(fileAndEntryName,
+                                       zis,
+                                       fileAndEntryName)
+    end
   end
-
 end