diff options
| author | Andre Arko <andre@arko.net> | 2013-10-02 23:21:01 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2013-10-03 16:37:54 -0700 |
| commit | e12f0c6eaaa981f380ba384350d3911c4674384c (patch) | |
| tree | ebd98e2424f0c89c3643db15f630765a0e32cd97 | |
| parent | ade74cea6c616be01544133110e997aa03c0bc1f (diff) | |
| download | bundler-e12f0c6eaaa981f380ba384350d3911c4674384c.tar.gz | |
remove @@spec_fetch_map
| -rw-r--r-- | lib/bundler/endpoint_specification.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/fetcher.rb | 9 | ||||
| -rw-r--r-- | lib/bundler/lazy_specification.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/remote_specification.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/rubygems_ext.rb | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/lib/bundler/endpoint_specification.rb b/lib/bundler/endpoint_specification.rb index 4d599c5344..4ab6b1b13d 100644 --- a/lib/bundler/endpoint_specification.rb +++ b/lib/bundler/endpoint_specification.rb @@ -4,7 +4,7 @@ module Bundler include MatchPlatform attr_reader :name, :version, :platform, :dependencies - attr_accessor :source + attr_accessor :source, :source_uri def initialize(name, version, platform, dependencies) @name = name diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb index 48784c2ecf..e59d9f3e41 100644 --- a/lib/bundler/fetcher.rb +++ b/lib/bundler/fetcher.rb @@ -31,12 +31,9 @@ module Bundler class << self attr_accessor :disable_endpoint, :api_timeout, :redirect_limit, :max_retries - @@spec_fetch_map ||= {} - def fetch(spec) - spec, uri = @@spec_fetch_map[spec.full_name] - if spec - path = download_gem_from_uri(spec, uri) + if spec.source_uri + path = download_gem_from_uri(spec, spec.source_uri) s = Bundler.rubygems.spec_from_gem(path, Bundler.settings["trust-policy"]) spec.__swap__(s) end @@ -180,7 +177,7 @@ module Bundler spec = RemoteSpecification.new(name, version, platform, self) end spec.source = source - @@spec_fetch_map[spec.full_name] = [spec, @remote_uri] + spec.source_uri = @remote_uri index << spec end diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb index 966d107c38..bdcf2df2cc 100644 --- a/lib/bundler/lazy_specification.rb +++ b/lib/bundler/lazy_specification.rb @@ -7,7 +7,7 @@ module Bundler include MatchPlatform attr_reader :name, :version, :dependencies, :platform - attr_accessor :source + attr_accessor :source, :source_uri def initialize(name, version, platform, source = nil) @name = name diff --git a/lib/bundler/remote_specification.rb b/lib/bundler/remote_specification.rb index 5fe95053f6..85405c4c1b 100644 --- a/lib/bundler/remote_specification.rb +++ b/lib/bundler/remote_specification.rb @@ -10,7 +10,7 @@ module Bundler include MatchPlatform attr_reader :name, :version, :platform - attr_accessor :source + attr_accessor :source, :source_uri def initialize(name, version, platform, spec_fetcher) @name = name diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index ac4567ac4c..d795f9d114 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -13,7 +13,7 @@ module Gem @loaded_stacks = Hash.new { |h,k| h[k] = [] } class Specification - attr_accessor :source, :location, :relative_loaded_from + attr_accessor :source, :source_uri, :location, :relative_loaded_from alias_method :rg_full_gem_path, :full_gem_path alias_method :rg_loaded_from, :loaded_from |