From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Woodcroft Subject: Re: [PATCH] 11 little Ruby gems. Date: Wed, 7 Oct 2015 19:08:05 +1000 Message-ID: <5614E0F5.2090509@uq.edu.au> References: <5613E0C7.1020607@uq.edu.au> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080308060407000105020708" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zjki6-0007Ip-7w for guix-devel@gnu.org; Wed, 07 Oct 2015 05:08:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zjkhr-0005Sb-FV for guix-devel@gnu.org; Wed, 07 Oct 2015 05:08:30 -0400 Received: from mailhub1.soe.uq.edu.au ([130.102.132.208]:41306 helo=newmailhub.uq.edu.au) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zjkhq-0005QY-Pb for guix-devel@gnu.org; Wed, 07 Oct 2015 05:08:15 -0400 In-Reply-To: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: "Thompson, David" Cc: guix-devel This is a multi-part message in MIME format. --------------080308060407000105020708 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 07/10/15 04:25, Thompson, David wrote: > In short, yes, your patches are very welcome. Thanks! - Dave Here ya go then. Can I ask, would it be helpful to alphabetize the packages in ruby.scm, at least vaguely? Always adding new packages to the bottom of the file causes git merge conflicts I would imagine. Of course, it would be even more helpful if guix import put them in the right spot too, but that seems harder. --------------080308060407000105020708 Content-Type: text/x-patch; name="0001-gnu-Add-ruby-rspec-core-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gnu-Add-ruby-rspec-core-2.patch" >From 5a9ae660aa19c3ddc1365e17bf30f3263422b698 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Wed, 7 Oct 2015 18:41:03 +1000 Subject: [PATCH 1/5] gnu: Add ruby-rspec-core-2. * gnu/packages/ruby.scm (ruby-rspec-core-2): New variable. --- gnu/packages/ruby.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c906361..9ad3f81 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -258,6 +258,17 @@ groups.") (home-page "https://github.com/rspec/rspec-core") (license license:expat))) +(define-public ruby-rspec-core-2 + (package (inherit ruby-rspec-core) + (version "2.14.8") + (source (origin + (method url-fetch) + (uri (rubygems-uri "rspec-core" version)) + (sha256 + (base32 + "0psjy5kdlz3ph39br0m01w65i1ikagnqlg39f8p65jh5q7dz8hwc")))) + (propagated-inputs `()))) + (define-public ruby-diff-lcs (package (name "ruby-diff-lcs") -- 2.4.3 --------------080308060407000105020708 Content-Type: text/x-patch; name="0002-gnu-Add-ruby-rspec-expectations-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-gnu-Add-ruby-rspec-expectations-2.patch" >From ef34aa18531a98fc0bfcab496ae466c8ab70104d Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Wed, 7 Oct 2015 18:42:54 +1000 Subject: [PATCH 2/5] gnu: Add ruby-rspec-expectations-2. * gnu/packages/ruby.scm (ruby-rspec-expectations-2): New variable. --- gnu/packages/ruby.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9ad3f81..c8ee6d0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -312,6 +312,18 @@ outcomes of a code example.") (home-page "https://github.com/rspec/rspec-expectations") (license license:expat))) +(define-public ruby-rspec-expectations-2 + (package (inherit ruby-rspec-expectations) + (version "2.14.5") + (source (origin + (method url-fetch) + (uri (rubygems-uri "rspec-expectations" version)) + (sha256 + (base32 + "1ni8kw8kjv76jvwjzi4jba00k3qzj9f8wd94vm6inz0jz3gwjqf9")))) + (propagated-inputs + `(("ruby-diff-lcs" ,ruby-diff-lcs))))) + (define-public ruby-rspec-mocks (package (name "ruby-rspec-mocks") -- 2.4.3 --------------080308060407000105020708 Content-Type: text/x-patch; name="0003-gnu-Add-ruby-rspec-mocks-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0003-gnu-Add-ruby-rspec-mocks-2.patch" >From c16de1f8961269ca796e897e7c97f2bdc2875d84 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Wed, 7 Oct 2015 18:43:43 +1000 Subject: [PATCH 3/5] gnu: Add ruby-rspec-mocks-2. * gnu/packages/ruby.scm (ruby-rspec-mocks-2): New variable. --- gnu/packages/ruby.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c8ee6d0..7324f85 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -346,6 +346,18 @@ support for stubbing and mocking.") (home-page "https://github.com/rspec/rspec-mocks") (license license:expat))) +(define-public ruby-rspec-mocks-2 + (package (inherit ruby-rspec-mocks) + (version "2.14.6") + (source (origin + (method url-fetch) + (uri (rubygems-uri "rspec-mocks" version)) + (sha256 + (base32 + "1fwsmijd6w6cmqyh4ky2nq89jrpzh56hzmndx9wgkmdgfhfakv30")))) + (propagated-inputs + `(("ruby-diff-lcs" ,ruby-diff-lcs))))) + (define-public ruby-rspec (package (name "ruby-rspec") -- 2.4.3 --------------080308060407000105020708 Content-Type: text/x-patch; name="0004-gnu-Add-ruby-rspec-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0004-gnu-Add-ruby-rspec-2.patch" >From 4de0d42bc3453c5fd1f8aa19b1a69b24b67cf271 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Wed, 7 Oct 2015 18:45:04 +1000 Subject: [PATCH 4/5] gnu: Add ruby-rspec-2. * gnu/packages/ruby.scm (ruby-rspec-2): New variable. --- gnu/packages/ruby.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7324f85..0d74cf4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -382,6 +382,20 @@ expectations and mocks frameworks.") (home-page "http://rspec.info/") (license license:expat))) +(define-public ruby-rspec-2 + (package (inherit ruby-rspec) + (version "2.14.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "rspec" version)) + (sha256 + (base32 + "134y4wzk1prninb5a0bhxgm30kqfzl8dg06af4js5ylnhv2wd7sg")))) + (propagated-inputs + `(("ruby-rspec-core" ,ruby-rspec-core-2) + ("ruby-rspec-mocks" ,ruby-rspec-mocks-2) + ("ruby-rspec-expectations" ,ruby-rspec-expectations-2))))) + ;; Bundler is yet another source of circular dependencies, so we must disable ;; its test suite as well. (define-public bundler -- 2.4.3 --------------080308060407000105020708 Content-Type: text/x-patch; name="0005-gnu-Add-ruby-yard.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0005-gnu-Add-ruby-yard.patch" >From 31115f17b536f7c02f09347ea6f04275668b8d02 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Wed, 7 Oct 2015 18:57:24 +1000 Subject: [PATCH 5/5] gnu: Add ruby-yard. * gnu/packages/ruby.scm (ruby-yard): New variable. --- gnu/packages/ruby.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0d74cf4..2703c9f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1464,3 +1464,34 @@ and trust on your team.") features such as filtering and fine grained logging.") (home-page "https://github.com/pjotrp/bioruby-logger-plugin") (license license:expat))) + +(define-public ruby-yard + (package + (name "ruby-yard") + (version "0.8.7.6") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "yard" version)) + (sha256 + (base32 + "1dj6ibc0qqvmb5a5r5kk0vhr04mnrz9b26gnfrs5p8jgp620i89x")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "specs" + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-HOME + ;; $HOME needs to be set to somewhere writeable for tests to run + (lambda _ (setenv "HOME" "/tmp") #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec-2) + ("ruby-rack" ,ruby-rack))) + (synopsis "Documentation generation tool for Ruby") + (description + "YARD is a documentation generation tool for the Ruby programming +language. It enables the user to generate consistent, usable documentation +that can be exported to a number of formats very easily, and also supports +extending for custom Ruby constructs such as custom class level definitions.") + (home-page "http://yardoc.org") + (license license:expat))) -- 2.4.3 --------------080308060407000105020708--