Fix already using rbenv + default ruby. Resolves #369.

This commit is contained in:
Anthony Sottile 2016-05-17 08:23:21 -07:00
parent 749b840695
commit e77bb8f3c3

View file

@ -19,16 +19,18 @@ ENVIRONMENT_DIR = 'rbenv'
def get_env_patch(venv, language_version): def get_env_patch(venv, language_version):
return ( patches = (
('GEM_HOME', os.path.join(venv, 'gems')), ('GEM_HOME', os.path.join(venv, 'gems')),
('RBENV_ROOT', venv), ('RBENV_ROOT', venv),
('RBENV_VERSION', language_version),
('PATH', ( ('PATH', (
os.path.join(venv, 'gems', 'bin'), os.pathsep, os.path.join(venv, 'gems', 'bin'), os.pathsep,
os.path.join(venv, 'shims'), os.pathsep, os.path.join(venv, 'shims'), os.pathsep,
os.path.join(venv, 'bin'), os.pathsep, Var('PATH'), os.path.join(venv, 'bin'), os.pathsep, Var('PATH'),
)), )),
) )
if language_version != 'default':
patches += (('RBENV_VERSION', language_version),)
return patches
@contextlib.contextmanager @contextlib.contextmanager