Rakefile in fdlcap-0.4.2 vs Rakefile in fdlcap-0.4.3

@@ -1,22 +1,31 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'vendor', 'gems', 'environment')
-Bundler.require_env
-require 'rake'
-require 'bundler'
+begin
+  # Require the preresolved locked set of gems.
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fallback on doing the resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
 
+require "rake/testtask"
+require "rake/clean"
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "fdlcap"
     gem.summary = %Q{a set of capistrano recipies we use regularly at Factory Design Labs}
     gem.email = "[e-mail]"
     gem.homepage = "http://github.com/factorylabs/fdlcap"
     gem.authors = ["Factory Design Labs", "Gabe Varela", "Jay Zeschin" ]
 
-    manifest = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile')
+    manifest = Bundler.definition
     manifest.dependencies.each do |d|
-      next if d.only
-      gem.add_dependency(d.name, d.version)
+      next unless d.groups.include?(:dependency)
+      puts d.requirement.to_s
+      gem.add_dependency(d.name, d.requirement.to_s)
     end
 
     gem.files.exclude('.gitignore')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end