spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-07 02:24:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

[wgem] really working without node and npm installed

Browse Source
This commit is contained in:
Vinícius Moreira
2019-12-13 18:58:35 -03:00
parent 217a9d5ec9
commit cdff6696eb
4 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bauh/commons/system.py
View File

@@ -4,7 +4,7 @@ import sys
import time
from io import StringIO
from subprocess import PIPE
from typing import List, Tuple
from typing import List, Tuple, Set
# default environment variables for subprocesses.
from bauh.api.abstract.handler import ProcessWatcher
@@ -25,7 +25,7 @@ USE_GLOBAL_INTERPRETER = bool(os.getenv('VIRTUAL_ENV'))
SIZE_MULTIPLIERS = ((0.001, 'Kb'), (0.000001, 'Mb'), (0.000000001, 'Gb'), (0.000000000001, 'Tb'))
def gen_env(global_interpreter: bool, lang: str = DEFAULT_LANG) -> dict:
def gen_env(global_interpreter: bool, lang: str = DEFAULT_LANG, extra_paths: Set[str] = None) -> dict:
res = {}
if lang:
@@ -36,6 +36,9 @@ def gen_env(global_interpreter: bool, lang: str = DEFAULT_LANG) -> dict:
else:
res['PATH'] = PATH
if extra_paths:
res['PATH'] += ':' + ':'.join(extra_paths)
return res
@@ -60,8 +63,9 @@ class SystemProcess:
class SimpleProcess:
def __init__(self, cmd: List[str], cwd: str = '.', expected_code: int = None, global_interpreter: bool = USE_GLOBAL_INTERPRETER,
lang: str = DEFAULT_LANG, root_password: str = None):
def __init__(self, cmd: List[str], cwd: str = '.', expected_code: int = None,
global_interpreter: bool = USE_GLOBAL_INTERPRETER, lang: str = DEFAULT_LANG, root_password: str = None,
extra_paths: Set[str] = None):
pwdin, final_cmd = None, []
if root_password is not None:
@@ -70,17 +74,17 @@ class SimpleProcess:
final_cmd.extend(cmd)
self.instance = self._new(final_cmd, cwd, global_interpreter, lang, stdin=pwdin)
self.instance = self._new(final_cmd, cwd, global_interpreter, lang, stdin=pwdin, extra_paths=extra_paths)
self.expected_code = expected_code
def _new(self, cmd: List[str], cwd: str, global_interpreter: bool, lang: str, stdin = None) -> subprocess.Popen:
def _new(self, cmd: List[str], cwd: str, global_interpreter: bool, lang: str, stdin = None, extra_paths: Set[str] = None) -> subprocess.Popen:
args = {
"stdout": subprocess.PIPE,
"stderr": subprocess.STDOUT,
"bufsize": -1,
"cwd": cwd,
"env": gen_env(global_interpreter, lang)
"env": gen_env(global_interpreter, lang, extra_paths=extra_paths)
}
if stdin:
@@ -166,7 +170,7 @@ class ProcessHandler:
def run_cmd(cmd: str, expected_code: int = 0, ignore_return_code: bool = False, print_error: bool = True,
cwd: str = '.', global_interpreter: bool = USE_GLOBAL_INTERPRETER) -> str:
cwd: str = '.', global_interpreter: bool = USE_GLOBAL_INTERPRETER, extra_paths: Set[str] = None) -> str:
"""
runs a given command and returns its default output
:param cmd:
@@ -179,7 +183,7 @@ def run_cmd(cmd: str, expected_code: int = 0, ignore_return_code: bool = False,
args = {
"shell": True,
"stdout": PIPE,
"env": gen_env(global_interpreter),
"env": gen_env(global_interpreter, extra_paths=extra_paths),
'cwd': cwd
}