summaryrefslogtreecommitdiffstats
path: root/pre_commit
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-07-03 19:27:38 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-07-03 19:27:38 +0000
commita1fd3d0746ade4480fa73bf03b03b268b4c2fc6c (patch)
tree7e819595d15c58bd917c69fdaf2b6f530482d9f9 /pre_commit
parentAdding upstream version 2.5.1. (diff)
downloadpre-commit-a1fd3d0746ade4480fa73bf03b03b268b4c2fc6c.tar.xz
pre-commit-a1fd3d0746ade4480fa73bf03b03b268b4c2fc6c.zip
Adding upstream version 2.6.0.upstream/2.6.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'pre_commit')
-rw-r--r--pre_commit/languages/node.py3
-rw-r--r--pre_commit/languages/ruby.py73
2 files changed, 50 insertions, 26 deletions
diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py
index 26f4919..d99e6f2 100644
--- a/pre_commit/languages/node.py
+++ b/pre_commit/languages/node.py
@@ -10,6 +10,7 @@ import pre_commit.constants as C
from pre_commit import parse_shebang
from pre_commit.envcontext import envcontext
from pre_commit.envcontext import PatchesT
+from pre_commit.envcontext import UNSET
from pre_commit.envcontext import Var
from pre_commit.hook import Hook
from pre_commit.languages import helpers
@@ -56,6 +57,8 @@ def get_env_patch(venv: str) -> PatchesT:
('NODE_VIRTUAL_ENV', venv),
('NPM_CONFIG_PREFIX', install_prefix),
('npm_config_prefix', install_prefix),
+ ('NPM_CONFIG_USERCONFIG', UNSET),
+ ('npm_config_userconfig', UNSET),
('NODE_PATH', os.path.join(venv, lib_dir, 'node_modules')),
('PATH', (bin_dir(venv), os.pathsep, Var('PATH'))),
)
diff --git a/pre_commit/languages/ruby.py b/pre_commit/languages/ruby.py
index fe524ec..73b23cc 100644
--- a/pre_commit/languages/ruby.py
+++ b/pre_commit/languages/ruby.py
@@ -1,4 +1,5 @@
import contextlib
+import functools
import os.path
import shutil
import tarfile
@@ -7,6 +8,7 @@ from typing import Sequence
from typing import Tuple
import pre_commit.constants as C
+from pre_commit import parse_shebang
from pre_commit.envcontext import envcontext
from pre_commit.envcontext import PatchesT
from pre_commit.envcontext import UNSET
@@ -19,33 +21,51 @@ from pre_commit.util import clean_path_on_failure
from pre_commit.util import resource_bytesio
ENVIRONMENT_DIR = 'rbenv'
-get_default_version = helpers.basic_get_default_version
healthy = helpers.basic_healthy
+@functools.lru_cache(maxsize=1)
+def get_default_version() -> str:
+ if all(parse_shebang.find_executable(exe) for exe in ('ruby', 'gem')):
+ return 'system'
+ else:
+ return C.DEFAULT
+
+
def get_env_patch(
venv: str,
language_version: str,
-) -> PatchesT: # pragma: win32 no cover
+) -> PatchesT:
patches: PatchesT = (
('GEM_HOME', os.path.join(venv, 'gems')),
('GEM_PATH', UNSET),
- ('RBENV_ROOT', venv),
('BUNDLE_IGNORE_CONFIG', '1'),
- (
- '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 != C.DEFAULT:
- patches += (('RBENV_VERSION', language_version),)
+ if language_version == 'system':
+ patches += (
+ (
+ 'PATH', (
+ os.path.join(venv, 'gems', 'bin'), os.pathsep,
+ Var('PATH'),
+ ),
+ ),
+ )
+ else: # pragma: win32 no cover
+ patches += (
+ ('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'),
+ ),
+ ),
+ )
return patches
-@contextlib.contextmanager # pragma: win32 no cover
+@contextlib.contextmanager
def in_env(
prefix: Prefix,
language_version: str,
@@ -65,7 +85,7 @@ def _extract_resource(filename: str, dest: str) -> None:
def _install_rbenv(
prefix: Prefix,
- version: str = C.DEFAULT,
+ version: str,
) -> None: # pragma: win32 no cover
directory = helpers.environment_dir(ENVIRONMENT_DIR, version)
@@ -92,21 +112,22 @@ def _install_ruby(
def install_environment(
prefix: Prefix, version: str, additional_dependencies: Sequence[str],
-) -> None: # pragma: win32 no cover
+) -> None:
additional_dependencies = tuple(additional_dependencies)
directory = helpers.environment_dir(ENVIRONMENT_DIR, version)
with clean_path_on_failure(prefix.path(directory)):
- # TODO: this currently will fail if there's no version specified and
- # there's no system ruby installed. Is this ok?
- _install_rbenv(prefix, version=version)
- with in_env(prefix, version):
- # Need to call this before installing so rbenv's directories are
- # set up
- helpers.run_setup_cmd(prefix, ('rbenv', 'init', '-'))
- if version != C.DEFAULT:
+ if version != 'system': # pragma: win32 no cover
+ _install_rbenv(prefix, version)
+ with in_env(prefix, version):
+ # Need to call this before installing so rbenv's directories
+ # are set up
+ helpers.run_setup_cmd(prefix, ('rbenv', 'init', '-'))
+ # XXX: this will *always* fail if `version == C.DEFAULT`
_install_ruby(prefix, version)
- # Need to call this after installing to set up the shims
- helpers.run_setup_cmd(prefix, ('rbenv', 'rehash'))
+ # Need to call this after installing to set up the shims
+ helpers.run_setup_cmd(prefix, ('rbenv', 'rehash'))
+
+ with in_env(prefix, version):
helpers.run_setup_cmd(
prefix, ('gem', 'build', *prefix.star('.gemspec')),
)
@@ -123,6 +144,6 @@ def run_hook(
hook: Hook,
file_args: Sequence[str],
color: bool,
-) -> Tuple[int, bytes]: # pragma: win32 no cover
+) -> Tuple[int, bytes]:
with in_env(hook.prefix, hook.language_version):
return helpers.run_xargs(hook, hook.cmd, file_args, color=color)