From c60897e876a3745cb6285064dd37b5fb09b4abc1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 8 Jun 2024 23:51:37 +0200 Subject: [PATCH 1/4] set_ssh --- cd/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd/__init__.py b/cd/__init__.py index 4ea730e..863e56d 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -119,9 +119,9 @@ def set_ssh(*arguments): if ssh_hosts: fs.write(known, ssh_hosts) os.chmod(known, 0o400) - cat(known) # browse(ssh) + cat(known) def open(*arguments): From 617aa98ee11dc5261e716535946c6c05415f2da9 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 8 Jun 2024 23:56:21 +0200 Subject: [PATCH 2/4] " --- cd/__main__.py | 6 +++--- cd/project.py | 12 ++++++------ cd/projects.py | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cd/__main__.py b/cd/__main__.py index d67667f..23bd676 100755 --- a/cd/__main__.py +++ b/cd/__main__.py @@ -6,13 +6,13 @@ import sys import cd -if __name__ == '__main__': +if __name__ == "__main__": command, *arguments = sys.argv command = os.path.basename(command) - if command == '__main__.py': + if command == "__main__.py": cd.set_ssh(*arguments) cd.install_commands(__file__) else: - command = command.replace('-', '_') + command = command.replace("-", "_") function = getattr(cd, command) function(*arguments) diff --git a/cd/project.py b/cd/project.py index d5a96d7..3d2e813 100644 --- a/cd/project.py +++ b/cd/project.py @@ -1,16 +1,16 @@ from os import path BRANCH = [ - 'GITHUB_REF_NAME', - 'CI_COMMIT_BRANCH', + "GITHUB_REF_NAME", + "CI_COMMIT_BRANCH", ] NAME = [ - 'GITHUB_REPOSITORY', - 'CI_PROJECT_PATH', + "GITHUB_REPOSITORY", + "CI_PROJECT_PATH", ] ROOT = [ - 'GITHUB_WORKSPACE', - 'CI_PROJECT_DIR', + "GITHUB_WORKSPACE", + "CI_PROJECT_DIR", ] diff --git a/cd/projects.py b/cd/projects.py index 81fe3db..4144f6a 100644 --- a/cd/projects.py +++ b/cd/projects.py @@ -1,12 +1,12 @@ from os import path GROUP_AND_NAME = [ - 'GITHUB_REPOSITORY', - 'CI_PROJECT_PATH', + "GITHUB_REPOSITORY", + "CI_PROJECT_PATH", ] SERVER_URL = [ - 'GITHUB_SERVER_URL', - 'CI_SERVER_URL', + "GITHUB_SERVER_URL", + "CI_SERVER_URL", ] From c84367a486d57630e8d0a3a01caf6260454b2021 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 8 Jun 2024 23:59:45 +0200 Subject: [PATCH 3/4] __init__ -> None --- cd/project.py | 2 +- cd/projects.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cd/project.py b/cd/project.py index 3d2e813..3ff02cd 100644 --- a/cd/project.py +++ b/cd/project.py @@ -15,7 +15,7 @@ ROOT = [ class Project: - def __init__(self, projects): + def __init__(self, projects) -> None: self.projects = projects # branch for variable in BRANCH: diff --git a/cd/projects.py b/cd/projects.py index 4144f6a..6f7c96a 100644 --- a/cd/projects.py +++ b/cd/projects.py @@ -11,7 +11,7 @@ SERVER_URL = [ class Projects: - def __init__(self, environment): + def __init__(self, environment) -> None: self.environment = environment # group, name for variable in GROUP_AND_NAME: From ab2560ded20e8ff94b2757d6acb67c1dd7aa7834 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 9 Jun 2024 00:01:38 +0200 Subject: [PATCH 4/4] imports --- cd/__init__.py | 6 +++--- cd/__main__.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cd/__init__.py b/cd/__init__.py index 863e56d..a5d1bb8 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -1,10 +1,10 @@ import os +import env +from rwx import fs, ps + from cd.project import Project from cd.projects import Projects -import env -from rwx import fs -from rwx import ps COMMANDS_PREFIX = "cd-" diff --git a/cd/__main__.py b/cd/__main__.py index 23bd676..af676cd 100755 --- a/cd/__main__.py +++ b/cd/__main__.py @@ -5,7 +5,6 @@ import sys import cd - if __name__ == "__main__": command, *arguments = sys.argv command = os.path.basename(command)