From 9583b70a22fac7a7388ee8f174b31924a44c74b8 Mon Sep 17 00:00:00 2001 From: Alexander Simonov Date: Sat, 31 Aug 2013 01:25:16 +0300 Subject: [PATCH] Rubyzip 1.0 compatibility --- lib/neography.rb | 2 +- lib/neography/tasks.rb | 4 ++-- neography.gemspec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/neography.rb b/lib/neography.rb index 135228c..72b9a7e 100644 --- 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 index a1078cc..40cac7f 100644 --- 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 index 664a97e..42b3a88 100644 --- 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