nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Use INVOKE & return #t from Ruby package phases. 

* gnu/packages/maths.scm (ruby-asciimath)[arguments]: Return #t from
all phases.
* gnu/packages/rails.scm (ruby-debug-inspector)[arguments]: Substitute
INVOKE for SYSTEM*.
* gnu/packages/ruby.scm (ruby-permutation, ruby-blankslate)
(ruby-minitest-pretty-diff, ruby-guard, ruby-rb-inotify, ruby-tins)
(ruby-gem-hadar, ruby-term-ansicolor, ruby-json-pure)
(ruby-activesupport, ruby-redcloth, ruby-netrc, ruby-unf-ext, ruby-yard)
(ruby-turn, ruby-sqlite3, ruby-shoulda-context, ruby-shoulda-matchers)
(ruby-shoulda, ruby-httpclient, ruby-ansi, ruby-bio-commandeer)
(ruby-rubytest, ruby-brass, ruby-qed, ruby-ae, ruby-lemon, ruby-hashery)
(ruby-rc4, ruby-concurrent)[arguments]: Likewise.
This commit is contained in:
Tobias Geerinckx-Rice 2018-09-20 03:23:37 +02:00
parent 4f66ae2899
commit 9923d5a40f
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
3 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/maths.scm
View File

@ -2084,7 +2084,8 @@ porting.")
(lambda _ (lambda _
(substitute* "spec/parser_spec.rb" (substitute* "spec/parser_spec.rb"
(("\\\\\"") (("\\\\\"")
"\""))))))) "\""))
#t)))))
(native-inputs (native-inputs
`(("bundler" ,bundler) `(("bundler" ,bundler)
("ruby-rspec" ,ruby-rspec))) ("ruby-rspec" ,ruby-rspec)))

