From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esEK7-0007Vl-53 for guix-patches@gnu.org; Sat, 03 Mar 2018 16:04:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1esEK3-0003BV-By for guix-patches@gnu.org; Sat, 03 Mar 2018 16:04:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:35193) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1esEK3-0003BQ-8n for guix-patches@gnu.org; Sat, 03 Mar 2018 16:04:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1esEK3-0003L6-0o for guix-patches@gnu.org; Sat, 03 Mar 2018 16:04:03 -0500 Subject: [bug#30689] [PATCH 02/10] gnu: Add ruby-asciidoctor. Resent-Message-ID: From: Christopher Baines Date: Sat, 3 Mar 2018 21:03:00 +0000 Message-Id: <20180303210308.15500-2-mail@cbaines.net> In-Reply-To: <20180303210308.15500-1-mail@cbaines.net> References: <20180303210308.15500-1-mail@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30689@debbugs.gnu.org From: Ben Woodcroft * gnu/packages/ruby.scm (ruby-asciidoctor): New variable. --- gnu/packages/maths.scm | 13 +++++++++---- gnu/packages/ruby.scm | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6cd41278d..5771d128f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -97,6 +97,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages tbb) #:use-module (gnu packages scheme) #:use-module (gnu packages shells) @@ -1926,11 +1927,15 @@ porting.") "1d80kiph5mc78zps7si1hv48kv4k12mzaq8jk5kb3pqpjdr72qmc")))) (build-system ruby-build-system) (arguments - `(#:phases + '(#:phases (modify-phases %standard-phases - (replace 'check - (lambda* _ - (invoke "rspec" "test/parser_spec.rb")))))) + ;; Apply this patch + ;; https://github.com/asciidoctor/asciimath/commit/1c06fdc8086077f4785479f78b0823a4a72d7948 + (add-after 'unpack 'patch-remove-spurious-backslashes + (lambda _ + (substitute* "spec/parser_spec.rb" + (("\\\\\"") + "\""))))))) (native-inputs `(("bundler" ,bundler) ("ruby-rspec" ,ruby-rspec))) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ee5d20955..fbb387e71 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -665,6 +665,41 @@ line of code.") ;; of the Expat license. (license license:bsd-3))) +(define-public ruby-asciidoctor + (package + (name "ruby-asciidoctor") + (version "1.5.6.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "asciidoctor" version)) + (sha256 + (base32 + "1jnf9y8q5asfdzilp8vcqafrc2faj719df4yh1993mh6jd0iqdy4")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "test:all" + #:phases + (modify-phases %standard-phases + (add-before 'check 'remove-circular-tests + (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") + #t))))) + (native-inputs + `(("ruby-minitest" ,ruby-minitest) + ("ruby-nokogiri" ,ruby-nokogiri) + ("ruby-asciimath" ,ruby-asciimath) + ("ruby-coderay" ,ruby-coderay))) + (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) and other formats.") + (home-page "http://asciidoctor.org") + (license license:expat))) + (define-public ruby-ci-reporter (package (name "ruby-ci-reporter") -- 2.16.0