seven_zip_ruby 1.2.0-x86-mswin32-100 → 1.2.1-x86-mswin32-100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5f76d2c9638a3a822cf5857fd882751e10b08fb
-  data.tar.gz: df3d399ba030d7877763bba565c53ee3601408e5
+  metadata.gz: a2591f2e4d7e5ffae2721a4fd74b3e3b37b5e396
+  data.tar.gz: 926dbe103501613ac3a842e1d62fef8928f4210b
 SHA512:
-  metadata.gz: f703eb23188d2097dc2ea3c63bacb8487e86e611076d80a3465d7e45e92ad4834fc073b2301d98d3dcbb796e91aff0045831a0d65137000f795474af9b03c1e3
-  data.tar.gz: 93a2e680ea29f54d5f169725f66ed22c49cb69459677bc3a4ff3d2a1a1d99c7c66af1a179a8577e76ac95fdf2513b161eef95835f2495c61f4b46e3c2f6d455a
+  metadata.gz: a420230781f066b54d1d95f5a61c46533a9186e2ded940fcdf137d4bb7dc6273fd94de2db88b1b73bae8a841920d446ef164e60e30d1eb7fba8ef020cd5d779d
+  data.tar.gz: ef32b145deb0ec70aec3fee472f40bc7c57fe2acec41ad1a370f0a1e6cce792c0fe7de25f2be31901c29580d0d57a8f92d349bc3232fe1d9a65f62e0f51d46e8

data/lib/seven_zip_ruby/seven_zip_reader.rb

@@ -1,4 +1,5 @@
 require("stringio")
+require("thread")
 
 module SevenZipRuby
 
@@ -165,7 +166,7 @@ module SevenZipRuby
       def extract(stream, index, dir = ".", param = {})
         password = { password: param.delete(:password) }
         self.open(stream, password) do |szr|
-          szr.extract(index, dir, param)
+          szr.extract(index, dir)
         end
       end
 
@@ -183,7 +184,7 @@ module SevenZipRuby
       def extract_all(stream, dir = ".", param = {})
         password = { password: param.delete(:password) }
         self.open(stream, password) do |szr|
-          szr.extract_all(dir, param)
+          szr.extract_all(dir)
         end
       end
 
@@ -267,7 +268,9 @@ module SevenZipRuby
     #   end
     def test
       begin
-        return test_all_impl(nil)
+        synchronize do
+          return test_all_impl(nil)
+        end
       rescue
         return false
       end
@@ -288,7 +291,9 @@ module SevenZipRuby
     #   end
     def verify_detail
       begin
-        return test_all_impl(true)
+        synchronize do
+          return test_all_impl(true)
+        end
       rescue
         return nil
       end
@@ -320,11 +325,15 @@ module SevenZipRuby
         return extract_all(path)
       when Enumerable
         index_list = index.map(&:to_i).sort.uniq
-        extract_files_impl(index_list, file_proc(path))
+        synchronize do
+          extract_files_impl(index_list, file_proc(path))
+        end
       when nil
         raise ArgumentError.new("Invalid parameter index")
       else
-        extract_impl(index.to_i, file_proc(path))
+        synchronize do
+          extract_impl(index.to_i, file_proc(path))
+        end
       end
     end
 
@@ -340,7 +349,9 @@ module SevenZipRuby
     #     end
     #   end
     def extract_all(dir = ".")
-      extract_all_impl(file_proc(File.expand_path(dir)))
+      synchronize do
+        extract_all_impl(file_proc(File.expand_path(dir)))
+      end
     end
 
     # Extract entires of 7zip archive to local directory based on the block return value.
@@ -393,7 +404,9 @@ module SevenZipRuby
         end
 
         ret = []
-        extract_all_impl(data_proc(ret, idx_prj))
+        synchronize do
+          extract_all_impl(data_proc(ret, idx_prj))
+        end
         return ret
 
       when Enumerable
@@ -401,7 +414,9 @@ module SevenZipRuby
         idx_prj = Hash[*(index_list.each_with_index.map{ |idx, i| [ idx, i ] }.flatten)]
 
         ret = []
-        extract_files_impl(index_list, data_proc(ret, idx_prj))
+        synchronize do
+          extract_files_impl(index_list, data_proc(ret, idx_prj))
+        end
         return ret
 
       when nil
@@ -418,7 +433,9 @@ module SevenZipRuby
         end
 
         ret = []
