Updated rubyzip, bundler, rubygems version number and tests for them.

Author: tajchert

Gemfile

@@ -2,13 +2,13 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "rubyzip", "<1.0.0"
+gem "rubyzip", ">= 1.1.6"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.11.0"
-  gem "bundler", ">= 1.1.5"
+  gem "bundler", ">= 1.3.0"
   gem "jeweler", "~> 1.8.7"
   gem "yard", require: false
   gem "redcarpet"

Gemfile.lock

@@ -53,7 +53,7 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
-    rubyzip (0.9.9)
+    rubyzip (1.1.6)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -64,10 +64,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.1.5)
+  bundler (>= 1.3.0)
   jeweler (~> 1.8.7)
   redcarpet
   rspec (~> 2.11.0)
-  rubyzip (< 1.0.0)
+  rubyzip (>= 1.1.6)
   simplecov
   yard

lib/android/apk.rb

@@ -1,4 +1,4 @@
-require 'zip/zip' # need rubyzip gem -> doc: http://rubyzip.sourceforge.net/
+require 'zip' # need rubyzip gem -> doc: http://rubyzip.sourceforge.net/
 require 'digest/md5'
 require 'digest/sha1'
 require 'digest/sha2'
@@ -40,8 +40,8 @@ def initialize(filepath)
       @path = filepath
       raise NotFoundError, "'#{filepath}'" unless File.exist? @path
       begin
-        @zip = Zip::ZipFile.open(@path)
-      rescue Zip::ZipError => e
+        @zip = Zip::File.open(@path)
+      rescue Zip::Error => e
         raise NotApkFileError, e.message 
       end
 

ruby_apk.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby_apk"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["SecureBrain"]
@@ -61,33 +61,33 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/SecureBrain/ruby_apk/"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.6"
+  s.rubygems_version = "2.4.1"
   s.summary = "static analysis tool for android apk"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rubyzip>, ["< 1.0.0"])
+      s.add_runtime_dependency(%q<rubyzip>, [">= 1.1.6"])
       s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.1.5"])
+      s.add_development_dependency(%q<bundler>, [">= 1.3.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<redcarpet>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<rubyzip>, ["< 1.0.0"])
+      s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
       s.add_dependency(%q<rspec>, ["~> 2.11.0"])
-      s.add_dependency(%q<bundler>, [">= 1.1.5"])
+      s.add_dependency(%q<bundler>, [">= 1.3.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<redcarpet>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rubyzip>, ["< 1.0.0"])
+    s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
     s.add_dependency(%q<rspec>, ["~> 2.11.0"])
-    s.add_dependency(%q<bundler>, [">= 1.1.5"])
+    s.add_dependency(%q<bundler>, [">= 1.3.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<redcarpet>, [">= 0"])

spec/apk_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'tempfile'
-require 'zip/zip'
+require 'zip'
 require 'digest/sha1'
 require 'digest/sha2'
 require 'digest/md5'
@@ -18,12 +18,12 @@ def destroy!
     File.unlink(@path) if File.exist? @path
   end
   def append(entry_name, data)
-    Zip::ZipFile.open(@path, Zip::ZipFile::CREATE) { |zip|
+    Zip::File.open(@path, Zip::File::CREATE) { |zip|
       zip.get_output_stream(entry_name) {|f| f.write data }
     }
   end
   def remove(entry_name)
-    Zip::ZipFile.open(@path, Zip::ZipFile::CREATE) { |zip|
+    Zip::File.open(@path, Zip::File::CREATE) { |zip|
       zip.remove(entry_name)
     }
   end
@@ -228,14 +228,14 @@ def remove(entry_name)
     before do
       tmp_apk.append("hoge.txt", "aaaaaaa")
     end
-    it { expect { |b| apk.each_entry(&b) }.to yield_successive_args(Zip::ZipEntry, Zip::ZipEntry, Zip::ZipEntry) }
+    it { expect { |b| apk.each_entry(&b) }.to yield_successive_args(Zip::Entry, Zip::Entry, Zip::Entry) }
   end
 
   describe '#entry' do
     subject { apk.entry(entry_name) }
     context 'assigns exist entry' do
       let(:entry_name) { 'AndroidManifest.xml' }
-      it { should be_instance_of Zip::ZipEntry }
+      it { should be_instance_of Zip::Entry }
     end
     context 'assigns not exist entry name' do
       let(:entry_name) { 'not_exist_path' }