Merge pull request #8 from cogent/rubyzip

Rubyzip and some other tweaks

Gemfile

@@ -0,0 +1,9 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gemspec
+
+group :development do
+  gem "bundler"
+  gem "rake"
+end

Gemfile.lock

@@ -0,0 +1,21 @@
+PATH
+  remote: .
+  specs:
+    ipa_reader (0.7.1)
+      CFPropertyList (= 2.1.1)
+      rubyzip (>= 1.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (2.1.1)
+    rake (10.3.2)
+    rubyzip (1.1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  ipa_reader!
+  rake

Rakefile

@@ -1,21 +1,10 @@
+require "bundler/gem_tasks"
 
-begin
-  require 'bones'
-rescue LoadError
-  abort '### Please install the "bones" gem ###'
-end
-
-task :default => 'test:run'
-task 'gem:release' => 'test:run'
+require "rake/testtask"
 
-Bones {
-  name  'ipa_reader'
-  authors  'Nicholas Schlueter'
-  summary 'Reads metadata form iPhone Package Archive Files (ipa).'
-  description 'I am using this gem to get version to build the over the air iPhone Ad Hoc distribution plist file.'
-  email    'schlueter@gmail.com'
-  url      'http://github.com/schlu/Ipa-Reader'
-  depend_on "zip", "2.0.2"
-  depend_on "CFPropertyList", "2.1.1"
-}
+Rake::TestTask.new do |t|
+  t.libs << "test"
+end
 
+desc "Run tests"
+task :default => :test

ipa_reader.gemspec

@@ -22,14 +22,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<zip>, ["= 2.0.2"])
+      s.add_runtime_dependency(%q<rubyzip>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<CFPropertyList>, ["= 2.1.1"])
     else
-      s.add_dependency(%q<zip>, ["= 2.0.2"])
+      s.add_dependency(%q<rubyzip>, [">= 1.0.0"])
       s.add_dependency(%q<CFPropertyList>, ["= 2.1.1"])
     end
   else
-    s.add_dependency(%q<zip>, ["= 2.0.2"])
+    s.add_dependency(%q<rubyzip>, [">= 1.0.0"])
     s.add_dependency(%q<CFPropertyList>, ["= 2.1.1"])
   end
 end

lib/ipa_reader/ipa_file.rb

@@ -12,7 +12,7 @@ def initialize(file_path)
       self.file_path = file_path
       info_plist_file = nil
       regex = /Payload\/[^\/]+.app\/Info.plist/
-      Zip::ZipFile.foreach(file_path) { |f| info_plist_file = f if f.name.match(regex) }
+      Zip::File.foreach(file_path) { |f| info_plist_file = f if f.name.match(regex) }
       cf_plist = CFPropertyList::List.new(:data => self.read_file(regex), :format => CFPropertyList::List::FORMAT_BINARY)
       self.plist = cf_plist.value.to_rb
     end
@@ -72,7 +72,7 @@ def icon_prerendered
 
     def read_file(regex)
       file = nil
-      Zip::ZipFile.foreach(self.file_path) { |f| file = f if f.name.match(regex) }
+      Zip::File.foreach(self.file_path) { |f| file = f if f.name.match(regex) }
       file.get_input_stream.read
     end
   end