Merge pull request #95 from natefoo/doc-gen-fix

Updates for settings documentation generation

README.rst

@@ -517,12 +517,18 @@ The following options in the ``gravity`` section of ``galaxy.yml`` can be used t
       # Consumes less memory when multiple processes are configured. Default is ``false`` if using unicornherder, else ``true``.
       # preload:
 
+      # umask under which service should be executed
+      # umask:
+
       # Value of supervisor startsecs, systemd TimeoutStartSec
       # start_timeout: 15
 
       # Value of supervisor stopwaitsecs, systemd TimeoutStopSec
       # stop_timeout: 65
 
+      # Amount of time to wait for a server to become alive when performing rolling restarts.
+      # restart_timeout: 300
+
       # Memory limit (in GB). If the service exceeds the limit, it will be killed. Default is no limit or the value of the
       # ``memory_limit`` setting at the top level of the Gravity configuration, if set. Ignored if ``process_manager`` is
       # ``supervisor``.

gravity/util/__init__.py

@@ -61,13 +61,16 @@ def process_property(key, value, depth=0):
         if default.endswith("\n...\n"):
             default = default[: -(len("\n...\n"))]
         default = default.strip()
-    description = "\n".join(f"{extra_white_space}# {desc}" for desc in value["description"].strip().split("\n"))
-    allOff = value.get("allOf", [])
-    if allOff and allOff[0].get("properties"):
+    description = "\n".join(f"{extra_white_space}# {desc}".rstrip() for desc in value["description"].strip().split("\n"))
+    combined = value.get("allOf", [])
+    if not combined and value.get("anyOf"):
+        # we've got a union
+        combined = [c for c in value["anyOf"] if c["type"] == "object"]
+    if combined and combined[0].get("properties"):
         # we've got a nested map, add key once
         description = f"{description}\n{extra_white_space}{key}:\n"
     has_child = False
-    for item in allOff:
+    for item in combined:
         if "enum" in item:
             enum_items = [i for i in item["enum"] if not i.startswith("_")]
             description = f'{description}\n{extra_white_space}# Valid options are: {", ".join(enum_items)}'