14
gnu/packages/rails.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -80,14 +81,11 @@ migration.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda _
(and (invoke "rake" "compile")
(zero? (system* "rake" "compile")) (invoke "ruby" "-Ilib" "-e"
(zero? (string-append
(system* "require 'debug_inspector'; RubyVM::DebugInspector."
"ruby" "-Ilib" "-e" "open{|dc| p dc.backtrace_locations}")))))))
(string-append
"require 'debug_inspector'; RubyVM::DebugInspector."
"open{|dc| p dc.backtrace_locations}")))))))))
(synopsis "Ruby wrapper for the MRI 2.0 debug_inspector API") (synopsis "Ruby wrapper for the MRI 2.0 debug_inspector API")
(description (description
"This package provides a Ruby wrapper for the MRI 2.0 debug_inspector "This package provides a Ruby wrapper for the MRI 2.0 debug_inspector

73
gnu/packages/ruby.scm
View File

@ -1114,7 +1114,7 @@ and inspect the environment.")
#t)) #t))
(replace 'check (replace 'check
(lambda _ (lambda _
(zero? (system* "ruby" "-Ilib" "test/test.rb"))))))) (invoke "ruby" "-Ilib" "test/test.rb"))))))
(synopsis "Library to perform operations with sequence permutations") (synopsis "Library to perform operations with sequence permutations")
(description "This package provides a Ruby library to perform different (description "This package provides a Ruby library to perform different
operations with permutations of sequences, such as strings and arrays.") operations with permutations of sequences, such as strings and arrays.")
@ -1618,7 +1618,7 @@ objects.")
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (zero? (system* "rspec" "spec/"))))))) (lambda _ (invoke "rspec" "spec/"))))))
(native-inputs (native-inputs
`(("bundler" ,bundler) `(("bundler" ,bundler)
("ruby-rspec" ,ruby-rspec))) ("ruby-rspec" ,ruby-rspec)))
@ -2028,7 +2028,7 @@ is to be run.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda _
(zero? (system* "script/test"))))))) (invoke "script/test"))))))
(native-inputs (native-inputs
`(("bundler" ,bundler) `(("bundler" ,bundler)
("ruby-turn" ,ruby-turn))) ("ruby-turn" ,ruby-turn)))
@ -2603,7 +2603,7 @@ invocation, and source and documentation browsing.")
#t)) #t))
(replace 'build (replace 'build
(lambda _ (lambda _
(zero? (system* "gem" "build" "guard.gemspec"))))))) (invoke "gem" "build" "guard.gemspec"))))))
(propagated-inputs (propagated-inputs
`(("ruby-formatador" ,ruby-formatador) `(("ruby-formatador" ,ruby-formatador)
("ruby-listen" ,ruby-listen) ("ruby-listen" ,ruby-listen)
@ -2718,7 +2718,7 @@ IANA Time Zone database packaged as Ruby modules for use with @code{TZInfo}.")
;; list of files. ;; list of files.
(replace 'build (replace 'build
(lambda _ (lambda _
(zero? (system* "gem" "build" "rb-inotify.gemspec"))))))) (invoke "gem" "build" "rb-inotify.gemspec"))))))
(propagated-inputs (propagated-inputs
`(("ruby-ffi" ,ruby-ffi))) `(("ruby-ffi" ,ruby-ffi)))
(native-inputs (native-inputs
@ -2811,7 +2811,7 @@ documentation for Ruby code.")
;; causes an error. ;; causes an error.
(substitute* "tins.gemspec" (substitute* "tins.gemspec"
(("\"lib/spruz\", ") "")) (("\"lib/spruz\", ") ""))
(zero? (system* "gem" "build" "tins.gemspec"))))))) (invoke "gem" "build" "tins.gemspec"))))))
(synopsis "Assorted tools for Ruby") (synopsis "Assorted tools for Ruby")
(description "Tins is a Ruby library providing assorted tools.") (description "Tins is a Ruby library providing assorted tools.")
(home-page "https://github.com/flori/tins") (home-page "https://github.com/flori/tins")
@ -2836,7 +2836,7 @@ documentation for Ruby code.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'build (replace 'build
(lambda _ (lambda _
(zero? (system* "gem" "build" "gem_hadar.gemspec"))))))) (invoke "gem" "build" "gem_hadar.gemspec"))))))
(propagated-inputs (propagated-inputs
`(("git" ,git) `(("git" ,git)
("ruby-tins" ,ruby-tins) ("ruby-tins" ,ruby-tins)
@ -2913,7 +2913,7 @@ Ruby's large and slower test/unit.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'build (replace 'build
(lambda _ (lambda _
(zero? (system* "gem" "build" "term-ansicolor.gemspec"))))))) (invoke "gem" "build" "term-ansicolor.gemspec"))))))
(propagated-inputs (propagated-inputs
`(("ruby-tins" ,ruby-tins))) `(("ruby-tins" ,ruby-tins)))
(native-inputs (native-inputs
@ -3021,7 +3021,7 @@ a native C extension.")
(lambda _ (lambda _
;; Regenerate gemspec so loosened dependency constraints are ;; Regenerate gemspec so loosened dependency constraints are
;; propagated. ;; propagated.
(zero? (system* "rake" "gemspec"))))))) (invoke "rake" "gemspec"))))))
(native-inputs (native-inputs
`(("bundler" ,bundler) `(("bundler" ,bundler)
("ragel" ,ragel) ("ragel" ,ragel)
@ -3105,8 +3105,8 @@ you about the changes.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda _
;; There is no tests, instead attempt to load the library. ;; There are no tests, instead attempt to load the library.
(zero? (system* "ruby" "-Ilib" "-r" "active_support"))))))) (invoke "ruby" "-Ilib" "-r" "active_support"))))))
(propagated-inputs (propagated-inputs
`(("ruby-concurrent" ,ruby-concurrent) `(("ruby-concurrent" ,ruby-concurrent)
("ruby-i18n" ,ruby-i18n) ("ruby-i18n" ,ruby-i18n)
@ -3316,7 +3316,7 @@ alternative to Marshal for Object serialization. ")
;; existing gemspec. ;; existing gemspec.
(replace 'build (replace 'build
(lambda _ (lambda _
(zero? (system* "gem" "build" "redcloth.gemspec"))))))) (invoke "gem" "build" "redcloth.gemspec"))))))
(native-inputs (native-inputs
`(("bundler" ,bundler) `(("bundler" ,bundler)
("ruby-diff-lcs" ,ruby-diff-lcs) ("ruby-diff-lcs" ,ruby-diff-lcs)
@ -3394,9 +3394,9 @@ other things and it comes with a command line interface.")
;; There is no Rakefile and minitest can only run one file at once, ;; There is no Rakefile and minitest can only run one file at once,
;; so we have to iterate over all test files. ;; so we have to iterate over all test files.
(lambda _ (lambda _
(and (map (lambda (file) (map (lambda (file)
(zero? (system* "ruby" "-Itest" file))) (invoke "ruby" "-Itest" file))
(find-files "./test" "test_.*\\.rb")))))))) (find-files "./test" "test_.*\\.rb")))))))
(native-inputs (native-inputs
`(("ruby-minitest" ,ruby-minitest))) `(("ruby-minitest" ,ruby-minitest)))
(synopsis "Library to read and update netrc files") (synopsis "Library to read and update netrc files")
@ -3421,7 +3421,7 @@ including comments and whitespace.")
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'build 'build-ext (add-after 'build 'build-ext
(lambda _ (zero? (system* "rake" "compile:unf_ext"))))))) (lambda _ (invoke "rake" "compile:unf_ext"))))))
(native-inputs (native-inputs
`(("bundler" ,bundler) `(("bundler" ,bundler)
("ruby-rake-compiler" ,ruby-rake-compiler) ("ruby-rake-compiler" ,ruby-rake-compiler)
@ -3797,7 +3797,7 @@ A modified copy of yajl is used, and included in the package.")
;; $HOME needs to be set to somewhere writeable for tests to run ;; $HOME needs to be set to somewhere writeable for tests to run
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
;; Run tests without using 'rake' to avoid dependencies. ;; Run tests without using 'rake' to avoid dependencies.
(zero? (system* "rspec"))))))) (invoke "rspec"))))))
(native-inputs (native-inputs
`(("ruby-rspec" ,ruby-rspec) `(("ruby-rspec" ,ruby-rspec)
("ruby-rack" ,ruby-rack))) ("ruby-rack" ,ruby-rack)))
@ -3984,7 +3984,7 @@ name and provides query methods such as @{RubyEngine.mri?}.")
;; without issue. ;; without issue.
(replace 'check (replace 'check
(lambda _ (lambda _
(zero? (system* "ruby" "-Ilib" "bin/turn" "-h"))))))) (invoke "ruby" "-Ilib" "bin/turn" "-h"))))))
(propagated-inputs (propagated-inputs
`(("ruby-ansi" ,ruby-ansi) `(("ruby-ansi" ,ruby-ansi)
("ruby-minitest" ,ruby-minitest-4))) ("ruby-minitest" ,ruby-minitest-4)))
@ -4124,7 +4124,7 @@ neither too verbose nor too minimal.")
#t)) #t))
(add-before 'check 'add-gemtest-file (add-before 'check 'add-gemtest-file
;; This file exists in the repository but is not distributed. ;; This file exists in the repository but is not distributed.
(lambda _ (zero? (system* "touch" ".gemtest"))))))) (lambda _ (invoke "touch" ".gemtest"))))))
(inputs (inputs
`(("sqlite" ,sqlite))) `(("sqlite" ,sqlite)))
(native-inputs (native-inputs
@ -4158,7 +4158,7 @@ engine.")
(lambda _ (lambda _
;; Do not run tests to avoid circular dependence with rails. ;; Do not run tests to avoid circular dependence with rails.
;; Instead just import the library to test. ;; Instead just import the library to test.
(zero? (system* "ruby" "-Ilib" "-r" "shoulda-context"))))))) (invoke "ruby" "-Ilib" "-r" "shoulda-context"))))))
(synopsis "Test::Unit context framework extracted from Shoulda") (synopsis "Test::Unit context framework extracted from Shoulda")
(description (description
"@code{shoulda-context} is the context framework extracted from Shoulda. "@code{shoulda-context} is the context framework extracted from Shoulda.
@ -4187,7 +4187,7 @@ names.")
(lambda _ (lambda _
;; Do not run tests to avoid circular dependence with rails. Instead ;; Do not run tests to avoid circular dependence with rails. Instead
;; just import the library to test. ;; just import the library to test.
(zero? (system* "ruby" "-Ilib" "-r" "shoulda-matchers"))))))) (invoke "ruby" "-Ilib" "-r" "shoulda-matchers"))))))
(propagated-inputs (propagated-inputs
`(("ruby-activesupport" ,ruby-activesupport))) `(("ruby-activesupport" ,ruby-activesupport)))
(synopsis "Collection of testing matchers extracted from Shoulda") (synopsis "Collection of testing matchers extracted from Shoulda")
@ -4227,7 +4227,7 @@ more complex, and error-prone.")
(replace 'check (replace 'check
;; Don't run tests to avoid circular dependence with rails. Instead ;; Don't run tests to avoid circular dependence with rails. Instead
;; just import the library to test. ;; just import the library to test.
(lambda _ (zero? (system* "ruby" "-Ilib" "-r" "shoulda"))))))) (lambda _ (invoke "ruby" "-Ilib" "-r" "shoulda"))))))
(propagated-inputs (propagated-inputs
`(("ruby-shoulda-context" ,ruby-shoulda-context) `(("ruby-shoulda-context" ,ruby-shoulda-context)
("ruby-shoulda-matchers" ,ruby-shoulda-matchers-2))) ("ruby-shoulda-matchers" ,ruby-shoulda-matchers-2)))
@ -4380,10 +4380,9 @@ It has built-in support for the legacy @code{cookies.txt} and
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(if tests? (if tests?
(zero? (invoke "ruby"
(system* "ruby" "-Ilib"
"-Ilib" "test/runner.rb")
"test/runner.rb"))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("ruby-rack" ,ruby-rack))) `(("ruby-rack" ,ruby-rack)))
@ -4422,7 +4421,7 @@ requests either using arguments or with an interactive prompt.")
;; be require'd. ;; be require'd.
(replace 'check (replace 'check
(lambda _ (lambda _
(zero? (system* "ruby" "-Ilib" "-r" "ansi")))) (invoke "ruby" "-Ilib" "-r" "ansi")))
(add-before 'validate-runpath 'replace-broken-symlink (add-before 'validate-runpath 'replace-broken-symlink
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -4493,7 +4492,7 @@ subprocess.")
;; Run test without calling 'rake' so that jeweler is ;; Run test without calling 'rake' so that jeweler is
;; not required as an input. ;; not required as an input.
(lambda _ (lambda _
(zero? (system* "rspec" "spec/bio-commandeer_spec.rb"))))))) (invoke "rspec" "spec/bio-commandeer_spec.rb"))))))
(propagated-inputs (propagated-inputs
`(("ruby-bio-logger" ,ruby-bio-logger) `(("ruby-bio-logger" ,ruby-bio-logger)
("ruby-systemu" ,ruby-systemu))) ("ruby-systemu" ,ruby-systemu)))
@ -4530,7 +4529,7 @@ detail to ease debugging.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda _
(zero? (system* "ruby" "-Ilib" "-r" "rubytest"))))))) (invoke "ruby" "-Ilib" "-r" "rubytest"))))))
(propagated-inputs (propagated-inputs
`(("ruby-ansi" ,ruby-ansi))) `(("ruby-ansi" ,ruby-ansi)))
(synopsis "Universal test harness for Ruby") (synopsis "Universal test harness for Ruby")
@ -4560,7 +4559,7 @@ single pass.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda _
(zero? (system* "ruby" "-Ilib" "-r" "brass"))))))) (invoke "ruby" "-Ilib" "-r" "brass"))))))
(synopsis "Basic foundational assertions framework") (synopsis "Basic foundational assertions framework")
(description (description
"BRASS (Bare-Metal Ruby Assertion System Standard) is a basic "BRASS (Bare-Metal Ruby Assertion System Standard) is a basic
@ -4588,7 +4587,7 @@ make use of.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda _
(zero? (system* "ruby" "-Ilib" "bin/qed" "--copyright"))))))) (invoke "ruby" "-Ilib" "bin/qed" "--copyright"))))))
(propagated-inputs (propagated-inputs
`(("ruby-ansi" ,ruby-ansi) `(("ruby-ansi" ,ruby-ansi)
("ruby-brass" ,ruby-brass))) ("ruby-brass" ,ruby-brass)))
@ -4622,7 +4621,7 @@ requirement specifications systems like Cucumber.")
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (zero? (system* "qed")))) (lambda _ (invoke "qed")))
(add-before 'validate-runpath 'replace-broken-symlink (add-before 'validate-runpath 'replace-broken-symlink
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -4660,7 +4659,7 @@ for reuse by other test frameworks.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (lambda _ (zero? (system* "qed"))))))) (replace 'check (lambda _ (invoke "qed"))))))
(propagated-inputs (propagated-inputs
`(("ruby-ae" ,ruby-ae) `(("ruby-ae" ,ruby-ae)
("ruby-ansi" ,ruby-ansi) ("ruby-ansi" ,ruby-ansi)
@ -4716,8 +4715,8 @@ Rubytest-based test frameworks. It provides the @code{rubytest} executable.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda _
(and (zero? (system* "qed")) (invoke "qed")
(zero? (system* "rubytest" "-Ilib" "-Itest" "test/")))))))) (invoke "rubytest" "-Ilib" "-Itest" "test/"))))))
(native-inputs (native-inputs
`(("ruby-rubytest-cli" ,ruby-rubytest-cli) `(("ruby-rubytest-cli" ,ruby-rubytest-cli)
("ruby-qed" ,ruby-qed) ("ruby-qed" ,ruby-qed)
@ -4751,7 +4750,7 @@ specific use case.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda _
(zero? (system* "rspec" "spec/rc4_spec.rb"))))))) (invoke "rspec" "spec/rc4_spec.rb"))))))
(native-inputs (native-inputs
`(("ruby-rspec" ,ruby-rspec-2))) `(("ruby-rspec" ,ruby-rspec-2)))
(synopsis "Implementation of the RC4 algorithm") (synopsis "Implementation of the RC4 algorithm")
@ -5005,7 +5004,7 @@ call.")
(add-before 'check 'rake-compile (add-before 'check 'rake-compile
;; Fix the test error described at ;; Fix the test error described at
;; https://github.com/ruby-concurrency/concurrent-ruby/pull/408 ;; https://github.com/ruby-concurrency/concurrent-ruby/pull/408
(lambda _ (zero? (system* "rake" "compile")))) (lambda _ (invoke "rake" "compile")))
(add-before 'check 'remove-timecop-dependency (add-before 'check 'remove-timecop-dependency
;; Remove timecop-dependent tests as having timecop as a depedency ;; Remove timecop-dependent tests as having timecop as a depedency
;; causes circular depedencies. ;; causes circular depedencies.