Use Dsl.evaluate again

Fixes rubygems#786
mcolyer · Oct 22, 2010 · 6b3e2c7 · 6b3e2c7
1 parent 5aedb14
commit 6b3e2c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
@@ -14,10 +14,7 @@ def self.build(gemfile, lockfile, unlock)
         raise GemfileNotFound, "#{gemfile} not found"
       end
 
-      # TODO: move this back into DSL
-      builder = Dsl.new
-      builder.instance_eval(Bundler.read_file(gemfile.to_s), gemfile.to_s, 1)
-      builder.to_definition(lockfile, unlock)
+      Dsl.evaluate(gemfile, lockfile, unlock)
     end
 
 =begin

diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
@@ -2,10 +2,10 @@
 
 module Bundler
   class Dsl
-    def self.evaluate(gemfile)
+    def self.evaluate(gemfile, lockfile, unlock)
       builder = new
       builder.instance_eval(Bundler.read_file(gemfile.to_s), gemfile.to_s, 1)
-      builder.to_definition
+      builder.to_definition(lockfile, unlock)
     end
 
     VALID_PLATFORMS = Bundler::Dependency::PLATFORM_MAP.keys.freeze