almalinux/lorax
12
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix the recipe version bumping

Browse Source 
Recipe should have its version bumped based on the version from the
previous commit, and not be bumped on the first commit. Fix the code and
the tests.
This commit is contained in:
Brian C. Lane 2017-11-10 14:45:13 -08:00
parent 63f47c2c00
commit 6d71e2fcc1
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pylorax/api/recipes.py
View File

@ -74,22 +74,22 @@ class Recipe(dict):
"""Return the Recipe in TOML format""" """Return the Recipe in TOML format"""
return toml.dumps(self).encode("UTF-8") return toml.dumps(self).encode("UTF-8")
def bump_version(self, new_version=None): def bump_version(self, old_version=None):
"""semver recipe version number bump """semver recipe version number bump
:param new_version: An optional new version number :param old_version: An optional old version number
:type new_version: str :type old_version: str
:returns: The new version number or None :returns: The new version number or None
:rtype: str :rtype: str
:raises: ValueError :raises: ValueError
If neither have a version, 0.0.1 is returned If neither have a version, 0.0.1 is returned
If there is no previous version the new version is checked and returned If there is no old version the new version is checked and returned
If there is no new version, but there is a previous one, bump its patch level If there is no new version, but there is a old one, bump its patch level
If the previous and new versions are the same, bump the patch level If the old and new versions are the same, bump the patch level
If they are different, check and return the new version If they are different, check and return the new version
""" """
old_version = self.get("version") new_version = self.get("version")
if not new_version and not old_version: if not new_version and not old_version:
self["version"] = "0.0.1" self["version"] = "0.0.1"
@ -385,7 +385,7 @@ def revert_file(repo, branch, filename, commit):
message = "Recipe %s reverted to commit %s" % (filename, commit_hash) message = "Recipe %s reverted to commit %s" % (filename, commit_hash)
return repo.create_commit(ref, sig, sig, "UTF-8", message, tree, [parent_commit]) return repo.create_commit(ref, sig, sig, "UTF-8", message, tree, [parent_commit])
def commit_recipe(repo, branch, recipe, new_version=None): def commit_recipe(repo, branch, recipe):
"""Commit a recipe to a branch """Commit a recipe to a branch
:param repo: Open repository :param repo: Open repository
@ -398,7 +398,13 @@ def commit_recipe(repo, branch, recipe, new_version=None):
:rtype: Git.OId :rtype: Git.OId
:raises: Can raise errors from Ggit :raises: Can raise errors from Ggit
""" """
recipe.bump_version(new_version) try:
old_recipe = read_recipe_commit(repo, branch, recipe.filename)
old_version = old_recipe["version"]
except Exception:
old_version = None
recipe.bump_version(old_version)
recipe_toml = recipe.toml() recipe_toml = recipe.toml()
message = "Recipe %s, version %s saved." % (recipe["name"], recipe["version"]) message = "Recipe %s, version %s saved." % (recipe["name"], recipe["version"])
return write_commit(repo, branch, recipe.filename, message, recipe_toml) return write_commit(repo, branch, recipe.filename, message, recipe_toml)
@ -422,7 +428,7 @@ def commit_recipe_file(repo, branch, filename):
except IOError: except IOError:
raise RecipeFileError raise RecipeFileError
return commit_recipe(repo, branch, recipe, new_version=recipe["version"]) return commit_recipe(repo, branch, recipe)
def commit_recipe_directory(repo, branch, directory): def commit_recipe_directory(repo, branch, directory):
"""Commit all *.toml files from a directory, if they aren't already in git. """Commit all *.toml files from a directory, if they aren't already in git.

18
tests/pylorax/test_recipes.py
View File

