From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fukhf-0006Y0-RX for guix-patches@gnu.org; Tue, 28 Aug 2018 16:35:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fukhd-00005V-BC for guix-patches@gnu.org; Tue, 28 Aug 2018 16:35:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59214) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fukhc-0008W9-0R for guix-patches@gnu.org; Tue, 28 Aug 2018 16:35:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fukhb-0001eN-RR for guix-patches@gnu.org; Tue, 28 Aug 2018 16:35:03 -0400 Subject: [bug#32370] [PATCH 3/4] gnu: Enable tests for ruby-multi-json. Resent-Message-ID: From: Christopher Baines Date: Tue, 28 Aug 2018 21:34:00 +0100 Message-Id: <20180828203401.14685-3-mail@cbaines.net> In-Reply-To: <20180828203401.14685-1-mail@cbaines.net> References: <20180828203401.14685-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: 32370@debbugs.gnu.org From: Ben Woodcroft * gnu/packages/ruby.scm (ruby-multi-json)[version]: Update to 1.13.1. [source]: Switch to GitHub, so that the tests can be run. [arguments]: Enable running the tests, and add a patch to fix an issue running the tests. [native-inputs]: Add native-inputs required for running the tests. [home-page]: Use HTTPS. Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 30b8cd1ba9..34854d6bb4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2268,23 +2268,40 @@ net/http library.") (define-public ruby-multi-json (package (name "ruby-multi-json") - (version "1.12.2") + (version "1.13.1") (source (origin (method url-fetch) - (uri (rubygems-uri "multi_json" version)) + ;; Tests are not distributed at rubygems.org so download from GitHub + ;; instead. + (uri (string-append "https://github.com/intridea/multi_json/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x")))) + "1s64xqvrnrxmb59v6b2kchnisawg5ai9ky1w60dy6z6ws9la1xv4")))) (build-system ruby-build-system) (arguments - '(#:tests? #f)) ;; No testsuite included in the gem. + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-signing-key-reference + (lambda _ + (substitute* "multi_json.gemspec" + ((".*spec.signing_key.*") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-yard" ,ruby-yard) + ("ruby-json-pure" ,ruby-json-pure) + ("ruby-oj" ,ruby-oj) + ("ruby-yajl-ruby" ,ruby-yajl-ruby))) (synopsis "Common interface to multiple JSON libraries for Ruby") (description "This package provides a common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.") - (home-page "http://github.com/intridea/multi_json") + (home-page "https://github.com/intridea/multi_json") (license license:expat))) (define-public ruby-arel -- 2.18.0