seven_zip_ruby 1.2.1-x86-mswin32-100 → 1.2.2-x86-mswin32-100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2591f2e4d7e5ffae2721a4fd74b3e3b37b5e396
-  data.tar.gz: 926dbe103501613ac3a842e1d62fef8928f4210b
+  metadata.gz: 2c9893ddbe6b4c8c76c56123b4fcca99a1f54274
+  data.tar.gz: a63ac8113882ce75b63c42f6ff48b4273fa7eba0
 SHA512:
-  metadata.gz: a420230781f066b54d1d95f5a61c46533a9186e2ded940fcdf137d4bb7dc6273fd94de2db88b1b73bae8a841920d446ef164e60e30d1eb7fba8ef020cd5d779d
-  data.tar.gz: ef32b145deb0ec70aec3fee472f40bc7c57fe2acec41ad1a370f0a1e6cce792c0fe7de25f2be31901c29580d0d57a8f92d349bc3232fe1d9a65f62e0f51d46e8
+  metadata.gz: 8e848a152c81f4daa41708286d953022c6227d7bffa5d4e686b0ab3479019a755be286372076b0ead1a1a84f97aa43fee18c94f7e3efc03e1f81831705547918
+  data.tar.gz: 990619d42556d066da0498fa66649442cac4e4ac5188d107152242f48d0a354901f5c0f3aa4526835593d17b2d467ce29d86e3ee2d88148100157b62a55461de

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: x86-mswin32-100
 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: []
@@ -101,10 +101,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 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