Browse Source
* guix/ui.scm: Add missing copyright lines. (args-fold*, environment-build-options, %default-argument-handler, parse-command-line): Move to ... * guix/scripts.scm: ...here. New file. * guix/scripts/archive.scm: Use it. * guix/scripts/build.scm: Likewise. * guix/scripts/download.scm: Likewise. * guix/scripts/edit.scm: Likewise. * guix/scripts/environment.scm: Likewise. * guix/scripts/gc.scm: Likewise. * guix/scripts/graph.scm: Likewise. * guix/scripts/hash.scm: Likewise. * guix/scripts/import/cpan.scm: Likewise. * guix/scripts/import/cran.scm: Likewise. * guix/scripts/import/elpa.scm: Likewise. * guix/scripts/import/gem.scm: Likewise. * guix/scripts/import/gnu.scm: Likewise. * guix/scripts/import/hackage.scm: Likewise. * guix/scripts/import/nix.scm: Likewise. * guix/scripts/import/pypi.scm: Likewise. * guix/scripts/lint.scm: Likewise. * guix/scripts/package.scm: Likewise. * guix/scripts/publish.scm: Likewise. * guix/scripts/pull.scm: Likewise. * guix/scripts/refresh.scm: Likewise. * guix/scripts/size.scm: Likewise. * guix/scripts/system.scm: Likewise. * tests/ui.scm (with-environment-variable, "parse-command-line", "parse-command-line and --no options"): Move to ... * tests/scripts.scm: ...here. New file. * Makefile.am (MODULES): Add guix/scripts.scm. (SCM_TESTS): Add tests/scripts.scm. * po/guix/POTFILES.in: Add guix/scripts.scm.wip-container

