complete rubyzip >1.0 migration

the zip-zip gem adds aliases from the rubyzip 0.9 names
(e.g. Zip::ZipFile) to the 1.0 names (e.g. Zip::File)

remove the last of the old names, and remove the gem

fixes CNVS-25247

Change-Id: I6b0c0427a1b4fa7f67a29f391043d018ddf1a551
Reviewed-on: https://gerrit.instructure.com/67660
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jeremy Stanley <jeremy@instructure.com>
This commit is contained in:
Jeremy Stanley 2015-11-21 20:26:31 -07:00
parent f0f3028c68
commit f4dd6019fc
2 changed files with 1 additions and 2 deletions

View File

@ -86,7 +86,6 @@ gem 'ruby-duration', '3.2.0', require: false
gem 'ruby-saml-mod', '0.2.7'
gem 'rubycas-client', '2.3.9', require: false
gem 'rubyzip', '1.1.1', require: 'zip'
gem 'zip-zip', '0.2' # needed until plugins use the new namespace
gem 'safe_yaml', '0.9.7', require: false
gem 'safe_yaml-instructure', '0.8.0', require: false
gem 'hashie', '2.0.5', require: false

View File

@ -42,7 +42,7 @@ module ReportSpecHelper
a = report.attachment
if a.content_type == 'application/zip'
parsed = {}
Zip::ZipInputStream::open(a.open) do |io|
Zip::InputStream::open(a.open) do |io|
while (entry = io.get_next_entry)
parsed[entry.name] = parse_csv(io.read, options)
end