Add cli option to publish to core db.

fusesoc/capi2/core.py

@@ -58,7 +58,7 @@ def __init__(
         if cd_provider:
             self.files_root = os.path.join(cache_root, self.name.sanitized_name)
             self.provider = get_provider(cd_provider["name"])(
-                cd_provider, self.core_root, self.files_root
+                cd_provider, self.core_root, self.files_root, cd_provider["name"]
             )
         else:
             self.files_root = self.core_root

fusesoc/config.py

@@ -56,6 +56,8 @@ def __init__(self, path=None):
         logger.debug("cache_root=" + self.cache_root)
         logger.debug("library_root=" + self.library_root)
         logger.debug("ssh-trustfile=" + (self.ssh_trustfile or "none"))
+        logger.debug("publish-uri=" + (self.publish_uri or "none"))
+        logger.debug("publish-uri-pem=" + (self.publish_uri_pem or "none"))
 
     def _parse_library(self):
         # Parse library sections
@@ -199,6 +201,22 @@ def ssh_trustfile(self):
     def ssh_trustfile(self, val):
         self._set_default_section("ssh-trustfile", val)
 
+    @property
+    def publish_uri(self):
+        return self._cp.get(Config.default_section, "publish-uri", fallback=None)
+
+    @publish_uri.setter
+    def publish_uri(self, val):
+        self._set_default_section("publish-uri", val)
+
+    @property
+    def publish_uri_pem(self):
+        return self._cp.get(Config.default_section, "publish-uri-pem", fallback=None)
+
+    @publish_uri_pem.setter
+    def publish_uri_pem(self, val):
+        self._set_default_section("publish-uri-pem", val)
+
     @property
     def library_root(self):
         return self._get_library_root()

fusesoc/main.py

@@ -5,15 +5,18 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 import argparse
+import json
 import os
 import pathlib
 import shutil
 import signal
+import subprocess
 import sys
 import warnings
 from pathlib import Path
 
 import argcomplete
+import requests
 
 from fusesoc import signature
 
@@ -298,6 +301,127 @@ def core_sign(fs, args):
     print(f"{sigfile} created")
 
 
+def guess_provider():
+    guess = {"found": False}
+    cmd = ["git", "remote", "-v"]
+    res = subprocess.run(cmd, capture_output=True).stdout.decode("utf-8").strip()
+    lines = res.splitlines()
+    if len(lines) < 1:
+        return guess
+    fetchlines = list(filter(lambda s: s.endswith("(fetch)"), lines))
+    if len(fetchlines) < 1:
+        return guess
+    comps = fetchlines[0].split("/")
+    if comps[2] == "github.com":
+        guess["name"] = "github"
+    else:
+        guess["name"] = comps[2]
+    user = comps[3]
+    repo = comps[4]
+    repo = repo[: len(repo) - len("(fetch)")].strip()
+    cmd = ["git", "log", "-n", "1"]
+    res = (
+        subprocess.run(cmd, capture_output=True)
+        .stdout.decode("utf-8")
+        .strip()
+        .splitlines()[0]
+    )
+    comps = res.split(" ")
+    if (len(comps) >= 2) and (comps[0] == "commit"):
+        version = comps[1]
+    else:
+        version = ""
+    guess[
+        "yaml"
+    ] = """provider:
+  name : {}
+  user : {}
+  repo : {}
+  version : {}
+""".format(
+        guess["name"], user, repo, version
+    )
+    guess["found"] = True
+    return guess
+
+
+def core_publish(fs, args):
+    core = _get_core(fs, args.core)
+    uri = fs.config.publish_uri
+    pem = fs.config.publish_uri_pem
+    sigfile = core.core_file + ".sig"
+    if (core.provider != None) and (core.provider.name != "github"):
+        print(
+            'The provider for this core is "'
+            + core.provider.name
+            + '" and only "github" is supported for publishing.  Aborting.'
+        )
+        return False
+    if core.provider == None:
+        provider_info = guess_provider()
+        if provider_info["found"] == False:
+            print(
+                "No provider is given in core file or guessable from current project, and a provider of type github is needed for publishing.  Aborting."
+            )
+            return False
+        if provider_info["name"] != "github":
+            print(
+                "No provider is given in core file, and the current project appears to not be on github, which is needed for publishing.  Aborting."
+            )
+            return False
+        print(
+            "No provider is given in core file, but the current project seems to be on github."
+        )
+        if not args.autoprovider:
+            print(
+                "The following provider section can be added to the core file if the --autoprovider flag is given to this command."
+            )
+            print(provider_info["yaml"])
+            return False
+        print("Adding the following provider section to the core file.")
+        print(provider_info["yaml"])
+        cf = open(core.core_file, "ab")
+        cf.write(("\n" + provider_info["yaml"] + "\n").encode("utf-8"))
+        cf.close()
+        print("Now retry publishing.")
+        return False
+
+    print("Core provider: " + core.provider.name)
+    print("Publish core file: " + core.core_file)
+    fob_core = open(core.core_file, "rb")
+    body = {"core_file": fob_core}
+    fob_sig = None
+    if os.path.exists(sigfile):
+        print("and signature file: " + sigfile)
+        fob_sig = open(sigfile, "rb")
+        body["signature_file"] = fob_sig
+    else:
+        print("(without signature file)")
+        sf_data = None
+    if pem:
+        print("with certificate from: " + pem)
+    print("to api at: " + uri)
+    if args.yes:
+        print("without confirmation")
+    else:
+        c = input("Confirm by typing 'yes': ")
+        if c != "yes":
+            print("Aborted.")
+            return False
+
+    target = uri + "/v1/publish/"
+    logger.debug("POST to " + target)
+    res = requests.post(target, files=body, allow_redirects=True, verify=pem)
+    if not res.ok:
+        print("Request returned http result", res.status_code, res.reason)
+        err = json.loads(res.content)
+        print(json.dumps(err, indent=4))
+    res.close()
+    fob_core.close()
+    if fob_sig:
+        fob_sig.close()
+
+
 def gen_clean(fs, args):
     cachedir = os.path.join(fs.config.cache_root, "generator_cache")
     shutil.rmtree(cachedir, ignore_errors=True)
@@ -538,6 +662,22 @@ def get_parser():
     parser_core_sign.add_argument("keyfile", help="File containing ssh private key")
     parser_core_sign.set_defaults(func=core_sign)
 
+    parser_core_publish = core_subparsers.add_parser(
+        "publish", help="Publish core to package db"
+    )
+    parser_core_publish.add_argument(
+        "core", help="Name of the core to publish"
+    ).completer = CoreCompleter()
+    parser_core_publish.add_argument(
+        "--yes", help="Skip confirmation", action="store_true"
+    )
+    parser_core_publish.add_argument(
+        "--autoprovider",
+        help="Automatically add provider section if missing and possible to guess",
+        action="store_true",
+    )
+    parser_core_publish.set_defaults(func=core_publish)
+
     # tool subparser
     parser_tool = subparsers.add_parser(
         "tool", help="Subcommands for dealing with tools"

fusesoc/provider/provider.py

@@ -19,12 +19,13 @@ def get_provider(name):
 
 
 class Provider:
-    def __init__(self, config, core_root, files_root):
+    def __init__(self, config, core_root, files_root, name):
         self.config = config
         self.core_root = core_root
         self.files_root = files_root
         self.cachable = not (config.get("cachable", "") == False)
         self.patches = config.get("patches", [])
+        self.name = name
 
     def clean_cache(self):
         def _make_tree_writable(topdir):

pyproject.toml

@@ -31,6 +31,7 @@ dependencies = [
   "simplesat>=0.9.1",
   "fastjsonschema",
   "argcomplete",
+  "requests",
 ]
 requires-python = ">=3.6, <4"