From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Roelandt Subject: [PATCH 3/5] guix lint: check whether descriptions and synopses start with an upper-case letter. Date: Sat, 27 Sep 2014 23:49:26 +0200 Message-ID: <1411854568-11187-4-git-send-email-tipecaml@gmail.com> References: <1411854568-11187-1-git-send-email-tipecaml@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXzsU-000836-2g for guix-devel@gnu.org; Sat, 27 Sep 2014 17:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXzsH-000306-Cn for guix-devel@gnu.org; Sat, 27 Sep 2014 17:50:06 -0400 Received: from mail-wg0-x231.google.com ([2a00:1450:400c:c00::231]:58287) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXzsH-0002zP-2W for guix-devel@gnu.org; Sat, 27 Sep 2014 17:49:53 -0400 Received: by mail-wg0-f49.google.com with SMTP id x12so11404995wgg.20 for ; Sat, 27 Sep 2014 14:49:47 -0700 (PDT) In-Reply-To: <1411854568-11187-1-git-send-email-tipecaml@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * guix/scripts/lint.scm (check-description-style, check-synopsis-start-upper-case): New methods * tests/lint.scm: Test them. --- guix/scripts/lint.scm | 26 ++++++++++++++++++++++++++ tests/lint.scm | 18 ++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm index 12391ef..5f9b6e4 100644 --- a/guix/scripts/lint.scm +++ b/guix/scripts/lint.scm @@ -29,6 +29,7 @@ #:use-module (srfi srfi-11) #:use-module (srfi srfi-37) #:export (guix-lint + check-description-style check-inputs-should-be-native check-patches check-synopsis-style)) @@ -110,6 +111,19 @@ Run a set of checkers on the specified package; if none is specified, run the ch %checkers) (exit 0)) +(define (start-with-upper-case s) + (char-set-contains? char-set:upper-case (string-ref s 0))) + +(define (check-description-style package) + ;; Emit a warning if stylistic issues are found in the description of PACKAGE. + (let ((description (package-description package))) + (when (and (string? description) + (not (string-null? description)) + (not (start-with-upper-case description))) + (emit-warning package + "description should start with an upper-case letter" + 'description)))) + (define (check-inputs-should-be-native package) ;; Emit a warning if some inputs of PACKAGE are likely to belong to its ;; native inputs. @@ -146,9 +160,17 @@ Run a set of checkers on the specified package; if none is specified, run the ch "synopsis should be less than 80 characters long" 'synopsis))) + (define (check-synopsis-start-upper-case synopsis) + (when (and (not (string-null? synopsis)) + (not (start-with-upper-case synopsis))) + (emit-warning package + "synopsis should start with an upper-case letter" + 'synopsis))) + (let ((synopsis (package-synopsis package))) (if (string? synopsis) (begin + (check-synopsis-start-upper-case synopsis) (check-final-period synopsis) (check-start-article synopsis) (check-synopsis-length synopsis))))) @@ -172,6 +194,10 @@ Run a set of checkers on the specified package; if none is specified, run the ch (define %checkers (list (lint-checker + (name "description") + (description "Validate package descriptions") + (check check-description-style)) + (lint-checker (name "inputs-should-be-native") (description "Identify inputs that should be native inputs") (check check-inputs-should-be-native)) diff --git a/tests/lint.scm b/tests/lint.scm index e082908..ceb7abe 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -44,6 +44,24 @@ (thunk)) (get-output-string port))) +(test-assert "description: does not start with an upper-case letter" + (->bool + (string-contains (call-with-warnings + (lambda () + (let ((pkg (dummy-package "x" + (description "bad description.")))) + (check-description-style pkg)))) + "description should start with an upper-case letter"))) + +(test-assert "synopsis: does not start with an upper-case letter" + (->bool + (string-contains (call-with-warnings + (lambda () + (let ((pkg (dummy-package "x" + (synopsis "bad synopsis.")))) + (check-synopsis-style pkg)))) + "synopsis should start with an upper-case letter"))) + (test-assert "synopsis: ends with a period" (->bool (string-contains (call-with-warnings -- 1.8.4.rc3