updated gems

Gemfile

@@ -6,8 +6,8 @@ group :development, :test do
   gem "rake"
   gem "rr"
   gem "aws-s3"
-  gem "mime-types", "< 2.0"
-  gem "fakefs", "< 0.6"
+  gem "mime-types"
+  gem "fakefs"
   gem "json"
   gem "rspec"
   gem "webmock"

Gemfile.lock

@@ -2,23 +2,23 @@ PATH
   remote: .
   specs:
     heroku (3.30.6)
-      heroku-api (~> 0.3.19)
+      heroku-api (>= 0.3.19)
       launchy (>= 0.3.2)
-      multi_json (~> 1.10)
+      multi_json (>= 1.10)
       netrc (>= 0.10.0)
       rest-client (>= 1.7.3)
-      rubyzip (= 0.9.9)
+      rubyzip (>= 0.9.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.7)
+    addressable (2.3.8)
     aws-s3 (0.6.3)
       builder
       mime-types
       xml-simple
     builder (3.2.2)
-    coveralls (0.7.11)
+    coveralls (0.8.0)
       multi_json (~> 1.10)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.9.1)
@@ -28,41 +28,47 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    excon (0.44.4)
-    fakefs (0.5.4)
+    domain_name (0.5.23)
+      unf (>= 0.0.5, < 1.0.0)
+    excon (0.45.1)
+    fakefs (0.6.7)
     ffi (1.9.8-x86-mingw32)
     heroku-api (0.3.23)
       excon (~> 0.44)
       multi_json (~> 1.8)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     json (1.8.2)
     launchy (2.4.3)
       addressable (~> 2.3)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
     multi_json (1.11.0)
     netrc (0.10.3)
     rake (10.4.2)
-    rest-client (1.7.3)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rest-client (1.7.3-x86-mingw32)
+    rest-client (1.8.0-x86-mingw32)
       ffi (~> 1.9)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rr (1.1.2)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
+    rspec-core (3.2.3)
       rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    rubyzip (0.9.9)
+    rubyzip (1.1.7)
     safe_yaml (1.0.4)
     simplecov (0.9.2)
       docile (~> 1.1.0)
@@ -73,7 +79,11 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     tins (1.3.5)
-    webmock (1.20.4)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
+    unf_ext (0.0.6-x86-mingw32)
+    webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     xml-simple (1.1.5)
@@ -85,10 +95,10 @@ PLATFORMS
 DEPENDENCIES
   aws-s3
   coveralls
-  fakefs (< 0.6)
+  fakefs
   heroku!
   json
-  mime-types (< 2.0)
+  mime-types
   rake
   rr
   rspec

heroku.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |gem|
 
   gem.files = %x{ git ls-files }.split("\n").select { |d| d =~ %r{^(LICENSE|README|bin/|data/|ext/|lib/|spec/|test/)} }
 
-  gem.add_dependency "heroku-api",     "~> 0.3.19"
+  gem.add_dependency "heroku-api",     ">= 0.3.19"
   gem.add_dependency "launchy",        ">= 0.3.2"
   gem.add_dependency "netrc",          ">= 0.10.0"
   gem.add_dependency "rest-client",    ">= 1.7.3"
-  gem.add_dependency "rubyzip",        "= 0.9.9"
-  gem.add_dependency "multi_json",     "~> 1.10"
+  gem.add_dependency "rubyzip",        ">= 0.9.9"
+  gem.add_dependency "multi_json",     ">= 1.10"
 end

lib/heroku/updater.rb

@@ -107,7 +107,7 @@ def self.update(prerelease=false)
       stderr_print 'updating...'
       wait_for_lock do
         require "tmpdir"
-        require "zip/zip"
+        require "zip"
 
         Dir.mktmpdir do |download_dir|
           zip_filename = "#{download_dir}/heroku.zip"
@@ -148,11 +148,11 @@ def self.download_file(from_url, to_filename)
     end
 
     def self.extract_zip(filename, dir)
-      Zip::ZipFile.open(filename) do |zip|
+      Zip::File.open(filename) do |zip|
         zip.each do |entry|
           target = File.join(dir, entry.to_s)
           FileUtils.mkdir_p File.dirname(target)
-          zip.extract(entry, target) { true }
+          entry.extract(target) { true }
         end
       end
     end

tasks/zip.rake

@@ -1,4 +1,4 @@
-require "zip/zip"
+require "zip"
 
 namespace :zip do
   desc "build zip"
@@ -22,7 +22,7 @@ namespace :zip do
       cd "heroku-client" do
         assemble_distribution
         assemble_gems
-        Zip::ZipFile.open(t.name, Zip::ZipFile::CREATE) do |zip|
+        Zip::File.open(t.name, Zip::File::CREATE) do |zip|
           Dir["**/*"].each do |file|
             zip.add(file, file) { true }
           end