CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.25)
-project(COSC-4P80-Assignment-1 VERSION 13.4.0)
+project(COSC-4P80-Assignment-1 VERSION 0.0.16)
 
 option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
 option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)

commit.py

@@ -1,13 +1,6 @@
 #!/usr/bin/python3
 
 import subprocess
-import argparse
-import sys
-import os
-import itertools
-import requests
-import json
-from pathlib import Path
 
 #---------------------------------------
 #		CONFIG
@@ -15,109 +8,12 @@ from pathlib import Path
 
 VERSION_BEGIN_STR = " VERSION "
 VERSION_END_STR = ")"
+PATCH_LIMIT = 100000
 
 #---------------------------------------
 #	      DO NOT TOUCH
 #---------------------------------------
 
-USER_HOME = Path.home()
-ENVIRONMENT_DATA_LOCATION = USER_HOME / ".brett_scripts.env"
-
-if sys.platform.startswith("win"):
-	CONFIG_FILE_DIRECTORY = Path(os.getenv('APPDATA') + "\BLT")
-	CONFIG_FILE_LOCATION = Path(CONFIG_FILE_DIRECTORY + "\commit_config.env")
-else:
-	XDG_CONFIG_HOME = Path(os.environ.get('XDG_CONFIG_HOME'))
-	if len(str(XDG_CONFIG_HOME)) == 0:
-		XDG_CONFIG_HOME = USER_HOME
-	CONFIG_FILE_DIRECTORY = XDG_CONFIG_HOME / "blt"
-	CONFIG_FILE_LOCATION = CONFIG_FILE_DIRECTORY / "commit_config.env"
-
-class Config:
-	def __init__(self):
-		# Inline with semantic versioning it doesn't make sense to branch / release on minor
-		self.branch_on_major = True
-		self.branch_on_minor = False
-		self.release_on_major = True
-		self.release_on_minor = False
-		self.main_branch = "main"
-		self.patch_limit = -1
-	
-	def from_file(file):
-		values = {}
-		if (not os.path.exists(file)):
-			return Config()
-
-		with open(file, "rt") as f:
-			for line in f:
-				if line.startswith("export"):
-					content = line.split("=")
-					for idx, c in enumerate(content):
-						content[idx] = c.replace("export", "").strip()
-					values[content[0]] = content[1].replace("\"", "").replace("'", "")
-		config = Config()
-		config.branch_on_major = values["branch_on_major"].lower() == "true"
-		config.branch_on_minor = values["branch_on_minor"].lower() == "true"
-		config.release_on_major = values["release_on_major"].lower() == "true"
-		config.release_on_minor = values["release_on_minor"].lower() == "true"
-		config.main_branch = values["main_branch"]
-		config.patch_limit = int(values["patch_limit"])
-  
-		return config;
-
-	def save_to_file(self, file):
-		dir_index = str(file).rfind("/")
-		dir = str(file)[:dir_index]
-		if not os.path.exists(dir):
-			print(f"Creating config directory {dir}")
-			os.makedirs(dir)
-		with open(file, 'w') as f:
-			f.write("export branch_on_major=" + str(self.branch_on_major) + "\n")
-			f.write("export branch_on_minor=" + str(self.branch_on_minor) + "\n")
-			f.write("export release_on_major=" + str(self.release_on_major) + "\n")
-			f.write("export release_on_minor=" + str(self.release_on_minor) + "\n")
-			f.write('export main_branch="' + self.main_branch + '"' + "\n")
-			f.write("export patch_limit=" + str(self.patch_limit) + "\n")
-			
-
-class EnvData:
-	def __init__(self, github_username = '', github_token = ''):
-		self.github_token = github_token
-		self.github_username = github_username
-  
-	def get_env_from_file(file):
-		f = open(file, "rt")
-		values = {}
-		for line in f:
-			if line.startswith("export"):
-				content = line.split("=")
-				for idx, c in enumerate(content):
-					content[idx] = c.replace("export", "").strip()
-				values[content[0]] = content[1].replace("\"", "").replace("'", "")
-		try:
-			github_token = values["github_token"]
-		except Exception:
-			print("Failed to parse github token!")
-		try:
-			github_username = values["github_username"]
-		except:
-			print("Failed to parse github username! Assuming you are me!")
-			github_username = "Tri11Paragon"
-		return EnvData(github_username=github_username, github_token=github_token)
-
-def open_process(command, print_out = True):
-	process = subprocess.Popen(command, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
-	stdout, stderr = process.communicate()
-	exit_code = process.wait()
-	str_out = stdout.decode('utf8')
-	str_err = stderr.decode('utf8')
-	if print_out and len(str_out) > 0:
-		print(str_out, end='')
-	if print_out and len(str_err) > 0:
-		print(str_err, end='')
-	#print(stdout, stderr, exit_code)
-	return (stdout, stderr, exit_code)
-
 def load_cmake():
 	cmake_file = open("CMakeLists.txt", 'r')
 	cmake_text = cmake_file.read()
@@ -142,8 +38,8 @@ def split_version(cmake_text):
 def recombine(cmake_text, version_parts, begin, end):
 	constructed_version = version_parts[0] + '.' + version_parts[1] + '.' + version_parts[2]
 	constructed_text_begin = cmake_text[0:begin]
-	constructed_text_end = cmake_text[end::]
+	constrcuted_text_end = cmake_text[end::]
-	return constructed_text_begin + constructed_version + constructed_text_end
+	return constructed_text_begin + constructed_version + constrcuted_text_end
 
 
 def inc_major(cmake_text):
@@ -159,130 +55,32 @@ def inc_minor(cmake_text):
 	version_parts[2] = '0'
 	return recombine(cmake_text, version_parts, begin, end)
 
-def inc_patch(config: Config, cmake_text):
+def inc_patch(cmake_text):
 	version_parts, begin, end = split_version(cmake_text)
-	if config.patch_limit > 0 and int(version_parts[2]) + 1 >= config.patch_limit:
+	if int(version_parts[2]) + 1 >= PATCH_LIMIT:
 		return inc_minor(cmake_text)
 	version_parts[2] = str(int(version_parts[2]) + 1)
 	return recombine(cmake_text, version_parts, begin, end)
 
-def make_branch(config: Config, name):
-	print(f"Making new branch {name}")
-	subprocess.call(["git", "checkout", "-b", name])
-	subprocess.call(["git", "merge", config.main_branch])
-	subprocess.call(["git", "checkout", config.main_branch])
-
-def make_release(env: EnvData, name):
-	print(f"Making new release {name}")
-	repos_v = open_process(["git", "remote", "-v"])[0].splitlines()
-	urls = []
-	for line in repos_v:
-		origin = ''.join(itertools.takewhile(str.isalpha, line.decode('utf8')))
-		urls.append("https://api.github.com/repos/" + open_process(["git", "remote", "get-url", origin], False)[0].decode('utf8').replace("\n", "").replace("https://github.com/", "") + "/releases")
-	urls = set(urls)
-	data = {
-		'tag_name': name,
-		'name': name,
-		'body': "Automated Release '" + name + "'",
-		'draft': False,
-		'prerelease': False
-	}
-	headers = {
-		'Authorization': f'Bearer {env.github_token}',
-		'Accept': 'application/vnd.github+json',
-		'X-GitHub-Api-Version': '2022-11-28'
-	}
-	for url in urls:
-		response = requests.post(url, headers=headers, data=json.dumps(data))
-		if response.status_code == 201:
-			print('Release created successfully!')
-			release_data = response.json()
-			print(f"Release URL: {release_data['html_url']}")
-		else:
-			print(f"Failed to create release: {response.status_code}")
-			print(response.json())
-
-
-def main():
-	parser = argparse.ArgumentParser(
-		prog="Commit Helper", 
-		description="Help you make pretty commits :3")
-	
-	parser.add_argument("action", nargs='?', default=None)
-	parser.add_argument("-p", "--patch", action='store_true', default=False, required=False)
-	parser.add_argument("-m", "--minor", action='store_true', default=False, required=False)
-	parser.add_argument("-M", "--major", action='store_true', default=False, required=False)
-	parser.add_argument('-e', "--env", help="environment file", required=False, default=None)
-	parser.add_argument('-c', "--config", help="config file", required=False, default=None)
-	parser.add_argument("--create_default_config", action="store_true", default=False, required=False)
-	
-	args = parser.parse_args()
- 
-	if args.env is not None:
-		env = EnvData.get_env_from_file(args.e)
-	else:
-		env = EnvData.get_env_from_file(ENVIRONMENT_DATA_LOCATION)
-  
-	if args.config is not None:
-		config = Config.from_file(args.config)
-	else:
-		config = Config.from_file(CONFIG_FILE_LOCATION)
-  
-	if args.create_default_config:
-		config.save_to_file(args.config if args.config is not None else CONFIG_FILE_LOCATION)
-	
 cmake_text = load_cmake()
 cmake_version = get_version(cmake_text)[0]
 print(f"Current Version: {cmake_version}")
 
-	if not (args.patch or args.minor or args.major):
 try:
-			if args.action is not None:
-				type = args.action
-			else:
 	type = input("What kind of commit is this ((M)ajor, (m)inor, (p)atch)? ")
 
 	if type.startswith('M'):
-				args.major = True
-			elif type.startswith('m'):
-				args.minor = True
-			elif type.startswith('p') or type.startswith('P') or len(type) == 0:
-				args.patch = True
-		except KeyboardInterrupt:
-			print("\nCancelling!")
-			return
-	
-	if args.major:
 		print("Selected major")
 		write_cmake(inc_major(cmake_text))
-	elif args.minor:
+	elif type.startswith('m'):
 		print("Selected minor")
 		write_cmake(inc_minor(cmake_text))
-	elif args.patch:
+	elif type.startswith('p') or type.startswith('P') or len(type) == 0:
 		print("Selected patch")
-		write_cmake(inc_patch(config, cmake_text))
+		write_cmake(inc_patch(cmake_text))
-
 
 	subprocess.call(["git", "add", "*"])
 	subprocess.call(["git", "commit"])
- 
-	cmake_text = load_cmake()
-	version_parts = split_version(cmake_text)[0]
-	if args.major:
-		if config.branch_on_major:
-			make_branch(config, "v" + str(version_parts[0]))
-	if args.minor:
-		if config.branch_on_minor:
-			make_branch(config, "v" + str(version_parts[0]) + "." + str(version_parts[1]))
-		
 	subprocess.call(["sh", "-c", "git remote | xargs -L1 git push --all"])
- 
+except KeyboardInterrupt:
-	if args.major:
+	print("\nCancelling!")
-		if config.release_on_major:
-			make_release(env, "v" + str(version_parts[0]))
-	if args.minor:
-		if config.release_on_minor:
-			make_release(env, "v" + str(version_parts[0]) + "." + str(version_parts[1]))
-  
-if __name__ == "__main__":
-	main()