summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSHIBATA Hiroshi <hsbt@ruby-lang.org>2018-03-01 12:38:43 +0900
committerSHIBATA Hiroshi <hsbt@ruby-lang.org>2018-03-01 12:38:43 +0900
commit9448fc8c37eb9f867f352c3085f20994c7726fa9 (patch)
tree1cc0e339bd8e4160c83807d25d0f780be50aad91
parentc4fc79a2bfed38335a3371300bea49286a371d83 (diff)
downloadbundler-update-deprecated-methods.tar.gz
Use Gem::Util.inflate instead of Gem.inflateupdate-deprecated-methods
-rw-r--r--lib/bundler/fetcher.rb4
-rw-r--r--lib/bundler/fetcher/index.rb4
-rw-r--r--lib/bundler/rubygems_integration.rb2
-rw-r--r--spec/install/gems/resolving_spec.rb2
-rw-r--r--spec/support/artifice/compact_index.rb2
-rw-r--r--spec/support/artifice/endpoint.rb2
6 files changed, 8 insertions, 8 deletions
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb
index 03ff528826..3538b668fa 100644
--- a/lib/bundler/fetcher.rb
+++ b/lib/bundler/fetcher.rb
@@ -96,11 +96,11 @@ module Bundler
uri = URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
if uri.scheme == "file"
- Bundler.load_marshal Gem.inflate(Gem.read_binary(uri.path))
+ Bundler.load_marshal Gem::Util.inflate(Gem.read_binary(uri.path))
elsif cached_spec_path = gemspec_cached_path(spec_file_name)
Bundler.load_gemspec(cached_spec_path)
else
- Bundler.load_marshal Gem.inflate(downloader.fetch(uri).body)
+ Bundler.load_marshal Gem::Util.inflate(downloader.fetch(uri).body)
end
rescue MarshalError
raise HTTPError, "Gemspec #{spec} contained invalid data.\n" \
diff --git a/lib/bundler/fetcher/index.rb b/lib/bundler/fetcher/index.rb
index 9529944391..19b37ee548 100644
--- a/lib/bundler/fetcher/index.rb
+++ b/lib/bundler/fetcher/index.rb
@@ -29,11 +29,11 @@ module Bundler
uri = URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
if uri.scheme == "file"
- Bundler.load_marshal Gem.inflate(Gem.read_binary(uri.path))
+ Bundler.load_marshal Gem::Util.inflate(Gem.read_binary(uri.path))
elsif cached_spec_path = gemspec_cached_path(spec_file_name)
Bundler.load_gemspec(cached_spec_path)
else
- Bundler.load_marshal Gem.inflate(downloader.fetch(uri).body)
+ Bundler.load_marshal Gem::Util.inflate(downloader.fetch(uri).body)
end
rescue MarshalError
raise HTTPError, "Gemspec #{spec} contained invalid data.\n" \
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 2d70eae7dc..231b085f05 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -132,7 +132,7 @@ module Bundler
end
def inflate(obj)
- Gem.inflate(obj)
+ Gem::Util.inflate(obj)
end
def sources=(val)
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb
index d3df4c4bea..cf9f19980a 100644
--- a/spec/install/gems/resolving_spec.rb
+++ b/spec/install/gems/resolving_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe "bundle install with install-time dependencies" do
build_repo2
path = "#{gem_repo2}/#{Gem::MARSHAL_SPEC_DIR}/actionpack-2.3.2.gemspec.rz"
- spec = Marshal.load(Gem.inflate(File.read(path)))
+ spec = Marshal.load(Gem::Util.inflate(File.read(path)))
spec.dependencies.each do |d|
d.instance_variable_set(:@type, :fail)
end
diff --git a/spec/support/artifice/compact_index.rb b/spec/support/artifice/compact_index.rb
index 434307576f..d59f59831b 100644
--- a/spec/support/artifice/compact_index.rb
+++ b/spec/support/artifice/compact_index.rb
@@ -10,7 +10,7 @@ class CompactIndexAPI < Endpoint
def load_spec(name, version, platform, gem_repo)
full_name = "#{name}-#{version}"
full_name += "-#{platform}" if platform != "ruby"
- Marshal.load(Gem.inflate(File.open(gem_repo.join("quick/Marshal.4.8/#{full_name}.gemspec.rz")).read))
+ Marshal.load(Gem::Util.inflate(File.open(gem_repo.join("quick/Marshal.4.8/#{full_name}.gemspec.rz")).read))
end
def etag_response
diff --git a/spec/support/artifice/endpoint.rb b/spec/support/artifice/endpoint.rb
index 9afecff8e6..84dbcfd345 100644
--- a/spec/support/artifice/endpoint.rb
+++ b/spec/support/artifice/endpoint.rb
@@ -68,7 +68,7 @@ class Endpoint < Sinatra::Base
def load_spec(name, version, platform, gem_repo)
full_name = "#{name}-#{version}"
full_name += "-#{platform}" if platform != "ruby"
- Marshal.load(Gem.inflate(File.open(gem_repo.join("quick/Marshal.4.8/#{full_name}.gemspec.rz")).read))
+ Marshal.load(Gem::Util.inflate(File.open(gem_repo.join("quick/Marshal.4.8/#{full_name}.gemspec.rz")).read))
end
end