29 changed files with 183 additions and 91 deletions
@ -0,0 +1,81 @@ |
|||
;;; GNU Guix --- Functional package management for GNU |
|||
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> |
|||
;;; Copyright © 2014 Deck Pickard <deck.r.pickard@gmail.com> |
|||
;;; |
|||
;;; This file is part of GNU Guix. |
|||
;;; |
|||
;;; GNU Guix is free software; you can redistribute it and/or modify it |
|||
;;; under the terms of the GNU General Public License as published by |
|||
;;; the Free Software Foundation; either version 3 of the License, or (at |
|||
;;; your option) any later version. |
|||
;;; |
|||
;;; GNU Guix 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 General Public License for more details. |
|||
;;; |
|||
;;; You should have received a copy of the GNU General Public License |
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. |
|||
|
|||
(define-module (guix scripts) |
|||
#:use-module (guix utils) |
|||
#:use-module (guix ui) |
|||
#:use-module (srfi srfi-1) |
|||
#:use-module (srfi srfi-37) |
|||
#:use-module (ice-9 match) |
|||
#:export (args-fold* |
|||
parse-command-line)) |
|||
|
|||
;;; Commentary: |
|||
;;; |
|||
;;; General code for Guix scripts. |
|||
;;; |
|||
;;; Code: |
|||
|
|||
(define (args-fold* options unrecognized-option-proc operand-proc . seeds) |
|||
"A wrapper on top of `args-fold' that does proper user-facing error |
|||
reporting." |
|||
(catch 'misc-error |
|||
(lambda () |
|||
(apply args-fold options unrecognized-option-proc |
|||
operand-proc seeds)) |
|||
(lambda (key proc msg args . rest) |
|||
;; XXX: MSG is not i18n'd. |
|||
(leave (_ "invalid argument: ~a~%") |
|||
(apply format #f msg args))))) |
|||
|
|||
(define (environment-build-options) |
|||
"Return additional build options passed as environment variables." |
|||
(arguments-from-environment-variable "GUIX_BUILD_OPTIONS")) |
|||
|
|||
(define %default-argument-handler |
|||
;; The default handler for non-option command-line arguments. |
|||
(lambda (arg result) |
|||
(alist-cons 'argument arg result))) |
|||
|
|||
(define* (parse-command-line args options seeds |
|||
#:key |
|||
(argument-handler %default-argument-handler)) |
|||
"Parse the command-line arguments ARGS as well as arguments passed via the |
|||
'GUIX_BUILD_OPTIONS' environment variable according to OPTIONS (a list of |
|||
SRFI-37 options) and return the result, seeded by SEEDS. |
|||
Command-line options take precedence those passed via 'GUIX_BUILD_OPTIONS'. |
|||
|
|||
ARGUMENT-HANDLER is called for non-option arguments, like the 'operand-proc' |
|||
parameter of 'args-fold'." |
|||
(define (parse-options-from args seeds) |
|||
;; Actual parsing takes place here. |
|||
(apply args-fold* args options |
|||
(lambda (opt name arg . rest) |
|||
(leave (_ "~A: unrecognized option~%") name)) |
|||
argument-handler |
|||
seeds)) |
|||
|
|||
(call-with-values |
|||
(lambda () |
|||
(parse-options-from (environment-build-options) seeds)) |
|||
(lambda seeds |
|||
;; ARGS take precedence over what the environment variable specifies. |
|||
(parse-options-from args seeds)))) |
|||
|
|||
;;; scripts.scm ends here |
@ -0,0 +1,72 @@ |
|||
;;; GNU Guix --- Functional package management for GNU |
|||
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> |
|||
;;; |
|||
;;; This file is part of GNU Guix. |
|||
;;; |
|||
;;; GNU Guix is free software; you can redistribute it and/or modify it |
|||
;;; under the terms of the GNU General Public License as published by |
|||
;;; the Free Software Foundation; either version 3 of the License, or (at |
|||
;;; your option) any later version. |
|||
;;; |
|||
;;; GNU Guix 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 General Public License for more details. |
|||
;;; |
|||
;;; You should have received a copy of the GNU General Public License |
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. |
|||
|
|||
|
|||
(define-module (test-scripts) |
|||
#:use-module (guix scripts) |
|||
#:use-module ((guix scripts build) |
|||
#:select (%standard-build-options)) |
|||
#:use-module (srfi srfi-64)) |
|||
|
|||
;; Test the (guix scripts) module. |
|||
|
|||
(define-syntax-rule (with-environment-variable variable value body ...) |
|||
"Run BODY with VARIABLE set to VALUE." |
|||
(let ((orig (getenv variable))) |
|||
(dynamic-wind |
|||
(lambda () |
|||
(setenv variable value)) |
|||
(lambda () |
|||
body ...) |
|||
(lambda () |
|||
(if orig |
|||
(setenv variable orig) |
|||
(unsetenv variable)))))) |
|||
|
|||
|
|||
(test-begin "scripts") |
|||
|
|||
(test-equal "parse-command-line" |
|||
'((argument . "bar") (argument . "foo") |
|||
(cores . 10) ;takes precedence |
|||
(substitutes? . #f) (keep-failed? . #t) |
|||
(max-jobs . 77) (cores . 42)) |
|||
|
|||
(with-environment-variable "GUIX_BUILD_OPTIONS" "-c 42 -M 77" |
|||
(parse-command-line '("--keep-failed" "--no-substitutes" |
|||
"--cores=10" "foo" "bar") |
|||
%standard-build-options |
|||
(list '())))) |
|||
|
|||
(test-equal "parse-command-line and --no options" |
|||
'((argument . "foo") |
|||
(substitutes? . #f)) ;takes precedence |
|||
|
|||
(with-environment-variable "GUIX_BUILD_OPTIONS" "--no-substitutes" |
|||
(parse-command-line '("foo") |
|||
%standard-build-options |
|||
(list '((substitutes? . #t)))))) |
|||
|
|||
(test-end "scripts") |
|||
|
|||
|
|||
(exit (= (test-runner-fail-count (test-runner-current)) 0)) |
|||
|
|||
;;; Local Variables: |
|||
;;; eval: (put 'with-environment-variable 'scheme-indent-function 2) |
|||
;;; End: |
Loading…
Reference in new issue