From patchwork Mon Jan 28 17:35:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 880 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 E849916AEA; Mon, 28 Jan 2019 17:37:41 +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 9834C16AE7 for ; Mon, 28 Jan 2019 17:37:41 +0000 (GMT) Received: from localhost ([127.0.0.1]:35847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goAqr-0000RI-4Q for patchwork@mira.cbaines.net; Mon, 28 Jan 2019 12:37:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goAqJ-0008T2-5Y for guix-patches@gnu.org; Mon, 28 Jan 2019 12:37:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goAqI-0001PN-1i for guix-patches@gnu.org; Mon, 28 Jan 2019 12:37:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50153) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1goAqH-0001PH-UG for guix-patches@gnu.org; Mon, 28 Jan 2019 12:37:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1goAqH-0001Sf-RN for guix-patches@gnu.org; Mon, 28 Jan 2019 12:37:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#30689] [PATCH 07/39] gnu: Add ruby_version. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jan 2019 17:37:05 +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.15486970085392 (code B ref 30689); Mon, 28 Jan 2019 17:37:05 +0000 Received: (at 30689) by debbugs.gnu.org; 28 Jan 2019 17:36:48 +0000 Received: from localhost ([127.0.0.1]:49383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1goApz-0001Os-O6 for submit@debbugs.gnu.org; Mon, 28 Jan 2019 12:36:47 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:59174 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1goApa-0001KT-Dt for 30689@debbugs.gnu.org; Mon, 28 Jan 2019 12:36:26 -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 3D2CB16AEF for <30689@debbugs.gnu.org>; Mon, 28 Jan 2019 17:36:21 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 35e84cff for <30689@debbugs.gnu.org>; Mon, 28 Jan 2019 17:36:20 +0000 (UTC) From: Christopher Baines Date: Mon, 28 Jan 2019 17:35:48 +0000 Message-Id: <20190128173620.27999-7-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 Required for ruby-rspec-pending-for. * gnu/packages/ruby.scm (ruby_version): New variable. --- gnu/packages/ruby.scm | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7b6c56b4ef..19c0734fc9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5186,6 +5186,53 @@ display width of strings in Ruby.") (home-page "https://github.com/janlelis/unicode-display_width") (license license:expat))) +;; There is another gem called 'ruby-version' so we use an underscore in this +;; name +(define-public ruby_version + (package + (name "ruby_version") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ruby_version" version)) + (sha256 + (base32 + "0854i1bjy56176anr05l5m0vc81nl53c7fyfg7sljj62m1d64dgj")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-dependencies + (lambda _ + ;; Remove the Gemfile.lock, as we want to use Guix packages at + ;; whatever versions. + (delete-file "Gemfile.lock") + ;; Remove the incldued gem file as it's unnecessary. + (delete-file "pkg/ruby_version-1.0.0.gem") + (substitute* "ruby_version.gemspec" + ;; Don't require rdoc and rubygems-tasks as they're unnecessary + ((".*rdoc.*") "\n") + ((".*rubygems-tasks.*") "\n") + ;; Accept any version of rake and rspec + (("%q)\n") + (("%q)\n")) + ;; Remove the use of rubygems-tasks from the Rakefile, as it's + ;; unnecessary. + (substitute* "Rakefile" + (("^require 'rubygems/tasks'") "") + (("Gem::Tasks.new") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Ruby library to help check the Ruby version") + (description + "@code{ruby_version} provides a @code{RubyVersion} module to simplify +checking for the right Ruby version in software.") + (home-page "https://github.com/janlelis/ruby_version") + (license license:expat))) + (define-public ruby-domain-name (package (name "ruby-domain-name")