Environments are now installed to version-specific locations. Resolves #229

This commit is contained in:
Anthony Sottile 2015-05-16 19:16:23 -04:00
parent 154d918ff1
commit 45d4a195ef
9 changed files with 71 additions and 44 deletions

View file

@ -13,22 +13,25 @@ ENVIRONMENT_DIR = 'node_env'
class NodeEnv(helpers.Environment):
@property
def env_prefix(self):
return ". '{{prefix}}{0}/bin/activate' &&".format(ENVIRONMENT_DIR)
return ". '{{prefix}}{0}/bin/activate' &&".format(
helpers.environment_dir(ENVIRONMENT_DIR, self.language_version),
)
@contextlib.contextmanager
def in_env(repo_cmd_runner):
yield NodeEnv(repo_cmd_runner)
def in_env(repo_cmd_runner, language_version):
yield NodeEnv(repo_cmd_runner, language_version)
def install_environment(repo_cmd_runner, version='default'):
assert repo_cmd_runner.exists('package.json')
directory = helpers.environment_dir(ENVIRONMENT_DIR, version)
env_dir = repo_cmd_runner.path(ENVIRONMENT_DIR)
env_dir = repo_cmd_runner.path(directory)
with clean_path_on_failure(env_dir):
cmd = [
sys.executable, '-m', 'nodeenv', '--prebuilt',
'{{prefix}}{0}'.format(ENVIRONMENT_DIR),
'{{prefix}}{0}'.format(directory),
]
if version != 'default':
@ -36,10 +39,10 @@ def install_environment(repo_cmd_runner, version='default'):
repo_cmd_runner.run(cmd)
with in_env(repo_cmd_runner) as node_env:
with in_env(repo_cmd_runner, version) as node_env:
node_env.run("cd '{prefix}' && npm install -g")
def run_hook(repo_cmd_runner, hook, file_args):
with in_env(repo_cmd_runner) as env:
with in_env(repo_cmd_runner, hook['language_version']) as env:
return helpers.run_hook(env, hook, file_args)