clean up usage of python_util
This commit is contained in:
parent
d16a022728
commit
9e91491542
3 changed files with 28 additions and 17 deletions
|
@ -3,7 +3,6 @@ from .infrastructure import (
|
||||||
ImageApi,
|
ImageApi,
|
||||||
ResourceApi,
|
ResourceApi,
|
||||||
ExecutionApi,
|
ExecutionApi,
|
||||||
ProjectRepository,
|
|
||||||
EnvironmentApi,
|
EnvironmentApi,
|
||||||
CredentialsApi,
|
CredentialsApi,
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,17 +1,11 @@
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from sys import stdout
|
from sys import stdout
|
||||||
from os import chmod
|
from os import chmod, environ
|
||||||
from subprocess import run
|
|
||||||
from pkg_resources import resource_string
|
from pkg_resources import resource_string
|
||||||
import yaml
|
import yaml
|
||||||
from os import environ
|
|
||||||
import deprecation
|
import deprecation
|
||||||
|
from subprocess import check_output, Popen, PIPE, run
|
||||||
from ..domain import Devops, Image, C4k, Release, BuildFile
|
from ..domain import Devops, Image, C4k, Release, BuildFile
|
||||||
from ..python_util import execute
|
|
||||||
|
|
||||||
|
|
||||||
class ProjectRepository:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class ResourceApi:
|
class ResourceApi:
|
||||||
|
@ -20,15 +14,18 @@ class ResourceApi:
|
||||||
|
|
||||||
|
|
||||||
class FileApi:
|
class FileApi:
|
||||||
|
def __init__(self):
|
||||||
|
self.execution_api = ExecutionApi()
|
||||||
|
|
||||||
def clean_dir(self, directory: str):
|
def clean_dir(self, directory: str):
|
||||||
execute("rm -rf " + directory, shell=True)
|
self.execution_api.execute("rm -rf " + directory)
|
||||||
execute("mkdir -p " + directory, shell=True)
|
self.execution_api.execute("mkdir -p " + directory)
|
||||||
|
|
||||||
def cp_force(self, src: str, target_dir: str):
|
def cp_force(self, src: str, target_dir: str):
|
||||||
execute("cp -f " + src + "* " + target_dir, shell=True)
|
self.execution_api.execute("cp -f " + src + "* " + target_dir)
|
||||||
|
|
||||||
def cp_recursive(self, src: str, target_dir: str):
|
def cp_recursive(self, src: str, target_dir: str):
|
||||||
execute("cp -r " + src + " " + target_dir, shell=True)
|
self.execution_api.execute("cp -r " + src + " " + target_dir)
|
||||||
|
|
||||||
def write_data_to_file(self, path: Path, data: bytes):
|
def write_data_to_file(self, path: Path, data: bytes):
|
||||||
with open(path, "w", encoding="utf-8") as output_file:
|
with open(path, "w", encoding="utf-8") as output_file:
|
||||||
|
@ -99,10 +96,18 @@ class ExecutionApi:
|
||||||
if dry_run:
|
if dry_run:
|
||||||
print(command)
|
print(command)
|
||||||
else:
|
else:
|
||||||
output = execute(command, True)
|
output = check_output(command, encoding="UTF-8", shell=True)
|
||||||
|
output = output.rstrip()
|
||||||
print(output)
|
print(output)
|
||||||
return output
|
return output
|
||||||
|
|
||||||
|
def execute_live(command):
|
||||||
|
process = Popen(command, stdout=PIPE)
|
||||||
|
for line in iter(process.stdout.readline, b""):
|
||||||
|
print(line.decode("utf-8"), end="")
|
||||||
|
process.stdout.close()
|
||||||
|
process.wait()
|
||||||
|
|
||||||
|
|
||||||
class EnvironmentApi:
|
class EnvironmentApi:
|
||||||
def get(self, key):
|
def get(self, key):
|
||||||
|
|
|
@ -1,15 +1,22 @@
|
||||||
from subprocess import check_output, Popen, PIPE
|
from subprocess import check_output, Popen, PIPE
|
||||||
|
import deprecation
|
||||||
|
|
||||||
|
|
||||||
|
@deprecation.deprecated(deprecated_in="3.2", details="use ExecutionApi instead")
|
||||||
def execute(cmd, shell=False):
|
def execute(cmd, shell=False):
|
||||||
output = check_output(cmd, encoding='UTF-8', shell=shell)
|
output = check_output(cmd, encoding="UTF-8", shell=shell)
|
||||||
return output.rstrip()
|
return output.rstrip()
|
||||||
|
|
||||||
|
|
||||||
|
@deprecation.deprecated(deprecated_in="3.2", details="use ExecutionApi instead")
|
||||||
def execute_live(cmd):
|
def execute_live(cmd):
|
||||||
process = Popen(cmd, stdout=PIPE)
|
process = Popen(cmd, stdout=PIPE)
|
||||||
for line in iter(process.stdout.readline, b''):
|
for line in iter(process.stdout.readline, b""):
|
||||||
print(line.decode('utf-8'), end='')
|
print(line.decode("utf-8"), end="")
|
||||||
process.stdout.close()
|
process.stdout.close()
|
||||||
process.wait()
|
process.wait()
|
||||||
|
|
||||||
|
|
||||||
|
@deprecation.deprecated(deprecated_in="3.2", details="use domain.filter_none instead")
|
||||||
def filter_none(list_to_filter):
|
def filter_none(list_to_filter):
|
||||||
return [x for x in list_to_filter if x is not None]
|
return [x for x in list_to_filter if x is not None]
|
||||||
|
|
Loading…
Reference in a new issue