Skip to content

Commit

Permalink
Merge pull request #18 from drewda/update-rubyzip-gem
Browse files Browse the repository at this point in the history
Update rubyzip gem
  • Loading branch information
nerdEd committed Nov 6, 2014
2 parents 9151065 + cc9ef28 commit 820528a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source 'http://rubygems.org'
source 'https://rubygems.org'

gem 'rake'
gem 'rspec'
gem 'multi_json', '1.0.4'
gem 'simplecov', :require => false
gem 'rubyzip', '< 1.0.0'
gem 'rubyzip'
gem 'vcr'
gem 'fakeweb'
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
diff-lcs (1.1.3)
fakeweb (1.3.0)
Expand All @@ -13,7 +13,7 @@ GEM
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.8.0)
rubyzip (0.9.5)
rubyzip (1.1.6)
simplecov (0.6.1)
multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
Expand All @@ -28,6 +28,6 @@ DEPENDENCIES
multi_json (= 1.0.4)
rake
rspec
rubyzip (< 1.0.0)
rubyzip
simplecov
vcr
2 changes: 1 addition & 1 deletion gtfs.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |gem|

gem.add_dependency 'rake'
gem.add_dependency 'multi_json'
gem.add_dependency 'rubyzip', '< 1.0.0'
gem.add_dependency 'rubyzip'

gem.add_development_dependency 'rspec', ['>= 2.0.0']
gem.add_development_dependency 'simplecov'
Expand Down
4 changes: 2 additions & 2 deletions lib/gtfs/source.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'tmpdir'
require 'fileutils'
require 'zip/zip'
require 'zip'

module GTFS
class Source
Expand Down Expand Up @@ -34,7 +34,7 @@ def self.finalize(directory)
end

def extract_to_cache(source_path)
Zip::ZipFile.open(source_path) do |zip|
Zip::File.open(source_path) do |zip|
zip.entries.each do |entry|
zip.extract(entry.name, File.join(@tmp_dir, '/', entry.name))
end
Expand Down

0 comments on commit 820528a

Please sign in to comment.