From patchwork Mon Jan 28 17:35:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 902 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 DB68B16AEA; Mon, 28 Jan 2019 17:46:40 +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, URIBL_BLOCKED autolearn=ham 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 6BA4C16AE7 for ; Mon, 28 Jan 2019 17:46:40 +0000 (GMT) Received: from localhost ([127.0.0.1]:36060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goAzX-00080b-VP for patchwork@mira.cbaines.net; Mon, 28 Jan 2019 12:46:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goAuA-0003Hg-It for guix-patches@gnu.org; Mon, 28 Jan 2019 12:41:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goAu8-0004fG-NS for guix-patches@gnu.org; Mon, 28 Jan 2019 12:41:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50194) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1goAu7-0004eR-JH for guix-patches@gnu.org; Mon, 28 Jan 2019 12:41:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1goAu7-0001c6-Gb for guix-patches@gnu.org; Mon, 28 Jan 2019 12:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#30689] [PATCH 04/39] gnu: ruby-public-suffix: Enable tests. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jan 2019 17:41:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30689 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo To: 30689@debbugs.gnu.org Received: via spool by 30689-submit@debbugs.gnu.org id=B30689.15486972176091 (code B ref 30689); Mon, 28 Jan 2019 17:41:03 +0000 Received: (at 30689) by debbugs.gnu.org; 28 Jan 2019 17:40:17 +0000 Received: from localhost ([127.0.0.1]:49463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1goAtM-0001a5-LZ for submit@debbugs.gnu.org; Mon, 28 Jan 2019 12:40:16 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:59168 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1goApZ-0001KF-KC for 30689@debbugs.gnu.org; Mon, 28 Jan 2019 12:36:22 -0500 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 0088616AEC for <30689@debbugs.gnu.org>; Mon, 28 Jan 2019 17:36:20 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 6edcd33a for <30689@debbugs.gnu.org>; Mon, 28 Jan 2019 17:36:20 +0000 (UTC) From: Christopher Baines Date: Mon, 28 Jan 2019 17:35:45 +0000 Message-Id: <20190128173620.27999-4-mail@cbaines.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190128173620.27999-1-mail@cbaines.net> References: <87h8dshesk.fsf@cbaines.net> <20190128173620.27999-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 * gnu/packages/ruby.scm (ruby-public-suffix)[arguments]: Enable the tests, add a phase to remove the Rubocop dependency. [native-inputs]: Add bundler, ruby-yard, ruby-mocha and ruby-minitest-reporters. --- gnu/packages/ruby.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ebd36df9b3..57f7108b66 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6126,8 +6126,21 @@ programs running in the background, in Ruby.") "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l")))) (build-system ruby-build-system) (arguments - ;; Tests require network - `(#:tests? #f)) + '(#:phases + (modify-phases %standard-phases + ;; Remove the requirement on Rubocop, as it isn't useful to run, and + ;; including it as an input can lead to circular dependencies. + (add-after 'unpack 'remove-rubocop-from-Rakefile + (lambda _ + (substitute* "Rakefile" + (("require \"rubocop/rake\\_task\"") "") + (("RuboCop::RakeTask\\.new") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-yard" ,ruby-yard) + ("ruby-mocha" ,ruby-mocha) + ("ruby-minitest-reporters" ,ruby-minitest-reporters))) (home-page "https://simonecarletti.com/code/publicsuffix-ruby/") (synopsis "Domain name parser") (description "The gem @code{public_suffix} is a domain name parser,