02/02: guix describe: Add '--list-formats'

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 9a27d84b7a22188d3029199ad3f6dd3b8eccae70
Author: Ekaitz Zarraga <address@hidden>
AuthorDate: Sat May 16 19:57:18 2020 +0200

    guix describe: Add '--list-formats'
    
    * guix/scripts/describe.scm (%available-formats): New variable.
    (list-formats): New procedure.
    (%options, show-help): Add --list-formats
    * doc/guix.texi: Add --list-formats
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 doc/guix.texi             |  3 +++
 guix/scripts/describe.scm | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 34acc91..eef5b70 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4471,6 +4471,9 @@ produce a list of channel specifications in JSON format;
 produce a list of channel specifications in Recutils format.
 @end table
 
+@item --list-formats
+Display available formats for @option{--format} option.
+
 @item --profile=@var{profile}
 @itemx -p @var{profile}
 Display information about @var{profile}.
diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index f13f221..7a2dbc4 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2018 Oleg Pykhalov <address@hidden>
+;;; Copyright © 2020 Ekaitz Zarraga <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -41,14 +42,26 @@
 ;;;
 ;;; Command-line options.
 ;;;
+(define %available-formats '("human" "channels" "json" "recutils"))
+
+(define (list-formats)
+  (display (G_ "The available formats are:\n"))
+  (newline)
+  (for-each (lambda (f)
+              (format #t "  - ~a~%" f))
+            %available-formats))
 
 (define %options
   ;; Specifications of the command-line options.
   (list (option '(#\f "format") #t #f
                 (lambda (opt name arg result)
-                  (unless (member arg '("human" "channels" "json" "recutils"))
+                  (unless (member arg %available-formats)
                     (leave (G_ "~a: unsupported output format~%") arg))
                   (alist-cons 'format (string->symbol arg) result)))
+        (option '("list-formats") #f #f
+                (lambda (opt name arg result)
+                  (list-formats)
+                  (exit 0)))
         (option '(#\p "profile") #t #f
                 (lambda (opt name arg result)
                   (alist-cons 'profile (canonicalize-profile arg)
@@ -71,6 +84,8 @@ Display information about the channels currently in use.\n"))
   (display (G_ "
   -f, --format=FORMAT    display information in the given FORMAT"))
   (display (G_ "
+      --list-formats     display available formats"))
+  (display (G_ "
   -p, --profile=PROFILE  display information about PROFILE"))
   (newline)
   (display (G_ "