seven_zip_ruby 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc520a330afc1504a227c21446eaa410dc2b130c
-  data.tar.gz: faa164047f17bec951a944433a6c9d7276a9fa92
+  metadata.gz: bc5b39f5f4ce40497a97a9477dba9e3fe4257e1b
+  data.tar.gz: 377e14418cbed8063581cfe00282ce3ab57ff84c
 SHA512:
-  metadata.gz: 5bb85502e25cc0146b8e0238bdf853549a3b62ce1b8a2e9d7ac4485ad2fbd1a900fe66fd2a116cc1b6192194f067b73dc1cfb3be36af5971c92ed75fc2c7167c
-  data.tar.gz: b32b40db99b37c8fcf39beca6f47ffb363f2fcab3a5bdd8f8aa6ccedd13b6f1c7abbf22d3bf55aec30ae68877579095cf9790618d46ec99df33ec21afbac781d
+  metadata.gz: 6832f88d201f527dd22b832ea7ff7aabd3489239d76804c004c7c74daa2c609a3f298ed5eef2acb3de2aa7ba0d4279cccff24097b4e1b59e956a2c386b35a093
+  data.tar.gz: 3c5cdc5cf8416455c2c809bcbee52174e806aa61c77e47e0b1d3c32f3ab3b0b0dfac60177660849938b202e8f0b5f45bc5a8d5a72e08d67c861713c93af06587

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - "2.0.0"
-  - "2.1.0"
+  - "2.1.1"
   - "rbx"
   - "ruby-head"
 matrix:

data/README.md

@@ -187,6 +187,8 @@ LGPL and unRAR license. Please refer to LICENSE.txt.
 
 ## Releases
 
+* 1.2.*  
+  Bug fix.
 * 1.1.0  
   Raise error when wrong password is specified.
 * 1.0.0  

data/lib/seven_zip_ruby/seven_zip_reader.rb

@@ -102,8 +102,12 @@ module SevenZipRuby
         szr = self.new
         szr.open(stream, param)
         if (block)
-          block.call(szr)
-          szr.close
+          begin
+            block.call(szr)
+            szr.close
+          ensure
+            szr.close_file
+          end
         else
           szr
         end
@@ -135,8 +139,12 @@ module SevenZipRuby
         szr = self.new
         szr.open_file(filename, param)
         if (block)
-          block.call(szr)
-          szr.close
+          begin
+            block.call(szr)
+            szr.close
+          ensure
+            szr.close_file
+          end
         else
           szr
         end
@@ -200,9 +208,14 @@ module SevenZipRuby
       #     # => true/false
       #   end
       def verify(stream, opt = {})
-        szr = self.open(stream, opt)
-        ret = szr.verify
-        szr.close
+        ret = false
+        begin
+          self.open(stream, opt) do |szr|
+            ret = szr.verify
+          end
+        rescue
+          ret = false
+        end
         return ret
       end
     end
@@ -248,8 +261,12 @@ module SevenZipRuby
 
     def close
       close_impl
+      close_file
+    end
+
+    def close_file  # :nodoc:
       if (@stream)
-        @stream.close
+        @stream.close rescue nil
         @stream = nil
       end
     end

data/lib/seven_zip_ruby/version.rb

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

data/seven_zip_ruby.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = SevenZipRuby::VERSION
   spec.authors       = ["Masamitsu MURASE"]
   spec.email         = ["masamitsu.murase@gmail.com"]
-  spec.description   = %q{SevenZipRuby is a gem library to read and write 7zip archives. This gem library calls official 7z.dll internally.}
-  spec.summary       = %q{This is a gem library to read and write 7-Zip files.}
+  spec.description   = %q{SevenZipRuby (seven_zip_ruby) is a ruby gem library to read and write 7zip archives. This gem library calls official 7z.dll internally.}
+  spec.summary       = %q{This is a ruby gem library to read and write 7zip files.}
   spec.homepage      = "https://github.com/masamitsu-murase/seven_zip_ruby"
   spec.license       = "LGPL + unRAR"
 

data/spec/seven_zip_ruby_spec.rb

@@ -139,6 +139,11 @@ describe SevenZipRuby do
 
       expect(SevenZipRuby::SevenZipReader.verify(StringIO.new(data))).to eq true
 
+      data_org = data[-1]
+      data[-1] = 0x01.chr  # This highly dependes on the current test binary.
+      expect(SevenZipRuby::SevenZipReader.verify(StringIO.new(data))).to eq false
+      data[-1] = data_org
+
       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|
@@ -179,9 +184,7 @@ describe SevenZipRuby do
         end
         th_list.push(th)
       end
-      th_list.each do |t|
-        t.join
-      end
+      th_list.each(&:join)
     end
 
 
@@ -512,7 +515,6 @@ describe SevenZipRuby do
 
     example "run in multi threads" do
       th_list = []
-      mutex = Mutex.new
       100.times do
         th = Thread.new do
           stream = StringIO.new
@@ -523,9 +525,7 @@ describe SevenZipRuby do
         end
         th_list.push(th)
       end
-      th_list.each do |t|
-        t.join
-      end
+      th_list.each(&:join)
     end
 
     if (SevenZipRubySpecHelper.processor_count && SevenZipRubySpecHelper.processor_count > 1)
@@ -616,11 +616,11 @@ describe SevenZipRuby do
             th.join
             diff = Time.now - start
 
-            10.times do
+            20.times do
+              kill_time = rand * diff
               th = Thread.start{ prc.call }
-              sleep(rand * diff)
+              sleep(kill_time)
               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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seven_zip_ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Masamitsu MURASE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,8 +52,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: SevenZipRuby is a gem library to read and write 7zip archives. This gem
-  library calls official 7z.dll internally.
+description: SevenZipRuby (seven_zip_ruby) is a ruby gem library to read and write
+  7zip archives. This gem library calls official 7z.dll internally.
 email:
 - masamitsu.murase@gmail.com
 executables: []
@@ -814,7 +814,7 @@ rubyforge_project:
 rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
-summary: This is a gem library to read and write 7-Zip files.
+summary: This is a ruby gem library to read and write 7zip files.
 test_files:
 - spec/seven_zip_ruby_spec.rb
 - spec/seven_zip_ruby_spec_helper.rb