seven_zip_ruby 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 576e8ef01f360932073896eb2ada1386f998f644
-  data.tar.gz: 1ec0d7e51e795d61062c969126c206025e6734d4
+  metadata.gz: fc520a330afc1504a227c21446eaa410dc2b130c
+  data.tar.gz: faa164047f17bec951a944433a6c9d7276a9fa92
 SHA512:
-  metadata.gz: d46d87711429c1cdf191efdf8bed3c0077de239fe7934b8d1fa619f9fcadedd11d026b9b38dfd8a3ecf44af27e85e9be563a8df0432a24cc03939d9308e684be
-  data.tar.gz: 4164be8cbd6877ee638369385027c5ac232db25d3c784a11d9a4d80413076f8fedef31fdae86fce7ee5933ad7047ec41d853e504e39729b6a324b5aa198a7d83
+  metadata.gz: 5bb85502e25cc0146b8e0238bdf853549a3b62ce1b8a2e9d7ac4485ad2fbd1a900fe66fd2a116cc1b6192194f067b73dc1cfb3be36af5971c92ed75fc2c7167c
+  data.tar.gz: b32b40db99b37c8fcf39beca6f47ffb363f2fcab3a5bdd8f8aa6ccedd13b6f1c7abbf22d3bf55aec30ae68877579095cf9790618d46ec99df33ec21afbac781d

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: ruby
 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