From patchwork Tue Mar 5 07:54:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 1338 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 CF53016D18; Tue, 5 Mar 2019 07:55:30 +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=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 82A9B16CAC for ; Tue, 5 Mar 2019 07:55:30 +0000 (GMT) Received: from localhost ([127.0.0.1]:39163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h14vC-0004fk-5D for patchwork@mira.cbaines.net; Tue, 05 Mar 2019 02:55:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h14uo-0004Vd-Nm for guix-patches@gnu.org; Tue, 05 Mar 2019 02:55:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h14un-00025c-E6 for guix-patches@gnu.org; Tue, 05 Mar 2019 02:55:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46968) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h14un-00025L-9n for guix-patches@gnu.org; Tue, 05 Mar 2019 02:55:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h14un-00016i-5n for guix-patches@gnu.org; Tue, 05 Mar 2019 02:55:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34514] [PATCH v2 05/12] gnu: ruby-listen: Enable running the tests. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Mar 2019 07:55:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34514 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34514@debbugs.gnu.org Received: via spool by 34514-submit@debbugs.gnu.org id=B34514.15517724784145 (code B ref 34514); Tue, 05 Mar 2019 07:55:05 +0000 Received: (at 34514) by debbugs.gnu.org; 5 Mar 2019 07:54:38 +0000 Received: from localhost ([127.0.0.1]:60495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h14uM-00014h-7K for submit@debbugs.gnu.org; Tue, 05 Mar 2019 02:54:38 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:58056 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h14uH-00012x-7J for 34514@debbugs.gnu.org; Tue, 05 Mar 2019 02:54:34 -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 B28F616D1C for <34514@debbugs.gnu.org>; Tue, 5 Mar 2019 07:54:32 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id ea00b105 for <34514@debbugs.gnu.org>; Tue, 5 Mar 2019 07:54:32 +0000 (UTC) From: Christopher Baines Date: Tue, 5 Mar 2019 07:54:25 +0000 Message-Id: <20190305075432.13449-5-mail@cbaines.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305075432.13449-1-mail@cbaines.net> References: <87sgwm44a9.fsf@cbaines.net> <20190305075432.13449-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-listen)[source]: Switch to the Git repository, as this includes the tests. [arguments]: Set #:test-target and tweak the Rakefile to avoid requiring Rubocop unnecessarily. [native-inputs]: Add bundler and ruby-rspec for running the test suite. [inputs]: Add ruby-thor, as this is used for bin/listen. [propagated-inputs]: Add ruby-dep, as this is listed as a runtime dependency in the gemspec. --- gnu/packages/ruby.scm | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 13629597ad..4efad7cd0e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4421,16 +4421,39 @@ a native C extension.") (version "3.1.5") (source (origin - (method url-fetch) - (uri (rubygems-uri "listen" version)) + ;; The gem does not include a Rakefile, so fetch from the Git + ;; repository. + (method git-fetch) + (uri (git-reference + (url "https://github.com/guard/listen.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx")))) + "1hqmkfa9f2xb5jlvqbafdxjd5ax75jm8gqj5nh3k22xq0kacsvgg")))) (build-system ruby-build-system) - (arguments '(#:tests? #f)) ; no tests + (arguments + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-before 'check 'remove-unnecessary-dependencies' + (lambda _ + (substitute* "Rakefile" + ;; Rubocop is for code linting, and is unnecessary for running + ;; the tests. + ((".*rubocop.*") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (inputs + `(;; ruby-thor is used for the command line interface, and is referenced + ;; in the wrapper, and therefore just needs to be an input. + ("ruby-thor" ,ruby-thor))) (propagated-inputs - `(("ruby-rb-inotify" ,ruby-rb-inotify) - ("ruby-rb-fsevent" ,ruby-rb-fsevent))) + `(("ruby-rb-fsevent" ,ruby-rb-fsevent) + ("ruby-rb-inotify" ,ruby-rb-inotify) + ("ruby-dep" ,ruby-dep))) (synopsis "Listen to file modifications") (description "The Listen gem listens to file modifications and notifies you about the changes.")