branch: elpa/hyperdrive
commit f6a6e0390a37a90bf47d57c3a306289e0266c7b0
Author: Adam Porter <[email protected]>
Commit: Joseph Turner <[email protected]>
Change: Get gateway name from gateway as well as version
---
hyperdrive-lib.el | 7 ++++---
hyperdrive-vars.el | 3 ++-
hyperdrive.el | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hyperdrive-lib.el b/hyperdrive-lib.el
index 509a5ac3c1..63cd976dab 100644
--- a/hyperdrive-lib.el
+++ b/hyperdrive-lib.el
@@ -209,11 +209,12 @@ this function."
(setf h/gateway-version-checked-p t))
(defun h//gateway-version ()
- "Return the version number of gateway.
+ "Return the name and version number of gateway as a plist.
If it's not running, signal an error."
(condition-case err
- (let ((url (format "http://localhost:%d/"; h/hyper-gateway-ushin-port)))
- (alist-get 'version (plz 'get url :as #'json-read)))
+ (pcase-let* ((url (format "http://localhost:%d/";
h/hyper-gateway-ushin-port))
+ ((map name version) (plz 'get url :as #'json-read)))
+ (list :name name :version version))
(plz-error (h/api-default-else nil (caddr err)))))
(defun h/api-default-else (else plz-err)
diff --git a/hyperdrive-vars.el b/hyperdrive-vars.el
index 760b91de75..28caf4e547 100644
--- a/hyperdrive-vars.el
+++ b/hyperdrive-vars.el
@@ -362,7 +362,8 @@ values are alists mapping version range starts to plists
with
;;;;; Internals
-(defvar h/gateway-version-expected "3.8.0")
+(defvar h/gateway-version-expected
+ '(:name "hyper-gateway-ushin" :version "3.8.0"))
(defvar h/gateway-version-checked-p nil
"Non-nil if the gateway's version has been checked.
diff --git a/hyperdrive.el b/hyperdrive.el
index aa577a0315..24bbf2ea19 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -116,7 +116,7 @@ which see."
"Say version number of gateway.
Return version if gateway is running; otherwise signal an error."
(interactive)
- (h/message "%s" (h//gateway-version)))
+ (h/message "%S" (h//gateway-version)))
;;;###autoload
(defun hyperdrive-new (seed)
