Merge pull request #109 from simonoff/master

Rubyzip 1.0 compatibility
maxdemarzi · Sep 4, 2013 · 76bad11 · 76bad11
2 parents 215b743 + 9583b70
commit 76bad11
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/neography.rb b/lib/neography.rb
@@ -5,7 +5,7 @@
 require 'logger'
 require 'ostruct'
 require 'os'
-require 'zip/zipfilesystem'
+require 'zip/filesystem'
 
 require 'neography/multi_json_parser'
 

diff --git a/lib/neography/tasks.rb b/lib/neography/tasks.rb
@@ -1,7 +1,7 @@
 # borrowed from architect4r
 require 'os'
 require 'httpclient'
-require 'zip/zip'
+require 'zip'
 require 'net/http'
 
 namespace :neo4j do
@@ -29,7 +29,7 @@
 
       # Extract and move to neo4j directory
       unless File.exist?('neo4j')
-        Zip::ZipFile.open('neo4j.zip') do |zip_file|
+        Zip::File.open('neo4j.zip') do |zip_file|
           zip_file.each do |f|
            f_path=File.join(".", f.name)
            FileUtils.mkdir_p(File.dirname(f_path))

diff --git a/neography.gemspec b/neography.gemspec
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
   s.add_dependency "rake", ">= 0.8.7"
   s.add_dependency "json", ">= 1.7.7"
   s.add_dependency "os", ">= 0.9.6"
-  s.add_dependency "rubyzip", "~> 0.9.7"
-  s.add_dependency "multi_json", ">= 1.3.2" 
+  s.add_dependency "rubyzip", "~> 1.0.0"
+  s.add_dependency "multi_json", ">= 1.3.2"
 end