seven_zip_ruby 1.2.0-x86-mingw32 → 1.2.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8196c94279f08f664188803a8007c5a992c31685
-  data.tar.gz: c819c78dbd780e420f54206b11dab937542a3982
+  metadata.gz: 91f7b44889e262c53f68a16bff9ca709503fd8a3
+  data.tar.gz: 0bdca3000310e5f74b3322aa49d6a5fea1e6acf6
 SHA512:
-  metadata.gz: 96ed7cd28a07c35fd16492d5733ae12e3a48255cce18fbcf190a6175ce89030546ca0c01f787990dbb1edcddd809c01da1dc380cdcb43d44355a779efb196342
-  data.tar.gz: 5cad6570612584dbc85e30ff19f24182a5d497b96c0852ad7945e3e73c758eafacef5d4103e0e542efb000e003e7e1dee3c9264b9f6ba697ac35e9fa7d26e3cd
+  metadata.gz: 689ffdae9d3e90ffa4bee9790c8db0a710fdd96eb9d2b834e934e4d4456804d923923e3eded0f6c67493b0bbfe7698feaf13c8910b0942810f78f9c7d84fcaab
+  data.tar.gz: 05026822e8d1d3d25a9181f2c47351494b3c6e046ccc01afb0b3e75fca91df9dc9a1d8843d30c09a85cd2fcb76de6266f7b8f49e280f19351719a6c8a9150875

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-mingw32
 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