[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/17: gnu: ruby-asciidoctor: Update to 2.0.10.
From: |
guix-commits |
Subject: |
13/17: gnu: ruby-asciidoctor: Update to 2.0.10. |
Date: |
Sat, 11 Jul 2020 14:30:39 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 5df1126c3adf557f3a5b386e391e7cb56b9c1d63
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Jul 9 13:27:56 2020 -0400
gnu: ruby-asciidoctor: Update to 2.0.10.
* gnu/packages/ruby.scm (ruby-asciidoctor): Update to 2.0.10.
[origin]: Use git-fetch.
[phases]: Remove 'remove-circular-tests. Add 'strip-version-requirements.
[native-inputs]: Add ruby-erubis, ruby-cucumber, ruby-haml, ruby-rouge,
ruby-rspec-expectations, ruby-simplecov, ruby-slim and ruby-tilt.
---
gnu/packages/ruby.scm | 41 ++++++++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index cde014b..84b3b72 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1097,31 +1097,50 @@ syntax to the minimum while remaining clear.")
(define-public ruby-asciidoctor
(package
(name "ruby-asciidoctor")
- (version "1.5.7.1")
+ (version "2.0.10")
(source
(origin
- (method url-fetch)
- (uri (rubygems-uri "asciidoctor" version))
+ (method git-fetch) ;the gem release lacks a Rakefile
+ (uri (git-reference
+ (url "https://github.com/asciidoctor/asciidoctor.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0v52bzc72cvg7zfgq27pa4mgyf29dx9m20fghrw1xmvwgd519n1w"))))
+ "0jaxpnsdnx3qyjw5p2lsx1swny12q1i2vxw2kgdp4vlsyjv95z95"))))
(build-system ruby-build-system)
(arguments
`(#:test-target "test:all"
#:phases
(modify-phases %standard-phases
- (add-before 'check 'remove-circular-tests
+ (replace 'replace-git-ls-files
+ (lambda _
+ ;; TODO: Remove after the fix of using 'cut' to better mimic the
+ ;; git ls-files output is merged in ruby-build-system.
+ (substitute* "asciidoctor.gemspec"
+ (("`git ls-files -z`")
+ "`find . -type f -print0 |sort -z|cut -zc3-`"))
+ #t))
+ (add-after 'extract-gemspec 'strip-version-requirements
(lambda _
- ;; Remove tests that require circular dependencies to load or
pass.
- (delete-file "test/invoker_test.rb")
- (delete-file "test/converter_test.rb")
- (delete-file "test/options_test.rb")
+ (delete-file "Gemfile")
+ (substitute* "asciidoctor.gemspec"
+ (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped)
+ (string-append stripped "\n")))
#t)))))
(native-inputs
- `(("ruby-minitest" ,ruby-minitest)
+ `(("ruby-erubis" ,ruby-erubis)
+ ("ruby-minitest" ,ruby-minitest)
("ruby-nokogiri" ,ruby-nokogiri)
("ruby-asciimath" ,ruby-asciimath)
- ("ruby-coderay" ,ruby-coderay)))
+ ("ruby-coderay" ,ruby-coderay)
+ ("ruby-cucumber" ,ruby-cucumber)
+ ("ruby-haml" ,ruby-haml)
+ ("ruby-rouge" ,ruby-rouge)
+ ("ruby-rspec-expectations" ,ruby-rspec-expectations)
+ ("ruby-simplecov" ,ruby-simplecov)
+ ("ruby-slim" ,ruby-slim)
+ ("ruby-tilt" ,ruby-tilt)))
(synopsis "Converter from AsciiDoc content to other formats")
(description "Asciidoctor is a text processor and publishing toolchain for
converting AsciiDoc content to HTML5, DocBook 5 (or 4.5), PDF, and other
- 01/17: gnu: ruby-asciimath: Update to 2.0.1., (continued)
- 01/17: gnu: ruby-asciimath: Update to 2.0.1., guix-commits, 2020/07/11
- 04/17: gnu: ruby-yard: Update to 0.9.25., guix-commits, 2020/07/11
- 06/17: gnu: ruby-cucumber: Enable more tests., guix-commits, 2020/07/11
- 02/17: gnu: ruby-yard: Disable tests., guix-commits, 2020/07/11
- 08/17: gnu: ruby-tilt: Update to 2.0.10., guix-commits, 2020/07/11
- 11/17: gnu: Add ruby-slim., guix-commits, 2020/07/11
- 05/17: gnu: ruby-sinatra: Update to 2.0.8.1., guix-commits, 2020/07/11
- 03/17: gnu: Add ruby-yard-with-tests., guix-commits, 2020/07/11
- 07/17: gnu: Add ruby-pandoc-ruby., guix-commits, 2020/07/11
- 12/17: gnu: ruby-asciidoctor: Re-indent., guix-commits, 2020/07/11
- 13/17: gnu: ruby-asciidoctor: Update to 2.0.10.,
guix-commits <=
- 09/17: gnu: ruby-tilt: Add pandoc, sassc support., guix-commits, 2020/07/11
- 16/17: gnu: Add ruby-yard-tomdoc., guix-commits, 2020/07/11
- 10/17: gnu: ruby-temple: Update to 0.8.2., guix-commits, 2020/07/11
- 15/17: gnu: Add ruby-tomparse., guix-commits, 2020/07/11
- 17/17: gnu: ruby-ruby-prof: Disable a flaky test., guix-commits, 2020/07/11
- 14/17: gnu: Add ruby-spectroscope., guix-commits, 2020/07/11