Bump version for v0.2.0-alpha

doc/source/commands.rst

@@ -43,7 +43,7 @@ Create a new boot environment.
 
 .. code-block:: shell
 
-    zedenv activate [OPTIONS] BOOT_ENVIRONMENT
+    zedenv create [OPTIONS] BOOT_ENVIRONMENT
 
 .. table::
 
@@ -70,6 +70,7 @@ Destroy a boot environment or snapshot.
      Option                                Description
     ===================================  =========================================================
      ``-v``, ``--verbose``                 Print verbose output.
+     ``-b``, ``--bootloader`` ``TEXT``     Use bootloader type.
      ``-y``, ``--noconfirm``               Assume yes in situations where confirmation is needed.
      ``-n``, ``--noop``                    Print what would be destroyed but don't apply.
      ``--help``                            Show this message and exit.

doc/source/plugins.rst

@@ -82,12 +82,12 @@ Alternate Mountpoint
 First, remount the ``$esp`` to a new location, the default is ``/mnt/efi``.
 
 If you would like to explicitly specify the mountpoint used, you can set the
-``org.zedenv:esp`` property on your current boot environment, and the plugin
+``org.zedenv.systemdboot:esp`` property on your current boot environment, and the plugin
 will use the specified location: 
 
 .. code-block:: shell
 
-    zfs set org.zedenv:esp='/mnt/efi' zpool/ROOT/default
+    zfs set org.zedenv.systemdboot:esp='/mnt/efi' zpool/ROOT/default
 
 Don't forget to change the mount point in ``/etc/fstab``.
 

setup.py

@@ -1,6 +1,7 @@
 from setuptools import setup, find_packages
 
 from zedenv import __version__
+from zedenv import get_release_version
 
 tests_require = [
     'coverage',
@@ -27,7 +28,7 @@ def readme():
 
 setup(
     name='zedenv',
-    version=__version__,
+    version=get_release_version(__version__),
     description='Utility to manage Boot Environments using ZFS',
     long_description=readme(),
     url='http://github.com/johnramsden/zedenv',

zedenv/__init__.py

@@ -1,3 +1,34 @@
 # __init__.py
 
-__version__ = '0.1.1'
+import subprocess
+
+__version__ = '0.2.0'
+
+
+def vcs_release(version: str):
+    """
+    If in git repo, get git version
+    """
+    try:
+        git_hash = subprocess.check_output(
+                        ['git', 'rev-parse', '--short', 'HEAD'],
+                        universal_newlines=True, stderr=subprocess.PIPE)
+    except subprocess.CalledProcessError:
+        return version
+
+    return version + '+git.' + git_hash
+
+
+def get_release_version(version: str):
+    """
+    If on a tagged release, use tagged version, else append git hash
+    """
+    has_tags = None
+    try:
+        has_tags = subprocess.check_output(
+                                    ['git', 'tag', '-l', '--points-at', 'HEAD'],
+                                    universal_newlines=True, stderr=subprocess.PIPE)
+    except subprocess.CalledProcessError:
+        pass
+
+    return version if has_tags and has_tags.startswith("v") else vcs_release(version)

zedenv/cli/umount.py

@@ -73,10 +73,10 @@ def cli(boot_environment: str, verbose: Optional[bool]):
         }, exit_on_error=True)
 
     if dataset_mountpoint == "/":
-            ZELogger.log({
-                "level": "EXCEPTION",
-                "message": f"Cannot Unmount root dataset.\n"
-            }, exit_on_error=True)
+        ZELogger.log({
+            "level": "EXCEPTION",
+            "message": f"Cannot Unmount root dataset.\n"
+        }, exit_on_error=True)
 
     if not dataset_mountpoint:
         ZELogger.log({

zedenv/lib/be.py

@@ -36,6 +36,11 @@ def size(boot_environment) -> int:
 
 
 def bootfs_for_pool(zpool: str) -> str:
+    """
+    Get the 'bootfs' dataset for a given zpool
+    :param zpool: Pool to get bootfs of.
+    :return: The name of the 'bootfs' dataset.
+    """
     bootfs_list = None
     try:
         bootfs_list = pyzfscmds.cmd.zpool_get(pool=zpool,

zedenv/main.py

@@ -4,6 +4,7 @@
 import os
 import signal
 import sys
+import subprocess
 import platform
 
 import click
@@ -18,7 +19,7 @@
 def print_version(ctx, param, value):
     if not value or ctx.resilient_parsing:
         return
-    click.echo(f"Version {zedenv.__version__}")
+    click.echo(f"Version {zedenv.get_release_version(zedenv.__version__)}")
     ctx.exit()