seven_zip_ruby 1.1.0-x86-mswin32-100 → 1.2.0-x86-mswin32-100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44604e5c59493ad556f1e324a8e4beefbcbd9b6e
-  data.tar.gz: 9e1d75a8e14daf2f93c46c48f1df0384d44f5645
+  metadata.gz: c5f76d2c9638a3a822cf5857fd882751e10b08fb
+  data.tar.gz: df3d399ba030d7877763bba565c53ee3601408e5
 SHA512:
-  metadata.gz: f70ab04fc087986aaaadc3e62a714d8bd59c82e43cd412ddae4389363ab75cb6f9d34591aaa0b343f43996dae3b4115c76ce57525931cabb0a308f23c845e96d
-  data.tar.gz: e83c89c178359acc64c190d627b85ba18d43d32a0dc5947387c75f68f3d9993b62c1baf96c1425193a3b6c56ff2485856edc7f83afab0647a1aa81baac5187e7
+  metadata.gz: f703eb23188d2097dc2ea3c63bacb8487e86e611076d80a3465d7e45e92ad4834fc073b2301d98d3dcbb796e91aff0045831a0d65137000f795474af9b03c1e3
+  data.tar.gz: 93a2e680ea29f54d5f169725f66ed22c49cb69459677bc3a4ff3d2a1a1d99c7c66af1a179a8577e76ac95fdf2513b161eef95835f2495c61f4b46e3c2f6d455a

data/.gitignore

@@ -1,5 +1,6 @@
 *.rbc
 *.o
+*.obj
 *.so
 *.bundle
 *.bak

data/.travis.yml

@@ -1,6 +1,15 @@
 language: ruby
 rvm:
   - "2.0.0"
+  - "2.1.0"
+  - "rbx"
+  - "ruby-head"
+matrix:
+  allow_failures:
+    - rvm: "rbx"
+    - rvm: "ruby-head"
+notifications:
+  email: false
 cache:
   - apt
 before_install:

data/README.md

@@ -1,8 +1,8 @@
 # SevenZipRuby ![Logo](https://raw.github.com/masamitsu-murase/seven_zip_ruby/master/resources/seven_zip_ruby_logo.png)
 