-        extract_impl(index, data_proc(ret, idx_prj))
+        synchronize do
+          extract_impl(index, data_proc(ret, idx_prj))
+        end
         return ret[0]
 
       end
@@ -482,6 +499,18 @@ module SevenZipRuby
       end
     end
     private :data_proc
+
+    COMPRESS_GUARD = Mutex.new  # :nodoc:
+    def synchronize  # :nodoc:
+      if (COMPRESS_GUARD)
+        COMPRESS_GUARD.synchronize do
+          yield
+        end
+      else
+        yield
+      end
+    end
+    private :synchronize
   end
 
 

data/lib/seven_zip_ruby/seven_zip_writer.rb

@@ -1,4 +1,5 @@
 require("stringio")
+require("thread")
 
 module SevenZipRuby
 
@@ -253,7 +254,9 @@ module SevenZipRuby
     #    szw.close
     #  end
     def compress
-      compress_impl(compress_proc)
+      synchronize do
+        compress_impl(compress_proc)
+      end
       return self
     end
 
@@ -421,6 +424,18 @@ module SevenZipRuby
       end
     end
     private :compress_proc
+
+    COMPRESS_GUARD = Mutex.new  # :nodoc:
+    def synchronize  # :nodoc:
+      if (COMPRESS_GUARD)
+        COMPRESS_GUARD.synchronize do
+          yield
+        end
+      else
+        yield
+      end
+    end
+    private :synchronize
   end
 
 

data/lib/seven_zip_ruby/version.rb

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

data/spec/seven_zip_ruby_spec.rb

@@ -79,6 +79,24 @@ describe SevenZipRuby do
       end
     end
 
+    example "singleton method: extract" do
+      File.open(SevenZipRubySpecHelper::SEVEN_ZIP_FILE, "rb") do |file|
+        SevenZipRuby::SevenZipReader.extract(file, :all, SevenZipRubySpecHelper::EXTRACT_DIR)
+      end
+    end
+
+    example "singleton method: extract_all" do
+      File.open(SevenZipRubySpecHelper::SEVEN_ZIP_FILE, "rb") do |file|
+        SevenZipRuby::SevenZipReader.extract_all(file, SevenZipRubySpecHelper::EXTRACT_DIR)
+      end
+    end
+
+    example "singleton method: verify" do
+      File.open(SevenZipRubySpecHelper::SEVEN_ZIP_FILE, "rb") do |file|
+        SevenZipRuby::SevenZipReader.verify(file)
+      end
+    end
+
     example "extract archive" do
       File.open(SevenZipRubySpecHelper::SEVEN_ZIP_FILE, "rb") do |file|
         SevenZipRuby::SevenZipReader.open(file) do |szr|
@@ -144,6 +162,28 @@ describe SevenZipRuby do
       end
     end
 
+    example "run in multi threads" do
+      s = StringIO.new
+      SevenZipRuby::SevenZipWriter.open(s) do |szw|
+        szw.add_data(SevenZipRubySpecHelper::SAMPLE_LARGE_RANDOM_DATA, "data.bin")
+      end
+      data = s.string
+
+      th_list = []
+      100.times do
+        th = Thread.new do
+          stream = StringIO.new(data)
+          SevenZipRuby::SevenZipReader.open(stream) do |szr|
+            szr.extract_data(0)
+          end
+        end
+        th_list.push(th)
+      end
+      th_list.each do |t|
+        t.join
+      end
+    end
+
 
     describe "error handling" do
 
@@ -470,6 +510,24 @@ describe SevenZipRuby do
       expect(size.sort.reverse).to eq size
     end
 
+    example "run in multi threads" do
+      th_list = []
+      mutex = Mutex.new
+      100.times do
+        th = Thread.new do
+          stream = StringIO.new
+          SevenZipRuby::SevenZipWriter.open(stream) do |szw|
+            data = SevenZipRubySpecHelper::SAMPLE_LARGE_RANDOM_DATA
+            szw.add_data(data, "hoge.dat")
+          end
+        end
+        th_list.push(th)
+      end
+      th_list.each do |t|
+        t.join
+      end
+    end
+
     if (SevenZipRubySpecHelper.processor_count && SevenZipRubySpecHelper.processor_count > 1)
       example "set multi_thread" do
         time = [ false, true ].map do |multi_thread|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seven_zip_ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: x86-mswin32-100
 authors:
 - Masamitsu MURASE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler