diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-01-04 12:49:11 -0800 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2010-01-04 12:49:11 -0800 |
commit | 028d412a6dec4a7c4d2e525cd123db6e75b1370b (patch) | |
tree | 31e25820915d8bfd6c1b8ec245dab9ec0ca5a62c | |
parent | 12c740f3d386831560a952bb586482a875445f21 (diff) | |
download | bundler-028d412a6dec4a7c4d2e525cd123db6e75b1370b.tar.gz |
Rename repository to bundle in sources
-rw-r--r-- | lib/bundler/bundle.rb | 4 | ||||
-rw-r--r-- | lib/bundler/source.rb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/bundler/bundle.rb b/lib/bundler/bundle.rb index ae2f306e5a..4695f8bf63 100644 --- a/lib/bundler/bundle.rb +++ b/lib/bundler/bundle.rb @@ -33,7 +33,7 @@ module Bundler # TODO: clean this up sources.each do |s| - s.repository = self + s.bundle = self s.local = options[:cached] end @@ -88,7 +88,7 @@ module Bundler dependencies, sources = @environment.gem_dependencies, @environment.sources sources.each do |s| - s.repository = self + s.bundle = self s.local = true end diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb index 507aef9c88..15e66c689a 100644 --- a/lib/bundler/source.rb +++ b/lib/bundler/source.rb @@ -4,7 +4,7 @@ module Bundler # Represents a source of rubygems. Initially, this is only gem repositories, but # eventually, this will be git, svn, HTTP class Source - attr_accessor :repository, :local + attr_accessor :bundle, :local def initialize(options) ; end @@ -50,7 +50,7 @@ module Bundler def download(spec) Bundler.logger.info "Downloading #{spec.full_name}.gem" - destination = repository.path + destination = bundle.path unless destination.writable? raise RubygemsRetardation, "destination: #{destination} is not writable" @@ -125,7 +125,7 @@ module Bundler def download(spec) gemfile = Pathname.new(spec.loaded_from) gemfile = gemfile.dirname.join('..', 'cache', "#{spec.full_name}.gem") - repository.cache(gemfile) + bundle.cache(gemfile) end private @@ -298,7 +298,7 @@ module Bundler def location # TMP HAX to get the *.gemspec reading to work - repository.path.join('dirs', File.basename(@uri, '.git')) + bundle.path.join('dirs', File.basename(@uri, '.git')) end def gems |