diff options
author | Carl Lerche <carllerche@mac.com> | 2010-01-29 15:14:04 -0800 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2010-01-29 15:14:04 -0800 |
commit | f329d586cde5a924f1b8e170117e5b6cb96ed9ee (patch) | |
tree | c8acce93390d51065e8d8e36913434cdd56833a7 /lib/bundler/dsl.rb | |
parent | 6a344b8cbb0fc6d740a0f0f030f0e427b9c79bfc (diff) | |
download | bundler-f329d586cde5a924f1b8e170117e5b6cb96ed9ee.tar.gz |
Add first round of source pinning support
Diffstat (limited to 'lib/bundler/dsl.rb')
-rw-r--r-- | lib/bundler/dsl.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index feedfda8..d81b7a2d 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -11,8 +11,6 @@ module Bundler def initialize @sources = [] # Gem.sources.map { |s| Source::Rubygems.new(:uri => s) } @dependencies = [] - @git = nil - @git_sources = {} @group = nil end @@ -25,9 +23,13 @@ module Bundler options[k.to_s] = v end - # Set defaults + # Set options options["group"] ||= @group + if options["git"] + options["source"] = git(options["git"]) + end + @dependencies << Dependency.new(name, version, options) end @@ -39,6 +41,7 @@ module Bundler end @sources << source + source end def path(path, options = {}) |