From e77bb8f3c3418d5f42c6b382e2d271e85a9e8377 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Tue, 17 May 2016 08:23:21 -0700 Subject: [PATCH] Fix already using rbenv + default ruby. Resolves #369. --- pre_commit/languages/ruby.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pre_commit/languages/ruby.py b/pre_commit/languages/ruby.py index dc320b3f..28ad3771 100644 --- a/pre_commit/languages/ruby.py +++ b/pre_commit/languages/ruby.py @@ -19,16 +19,18 @@ ENVIRONMENT_DIR = 'rbenv' def get_env_patch(venv, language_version): - return ( + patches = ( ('GEM_HOME', os.path.join(venv, 'gems')), ('RBENV_ROOT', venv), - ('RBENV_VERSION', language_version), ('PATH', ( os.path.join(venv, 'gems', 'bin'), os.pathsep, os.path.join(venv, 'shims'), os.pathsep, os.path.join(venv, 'bin'), os.pathsep, Var('PATH'), )), ) + if language_version != 'default': + patches += (('RBENV_VERSION', language_version),) + return patches @contextlib.contextmanager