🤖 [AUTO] 1.2.11 2023-05-30 16:31:04

Author: oceaster

core/tools/commands/git/pull.py

@@ -18,30 +18,28 @@ def all():
   ''' Pulls the latest changes to & from every repository found within this projects scope '''
   os.chdir(BASE_DIR)
 
-  console.out(f"\n{PROJECT_NAME.upper()}\n-------------------------", "yellow")
+  console.out(f"\n> {PROJECT_NAME.upper()}", "amber")
   os.system("git pull --recurse-submodules")
 
   pulled_apis = []
   api_dir = f"{BASE_DIR}/api"
 
   for client in CLIENT_DATA:
-    print("\n")
     source_dir = CLIENT_DATA[client]["src"]
     source_api = BASE_DIR + f'/api/{client}'
 
     if os.path.exists(f"{source_dir}/.git"):
-      console.out(f"{client.upper()} (CLIENT)\n-------------------------", "yellow")
+      console.out(f"\n> {client.upper()} (CLIENT)", "amber")
       os.system(f"cd {source_dir} && git pull --recurse-submodules && cd {BASE_DIR}")
-      print("\n")
 
     if os.path.exists(f"{source_api}/.git"):
       pulled_apis.append(client)
-      console.out(f"{client.upper()} (API)\n-------------------------", "yellow")
+      console.out(f"\n> {client.upper()} (API)", "amber")
       os.system(f"cd {source_api} && git pull --recurse-submodules && cd {BASE_DIR}")
 
   potential_apis = listdir(api_dir)
   for dir in potential_apis:
     if (dir_path := f"{BASE_DIR}/api/{dir}") and isdir(dir_path) and (contents := listdir(dir_path)):
       if '.git' in contents and dir not in pulled_apis:
-        console.out(f"{dir.upper()} (API)\n-------------------------", "yellow")
+        console.out(f"\n> {dir.upper()} (API)", "amber")
         os.system(f"cd {dir_path} && git pull --recurse-submodules && cd {BASE_DIR}")

core/tools/commands/git/push.py

@@ -14,26 +14,24 @@ def all():
   ''' Pushes the latest changes to & from every repository found within this projects scope '''
   os.chdir(BASE_DIR)
 
-  console.out(f"\n{PROJECT_NAME.upper()}\n-------------------------", "yellow")
+  console.out(f"\n> {PROJECT_NAME.upper()}", "amber")
   os.system(f'''git add . && git commit -m "{AUTO_COMMIT_MESSAGE}" && git push''')
 
   pushed_apis = []
   api_dir = f"{BASE_DIR}/api"
 
   for client in CLIENT_DATA:
-    print("\n")
     source_dir = CLIENT_DATA[client]["src"]
     source_api = BASE_DIR + f'/api/{client}'
 
     if os.path.exists(f"{source_dir}/.git"):
-      console.out(f"{client.upper()} (CLIENT)\n-------------------------", "yellow")
+      console.out(f"\n> {client.upper()} (CLIENT)", "amber")
       os.chdir(source_dir)
       os.system(f'''git add . && git commit -m "{AUTO_COMMIT_MESSAGE}" && git push''')
       os.chdir(BASE_DIR)
-      print("\n")
 
     if os.path.exists(f"{source_api}/.git"):
-      console.out(f"{client.upper()} (API)\n-------------------------", "yellow")
+      console.out(f"\n> {client.upper()} (API)", "amber")
       os.chdir(source_api)
       os.system(f'''git add . && git commit -m "{AUTO_COMMIT_MESSAGE}" && git push''')
       os.chdir(BASE_DIR)
@@ -43,7 +41,7 @@ def all():
   for dir in potential_apis:
     if (dir_path := f"{BASE_DIR}/api/{dir}") and isdir(dir_path) and (contents := listdir(dir_path)):
       if '.git' in contents and dir not in pushed_apis:
-        console.out(f"{dir.upper()} (API)\n-------------------------", "yellow")
+        console.out(f"\n> {dir.upper()} (API)", "amber")
         os.chdir(dir_path)
         os.system(f'''git add . && git commit -m "{AUTO_COMMIT_MESSAGE}" && git push''')
         os.chdir(BASE_DIR)