Add block syntax to git and path in the Gemfile DSL

1 files changed, 14 insertions, 7 deletions

diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index 57ab3302..309058a5 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -9,6 +9,7 @@ module Bundler
     end
 
     def initialize
+      @source  = nil
       @sources = []
       @dependencies = []
       @group = nil
@@ -28,22 +29,26 @@ module Bundler
     end
 
     def source(source, options = {})
-      source = case source
+      @source = case source
       when :gemcutter, :rubygems, :rubyforge then Source::Rubygems.new("uri" => "http://gemcutter.org")
       when String then Source::Rubygems.new("uri" => source)
       else source
       end
 
-      options[:prepend] ? @sources.unshift(source) : @sources << source
-      source
+      options[:prepend] ? @sources.unshift(@source) : @sources << @source
+
+      yield if block_given?
+      @source
+    ensure
+      @source = nil
     end
 
-    def path(path, options = {}, source_options = {})
-      source Source::Path.new(_normalize_hash(options).merge("path" => Pathname.new(path))), source_options
+    def path(path, options = {}, source_options = {}, &blk)
+      source Source::Path.new(_normalize_hash(options).merge("path" => Pathname.new(path))), source_options, &blk
     end
 
-    def git(uri, options = {}, source_options = {})
-      source Source::Git.new(_normalize_hash(options).merge("uri" => uri)), source_options
+    def git(uri, options = {}, source_options = {}, &blk)
+      source Source::Git.new(_normalize_hash(options).merge("uri" => uri)), source_options, &blk
     end
 
     def to_definition
@@ -104,6 +109,8 @@ module Bundler
         end
       end
 
+      opts["source"] ||= @source
+
       opts["group"] = group
     end