aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuchen Pei <id@ypei.org>2023-07-10 22:10:59 +1000
committerYuchen Pei <id@ypei.org>2023-07-10 22:10:59 +1000
commit071ba8408abf2d13c914a331c719779d7696d1dd (patch)
treed18cde559cec2773ccabde42c47506e197c08393
parent8c151a133ffcc3bb1d4e8e23bc071d32785185c2 (diff)
Fixing flymake complaints.
There are still some weird "Foo should be imperative" complaints, but they do not seem to be important.
-rw-r--r--buildbot-client.el24
-rw-r--r--buildbot-utils.el32
-rw-r--r--buildbot-view.el66
3 files changed, 110 insertions, 12 deletions
diff --git a/buildbot-client.el b/buildbot-client.el
index a681583..06e43d6 100644
--- a/buildbot-client.el
+++ b/buildbot-client.el
@@ -25,95 +25,115 @@
;;; Code:
(require 'buildbot-utils)
+(require 'cl-seq)
-(defvar buildbot-host nil "Buildbot instance host")
+(defvar buildbot-host nil "Buildbot instance host.")
(defvar buildbot-builders nil
- "Buildbot builders. Can be generated with (buildbot-get-all-builders)")
+ "Buildbot builders. Can be generated with `(buildbot-get-all-builders)'.")
(defun buildbot-api-change (attr)
+ "Call the Changes API with ATTR."
(buildbot-url-fetch-json
(format
"%s/api/v2/changes?%s"
buildbot-host (buildbot-format-attr attr))))
(defun buildbot-api-logs (stepid)
+ "Call the Logs API with STEPID."
(buildbot-url-fetch-json
(format
"%s/api/v2/steps/%d/logs"
buildbot-host stepid)))
(defun buildbot-api-builders ()
+ "Call the Builders API to get all builders."
(buildbot-url-fetch-json
(format
"%s/api/v2/builders"
buildbot-host)))
(defun buildbot-api-builders-builds (builder-id attr)
+ "Call the Builds API with BUILDER-ID and ATTR."
(buildbot-url-fetch-json
(format
"%s/api/v2/builders/%d/builds?%s"
buildbot-host builder-id (buildbot-format-attr attr))))
(defun buildbot-api-build (attr)
+ "Call the Builds API with ATTR."
(buildbot-url-fetch-json
(format
"%s/api/v2/builds?%s"
buildbot-host (buildbot-format-attr attr))))
(defun buildbot-api-step (buildid)
+ "Call the Steps API with BUILDID."
(buildbot-url-fetch-json
(format
"%s/api/v2/builds/%s/steps"
buildbot-host buildid)))
(defun buildbot-api-log-raw (logid)
+ "Call the raw logs API with LOGID."
(buildbot-url-fetch-raw
(format "%s/api/v2/logs/%d/raw" buildbot-host logid)))
(defun buildbot-get-recent-builds-by-builder (builder-id limit)
+ "Get LIMIT number of recent builds with BUILDER-ID."
(alist-get 'builds
(buildbot-api-builders-builds
builder-id
`((limit . ,limit) (order . "-number") (property . "revision")))))
(defun buildbot-get-recent-changes (limit)
+ "Get LIMIT number of recent changes."
(buildbot-api-change (list (cons 'order "-changeid") (cons 'limit limit))))
(defun buildbot-get-all-builders ()
+ "Get all builders."
(alist-get 'builders (buildbot-api-builders)))
(defun buildbot-builder-by-id (builderid)
+ "Get a builder by its BUILDERID."
(cl-find-if
(lambda (builder)
(= (alist-get 'builderid builder) builderid))
buildbot-builders))
(defun buildbot-builder-by-name (name)
+ "Get a builder by its NAME."
(cl-find-if
(lambda (builder)
(equal (alist-get 'name builder) name))
buildbot-builders))
(defun buildbot-get-logs-by-stepid (stepid)
+ "Get logs of a step with STEPID."
(alist-get 'logs (buildbot-api-logs stepid)))
(defun buildbot-get-builder-name-by-id (id)
+ "Get a builder name with ID."
(alist-get 'name (buildbot-builder-by-id id)))
(defun buildbot-get-changes-by-revision (revision)
+ "Get the changes from a REVISION."
(alist-get 'changes
(buildbot-api-change (list (cons 'revision revision)))))
(defun buildbot-get-build-by-buildid (buildid)
+ "Get a build with BUILDID."
(buildbot-api-build (list (cons 'buildid buildid))))
(defun buildbot-get-steps-by-buildid (buildid)
+ "Get the steps of a build with BUILDID."
(alist-get 'steps (buildbot-api-step buildid)))
(defun buildbot-get-changes-by-branch (branch-name limit)
+ "Get LIMIT number of changes of a branch with BRANCH-NAME."
(alist-get 'changes
(buildbot-api-change
(cons `(branch . ,branch-name)
(when limit `((limit . ,limit)))))))
(provide 'buildbot-client)
+;;; buildbot-client.el ends here
diff --git a/buildbot-utils.el b/buildbot-utils.el
index cdb0cae..17dc085 100644
--- a/buildbot-utils.el
+++ b/buildbot-utils.el
@@ -18,9 +18,18 @@
;; License along with buildbot.el. If not, see
;; <https://www.gnu.org/licenses/>.
-(defvar buildbot-client-buffer-name "*buildbot api*")
+;;; Commentary:
+
+;; Commonly used utilities.
+
+;;; Code:
+(require 'json)
+
+(defvar buildbot-client-buffer-name "*buildbot api*"
+ "Name of the buffer recording buildbot API calls.")
(defun buildbot-parse-http-header (text)
+ "Parse the http header TEXT."
(let ((status) (fields))
(with-temp-buffer
(insert text)
@@ -32,12 +41,17 @@
(list (cons 'status status) (cons 'fields fields))))
(defun buildbot-delete-http-header ()
+ "Delete the http header from a response buffer."
(save-excursion
(goto-char (point-min))
(kill-region (point) (progn (re-search-forward "\r?\n\r?\n")
(point)))))
(defun buildbot-url-fetch-json (url &optional decompression with-header)
+ "Fetch and parse a json object from URL.
+
+With non-nil DECOMPRESSION, decompress the response.
+With non-nil WITH-HEADER, include the header in the result."
(with-current-buffer (get-buffer-create buildbot-client-buffer-name)
(goto-char (point-max))
(insert "[" (current-time-string) "] Request: " url "\n"))
@@ -64,6 +78,10 @@
(error "HTTP error: %s" (buffer-substring (point) (point-max)))))))
(defun buildbot-url-fetch-raw (url &optional decompression with-header)
+ "Fetch from URL.
+
+With non-nil DECOMPRESSION, decompress the response.
+With non-nil WITH-HEADER, include the header in the result."
(with-current-buffer (get-buffer-create buildbot-client-buffer-name)
(goto-char (point-max))
(insert "[" (current-time-string) "] Request: " url "\n"))
@@ -90,17 +108,20 @@
(error "HTTP error: %s" (buffer-substring (point) (point-max)))))))
(defun buildbot-format-attr (attr)
+ "Format an alist ATTR into a url query string."
(string-join (mapcar (lambda (pair)
(format "%s=%s" (car pair) (cdr pair)))
attr)
"&"))
(defun buildbot-format-epoch-time (epoch)
+ "Format an EPOCH."
(format-time-string "%Y-%m-%d %a %H:%M:%S %Z" (encode-time
(decode-time epoch))))
(defun buildbot-build-status (build)
+ "Get the status of a BUILD."
(let ((state (alist-get 'state_string build)))
(cond ((equal state "build successful")
'success)
@@ -109,6 +130,7 @@
(t 'pending))))
(defun buildbot-step-guess-status (step)
+ "Guess the status of a STEP."
(let ((state (alist-get 'state_string step)))
(cond ((string-suffix-p "(warnings)" state)
'pending)
@@ -123,12 +145,14 @@
(t 'success))))
(defun buildbot-status-face (status)
+ "Get the face of STATUS."
(pcase status
('success 'success)
('failure 'error)
(_ 'warning)))
(defun buildbot-get-build-stats (builds)
+ "Get the aggregated build stats of BUILDS."
(let ((results (copy-tree '((success . 0)
(failure . 0)
(pending . 0))))
@@ -142,6 +166,7 @@
results))
(defun buildbot-get-revision-info-from-change (change)
+ "Get the revision info from a CHANGE."
(list
(assq 'revision change)
(assq 'author change)
@@ -151,7 +176,9 @@
(assq 'comments change)))
(defun buildbot-get-revision-and-changes-info (changes)
- "Get revision-info and builds from a set of changes of the same revision."
+ "Get the revision-info and builds from a set of CHANGES.
+
+The changes should be of the same revision."
(let* ((first-change (elt changes 0))
(revision-info (buildbot-get-revision-info-from-change first-change))
(changes-info
@@ -167,3 +194,4 @@
`((revision-info . ,revision-info) (changes-info . ,changes-info))))
(provide 'buildbot-utils)
+;;; buildbot-utils.el ends here
diff --git a/buildbot-view.el b/buildbot-view.el
index 4034cd4..1be8bce 100644
--- a/buildbot-view.el
+++ b/buildbot-view.el
@@ -1,23 +1,32 @@
-;;; buildbot-view.el --- buildbot.el UI -*- lexical-binding: t; -*-
+;;; buildbot-view.el -- buildbot.el UI -*- lexical-binding: t -*-
+
+;; Copyright (C) 2023 Free Software Foundation.
+
+;; Author: Yuchen Pei <id@ypei.org>
+;; Package-Requires: ((emacs "28.2"))
-;; Copyright (C) 2023 Free Software Foundation, Inc.
-;;
;; This file is part of buildbot.el.
-;;
+
;; buildbot.el is free software: you can redistribute it and/or modify
;; it under the terms of the GNU Affero General Public License as
;; published by the Free Software Foundation, either version 3 of the
;; License, or (at your option) any later version.
-;;
+
;; buildbot.el is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; Affero General Public License for more details.
-;;
+
;; You should have received a copy of the GNU Affero General Public
;; License along with buildbot.el. If not, see
;; <https://www.gnu.org/licenses/>.
+;;; Commentary:
+
+;; buildbot.el UI.
+
+;;; Code:
+
(require 'buildbot-utils)
(require 'buildbot-client)
(require 'text-property-search)
@@ -30,9 +39,10 @@
(defvar-local buildbot-view-data nil)
(define-derived-mode buildbot-view-mode special-mode "Buildbot"
- "buildbot.el is a Buildbot client for emacs.")
+ "A Buildbot client for Emacs.")
(defun buildbot-view-next-header (n)
+ "Move forward N headers."
(interactive "p")
(dotimes (_ n)
(end-of-line 1)
@@ -41,6 +51,7 @@
(define-key buildbot-view-mode-map (kbd "M-n") #'buildbot-view-next-header)
(defun buildbot-view-next-failed-header (n)
+ "Move forward N headers with failed states."
(interactive "p")
(dotimes (_ n)
(end-of-line 1)
@@ -49,6 +60,7 @@
(define-key buildbot-view-mode-map "n" #'buildbot-view-next-failed-header)
(defun buildbot-view-next-header-same-thing (n)
+ "Move forward N headers of the same type."
(interactive "p")
(when-let
((type (get-text-property (point) 'type)))
@@ -60,6 +72,7 @@
#'buildbot-view-next-header-same-thing)
(defun buildbot-view-previous-header (n)
+ "Move backward N headers."
(interactive "p")
(beginning-of-line 1)
(unless (looking-at buildbot-view-header-regex)
@@ -69,6 +82,7 @@
(define-key buildbot-view-mode-map (kbd "M-p") #'buildbot-view-previous-header)
(defun buildbot-view-previous-failed-header (n)
+ "Move back N headers of failed states."
(interactive "p")
(beginning-of-line 1)
(unless (looking-at buildbot-view-header-regex)
@@ -79,6 +93,7 @@
(define-key buildbot-view-mode-map "p" #'buildbot-view-previous-failed-header)
(defun buildbot-view-previous-header-same-thing (n)
+ "Move back N headers of the same type."
(interactive "p")
(when-let
((type (get-text-property (point) 'type)))
@@ -90,6 +105,7 @@
#'buildbot-view-previous-header-same-thing)
(defun buildbot-view-format-revision-info (revision-info)
+ "Format REVISION-INFO header in the view."
(propertize
(format
"[Revision %s]\nAuthor: %s\nDate: %s\n\n%s"
@@ -100,12 +116,17 @@
'revision (alist-get 'revision revision-info) 'type 'revision))
(defun buildbot-view-format-build-stats (stats)
+ "Format build STATS in the view."
(format "Build stats: Success - %d | Failure - %d | Pending - %d"
(alist-get 'success stats)
(alist-get 'failure stats)
(alist-get 'pending stats)))
(defun buildbot-view-format-build (revision build &optional show-revision)
+ "Format a BUILD header associated with REVISION in the view.
+
+With a non-nil SHOW-REVISION, display REVISION instead of the
+builder name of the build."
(propertize
(format "\n[%s | %s]\n%s"
(if show-revision
@@ -118,9 +139,12 @@
(mapcar (lambda (test) (alist-get 'test_name test))
(alist-get 'failed_tests build))
"\n"))
- 'revision revision 'build build 'type 'build))
+ 'revision revision 'build build 'type 'build))
(defun buildbot-view-format-change-info (change-info &optional no-branch)
+ "Format a CHANGE-INFO in the view.
+
+With a non-nil NO-BRANCH, do not show branch info."
(let ((revision (alist-get 'revision change-info)))
(concat
(unless no-branch
@@ -136,6 +160,7 @@
"\n"))))
(defun buildbot-view-format-step (step)
+ "Format a STEP header in the view."
(propertize
(format "\n[%d. %s | %s]\n"
(alist-get 'number step)
@@ -147,12 +172,16 @@
'step step 'type 'step))
(defun buildbot-view-format-log (log)
+ "Format a LOG header in the view."
(propertize
(format "\n[%s]\n"
(alist-get 'name log))
'log log 'type 'log))
(defun buildbot-revision-format (revision-and-changes-info &optional no-branch)
+ "Format a revision view with REVISION-AND-CHANGES-INFO.
+
+With a non-nil NO-BRANCH, do not show branch info."
(let ((revision-info (alist-get 'revision-info revision-and-changes-info)))
(concat
(buildbot-view-format-revision-info revision-info)
@@ -164,12 +193,14 @@
"\n"))))
(defun buildbot-view-format-branch (branch)
+ "Format a BRANCH header in the view."
(propertize
(format "[Branch %s]" branch)
'branch branch
'type 'branch))
(defun buildbot-branch-format (branch changes)
+ "Format a branch view with BRANCH and CHANGES info."
(concat
(buildbot-view-format-branch branch)
"\n\n"
@@ -182,11 +213,13 @@
"\n\n")))
(defun buildbot-view-format-builder (builder)
+ "Format a BUILDER header in the view."
(propertize
(format "[Builder %s]" (alist-get 'name builder))
'builder builder 'type 'builder))
(defun buildbot-builder-format (builder builds-with-revisions)
+ "Format a builder view with info from BUILDER and BUILDS-WITH-REVISIONS."
(concat
(buildbot-view-format-builder builder)
"\n\n"
@@ -203,6 +236,7 @@
"\n\n")))
(defun buildbot-build-format (revision-info build steps)
+ "Format a build view with REVISION-INFO, BUILD and STEPS info."
(concat
(buildbot-view-format-revision-info revision-info)
"\n"
@@ -213,6 +247,7 @@
"\n")))
(defun buildbot-step-format (revision-info build step logs)
+ "Format a step view with REVISION-INFO, BUILD, STEP and LOGS info."
(concat
(buildbot-view-format-revision-info revision-info)
"\n"
@@ -225,6 +260,7 @@
"\n")))
(defun buildbot-log-format (revision-info build step log log-text)
+ "Format a log view with REVISION-INFO, BUILD, STEP, LOG and LOG-TEXT."
(concat
(buildbot-view-format-revision-info revision-info)
"\n"
@@ -237,10 +273,12 @@
log-text))
(defun buildbot-get-id-from-build (build)
+ "Get the build id from BUILD."
(or (alist-get 'id build)
(alist-get 'buildid build)))
(defun buildbot-view-buffer-name (type data)
+ "Get the buffer name of a view of TYPE with DATA."
(pcase type
('branch (format "*buildbot branch %s*" (alist-get 'branch data)))
('revision (format "*buildbot revision %s*"
@@ -257,6 +295,9 @@
(alist-get 'logid (alist-get 'log data))))))
(defun buildbot-view-open (type data &optional force)
+ "Open a view of TYPE using DATA.
+
+With a non-nil FORCE, reload the view buffer if exists."
(let ((buffer-name (buildbot-view-buffer-name type data)))
(when (or force (not (get-buffer buffer-name)))
(with-current-buffer (get-buffer-create buffer-name)
@@ -267,22 +308,26 @@
(switch-to-buffer buffer-name)))
(defun buildbot-view-reload ()
+ "Reload a view buffer."
(interactive)
(buildbot-view-update))
(define-key buildbot-view-mode-map "g" #'buildbot-view-reload)
;;;###autoload
(defun buildbot-revision-open (revision)
+ "Open a REVISION view."
(interactive "sRevision (e.g. commit hash): ")
(buildbot-view-open 'revision `((revision . ,revision))))
;;;###autoload
(defun buildbot-branch-open (branch)
+ "Open a BRANCH view."
(interactive "sBranch name: ")
(buildbot-view-open 'branch `((branch . ,branch))))
;;;###autoload
(defun buildbot-builder-open (builder-name)
+ "Open a builder view of BUILDER-NAME."
(interactive (list (completing-read
"Builder name: "
(mapcar
@@ -293,6 +338,7 @@
(buildbot-builder-by-name builder-name)))))
(defun buildbot-view-update ()
+ "Refresh a view."
(unless (derived-mode-p 'buildbot-view-mode)
(error "Not in buildbot view mode"))
(let ((inhibit-read-only t))
@@ -355,6 +401,9 @@
(goto-char (point-min))))
(defun buildbot-view-open-thing-at-point (force)
+ "Open thing at point.
+
+With a non-nil FORCE, refresh the opened buffer if exists."
(interactive "P")
(let ((data (copy-tree buildbot-view-data)))
(pcase (get-text-property (point) 'type)
@@ -384,3 +433,4 @@
#'buildbot-view-open-thing-at-point)
(provide 'buildbot-view)
+;;; buildbot-view.el ends here