lib/autoproj/package_managers/bundler_manager.rb in autoproj-2.0.0.rc28 vs lib/autoproj/package_managers/bundler_manager.rb in autoproj-2.0.0.rc29

@@ -31,13 +31,13 @@
 
                 config = ws.config
 
                 env.add_path 'PATH', File.join(ws.prefix_dir, 'gems', 'bin')
                 env.add_path 'PATH', File.join(config.bundler_gem_home, 'bin')
-                env.add_path 'PATH', File.join(config.gems_gem_home, 'bin')
+                env.add_path 'PATH', File.join(config.gems_gem_home(ws), 'bin')
                 env.add_path 'PATH', File.join(ws.dot_autoproj_dir, 'autoproj', 'bin')
-                env.set 'GEM_HOME', config.gems_gem_home
+                env.set 'GEM_HOME', config.gems_gem_home(ws)
                 env.set 'GEM_PATH', config.bundler_gem_home
 
                 root_dir     = File.join(ws.prefix_dir, 'gems')
                 gemfile_path = File.join(root_dir, 'Gemfile')
                 if File.file?(gemfile_path)
@@ -275,10 +275,10 @@
                     end
                 end
 
                 options = Array.new
                 if ws.config.private_gems?
-                    options << "--path" << ws.config.gems_bundler_path
+                    options << "--path" << ws.config.gems_bundler_path(ws)
                 end
 
                 binstubs_path = File.join(root_dir, 'bin')
                 if updated || !install_only || !File.file?("#{gemfile_path}.lock")
                     self.class.run_bundler_install ws, gemfile_path, *options,