Clean up handling of draft release metadata (#387)

Author: blink1073

jupyter_releaser/cli.py

@@ -57,32 +57,48 @@ def invoke(self, ctx):
 
         # Print a separation header
         util.log(f'\n\n{"-" * 50}')
-        util.log(cmd_name)
-        util.log(f'{"-" * 50}\n\n')
+        util.log(f"\n{cmd_name}\n")
 
         if cmd_name in skip or cmd_name.replace("-", "_") in skip:
             util.log("*** Skipping based on skip config")
+            util.log(f'{"-" * 50}\n\n')
             return
 
         # Handle all of the parameters
         for param in self.commands[cmd_name].get_params(ctx):
+            name = param.name
+            assert name is not None
+
             # Defer to env var overrides
             if param.envvar and os.environ.get(str(param.envvar)):
+                value = os.environ[str(param.envvar)]
+                if "token" in name.lower():
+                    value = "***"
+                util.log(f"Using env value for {name}: {value}")
                 continue
-            name = param.name
-            assert name is not None
+
+            # Handle cli and options overrides.
             if name in options or name.replace("_", "-") in options:
                 arg = f"--{name.replace('_', '-')}"
                 # Defer to cli overrides
                 if arg not in ctx.args:
                     val = options.get(name, options.get(name.replace("_", "-")))
+                    util.log(f"Adding option override for {arg}")
                     if isinstance(val, list):
                         for v in val:
                             ctx.args.append(arg)
                             ctx.args.append(v)
                     else:
                         ctx.args.append(arg)
                         ctx.args.append(val)
+                    continue
+                else:
+                    util.log(f"Using cli arg for {name}")
+                    continue
+
+            util.log(f"Using default value for {name}")
+
+        util.log(f'{"-" * 50}\n\n')
 
         # Handle before hooks
         before = f"before-{cmd_name}"

jupyter_releaser/util.py

@@ -470,20 +470,10 @@ def extract_metadata_from_release_url(gh, release_url, auth):
         )
 
     # Update environment variables.
-    if "post_version_spec" in data:
-        os.environ["RH_POST_VERSION_SPEC"] = data["post_version_spec"]
-    if "post_version_message" in data:
-        os.environ["RH_POST_VERSION_MESSAGE"] = data["post_version_message"]
-    if "version_spec" in data:
-        os.environ["RH_VERSION_SPEC"] = data["version_spec"]
-    if "branch" in data:
-        os.environ["RH_BRANCH"] = data["branch"]
-    if "since" in data:
-        os.environ["RH_SINCE"] = data["since"]
-    if "ref" in data:
-        os.environ["RH_REF"] = data["ref"]
-    if "since_last_stable" in data:
-        os.environ["RH_SINCE_LAST_STABLE"] = str(data["since_last_stable"])
+    for key, value in data.items():
+        if value is not None:
+            env_name = f"RH_{key.upper()}"
+            os.environ[env_name] = str(value)
 
     return data