@ -78,13 +78,13 @@ class BasicRecipeTest(unittest.TestCase):
self.assertEqual(new_version, "0.0.1") self.assertEqual(new_version, "0.0.1")
# Original has a version, new does not # Original has a version, new does not
recipe = recipes.Recipe("test-recipe", "A recipe used for testing", "0.0.1", None, None) recipe = recipes.Recipe("test-recipe", "A recipe used for testing", None, None, None)
new_version = recipe.bump_version(None) new_version = recipe.bump_version("0.0.1")
self.assertEqual(new_version, "0.0.2") self.assertEqual(new_version, "0.0.2")
# Original has no version, new does # Original has no version, new does
recipe = recipes.Recipe("test-recipe", "A recipe used for testing", None, None, None) recipe = recipes.Recipe("test-recipe", "A recipe used for testing", "0.1.0", None, None)
new_version = recipe.bump_version("0.1.0") new_version = recipe.bump_version(None)
self.assertEqual(new_version, "0.1.0") self.assertEqual(new_version, "0.1.0")
# New and Original are the same # New and Original are the same
@ -93,8 +93,8 @@ class BasicRecipeTest(unittest.TestCase):
self.assertEqual(new_version, "0.0.2") self.assertEqual(new_version, "0.0.2")
# New is different from Original # New is different from Original
recipe = recipes.Recipe("test-recipe", "A recipe used for testing", "0.0.1", None, None) recipe = recipes.Recipe("test-recipe", "A recipe used for testing", "0.1.1", None, None)
new_version = recipe.bump_version("0.1.1") new_version = recipe.bump_version("0.0.1")
self.assertEqual(new_version, "0.1.1") self.assertEqual(new_version, "0.1.1")
@ -120,14 +120,14 @@ class GitRecipesTest(unittest.TestCase):
def test_02_commit_recipe(self): def test_02_commit_recipe(self):
"""Test committing a Recipe object""" """Test committing a Recipe object"""
recipe = recipes.Recipe("test-recipe", "A recipe used for testing", None, None, None) recipe = recipes.Recipe("test-recipe", "A recipe used for testing", None, None, None)
oid = recipes.commit_recipe(self.repo, "master", recipe, "0.1.0") oid = recipes.commit_recipe(self.repo, "master", recipe)
self.assertNotEqual(oid, None) self.assertNotEqual(oid, None)
def test_03_list_recipe(self): def test_03_list_recipe(self):
"""Test listing recipe commits""" """Test listing recipe commits"""
commits = recipes.list_commits(self.repo, "master", "test-recipe.toml") commits = recipes.list_commits(self.repo, "master", "test-recipe.toml")
self.assertEqual(len(commits), 1, "Wrong number of commits.") self.assertEqual(len(commits), 1, "Wrong number of commits.")
self.assertEqual(commits[0].message, "Recipe test-recipe, version 0.1.0 saved.") self.assertEqual(commits[0].message, "Recipe test-recipe, version 0.0.1 saved.")
self.assertNotEqual(commits[0].timestamp, None, "Timestamp is None") self.assertNotEqual(commits[0].timestamp, None, "Timestamp is None")
self.assertEqual(len(commits[0].commit), 40, "Commit hash isn't 40 characters") self.assertEqual(len(commits[0].commit), 40, "Commit hash isn't 40 characters")
self.assertEqual(commits[0].revision, None, "revision is not None") self.assertEqual(commits[0].revision, None, "revision is not None")
@ -195,7 +195,7 @@ class GitRecipesTest(unittest.TestCase):
"""Test tagging a newer commit of a recipe""" """Test tagging a newer commit of a recipe"""
recipe = recipes.read_recipe_commit(self.repo, "master", "http-server.toml") recipe = recipes.read_recipe_commit(self.repo, "master", "http-server.toml")
recipe["description"] = "A modified description" recipe["description"] = "A modified description"
oid = recipes.commit_recipe(self.repo, "master", recipe, "0.1.0") oid = recipes.commit_recipe(self.repo, "master", recipe)
self.assertNotEqual(oid, None) self.assertNotEqual(oid, None)
# Tag the new commit # Tag the new commit

4
tests/pylorax/test_server.py
View File

@ -71,7 +71,7 @@ class ServerTestCase(unittest.TestCase):
"packages": [{"name":"openssh-server", "version": "6.6.*"}, "packages": [{"name":"openssh-server", "version": "6.6.*"},
{"name": "rsync", "version": "3.0.*"}, {"name": "rsync", "version": "3.0.*"},
{"name": "tmux", "version": "2.2"}], {"name": "tmux", "version": "2.2"}],
"version": "0.0.2"}]} "version": "0.0.1"}]}
resp = self.server.get("/api/v0/recipes/info/http-server") resp = self.server.get("/api/v0/recipes/info/http-server")
data = json.loads(resp.data) data = json.loads(resp.data)
self.assertEqual(data, info_dict_1) self.assertEqual(data, info_dict_1)
@ -95,7 +95,7 @@ class ServerTestCase(unittest.TestCase):
"packages": [{"name":"openssh-server", "version": "6.6.*"}, "packages": [{"name":"openssh-server", "version": "6.6.*"},
{"name": "rsync", "version": "3.0.*"}, {"name": "rsync", "version": "3.0.*"},
{"name": "tmux", "version": "2.2"}], {"name": "tmux", "version": "2.2"}],
"version": "0.0.2"}, "version": "0.0.1"},
]} ]}
resp = self.server.get("/api/v0/recipes/info/http-server,glusterfs") resp = self.server.get("/api/v0/recipes/info/http-server,glusterfs")
data = json.loads(resp.data) data = json.loads(resp.data)