-[![Build Status](https://travis-ci.org/masamitsu-murase/seven_zip_ruby.png?branch=master)](https://travis-ci.org/masamitsu-murase/seven_zip_ruby)
+[![Build Status](https://travis-ci.org/masamitsu-murase/seven_zip_ruby.png?branch=master)](https://travis-ci.org/masamitsu-murase/seven_zip_ruby) [![Gem Version](https://badge.fury.io/rb/seven_zip_ruby.png)](http://badge.fury.io/rb/seven_zip_ruby)
 
-This is a Ruby gem library to handle [7-Zip](http://www.7-zip.org) archives.
+This is a Ruby gem library to extract/compress [7-Zip](http://www.7-zip.org) archives.
 
 This extension calls the native library, 7z.dll or 7z.so, internally and it is included in this gem.
 
@@ -86,12 +86,19 @@ File.open("filename.7z", "wb") do |file|
 end
 ```
 
-## Supported platforms
+## Supported environment
+
+SevenZipRuby supports the following platforms.
 
 * Windows
 * Linux
 * Mac OSX
 
+SevenZipRuby supports the following Ruby engines on each platform.
+
+* MRI 2.0.0 and later
+* Rubinius 2.2.1 and later
+
 ## More examples
 
 ### Extract partially
@@ -180,7 +187,7 @@ LGPL and unRAR license. Please refer to LICENSE.txt.
 
 ## Releases
 
-* 1.1.0
+* 1.1.0  
   Raise error when wrong password is specified.
 * 1.0.0  
   Initial release.

data/Rakefile

@@ -1,4 +1,5 @@
 require "fileutils"
+require "tempfile"
 require "bundler/gem_tasks"
 
 BINARY_FILES = [ "seven_zip_archive.so", "seven_zip_archive.bundle" ]
@@ -32,7 +33,18 @@ end
 task :build_binary do
   Dir.chdir "ext/seven_zip_ruby" do
     FileUtils.rmtree BINARY_FILES
-    sh "ruby extconf.rb"
+
+    Tempfile.open([ "site", ".rb" ], Dir.pwd) do |temp|
+      temp.puts <<"EOS"
+require('rbconfig')
+RbConfig::CONFIG['sitearchdir'] = "../../lib"
+EOS
+      temp.flush
+
+      sh "ruby -r#{File.expand_path(temp.path)} extconf.rb"
+      temp.unlink
+    end
+
     sh "#{MAKE}"
   end
 end

data/lib/seven_zip_ruby.rb

@@ -1,16 +1,27 @@
 # -*- coding: utf-8 -*-
 
-require_relative("seven_zip_ruby/version")
+require("seven_zip_ruby/version")
 
-Dir.chdir("#{__dir__}/seven_zip_ruby"){ require_relative("seven_zip_ruby/seven_zip_archive") }
+external_lib = (RUBY_PLATFORM.downcase.match(/mswin|mingw/) ? "7z.dll" : "7z.so")
+dir = $:.find do |i|
+  next File.file?(File.join(i, "seven_zip_ruby", external_lib))
+end
+raise "Failed to find 7z.dll or 7z.so" unless (dir)
+
+Dir.chdir(File.join(dir, "seven_zip_ruby"))do
+  begin
+    version = RUBY_VERSION.match(/\d+\.\d+/)
+    require("seven_zip_ruby/#{version}/seven_zip_archive")
+  rescue LoadError
+    require("seven_zip_ruby/seven_zip_archive")
+  end
+end
 raise "Failed to initialize SevenZipRuby" unless (defined?(SevenZipRuby::SevenZipReader))
 
-require_relative("seven_zip_ruby/seven_zip_reader")
-require_relative("seven_zip_ruby/seven_zip_writer")
-require_relative("seven_zip_ruby/archive_info")
-require_relative("seven_zip_ruby/update_info")
-require_relative("seven_zip_ruby/entry_info")
-require_relative("seven_zip_ruby/exception")
+require("seven_zip_ruby/seven_zip_reader")
+require("seven_zip_ruby/seven_zip_writer")
+require("seven_zip_ruby/archive_info")
+require("seven_zip_ruby/update_info")
+require("seven_zip_ruby/entry_info")
+require("seven_zip_ruby/exception")
 
-module SevenZipRuby
-end

data/lib/seven_zip_ruby/entry_info.rb

@@ -4,11 +4,12 @@ module SevenZipRuby
   class EntryInfo
     def initialize(index, path, method, dir, encrypted, anti, size, pack_size, ctime, atime, mtime, attrib, crc)
       @index, @path, @method, @dir, @encrypted, @anti, @size, @pack_size, @ctime, @atime, @mtime, @attrib, @crc =
-        index, Pathname(path.to_s.force_encoding(Encoding::UTF_8)).cleanpath, method, dir, encrypted, anti, size, pack_size, ctime, atime, mtime, attrib, crc
+        index, Pathname(path.to_s.force_encoding(Encoding::UTF_8)).cleanpath.to_s, method, dir, encrypted, anti, size, pack_size, ctime, atime, mtime, attrib, crc
     end
 
     attr_reader :index, :path, :method, :size, :pack_size, :ctime, :atime, :mtime, :attrib, :crc
     alias to_i index
+    alias crc32 crc
 
     def directory?
       return @dir
@@ -38,7 +39,7 @@ module SevenZipRuby
       else
         type = "file"
       end
-      str = path.to_s.encode(Encoding::ASCII, invalid: :replace, undef: :replace, replace: "?")
+      str = path.encode(Encoding::ASCII, invalid: :replace, undef: :replace, replace: "?")
       return "#<EntryInfo: #{index}, #{type}, #{str}>"
     end
   end

data/lib/seven_zip_ruby/seven_zip_reader.rb

@@ -28,6 +28,11 @@ module SevenZipRuby
   #     end
   #   end
   #
+  #   # Extract archive 2
+  #   SevenZipRuby::Reader.open_file("filename.7z") do |szr|
+  #     szr.extract(:all, "path_to_dir")
+  #   end
+  #
   #   # Extract encrypted archive
   #   File.open("filename.7z", "rb") do |file|
   #     SevenZipRuby::Reader.open(file, password: "Password String") do |szr|
@@ -103,6 +108,40 @@ module SevenZipRuby
         end
       end
 
+
+      # Open 7zip archive to read.
+      #
+      # ==== Args
+      # +filename+ :: Filename of 7zip archive.
+      # +param+ :: Optional hash parameter. <tt>:password</tt> key represents password of this archive.
+      #
+      # ==== Examples
+      #   # Open archive
+      #   SevenZipRuby::SevenZipReader.open_file("filename.7z") do |szr|
+      #     # Read and extract archive.
+      #   end
+      #
+      #   # Open encrypted archive
+      #   SevenZipRuby::SevenZipReader.open_file("filename.7z", password: "PasswordOfArchive") do |szr|
+      #     # Read and extract archive.
+      #   end
+      #
+      #   # Open without block.
+      #   szr = SevenZipRuby::SevenZipReader.open_file("filename.7z")
+      #   # Read and extract archive.
+      #   szr.close
+      def open_file(filename, param = {}, &block)  # :yield: szr
+        szr = self.new
+        szr.open_file(filename, param)
+        if (block)
+          block.call(szr)
+          szr.close
+        else
+          szr
+        end
+      end
+
+
       # Open and extract 7zip archive.
       #
       # ==== Args
@@ -167,6 +206,8 @@ module SevenZipRuby
       end
     end
 
+    undef initialize_copy, clone, dup
+
     # Open 7zip archive.
     #
     # ==== Args
@@ -187,6 +228,31 @@ module SevenZipRuby
       return self
     end
 
+    # Open 7zip archive file.
+    #
+    # ==== Args
+    # +filename+ :: Filename of 7zip archive.
+    # +param+ :: Optional hash parameter. <tt>:password</tt> key represents password of this archive.
+    #
+    # ==== Examples
+    #   szr = SevenZipRuby::SevenZipReader.new
+    #   szr.open_file("filename.7z")
+    #   # ...
+    #   szr.close
+    def open_file(filename, param = {})
+      @stream = File.open(filename, "rb")
+      self.open(@stream, param)
+      return self
+    end
+
+    def close
+      close_impl
+      if (@stream)
+        @stream.close
+        @stream = nil
+      end
+    end
+
     # Verify 7zip archive.
     #
     # ==== Args
@@ -252,9 +318,11 @@ module SevenZipRuby
       when Symbol
         raise SevenZipError.new("Argument error") unless (index == :all)
         return extract_all(path)
-      when Array
+      when Enumerable
         index_list = index.map(&:to_i).sort.uniq
         extract_files_impl(index_list, file_proc(path))
+      when nil
+        raise ArgumentError.new("Invalid parameter index")
       else
         extract_impl(index.to_i, file_proc(path))
       end
@@ -328,7 +396,7 @@ module SevenZipRuby
         extract_all_impl(data_proc(ret, idx_prj))
         return ret
 
-      when Array
+      when Enumerable
         index_list = index.map(&:to_i)
         idx_prj = Hash[*(index_list.each_with_index.map{ |idx, i| [ idx, i ] }.flatten)]
 
@@ -336,6 +404,9 @@ module SevenZipRuby
         extract_files_impl(index_list, data_proc(ret, idx_prj))
         return ret
 
+      when nil
+        raise ArgumentError.new("Invalid parameter index")
+
       else
         index = index.to_i
         item = entry(index)
@@ -360,14 +431,15 @@ module SevenZipRuby
         case(type)
         when :stream
           ret = nil
+          arg_path = Pathname(arg.path)
           if (arg.anti?)
-            arg.path.rmtree if (arg.path.exist?)
+            arg_path.rmtree if (arg_path.exist?)
           elsif (arg.file?)
-            path = arg.path.expand_path(base_dir)
+            path = arg_path.expand_path(base_dir)
             path.parent.mkpath
             ret = File.open(path, "wb")
           else
-            path = arg.path.expand_path(base_dir)
+            path = arg_path.expand_path(base_dir)
             path.mkpath
             set_file_attribute(path.to_s, arg.attrib) if (arg.attrib)
             path.utime(arg.atime || path.atime, arg.mtime || path.mtime)
@@ -379,7 +451,7 @@ module SevenZipRuby
           raise InvalidArchive.new("Corrupted archive or invalid password") unless (arg[:success])
 
           unless (arg[:info].anti?)
-            path = arg[:info].path.expand_path(base_dir)
+            path = Pathname(arg[:info].path).expand_path(base_dir)
             set_file_attribute(path.to_s, arg[:info].attrib) if (arg[:info].attrib)
             path.utime(arg[:info].atime || path.atime, arg[:info].mtime || path.mtime)
           end

data/lib/seven_zip_ruby/seven_zip_writer.rb

@@ -22,6 +22,14 @@ module SevenZipRuby
   #     end
   #   end
   #
+  #   # Compress files 2
+  #   SevenZipRuby::SevenZipWriter.open_file("filename.7z") do |szw|
+  #     szw.add_directory("test_dir")
+  #     Dir.chdir("parent_dir_of_test.txt") do
+  #       szw.add_file("test.txt")
+  #     end
+  #   end
+  #
   #   stream = StringIO.new("")
   #   SevenZipRuby::SevenZipWriter.open(stream) do |szw|
   #     szw.add_file("test.txt")
@@ -46,7 +54,11 @@ module SevenZipRuby
     # Encoding used for path string in 7zip archive.
     PATH_ENCODING = Encoding::UTF_8
 
+    @use_native_input_file_stream = true
+
     class << self
+      attr_accessor :use_native_input_file_stream
+
       # Open 7zip archive to write.
       #
       # ==== Args
@@ -75,9 +87,49 @@ module SevenZipRuby
         szw = self.new
         szw.open(stream, param)
         if (block)
-          block.call(szw)
-          szw.compress
-          szw.close
+          begin
+            block.call(szw)
+            szw.compress
+            szw.close
+          ensure
+            szw.close_file
+          end
+        else
+          szw
+        end
+      end
+
+      # Open 7zip archive file.
+      #
+      # ==== Args
+      # +filename+ :: 7zip archive filename.
+      # +param+ :: Optional hash parameter. <tt>:password</tt> key represents password of this archive.
+      #
+      # ==== Examples
+      #   # Open archive
+      #   SevenZipRuby::SevenZipWriter.open_file("filename.7z") do |szw|
+      #     # Create archive.
+      #     # ...
+      #     # You don't have to call szw.compress. Of cource, you may call it.
+      #     # szw.compress
+      #   end
+      #
+      #   # Open without block.
+      #   szw = SevenZipRuby::SevenZipWriter.open_file("filename.7z")
+      #   # Create archive.
+      #   szw.compress  # Compress must be called in this case.
+      #   szw.close
+      def open_file(filename, param = {}, &block)  # :yield: szw
+        szw = self.new
+        szw.open_file(filename, param)
+        if (block)
+          begin
+            block.call(szw)
+            szw.compress
+            szw.close
+          ensure
+            szw.close_file
+          end
         else
           szw
         end
@@ -96,8 +148,10 @@ module SevenZipRuby
       #     SevenZipRuby::SevenZipWriter.add_directory(file, 'dir')
       #   end
       def add_directory(stream, dir, param = {})
-        password = { password: param.delete(:password) }
-        self.open(stream, password) do |szw|
+        open_param = {
+          password: param.delete(:password)
+        }
+        self.open(stream, open_param) do |szw|
           szw.add_directory(dir, param)
         end
       end
@@ -116,13 +170,17 @@ module SevenZipRuby
       #     SevenZipRuby::SevenZipWriter.add_file(file, 'file.txt')
       #   end
       def add_file(stream, filename, param = {})
-        password = { password: param.delete(:password) }
-        self.open(stream, password) do |szw|
+        open_param = {
+          password: param.delete(:password)
+        }
+        self.open(stream, open_param) do |szw|
           szw.add_file(filename, param)
         end
       end
     end
 
+    undef initialize_copy, clone, dup
+
     # Open 7zip archive to create.
     #
     # ==== Args
@@ -131,7 +189,8 @@ module SevenZipRuby
     #
     # ==== Examples
     #   File.open("filename.7z", "wb") do |file|
-    #     szw = SevenZipRuby::SevenZipWriter.open(file)
+    #     szw = SevenZipRuby::SevenZipWriter.new
+    #     szw.open(file)
     #     # ...
     #     szw.compress
     #     szw.close
@@ -142,6 +201,36 @@ module SevenZipRuby
       return self
     end
 
+    # Open 7zip archive file to create.
+    #
+    # ==== Args
+    # +filename+ :: 7zip archive filename.
+    # +param+ :: Optional hash parameter. <tt>:password</tt> key represents password of this archive.
+    #
+    # ==== Examples
+    #   szw = SevenZipRuby::SevenZipWriter.new
+    #   szw.open_file("filename.7z")
+    #   # ...
+    #   szw.compress
+    #   szw.close
+    def open_file(filename, param = {})
+      @stream = File.open(filename, "wb")
+      self.open(@stream, param)
+      return self
+    end
+
+    def close
+      close_impl
+      close_file
+    end
+
+    def close_file  # :nodoc:
+      if (@stream)
+        @stream.close rescue nil
+        @stream = nil
+      end
+    end
+
     # Compress and output data to archive file.
     # You don't have to call this method when you use block-style SevenZipWriter.open.
     #
@@ -261,7 +350,10 @@ module SevenZipRuby
         mkdir(directory, { ctime: directory.ctime, atime: directory.atime, mtime: directory.mtime })
       end
 
-      Pathname.glob(directory.join("**", "*").to_s) do |entry|
+      Pathname.glob(directory.join("**", "*").to_s, File::FNM_DOTMATCH) do |entry|
+        basename = entry.basename.to_s
+        next if (basename == "." || basename == "..")
+
         name = (base_dir + entry.relative_path_from(directory)).cleanpath if (base_dir)
 
         if (entry.file?)
@@ -312,9 +404,14 @@ module SevenZipRuby
         case(type)
         when :stream
           if (info.buffer?)
-            next StringIO.new(info.data)
+            #      type(filename/io), data
+            next [ false, StringIO.new(info.data) ]
           elsif (info.file?)
-            next File.open(info.data, "rb")
+            if (SevenZipWriter.use_native_input_file_stream)
+              next [ true, info.data ]
+            else
+              next [ false, File.open(info.data, "rb") ]
+            end
           else
             next nil
           end

data/lib/seven_zip_ruby/version.rb

@@ -1,3 +1,3 @@
 module SevenZipRuby
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/seven_zip_ruby_spec.rb

@@ -13,11 +13,13 @@ describe SevenZipRuby do
   end
 
   before(:each) do
+    @use_native_input_file_stream = SevenZipRuby::SevenZipWriter.use_native_input_file_stream
     SevenZipRubySpecHelper.prepare_each
   end
 
   after(:each) do
     SevenZipRubySpecHelper.cleanup_each
+    SevenZipRuby::SevenZipWriter.use_native_input_file_stream = @use_native_input_file_stream
   end
 
 
@@ -32,7 +34,7 @@ describe SevenZipRuby do
         expect(entries.size).to be SevenZipRubySpecHelper::SAMPLE_DATA.size
 
         SevenZipRubySpecHelper::SAMPLE_DATA.each do |sample|
-          entry = entries.select{ |i| i.path == Pathname(sample[:name]).cleanpath }
+          entry = entries.select{ |i| i.path == Pathname(sample[:name]).cleanpath.to_s }
           expect(entry.size).to be 1
 
           entry = entry[0]
@@ -58,14 +60,12 @@ describe SevenZipRuby do
     end
 
     example "extract data directly from archive" do
-      File.open(SevenZipRubySpecHelper::SEVEN_ZIP_FILE, "rb") do |file|
-        SevenZipRuby::SevenZipReader.open(file) do |szr|
-          entries = szr.entries
+      SevenZipRuby::SevenZipReader.open_file(SevenZipRubySpecHelper::SEVEN_ZIP_FILE) do |szr|
+        entries = szr.entries
 
-          SevenZipRubySpecHelper::SAMPLE_DATA.each do |sample|
-            entry = entries.find{ |i| i.path == Pathname(sample[:name]).cleanpath }
-            expect(szr.extract_data(entry.index)).to eq sample[:data]
-          end
+        SevenZipRubySpecHelper::SAMPLE_DATA.each do |sample|
+          entry = entries.find{ |i| i.path == Pathname(sample[:name]).cleanpath.to_s }
+          expect(szr.extract_data(entry.index)).to eq sample[:data]
         end
       end
     end
@@ -105,7 +105,7 @@ describe SevenZipRuby do
         th = Thread.new do
           szr = SevenZipRuby::SevenZipReader.open(file)
           sample = SevenZipRubySpecHelper::SAMPLE_DATA.sample
-          entry = szr.entries.find{ |i| i.path == Pathname(sample[:name]).cleanpath }
+          entry = szr.entries.find{ |i| i.path == Pathname(sample[:name]).cleanpath.to_s }
         end
         th.join
 
@@ -122,9 +122,10 @@ describe SevenZipRuby do
       expect(SevenZipRuby::SevenZipReader.verify(StringIO.new(data))).to eq true
 
       data[0x27] = 0xEB.chr  # This highly dependes on the current test binary.
+      expected = [ :DataError, :DataError, :DataError, :DataError, :DataError, :DataError, :DataError, true, true, true, true, true ]
       SevenZipRuby::SevenZipReader.open(StringIO.new(data)) do |szr|
         expect(szr.test).to eq false
-        expect(szr.verify_detail).to eq [ :DataError, :DataError, :DataError, true, true, true ]
+        expect(szr.verify_detail).to eq expected
       end
 
 
@@ -137,8 +138,9 @@ describe SevenZipRuby do
         expect(szr.verify).to eq false
       end
 
+      expected = [ :DataError, :DataError, :DataError, :DataError, :DataError, :DataError, :DataError, true, true, true, true, true ]
       SevenZipRuby::SevenZipReader.open(StringIO.new(data), { password: "wrong password" }) do |szr|
-        expect(szr.verify_detail).to eq [ :DataError, :DataError, :DataError, true, true, true ]
+        expect(szr.verify_detail).to eq expected
       end
     end
 
@@ -158,6 +160,22 @@ describe SevenZipRuby do
         end
       end
 
+      example "invalid index" do
+        File.open(SevenZipRubySpecHelper::SEVEN_ZIP_FILE, "rb") do |file|
+          SevenZipRuby::SevenZipReader.open(file) do |szr|
+            expect{ szr.extract_data(nil) }.to raise_error (ArgumentError)
+          end
+        end
+      end
+
+      example "invalid index for entry" do
+        File.open(SevenZipRubySpecHelper::SEVEN_ZIP_FILE, "rb") do |file|
+          SevenZipRuby::SevenZipReader.open(file) do |szr|
+            expect{ szr.entry("a") }.to raise_error
+          end
+        end
+      end
+
       example "invalid password" do
         File.open(SevenZipRubySpecHelper::SEVEN_ZIP_PASSWORD_FILE, "rb") do |file|
           expect{ SevenZipRuby::Reader.open(file){ |szr| szr.extract_data(1) } }.to raise_error
@@ -235,19 +253,11 @@ describe SevenZipRuby do
 
         sleep 1
         expect{ th.kill }.not_to raise_error  # Thread can be killed.
+      end
 
-
-        th = Thread.start do
-          SevenZipRuby::SevenZipWriter.open(output) do |szw|
-            szw.method = "BZIP2"
-            szw.level = 9
-            szw.multi_thread = false
-            szw.add_data(SevenZipRubySpecHelper::SAMPLE_LARGE_RANDOM_DATA * 2, "hoge.txt")
-          end
-        end
-
-        sleep 0.1  # Highly dependes on CPU speed...
-        expect{ th.kill }.not_to raise_error # Thread can be killed.
+      example "clone and dup cannot be called." do
+        expect{ SevenZipRuby::SevenZipReader.new.clone }.to raise_error
+        expect{ SevenZipRuby::SevenZipReader.new.dup }.to raise_error
       end
 
     end
@@ -266,7 +276,9 @@ describe SevenZipRuby do
       szw.mkdir("hoge/hoge/hoge")
       szw.compress
       szw.close
-      output.close
+
+      output.rewind
+      expect(SevenZipRuby::SevenZipReader.verify(output)).to eq true
     end
 
     example "compress" do
@@ -277,6 +289,24 @@ describe SevenZipRuby do
         szw.mkdir("hoge/hoge/hoge")
         szw.compress
       end
+
+      output.rewind
+      expect(SevenZipRuby::SevenZipReader.verify(output)).to eq true
+    end
+
+    example "open_file" do
+      FileUtils.mkpath(SevenZipRubySpecHelper::EXTRACT_DIR)
+      Dir.chdir(SevenZipRubySpecHelper::EXTRACT_DIR) do
+        filename = "hoge.7z"
+
+        SevenZipRuby::SevenZipWriter.open_file(filename) do |szw|
+          szw.add_data("This is a sample.", "hoge.txt")
+        end
+
+        File.open(filename, "rb") do |f|
+          expect(SevenZipRuby::SevenZipReader.verify(f)).to eq true
+        end
+      end
     end
 
     example "compress local file" do
@@ -296,53 +326,62 @@ describe SevenZipRuby do
       end
     end
 
-    example "add_directory" do
-      Dir.chdir(SevenZipRubySpecHelper::SAMPLE_FILE_DIR) do
-        output = StringIO.new("")
-        SevenZipRuby::SevenZipWriter.open(output) do |szw|
-          Pathname.glob("*") do |path|
-            if (path.file?)
-              szw.add_file(path)
-            else
-              szw.add_directory(path)
+    [ true, false ].each do |use_native_input_file_stream|
+      example "add_directory: use_native_input_file_stream=#{use_native_input_file_stream}" do
+        SevenZipRuby::SevenZipWriter.use_native_input_file_stream = use_native_input_file_stream
+
+        Dir.chdir(SevenZipRubySpecHelper::SAMPLE_FILE_DIR) do
+          output = StringIO.new("")
+          SevenZipRuby::SevenZipWriter.open(output) do |szw|
+            Pathname.glob("*", File::FNM_DOTMATCH) do |path|
+              basename = path.basename.to_s
+              next if (basename == "." || basename == "..")
+
+              if (path.file?)
+                szw.add_file(path)
+              else
+                szw.add_directory(path)
+              end
             end
           end
-        end
 
-        output.rewind
-        SevenZipRuby::SevenZipReader.open(output) do |szr|
-          entries = szr.entries
-          expect(entries.size).to eq SevenZipRubySpecHelper::SAMPLE_DATA.size
-
-          entries.each do |entry|
-            entry_in_sample = SevenZipRubySpecHelper::SAMPLE_DATA.find{ |i| i[:name] == entry.path.to_s }
-            local_entry = Pathname(File.join(SevenZipRubySpecHelper::SAMPLE_FILE_DIR, entry_in_sample[:name]))
-            if (entry_in_sample[:directory])
-              expect(entry.directory?).to eq true
-            else
-              expect(szr.extract_data(entry)).to eq File.open(entry_in_sample[:name], "rb", &:read)
+          output.rewind
+          SevenZipRuby::SevenZipReader.open(output) do |szr|
+            entries = szr.entries
+            expect(entries.size).to eq SevenZipRubySpecHelper::SAMPLE_DATA.size
+
+            entries.each do |entry|
+              entry_in_sample = SevenZipRubySpecHelper::SAMPLE_DATA.find{ |i| i[:name] == entry.path.to_s }
+              local_entry = Pathname(File.join(SevenZipRubySpecHelper::SAMPLE_FILE_DIR, entry_in_sample[:name]))
+              if (entry_in_sample[:directory])
+                expect(entry.directory?).to eq true
+              else
+                expect(szr.extract_data(entry)).to eq File.open(entry_in_sample[:name], "rb", &:read)
+              end
+              expect(entry.mtime.to_i).to eq local_entry.mtime.to_i
             end
-            expect(entry.mtime.to_i).to eq local_entry.mtime.to_i
           end
         end
       end
-    end
 
-    example "add_directory singleton version" do
-      dir = File.join(SevenZipRubySpecHelper::SAMPLE_FILE_DIR, "..")
-      dirname = File.basename(SevenZipRubySpecHelper::SAMPLE_FILE_DIR)
-      Dir.chdir(dir) do
-        output = StringIO.new("")
-        SevenZipRuby::SevenZipWriter.add_directory(output, dirname)
+      example "add_directory singleton version: use_native_input_file_stream=#{use_native_input_file_stream}" do
+        SevenZipRuby::SevenZipWriter.use_native_input_file_stream = use_native_input_file_stream
 
-        output2 = StringIO.new("")
-        SevenZipRuby::SevenZipWriter.open(output2) do |szr|
-          szr.add_directory(dirname)
-        end
+        dir = File.join(SevenZipRubySpecHelper::SAMPLE_FILE_DIR, "..")
+        dirname = File.basename(SevenZipRubySpecHelper::SAMPLE_FILE_DIR)
+        Dir.chdir(dir) do
+          output = StringIO.new("")
+          SevenZipRuby::SevenZipWriter.add_directory(output, dirname)
+
+          output2 = StringIO.new("")
+          SevenZipRuby::SevenZipWriter.open(output2) do |szr|
+            szr.add_directory(dirname)
+          end
 
-        expect(output.string).to eq output2.string
+          expect(output.string).to eq output2.string
+        end
       end
-    end
+    end  # use_native_input_file_stream
 
     example "use as option" do
       output = StringIO.new("")
@@ -354,15 +393,16 @@ describe SevenZipRuby do
       SevenZipRuby::SevenZipReader.open(output) do |szr|
         base_dir = Pathname(SevenZipRubySpecHelper::SAMPLE_FILE_DIR)
         entries = szr.entries
-        files = Pathname.glob(base_dir.to_s + "/**/*") +[ base_dir ]
+        files = Pathname.glob(base_dir.to_s + "/**/*", File::FNM_DOTMATCH) + [ base_dir ]
+        files = files.select{ |i| i.basename.to_s != "." && i.basename.to_s != ".." }
 
         expect(entries.size).to eq files.size
 
-        expect(entries.all?{ |i| i.path.to_s.start_with?("test/dir") }).to eq true
+        expect(entries.all?{ |i| i.path.start_with?("test/dir") }).to eq true
 
         entries.each do |entry|
           file = files.find do |i|
-            i.relative_path_from(base_dir) == entry.path.relative_path_from(Pathname("test/dir"))
+            i.relative_path_from(base_dir) == Pathname(entry.path).relative_path_from(Pathname("test/dir"))
           end
           expect(file.directory?).to eq entry.directory?
         end
@@ -493,6 +533,41 @@ describe SevenZipRuby do
         expect{ szw.add_data("This is hoge.txt content.", "hoge.txt") }.to raise_error(SevenZipRuby::InvalidOperation)
       end
 
+      example "clone and dup cannot be called." do
+        expect{ SevenZipRuby::SevenZipWriter.new.clone }.to raise_error
+        expect{ SevenZipRuby::SevenZipWriter.new.dup }.to raise_error
+      end
+
+      if (false && RUBY_ENGINE == "ruby")
+        # It seems that Rubinius has the different way to handle error.
+        # Therefore, it sometimes fails to kill SevenZipRuby thread.
+        example "kill thread" do
+          [ "LZMA", "PPMd", "BZIP2" ].each do |method|
+            prc = lambda do
+              output = StringIO.new("")
+              SevenZipRuby::SevenZipWriter.open(output) do |szw|
+                szw.method = method
+                szw.level = 9
+                szw.multi_thread = true
+                szw.add_data(SevenZipRubySpecHelper::SAMPLE_LARGE_RANDOM_DATA * 3, "hoge.txt")
+              end
+            end
+
+            start = Time.now
+            th = Thread.start{ prc.call }
+            th.join
+            diff = Time.now - start
+
+            10.times do
+              th = Thread.start{ prc.call }
+              sleep(rand * diff)
+              expect{ th.kill }.not_to raise_error   # Thread can be killed.
+              sleep diff*2  # Workaround. When some threads of SZR are running and killed, SEGV sometimes occurs...
+            end
+          end
+        end
+      end
+
     end
 
   end

data/spec/seven_zip_ruby_spec_helper.rb

@@ -6,8 +6,8 @@ require("rbconfig")
 module SevenZipRubySpecHelper
   DETAIL_CHECK = true
 
-  BASE_DIR = __dir__
-  TEMP_DIR = File.expand_path("../tmp", __dir__)
+  BASE_DIR = File.expand_path("..", __FILE__)
+  TEMP_DIR = File.expand_path("../../tmp", __FILE__)
 
   SAMPLE_FILE_DIR_RELATIVE = "sample_file"
   SAMPLE_FILE_DIR = File.expand_path(SAMPLE_FILE_DIR_RELATIVE, TEMP_DIR)
@@ -21,6 +21,12 @@ module SevenZipRubySpecHelper
     { name: "directory", directory: true },
     { name: "directory/utf8_file.txt", data: "日本語のファイル".force_encoding("ASCII-8BIT"), directory: false },
     { name: "directory/utf8_name®.txt", data: "日本語のファイル".force_encoding("ASCII-8BIT"), directory: false },
+    { name: "directory/.dot.txt", data: "Dot text".force_encoding("ASCII-8BIT"), directory: false },
+    { name: "directory/.dot_dir", directory: true },
+    { name: "directory/.dot_dir/normal.txt", data: "Dot text".force_encoding("ASCII-8BIT"), directory: false },
+    { name: ".dot_dir", directory: true },
+    { name: ".dot_dir/normal.txt", data: "Normal text".force_encoding("ASCII-8BIT"), directory: false },
+    { name: ".dot_dir/.dot.txt", data: "Dot text".force_encoding("ASCII-8BIT"), directory: false },
     { name: "empty_directory", directory: true }
   ]
 
@@ -70,8 +76,9 @@ module SevenZipRubySpecHelper
 
     def prepare_seven_zip_file
       Dir.chdir(SAMPLE_FILE_DIR) do
-        my_system("7z a -bd \"#{SEVEN_ZIP_FILE}\" *")
-        my_system("7z a -bd \"-p#{SEVEN_ZIP_PASSWORD}\" \"#{SEVEN_ZIP_PASSWORD_FILE}\" *")
+        files = (Dir.glob("*", File::FNM_DOTMATCH).to_a - [ ".", ".." ]).join(" ")
+        my_system("7z a -bd \"#{SEVEN_ZIP_FILE}\" #{files}")
+        my_system("7z a -bd \"-p#{SEVEN_ZIP_PASSWORD}\" \"#{SEVEN_ZIP_PASSWORD_FILE}\" #{files}")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seven_zip_ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: x86-mswin32-100
 authors:
 - Masamitsu MURASE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,8 @@ files:
 - seven_zip_ruby.gemspec
 - spec/seven_zip_ruby_spec.rb
 - spec/seven_zip_ruby_spec_helper.rb
-- lib/seven_zip_ruby/seven_zip_archive.so
+- lib/seven_zip_ruby/2.0/seven_zip_archive.so
+- lib/seven_zip_ruby/2.1/seven_zip_archive.so
 homepage: https://github.com/masamitsu-murase/seven_zip_ruby
 licenses:
 - LGPL + unRAR