layla/auto-semver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:RightBrain-Networks/auto-semver into bugfix/currentVersion

Browse Source
This commit is contained in:
Layla
2020-02-28 16:03:03 +00:00
parent f3c8944538 dc8fdc1c88
commit 7040fbb1a0
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
semver/get_version.py
View File

@ -69,7 +69,7 @@ def main():
if args.debug: if args.debug:
console_logger.setLevel(logging.DEBUG) console_logger.setLevel(logging.DEBUG)
logger.info(get_version(args.dot)) print(get_version(args.dot))
if __name__ == '__main__': if __name__ == '__main__':
try: main() try: main()

39
semver/tests.py
View File

@ -1,7 +1,7 @@
import unittest, os, subprocess, semver import unittest, os, subprocess, semver
from semver.logger import logging, logger, console_logger from semver.logger import logging, logger, console_logger
from semver import get_version from semver import get_version, NO_MERGE_FOUND
config_data = """ config_data = """
[bumpversion] [bumpversion]
@ -36,6 +36,15 @@ class TestSemverObject(unittest.TestCase):
semver_object.merged_branch = "patch/unittest" semver_object.merged_branch = "patch/unittest"
semver_object.get_version_type() semver_object.get_version_type()
self.assertEqual(semver_object.version_type, "patch") self.assertEqual(semver_object.version_type, "patch")
def test_run_no_merge(self):
semver_object = semver.SemVer()
try:
result = semver_object.run(False)
except Exception as e:
if e == NO_MERGE_FOUND:
self.assertTrue(True)
else:
self.assertTrue(False)
class TestGetVersion(unittest.TestCase): class TestGetVersion(unittest.TestCase):
def test_get_branch_version(self): def test_get_branch_version(self):
@ -44,19 +53,25 @@ class TestGetVersion(unittest.TestCase):
self.assertEqual(branch, "master") self.assertEqual(branch, "master")
def test_branch_dotting(self): def test_branch_dotting(self):
create_git_environment() create_git_environment()
subprocess.run(['git', 'checkout', '-b', 'test/branch']) subprocess.call(['git', 'checkout', '-b', 'test/branch'])
branch = get_version.get_version(True) branch = get_version.get_version(True)
self.assertEqual(branch, "test.branch") self.assertEqual(branch, "test.branch")
def test_branch_dotting_false(self): def test_branch_dotting_false(self):
create_git_environment() create_git_environment()
subprocess.run(['git', 'checkout', '-b', 'test/branch']) subprocess.call(['git', 'checkout', '-b', 'test/branch'])
branch = get_version.get_version(False) branch = get_version.get_version(False)
self.assertEqual(branch, "test/branch") self.assertEqual(branch, "test/branch")
def test_get_version_run(self):
create_git_environment()
val = subprocess.Popen(['python', '../get_version.py', '-d'], stdout=subprocess.PIPE,
stderr=open(os.devnull, 'wb'), cwd='.').stdout.read().decode('utf-8').rstrip()
self.assertEqual(val, "master")
class TestGetTagVersion(unittest.TestCase): class TestGetTagVersion(unittest.TestCase):
def test_get_version_tag(self): def test_get_version_tag(self):
create_git_environment() create_git_environment()
subprocess.run(['git', 'tag', '1.0.0']) subprocess.call(['git', 'tag', '1.0.0'])
tag = get_version.get_tag_version() tag = get_version.get_tag_version()
self.assertEqual(tag, "1.0.0") self.assertEqual(tag, "1.0.0")
def test_default_get_version_tag(self): def test_default_get_version_tag(self):
@ -65,18 +80,18 @@ class TestGetTagVersion(unittest.TestCase):
self.assertEqual(tag, "0.0.0") self.assertEqual(tag, "0.0.0")
def create_git_environment(): def create_git_environment():
subprocess.run(['rm', '-rf', './.git']) subprocess.call(['rm', '-rf', './.git'])
subprocess.run(['git', 'init']) subprocess.call(['git', 'init'])
subprocess.run(['touch', 'file.txt']) subprocess.call(['touch', 'file.txt'])
subprocess.run(['git', 'add', 'file.txt']) subprocess.call(['git', 'add', 'file.txt'])
subprocess.run(['git', 'commit', '-m', 'file.txt']) subprocess.call(['git', 'commit', '-m', 'file.txt'])
subprocess.run(['git', 'remote', 'add', 'origin', os.getcwd()+'/.git']) subprocess.call(['git', 'remote', 'add', 'origin', os.getcwd()+'/.git'])
if __name__ == "__main__": if __name__ == "__main__":
console_logger.setLevel(logging.DEBUG) console_logger.setLevel(logging.DEBUG)
subprocess.run(['rm', '-rf', test_directory]) subprocess.call(['rm', '-rf', test_directory])
subprocess.run(['mkdir', test_directory]) subprocess.call(['mkdir', test_directory])
os.chdir(test_directory) os.chdir(test_directory)
with open('.bumpversion.cfg', "w") as config: with open('.bumpversion.cfg', "w") as config:
config.write(config_data) config.write(config_data)