Compare commits

..

No commits in common. "068faa48d586031d8f7a62c61679cdc81e3ca701" and "847353990bf7f65a9ee905401092be2b1f4941ca" have entirely different histories.

1 changed files with 41 additions and 55 deletions

View File

@ -24,19 +24,12 @@ 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")
CONFIG_FILE_LOCATION = os.getenv('APPDATA') + "\BLT\commit_config.env"
else:
XDG_CONFIG_HOME = os.environ.get('XDG_CONFIG_HOME')
if XDG_CONFIG_HOME is None:
XDG_CONFIG_HOME = USER_HOME / ".config"
else:
XDG_CONFIG_HOME = Path(XDG_CONFIG_HOME)
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"
CONFIG_FILE_LOCATION = XDG_CONFIG_HOME / "blt" / "commit_config.env"
class Config:
def __init__(self):
@ -48,35 +41,29 @@ class Config:
self.main_branch = "main"
self.patch_limit = -1
def toJSON(self):
return json.dumps(self, default=lambda o: o.__dict__, sort_keys=True, indent=4)
def fromJSON(file):
with open(file, "r") as f:
j = json.load(f)
obj = Config()
[setattr(obj, key, val) for key, val in j.items() if hasattr(obj, key)]
return obj
def from_file(file):
values = {}
if (not os.path.exists(file)):
return Config()
with open(file, "r") as f:
j = json.load(f)
obj = Config()
[setattr(obj, key, val) for key, val in j.items() if hasattr(obj, key)]
return obj
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.release_on_major = values["release_on_major"].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:
json.dump(self, f, default=lambda o: o.__dict__, sort_keys=True, indent=4)
with open(file, 'w') as f:
f.write("export branch_on_major=" + str(self.branch_on_major))
f.write("export release_on_major=" + str(self.release_on_major))
f.write('export main_branch="' + self.main_branch + '"')
f.write("export patch_limit=" + str(self.patch_limit))
class EnvData:
@ -144,6 +131,7 @@ def recombine(cmake_text, version_parts, begin, end):
constructed_text_end = cmake_text[end::]
return constructed_text_begin + constructed_version + constructed_text_end
def inc_major(cmake_text):
version_parts, begin, end = split_version(cmake_text)
version_parts[0] = str(int(version_parts[0]) + 1)
@ -166,7 +154,8 @@ def inc_patch(config: Config, cmake_text):
def make_branch(config: Config, name):
print(f"Making new branch {name}")
subprocess.call(["git", "checkout", "-b", name])
subprocess.call(["git", "branch", "-b", name])
subprocess.call(["git", "checkout", name])
subprocess.call(["git", "merge", config.main_branch])
subprocess.call(["git", "checkout", config.main_branch])
@ -175,20 +164,21 @@ def make_release(env: EnvData, 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")
origin = itertools.takewhile(lambda c: not c.isspace(), line)
print(f"Origin: {origin}")
urls.append(open_process(["git", "remote", "get-url", origin])[0])
urls = set(urls)
print(urls)
data = {
'tag_name': name,
'name': name,
'body': "Automated Release '" + name + "'",
'body': "Automated Release",
'draft': False,
'prerelease': False
}
headers = {
'Authorization': f'Bearer {env.github_token}',
'Accept': 'application/vnd.github+json',
'X-GitHub-Api-Version': '2022-11-28'
'Authorization': f'token {env.github_token}',
'Accept': 'application/vnd.github.v3+json'
}
for url in urls:
response = requests.post(url, headers=headers, data=json.dumps(data))
@ -210,8 +200,8 @@ def main():
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('-e', "--env", help="environment file", required=False)
parser.add_argument('-c', "--config", help="config file", required=False)
parser.add_argument("--create_default_config", action="store_true", default=False, required=False)
args = parser.parse_args()
@ -226,8 +216,8 @@ def main():
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)
if args.default_create_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]
@ -248,7 +238,6 @@ def main():
args.patch = True
except KeyboardInterrupt:
print("\nCancelling!")
return
if args.major:
print("Selected major")
@ -260,26 +249,23 @@ def main():
print("Selected patch")
write_cmake(inc_patch(config, cmake_text))
subprocess.call(["git", "add", "*"])
subprocess.call(["git", "commit"])
cmake_text = load_cmake()
version_parts = split_version(cmake_text)[0]
if args.major:
version_parts = split_version(cmake_text)[0]
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"])
if args.major:
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]))
subprocess.call(["sh", "-c", "git remote | xargs -L1 git push --all"])
if __name__ == "__main__":
main()