gemfile lock works with Git

4 files changed, 5 insertions, 4 deletions

diff --git a/lib/bubble/environment.rb b/lib/bubble/environment.rb
index 44c0013bf5..e52f5fc486 100644
--- a/lib/bubble/environment.rb
+++ b/lib/bubble/environment.rb
@@ -15,7 +15,7 @@ module Bubble
       specs.each do |spec|
         Gem.loaded_specs[spec.name] = spec
       end
-      $LOAD_PATH.unshift *load_paths
+      $LOAD_PATH.unshift(*load_paths)
       self
     end
 
diff --git a/lib/bubble/source.rb b/lib/bubble/source.rb
index 6e322855d7..3afc75624c 100644
--- a/lib/bubble/source.rb
+++ b/lib/bubble/source.rb
@@ -102,8 +102,8 @@ module Bubble
         @ref  = options[:ref] || options[:branch] || 'master'
       end
 
-      def to_yaml(options = {})
-        { :uri => @uri.to_s, :ref => @ref, :glob => @glob }.to_yaml
+      def options
+        @options.merge(:ref => revision)
       end
 
       def path
diff --git a/spec/support/builders.rb b/spec/support/builders.rb
index 758b505694..99099d9bc6 100644
--- a/spec/support/builders.rb
+++ b/spec/support/builders.rb
@@ -160,6 +160,7 @@ module Spec
   private
 
     def build_with(builder, name, args, &blk)
+      @_build_path ||= nil
       options  = args.last.is_a?(Hash) ? args.pop : {}
       versions = args.last || "1.0"
 
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index f57208c121..150165d9e2 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -59,7 +59,7 @@ module Spec
     end
 
     def install_gemfile(*args)
-      gemfile *args
+      gemfile(*args)
       bbl :install
     end