From patchwork Mon Jan 13 22:53:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 19793 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DEF4C17A94; Mon, 13 Jan 2020 22:54:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A70C517A92 for ; Mon, 13 Jan 2020 22:54:16 +0000 (GMT) Received: from localhost ([::1]:56712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ir8b9-0002J1-JJ for patchwork@mira.cbaines.net; Mon, 13 Jan 2020 17:54:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47945) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ir8ax-0002Hj-DK for guix-patches@gnu.org; Mon, 13 Jan 2020 17:54:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ir8aw-0002b5-Cw for guix-patches@gnu.org; Mon, 13 Jan 2020 17:54:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54377) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ir8aw-0002ax-9m for guix-patches@gnu.org; Mon, 13 Jan 2020 17:54:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ir8aw-0004hF-9P for guix-patches@gnu.org; Mon, 13 Jan 2020 17:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39120] [PATCH 02/12] gnu: ruby-aruba: Update to 0.14.14. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Jan 2020 22:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 39120@debbugs.gnu.org Received: via spool by 39120-submit@debbugs.gnu.org id=B39120.157895602217941 (code B ref 39120); Mon, 13 Jan 2020 22:54:02 +0000 Received: (at 39120) by debbugs.gnu.org; 13 Jan 2020 22:53:42 +0000 Received: from localhost ([127.0.0.1]:60329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ir8ac-0004fD-7s for submit@debbugs.gnu.org; Mon, 13 Jan 2020 17:53:42 -0500 Received: from mira.cbaines.net ([212.71.252.8]:35318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ir8aZ-0004dz-IP for 39120@debbugs.gnu.org; Mon, 13 Jan 2020 17:53:40 -0500 Received: from localhost (unknown [46.237.162.0]) by mira.cbaines.net (Postfix) with ESMTPSA id C9B5317A93 for <39120@debbugs.gnu.org>; Mon, 13 Jan 2020 22:53:38 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f84629cd for <39120@debbugs.gnu.org>; Mon, 13 Jan 2020 22:53:36 +0000 (UTC) From: Christopher Baines Date: Mon, 13 Jan 2020 22:53:26 +0000 Message-Id: <20200113225336.15160-2-mail@cbaines.net> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200113225336.15160-1-mail@cbaines.net> References: <20200113225336.15160-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Stop patching out the use of simplecov, it's used throughout the tests now, so it's not as simple to avoid using it. * gnu/packages/ruby.scm (ruby-aruba): Update to 0.14.14. [arguments]: Stop patching out the use of simplecov. [native-inputs]: Add ruby-simplecov. --- gnu/packages/ruby.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b8a5c8b5d3..de10a25c5b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5405,14 +5405,14 @@ It is intended be used by all Cucumber implementations to parse (define-public ruby-aruba (package (name "ruby-aruba") - (version "0.14.8") + (version "0.14.14") (source (origin (method url-fetch) (uri (rubygems-uri "aruba" version)) (sha256 (base32 - "0zdd81l1lp0x78sxa6kkfqclpj5il3xl70nz05wqv2sfzzhqydxh")))) + "0l2mfpdxc03gdrbwc2hv4vdhjhqhfcdp6d02j05j64ncpi9srlqn")))) (build-system ruby-build-system) (arguments '(#:test-target "spec" @@ -5444,11 +5444,7 @@ It is intended be used by all Cucumber implementations to parse ((".*cucumber.*") "\n") ((".*license_finder.*") "\n") ((".*rake.*") "gem 'rake'\n") - ((".*simplecov.*") "\n") ((".*relish.*") "\n")) - (substitute* "spec/spec_helper.rb" - ((".*simplecov.*") "") - (("^SimpleCov.*") "")) (substitute* "aruba.gemspec" (("spec\\.add\\_runtime\\_dependency 'cucumber'.*") "spec.add_runtime_dependency 'cucumber'")) @@ -5458,7 +5454,8 @@ It is intended be used by all Cucumber implementations to parse (native-inputs `(("bundler" ,bundler) ("ruby-rspec" ,ruby-rspec) - ("ruby-fuubar" ,ruby-fuubar))) + ("ruby-fuubar" ,ruby-fuubar) + ("ruby-simplecov" ,ruby-simplecov))) (propagated-inputs `(("ruby-childprocess" ,ruby-childprocess) ("ruby-contracts" ,ruby-contracts)