Compare commits

..

No commits in common. "660cdbde117572559f83112fae146858233e9f9e" and "ab2560ded20e8ff94b2757d6acb67c1dd7aa7834" have entirely different histories.

4 changed files with 35 additions and 35 deletions

View file

@ -1,5 +1,4 @@
import os import os
from pathlib import Path
import env import env
from rwx import fs, ps from rwx import fs, ps
@ -13,21 +12,21 @@ projects = Projects(os.environ)
project = Project(projects) project = Project(projects)
def cd_browse_workspace() -> None: def cd_browse_workspace():
browse(project.root) browse(project.root)
def cd_build_project() -> None: def cd_build_project():
for extension in ["py", "sh"]: for extension in ["py", "sh"]:
path = Path(project.root) / f"build.{extension}" path = os.path.join(project.root, f"build.{extension}")
if path.exists(): if os.path.exists(path):
ps.run(path) ps.run(path)
break break
else: else:
pass pass
def cd_clone_branch() -> None: def cd_clone_branch():
print(f"""\ print(f"""\
{project.url} {project.url}
@ -41,17 +40,18 @@ def cd_clone_branch() -> None:
) )
def cd_list_environment() -> None: def cd_list_environment():
for variable, value in sorted(projects.environment.items()): for variable, value in sorted(projects.environment.items()):
print(variable, "=", value) print(variable, "=", value)
def cd_synchronize() -> None: def cd_synchronize():
host = "rwx.work" host = "rwx.work"
source = "out" source = "out"
user = "cd" user = "cd"
# #
root = Path(os.sep) / user / project.branch / projects.group / project.name root = os.sep.join(["",
user, project.branch, projects.group, project.name])
# #
target = f"{user}@{host}:{root}" target = f"{user}@{host}:{root}"
ps.run("rsync", ps.run("rsync",
@ -64,11 +64,11 @@ def cd_synchronize() -> None:
) )
def browse(root: str) -> None: def browse(root: str):
paths = [] paths = []
for directory, _, files in os.walk(root): for directory, _, files in os.walk(root):
for file in files: for file in files:
absolute_path = Path(directory) / file absolute_path = os.path.join(directory, file)
relative_path = os.path.relpath(absolute_path, start=root) relative_path = os.path.relpath(absolute_path, start=root)
paths.append(relative_path) paths.append(relative_path)
open(root) open(root)
@ -77,15 +77,15 @@ def browse(root: str) -> None:
shut(root) shut(root)
def cat(file: str) -> None: def cat(file: str):
open(file) open(file)
print(fs.read_file_text(file).rstrip()) print(fs.read_file_text(file).rstrip())
shut(file) shut(file)
def install_commands(path) -> None: def install_commands(path):
step("Install commands") step("Install commands")
user = Path("/usr/local/bin") user = "/usr/local/bin"
for command in [ for command in [
"browse-workspace", "browse-workspace",
"build-project", "build-project",
@ -94,51 +94,51 @@ def install_commands(path) -> None:
"synchronize", "synchronize",
]: ]:
print(command) print(command)
os.symlink(path, user / f"{COMMANDS_PREFIX}{command}") os.symlink(path, os.path.join(user, f"{COMMANDS_PREFIX}{command}"))
def set_ssh(*arguments) -> None: def set_ssh(*arguments):
step("Set SSH") step("Set SSH")
# #
ssh_key, ssh_hosts = arguments ssh_key, ssh_hosts = arguments
# #
ssh_type = "ed25519" ssh_type = "ed25519"
# #
home = Path("~").expanduser() home = os.path.expanduser("~")
# #
ssh = home / ".ssh" ssh = os.path.join(home, ".ssh")
ssh.mkdir(parents=True) os.makedirs(ssh, exist_ok=True)
ssh.chmod(0o700) os.chmod(ssh, 0o700)
# #
key = ssh / f"id_{ssh_type}" key = os.path.join(ssh, f"id_{ssh_type}")
if ssh_key: if ssh_key:
fs.write(key, ssh_key) fs.write(key, ssh_key)
key.chmod(0o400) os.chmod(key, 0o400)
# #
known = ssh / "known_hosts" known = os.path.join(ssh, "known_hosts")
if ssh_hosts: if ssh_hosts:
fs.write(known, ssh_hosts) fs.write(known, ssh_hosts)
known.chmod(0o400) os.chmod(known, 0o400)
# #
browse(ssh) browse(ssh)
cat(known) cat(known)
def open(*arguments) -> None: def open(*arguments):
print(env.CD_OPEN, end="") print(env.CD_OPEN, end="")
print(*arguments, flush=True) print(*arguments, flush=True)
def shut(*arguments) -> None: def shut(*arguments):
print(env.CD_SHUT, end="") print(env.CD_SHUT, end="")
print(*arguments, flush=True) print(*arguments, flush=True)
def split() -> None: def split():
print(env.CD_SPLT, flush=True) print(env.CD_SPLT, flush=True)
def step(*arguments) -> None: def step(*arguments):
env.CD_STEP += 1 env.CD_STEP += 1
print(env.CD_DOWN) print(env.CD_DOWN)
print(env.CD_VERT, env.CD_STEP, *arguments) print(env.CD_VERT, env.CD_STEP, *arguments)

View file

@ -1,13 +1,13 @@
#! /usr/bin/env python3 #! /usr/bin/env python3
import os
import sys import sys
from pathlib import Path
import cd import cd
if __name__ == "__main__": if __name__ == "__main__":
command, *arguments = sys.argv command, *arguments = sys.argv
command = Path(command).name command = os.path.basename(command)
if command == "__main__.py": if command == "__main__.py":
cd.set_ssh(*arguments) cd.set_ssh(*arguments)
cd.install_commands(__file__) cd.install_commands(__file__)

View file

@ -1,4 +1,4 @@
from pathlib import Path from os import path
BRANCH = [ BRANCH = [
"GITHUB_REF_NAME", "GITHUB_REF_NAME",
@ -24,10 +24,10 @@ class Project:
# name # name
for variable in NAME: for variable in NAME:
if value := projects.environment.get(variable, None): if value := projects.environment.get(variable, None):
self.name = Path(value).name self.name = path.basename(value)
# root # root
for variable in ROOT: for variable in ROOT:
if value := projects.environment.get(variable, None): if value := projects.environment.get(variable, None):
self.root = value self.root = value
# url # url
self.url = Path(projects.url) / self.name self.url = path.join(projects.url, self.name)

View file

@ -1,4 +1,4 @@
from pathlib import Path from os import path
GROUP_AND_NAME = [ GROUP_AND_NAME = [
"GITHUB_REPOSITORY", "GITHUB_REPOSITORY",
@ -20,4 +20,4 @@ class Projects:
# url # url
for variable in SERVER_URL: for variable in SERVER_URL:
if value := self.environment.get(variable, None): if value := self.environment.get(variable, None):
self.url = Path(value) / self.group self.url = path.join(value, self.group)