guix/guix-cuirass
2
0
Fork 0
mirror of git://git.savannah.gnu.org/guix/guix-cuirass.git synced 2023-12-14 06:03:04 +01:00
Code Issues Releases Wiki Activity

Move '%program-name' to (cuirass ui) module.

Browse source
This commit is contained in:
Mathieu Lirzin 2016-07-14 17:56:27 +02:00
parent 55e72cb107
commit 89b1f89cfc
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
6 changed files with 50 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -31,6 +31,7 @@ TESTS = \
tests/base.scm \
## tests/basic.sh # takes too long to execute
tests/database.scm \
tests/ui.scm \
tests/utils.scm
# Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if

7
bin/cuirass.in
View file

@ -2,8 +2,7 @@
# -*- scheme -*-
exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@"
!#
;;;; cuirass - continuous integration system
;;;
;;; cuirass -- continuous integration tool
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;;
;;; This file is part of Cuirass.
@ -21,8 +20,8 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@"
;;; You should have received a copy of the GNU General Public License
;;; along with Cuirass. If not, see <http://www.gnu.org/licenses/>.
(use-modules (cuirass config)
(cuirass base)
(use-modules (cuirass base)
(cuirass config)
(cuirass database)
(cuirass ui)
(cuirass utils)

11
src/cuirass/base.scm
View file

@ -24,19 +24,8 @@
#:export (;; Procedures.
call-with-time-display
;; Parameters.
%program-name
%package-cachedir))
(define %program-name
;; Similar in spirit to Gnulib 'progname' module.
(make-parameter ""
(λ (val)
(cond ((not (string? val))
(scm-error 'wrong-type-arg
"%program-name" "Not a string: ~S" (list #f) #f))
((string-rindex val #\/) => (λ (idx) (substring val (1+ idx))))
(else val)))))
(define %package-cachedir
;; Define to location of cache directory of this package.
(make-parameter (or (getenv "CUIRASS_CACHEDIR")

18
src/cuirass/ui.scm
View file

@ -18,10 +18,22 @@
;;; along with Cuirass. If not, see <http://www.gnu.org/licenses/>.
(define-module (cuirass ui)
#:use-module (cuirass base)
#:use-module (cuirass config)
#:export (show-version
show-package-information))
#:export (;; Procedures.
show-version
show-package-information
;; Parameters.
%program-name))
(define %program-name
;; Similar in spirit to Gnulib 'progname' module.
(make-parameter ""
(λ (val)
(cond ((not (string? val))
(scm-error 'wrong-type-arg
"%program-name" "Not a string: ~S" (list #f) #f))
((string-rindex val #\/) => (λ (idx) (substring val (1+ idx))))
(else val)))))
(define (show-version)
"Display version information for COMMAND."

19
tests/base.scm
View file

@ -1,16 +1,15 @@
;;;; base.scm - tests for (cuirass base) module
;;;
;;; base.scm -- tests for (cuirass base) module
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;;
;;; This file is part of Cuirass.
;;;
;;; Cuirass 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.
;;; Cuirass 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.
;;;
;;; Cuirass is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; Cuirass 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.
;;;
@ -20,10 +19,6 @@
(use-modules (cuirass base)
(srfi srfi-64))
(test-error "invalid program name"
'wrong-type-arg
(%program-name #f))
(test-error "invalid cache directory"
'wrong-type-arg
(%package-cachedir #f))

24
tests/ui.scm Normal file
View file

@ -0,0 +1,24 @@
;;; ui.scm -- tests for (cuirass ui) module
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;;
;;; This file is part of Cuirass.
;;;
;;; Cuirass 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.
;;;
;;; Cuirass 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 Cuirass. If not, see <http://www.gnu.org/licenses/>.
(use-modules (cuirass ui)
(srfi srfi-64))
(test-error "invalid program name"
'wrong-type-arg
(%program-name #f))