From patchwork Sun Jun 5 19:51:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fredrik Salomonsson X-Patchwork-Id: 39752 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EDC9A27BBE9; Sun, 5 Jun 2022 20:53:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5B02D27BBEB for ; Sun, 5 Jun 2022 20:53:30 +0100 (BST) Received: from localhost ([::1]:51968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nxwJV-0003pO-F4 for patchwork@mira.cbaines.net; Sun, 05 Jun 2022 15:53:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nxwJ4-0003o9-V9 for guix-patches@gnu.org; Sun, 05 Jun 2022 15:53:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nxwJ4-0003n7-MD for guix-patches@gnu.org; Sun, 05 Jun 2022 15:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nxwJ4-0007Lt-L5 for guix-patches@gnu.org; Sun, 05 Jun 2022 15:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55420] [PATCH v3 2/2] guix: emacs-utils: Add emacs-header-parse. Resent-From: Fredrik Salomonsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jun 2022 19:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55420@debbugs.gnu.org Cc: Fredrik Salomonsson Received: via spool by 55420-submit@debbugs.gnu.org id=B55420.165445872728186 (code B ref 55420); Sun, 05 Jun 2022 19:53:02 +0000 Received: (at 55420) by debbugs.gnu.org; 5 Jun 2022 19:52:07 +0000 Received: from localhost ([127.0.0.1]:33565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nxwIB-0007KY-1s for submit@debbugs.gnu.org; Sun, 05 Jun 2022 15:52:07 -0400 Received: from mout02.posteo.de ([185.67.36.66]:44129) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nxwI8-0007Jr-GI for 55420@debbugs.gnu.org; Sun, 05 Jun 2022 15:52:06 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4BD52240108 for <55420@debbugs.gnu.org>; Sun, 5 Jun 2022 21:51:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1654458718; bh=m6E9CYvuzXSeGSIOwwmLxc66Q6NBctPOrCvzoGgZAgM=; h=From:To:Cc:Subject:Date:From; b=UlAzeJEdOkbG97qOoMh97KLGBXYtstHNxv4i1FtRK4+G437y+3e/+GSS2yw1Hnajg yP+Uu18BNo5BrcSNFnXzqs4uJGykaR42EmGMaGgSdg7iY+FOiIjg2u/pooWLY4nMA+ iZPE/mWY8DjiKahvn3oo5Hz0M5KofDy7kZtmpGPRbZ3pXzkbwANctZt/5aqhV8+nJx M64n3b5pxHglpcRna39LcmVTkFSmGaohjDNExsRX/JBXJa0D6ReCmX082xcP+FVUGW JzxNNOk+WQdFyT7s3wpoh2rK2BV4fBi87Kxi2ySgGUWJ5PesraQoxDSSHuYNxV8FIQ AT5pgM0wJQ1tA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4LGS1n2X5Wz6tmp; Sun, 5 Jun 2022 21:51:57 +0200 (CEST) From: Fredrik Salomonsson Date: Sun, 5 Jun 2022 19:51:43 +0000 Message-Id: <20220605195143.23591-2-plattfot@posteo.net> In-Reply-To: <20220605195143.23591-1-plattfot@posteo.net> References: <20220605195143.23591-1-plattfot@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build/emacs-utils.scm (emacs-header-parse): New procedure. * tests/build-emacs-utils.scm ("emacs-header-parse: fetch version", "emacs-header-parse: fetch keywords", "emacs-header-parse: fetch nonexistent author"): New tests. --- guix/build/emacs-utils.scm | 9 +++++++++ tests/build-emacs-utils.scm | 27 ++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 1684bf3262..8ee547f2b3 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -38,6 +38,7 @@ (define-module (guix build emacs-utils) emacs-generate-autoloads emacs-byte-compile-directory + emacs-header-parse as-display emacs-substitute-sexps @@ -114,6 +115,14 @@ (define* (emacs-byte-compile-directory dir) (byte-recompile-directory (file-name-as-directory ,dir) 0 1)))) (emacs-batch-eval expr))) +(define (emacs-header-parse section file) + "Parse the header SECTION in FILE and return it as a string." + (emacs-batch-script + `(progn + (require 'lisp-mnt) + (find-file ,file) + (princ (lm-header ,section))))) + (define as-display ;syntactic keyword for 'emacs-substitute-sexps' '(as display)) diff --git a/tests/build-emacs-utils.scm b/tests/build-emacs-utils.scm index 27cff46c38..081032285a 100644 --- a/tests/build-emacs-utils.scm +++ b/tests/build-emacs-utils.scm @@ -28,7 +28,7 @@ (define-module (test build-emacs-utils) (test-begin "build-emacs-utils") ;; Only run the following tests if emacs is present. -(test-skip (if (which "emacs") 0 2)) +(test-skip (if (which "emacs") 0 5)) (test-equal "emacs-batch-script: print foo from emacs" "foo" @@ -40,4 +40,29 @@ (define-module (test build-emacs-utils) "Lisp error: (wrong-type-argument numberp \"three\")"))) (emacs-batch-script '(mapcar 'number-to-string (list 1 2 "three"))))) +(call-with-temporary-directory + (lambda (directory) + (let ((mock-elisp-file (string-append directory "/foo.el"))) + (call-with-output-file mock-elisp-file + (lambda (port) + (display ";;; foo --- mock emacs package -*- lexical-binding: t -*- + +;; Created: 4 Jun 2022 +;; Keywords: lisp test +;; Version: 1.0.0 +;;; Commentary: +;;; Code: +;;; foo.el ends here +" + port))) + (test-equal "emacs-header-parse: fetch version" + "1.0.0" + (emacs-header-parse "version" mock-elisp-file)) + (test-equal "emacs-header-parse: fetch keywords" + "lisp test" + (emacs-header-parse "keywords" mock-elisp-file)) + (test-equal "emacs-header-parse: fetch nonexistent author" + "nil" + (emacs-header-parse "author" mock-elisp-file))))) + (test-end "build-emacs-utils")