[PATCH 00/15] Add ruby-rubocop and dependencies.

Done

Details

2 participants

Christopher Baines
Ricardo Wurmus

Owner: unassigned

Submitted by: Christopher Baines

Severity: normal

Christopher Baines wrote on 27 Jan 2019 18:01

Recipients:(address . guix-patches@gnu.org)

Message-ID:87y376ghl0.fsf@cbaines.net

Following on from #34217 [1], these patches add ruby-rubocop and some
dependencies. This is part of packaging Rails (Ruby web framework) for
Guix [2].

1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34217
2: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30689


Christopher Baines (15):
  gnu: ruby-rspec-its: Enable tests.
  gnu: Add ruby-powerpack.
  gnu: Add ruby-rainbow.
  gnu: Add ruby-racc.
  gnu: Add ruby-hashdiff.
  gnu: Add ruby-crack.
  gnu: Add ruby-webmock.
  gnu: Add ruby-rest-client.
  gnu: Add ruby-bacon-colored-output.
  gnu: Add ruby-ast.
  gnu: Add ruby-cliver.
  gnu: Add ruby-parser.
  gnu: Add ruby-unicode-display-width.
  gnu: Add ruby-jaro-winkler.
  gnu: Add ruby-rubocop.

 gnu/packages/ruby.scm | 463 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 456 insertions(+), 7 deletions(-)

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 04/15] gnu: Add ruby-racc.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-4-mail@cbaines.net

Required for ruby-ast and ruby-parser.

* gnu/packages/ruby.scm (ruby-racc): New variable.

---

gnu/packages/ruby.scm | 22 ++++++++++++++++++++++

1 file changed, 22 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index cd756a8b9a..7c2b9d9762 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3655,6 +3655,28 @@ differences (added or removed nodes) between two XML/HTML documents.")
       (home-page "https://github.com/postmodern/nokogiri-diff")
       (license license:expat))))
 
+(define-public ruby-racc
+  (package
+    (name "ruby-racc")
+    (version "1.4.14")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "racc" version))
+       (sha256
+        (base32
+         "00yhs2ag7yy5v83mqvkbnhk9bvsh6mx3808k53n61ddzx446v1zl"))))
+    (build-system ruby-build-system)
+    (native-inputs
+     `(("ruby-hoe" ,ruby-hoe)
+       ("ruby-rake-compiler" ,ruby-rake-compiler)))
+    (synopsis "LALR(1) parser generator for Ruby")
+    (description
+     "Racc is a LALR(1) parser generator.  It is written in Ruby itself, and
+generates Ruby program.")
+    (home-page "http://i.loveruby.net/en/projects/racc/")
+    (license license:expat)))
+
 (define-public ruby-rack
   (package
     (name "ruby-rack")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 02/15] gnu: Add ruby-powerpack.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-2-mail@cbaines.net

Required for ruby-rubocop.

* gnu/packages/ruby.scm (ruby-powerpack): New variable.

---

gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++

1 file changed, 24 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index b0cf9feb02..223ff30ba8 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1510,6 +1510,30 @@ assertion messages for tests.")
     (home-page "https://github.com/k-tsj/power_assert")
     (license (list license:bsd-2 license:ruby))))
 
+(define-public ruby-powerpack
+  (package
+    (name "ruby-powerpack")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "powerpack" version))
+       (sha256
+        (base32
+         "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(#:test-target "spec"))
+    (native-inputs
+     `(("bundler" ,bundler)
+       ("ruby-rspec" ,ruby-rspec)
+       ("ruby-yard" ,ruby-yard)))
+    (synopsis "Useful extensions to core Ruby classes")
+    (description
+     "This package provides a few useful extensions to core Ruby classes.")
+    (home-page "https://github.com/bbatsov/powerpack")
+    (license license:expat)))
+
 (define-public ruby-locale
   (package
     (name "ruby-locale")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 05/15] gnu: Add ruby-hashdiff.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-5-mail@cbaines.net

Required for ruby-webmock.

* gnu/packages/ruby.scm (ruby-hashdiff): New variable.

---

gnu/packages/ruby.scm | 32 ++++++++++++++++++++++++++++++++

1 file changed, 32 insertions(+)

Toggle diff (45 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 7c2b9d9762..3d1dfee47f 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1231,6 +1231,38 @@ failure.")
     (home-page "https://github.com/thekompanee/fuubar")
     (license license:expat)))
 
+(define-public ruby-hashdiff
+  (package
+    (name "ruby-hashdiff")
+    (version "0.3.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "hashdiff" version))
+       (sha256
+        (base32
+         "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         ;; Run tests directly via rspec to avoid Rake issue:
+         ;; NoMethodError: undefined method `last_comment'
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "rspec"))
+             #t)))))
+    (native-inputs
+     `(("bundler" ,bundler)
+       ("ruby-rspec" ,ruby-rspec-2)))
+    (synopsis "HashDiff computes the smallest difference between two hashes")
+    (description
+     "HashDiff is a Ruby library to compute the smallest difference between
+two hashes.")
+    (home-page "https://github.com/liufengyun/hashdiff")
+    (license license:expat)))
+
 (define-public ruby-shindo
   (package
     (name "ruby-shindo")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 03/15] gnu: Add ruby-rainbow.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-3-mail@cbaines.net

Required for ruby-rubocop.

* gnu/packages/ruby.scm (ruby-rainbow): New variable.

---

gnu/packages/ruby.scm | 32 ++++++++++++++++++++++++++++++++

1 file changed, 32 insertions(+)

Toggle diff (45 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 223ff30ba8..cd756a8b9a 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3771,6 +3771,38 @@ clickjacking, directory traversal, session hijacking and IP spoofing.")
     (home-page "https://github.com/sinatra/sinatra/tree/master/rack-protection")
     (license license:expat)))
 
+(define-public ruby-rainbow
+  (package
+    (name "ruby-rainbow")
+    (version "3.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "rainbow" version))
+       (sha256
+        (base32
+         "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         ;; Run rspec directly, to avoid requiring Rubocop which is used from
+         ;; the Rakefile.
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "rspec"))
+             #t)))))
+    (native-inputs
+     `(("bundler" ,bundler)
+       ("ruby-rspec" ,ruby-rspec)))
+    (synopsis "Colorize printed text on ANSI terminals")
+    (description
+     "@code{rainbow} provides a string presenter object to colorize strings by
+wrapping them in ANSI escape codes.")
+    (home-page "https://github.com/sickill/rainbow")
+    (license license:expat)))
+
 (define-public ruby-contest
   (package
     (name "ruby-contest")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 07/15] gnu: Add ruby-webmock.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-7-mail@cbaines.net

Required by ruby-rest-client. Also at version ~> 2, so don't package 3 just

yet.

* gnu/packages/ruby.scm (ruby-webmock): New variable.

---

gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++

1 file changed, 26 insertions(+)

Toggle diff (39 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index e11900b835..5eb08d9929 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4781,6 +4781,32 @@ support to both Ruby and JRuby.  It uses @code{unf_ext} on CRuby and
     (home-page "https://github.com/knu/ruby-unf")
     (license license:bsd-2)))
 
+(define-public ruby-webmock
+  (package
+    (name "ruby-webmock")
+    (version "2.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "webmock" version))
+       (sha256
+        (base32
+         "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"))))
+    (build-system ruby-build-system)
+    (propagated-inputs
+     `(("bundler" ,bundler)
+       ("ruby-addressable" ,ruby-addressable)
+       ("ruby-crack" ,ruby-crack)
+       ("ruby-public-suffic" ,ruby-public-suffix)
+       ("ruby-rspec" ,ruby-rspec)
+       ("ruby-hashdiff" ,ruby-hashdiff)))
+    (synopsis "Allows stubbing and setting expectations on HTTP requests")
+    (description
+     "WebMock allows stubbing HTTP requests and setting expectations on HTTP
+requests.  This is useful when testing software.")
+    (home-page "https://github.com/bblimke/webmock")
+    (license license:expat)))
+
 (define-public ruby-domain-name
   (package
     (name "ruby-domain-name")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 08/15] gnu: Add ruby-rest-client.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-8-mail@cbaines.net

Required for ruby-ast.

* gnu/packages/ruby.scm (ruby-rest-client): New variable.

---

gnu/packages/ruby.scm | 42 ++++++++++++++++++++++++++++++++++++++++++

1 file changed, 42 insertions(+)

Toggle diff (55 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 5eb08d9929..f013d84299 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3888,6 +3888,48 @@ wrapping them in ANSI escape codes.")
     (home-page "https://github.com/sickill/rainbow")
     (license license:expat)))
 
+(define-public ruby-rest-client
+  (package
+    (name "ruby-rest-client")
+    (version "2.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "rest-client" version))
+       (sha256
+        (base32
+         "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'fix-dependencies
+           (lambda _
+             (substitute* "rest-client.gemspec"
+               ((".*rubocop.*") "\n")
+               ((".*pry.*") "\n"))
+             #t))
+         (add-before 'check 'delete-network-tests
+           (lambda _
+             (delete-file "spec/integration/request_spec.rb")
+             (delete-file "spec/integration/httpbin_spec.rb")
+             #t)))))
+    (propagated-inputs
+     `(("ruby-http-cookie" ,ruby-http-cookie)
+       ("ruby-mime-types" ,ruby-mime-types)
+       ("ruby-netrc" ,ruby-netrc)))
+    (native-inputs
+     `(("bundler" ,bundler)
+       ("ruby-webmock", ruby-webmock)
+       ("ruby-rspec", ruby-rspec)))
+    (synopsis "Simple HTTP and REST client for Ruby")
+    (description
+     "@code{rest-client} provides a simple HTTP and REST client for Ruby,
+inspired by the Sinatra microframework style of specifying actions: get, put,
+post, delete.")
+    (home-page "https://github.com/rest-client/rest-client")
+    (license license:expat)))
+
 (define-public ruby-contest
   (package
     (name "ruby-contest")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 01/15] gnu: ruby-rspec-its: Enable tests.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-1-mail@cbaines.net

Enable the tests, and also tweak the synopsis and description to hopefully be
more descriptive.

* gnu/packages/ruby.scm (ruby-rspec-its)[source]: Change to GitHub, and add
patch.
[arguments]: Enabled tests, set the #:test-target to "spec", and add the
phases to tweak the Gemfile and rspec-its.gemspec.
[native-inputs]: Add bundler, ruby-cucumber and ruby-aruba.
[synopsis,description]: Make more explicit and descriptive.
---
 gnu/packages/ruby.scm | 49 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

Toggle diff (69 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 59895240f8..b0cf9feb02 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -392,20 +392,55 @@ outcomes of a code example.")
     (version "1.2.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (rubygems-uri "rspec-its" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rspec/rspec-its.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"))))
+         "190rz7v4q4wk80fzhr5hknvxx4vb2pywmqr8wc41w2blj9ylzi0f"))
+       (patches
+        (list
+         (origin (method url-fetch)
+                 (uri (string-append
+                       "https://github.com/rspec/rspec-its/commit/"
+                       "bfaab439c7c879f5ef25552f41827891f6308373.patch"))
+                 (file-name "ruby-rspec-its-fix-specs-for-ruby-2.4.patch")
+                 (sha256
+                  (base32
+                   "0lnik0kvrpgkakvdb2fmzg22pdlraf6kiidr9sv6rnfyviiqwxgh")))))))
     (build-system ruby-build-system)
     (arguments
-     `(#:tests? #f)) ; needs cucumber.
+     `(#:test-target "spec"
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'dont-install-gems-from-gemfile
+           (lambda _
+             (substitute* "Gemfile"
+               (("rspec rspec-core rspec-expectations rspec-mocks rspec-support")
+                ""))
+             #t))
+         (add-before 'build 'remove-unnecessary-dependency-versions-from-gemfile
+           (lambda _
+             (substitute* "rspec-its.gemspec"
+               (("rake.*") "rake'\n")
+               (("cucumber.*") "cucumber'\n")
+               (("bundler.*") "bundler'\n")
+               (("aruba.*") "aruba'\n"))
+             #t)))))
     (propagated-inputs
      `(("ruby-rspec-core" ,ruby-rspec-core)
        ("ruby-rspec-expectations" ,ruby-rspec-expectations)))
-    (synopsis "RSpec extension gem for attribute matching")
-    (description "@code{rspec-its} is an RSpec extension gem for attribute
-matching.")
+    (native-inputs
+     `(("bundler" ,bundler)
+       ("ruby-cucumber" ,ruby-cucumber)
+       ("ruby-aruba" ,ruby-aruba)))
+    (synopsis "RSpec extension that provides the @code{its} method")
+    (description
+     "RSpec::Its provides the its method as a short-hand to specify the expected
+value of an attribute.  For example, one can use @code{its(:size)\\{should
+eq(1)\\}}.")
     (home-page "https://github.com/rspec/rspec-its")
     (license license:expat)))
 
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 06/15] gnu: Add ruby-crack.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-6-mail@cbaines.net

Required for ruby-webmock.

* gnu/packages/ruby.scm (ruby-crack): New variable.

---

gnu/packages/ruby.scm | 31 +++++++++++++++++++++++++++++++

1 file changed, 31 insertions(+)

Toggle diff (44 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 3d1dfee47f..e11900b835 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -791,6 +791,37 @@ value is found.")
     (home-page "https://github.com/egonSchiele/contracts.ruby")
     (license license:bsd-2)))
 
+(define-public ruby-crack
+  (package
+    (name "ruby-crack")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "crack" version))
+       (sha256
+        (base32
+         "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"))))
+    (build-system ruby-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (for-each (lambda (file)
+                         (display file)(display "\n")
+                         (invoke "ruby" file))
+                       (find-files "spec" ".*rb$"))
+             #t)))))
+    (propagated-inputs
+     `(("ruby-safe-yaml" ,ruby-safe-yaml)))
+    (synopsis "Simple JSON and XML parsing for Ruby")
+    (description
+     "@code{crack} provides really simple JSON and XML parsing, extracted from
+code in Merb and Rails.")
+    (home-page "https://github.com/jnunemaker/crack")
+    (license license:expat)))
+
 (define-public ruby-czmq-ffi-gen
   (package
     (name "ruby-czmq-ffi-gen")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 09/15] gnu: Add ruby-bacon-colored-output.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-9-mail@cbaines.net

This is a requirement of ruby-ast.

* gnu/packages/ruby.scm (ruby-bacon-colored-output): New variable.

---

gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++

1 file changed, 24 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index f013d84299..e0c09f59ab 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1515,6 +1515,30 @@ disable tests, have before and after blocks that run once and more.")
     (home-page "https://github.com/cldwalker/bacon-bits")
     (license license:expat)))
 
+(define-public ruby-bacon-colored-output
+  (package
+    (name "ruby-bacon-colored-output")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "bacon-colored_output" version))
+       (sha256
+        (base32
+         "1znyh3vkfdlmf19p3k4zip88ibym41dn5g4p4n5hmks2iznb7qpx"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(;; No included tests
+       #:tests? #f))
+    (propagated-inputs
+     `(("ruby-bacon" ,ruby-bacon)))
+    (synopsis "Colored output for Bacon test framework")
+    (description
+     "This package adds color through ANSI escape codes to Bacon test
+output.")
+    (home-page "https://github.com/whitequark/bacon-colored_output")
+    (license license:expat)))
+
 (define-public ruby-connection-pool
   (package
     (name "ruby-connection-pool")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 11/15] gnu: Add ruby-cliver.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-11-mail@cbaines.net

Requirement of ruby-parser.

* gnu/packages/ruby.scm (ruby-cliver): New variable.

---

gnu/packages/ruby.scm | 32 ++++++++++++++++++++++++++++++++

1 file changed, 32 insertions(+)

Toggle diff (45 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2bb9ea1cff..061659e59f 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -869,6 +869,38 @@ code in Merb and Rails.")
     (home-page "https://github.com/jnunemaker/crack")
     (license license:expat)))
 
+(define-public ruby-cliver
+  (package
+    (name "ruby-cliver")
+    (version "0.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "cliver" version))
+       (sha256
+        (base32
+         "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         ;; Avoid this issue with rspec@2
+         ;; NoMethodError: undefined method `last_comment'
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "rspec"))
+             #t)))))
+    (native-inputs
+     `(("bundler" ,bundler)
+       ("ruby-rspec" ,ruby-rspec-2)))
+    (synopsis "Assertions for command-line dependencies in Ruby")
+    (description
+     "@code{cliver} provides a way to detect missing command-line
+dependencies, including versions.")
+    (home-page "https://github.com/yaauie/cliver")
+    (license license:expat)))
+
 (define-public ruby-czmq-ffi-gen
   (package
     (name "ruby-czmq-ffi-gen")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 15/15] gnu: Add ruby-rubocop.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-15-mail@cbaines.net

* gnu/packages/ruby.scm (ruby-rubocop): New variable.

---

gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++++

1 file changed, 30 insertions(+)

Toggle diff (43 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 9026251626..6f9ad43c53 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4083,6 +4083,36 @@ post, delete.")
     (home-page "https://github.com/rest-client/rest-client")
     (license license:expat)))
 
+(define-public ruby-rubocop
+  (package
+    (name "ruby-rubocop")
+    (version "0.63.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "rubocop" version))
+       (sha256
+        (base32
+         "1pq00qwlmcv52dbhgbk534ggwn1ny9k3sq3vfb1zk3r4psnqz2jy"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(;; No included tests
+       #:tests? #f))
+    (propagated-inputs
+     `(("ruby-parser" ,ruby-parser)
+       ("ruby-powerpack" ,ruby-powerpack)
+       ("ruby-rainbow" ,ruby-rainbow)
+       ("ruby-ruby-progressbar" ,ruby-ruby-progressbar)
+       ("ruby-parallel" ,ruby-parallel)
+       ("ruby-jaro-winkler" ,ruby-jaro-winkler)
+       ("ruby-unicode-display-width" ,ruby-unicode-display-width)))
+    (synopsis "Ruby code style checking tool")
+    (description
+     "@code{rubocop} is a Ruby code style checking tool.  It aims to enforce
+the community-driven Ruby Style Guide.")
+    (home-page "https://github.com/rubocop-hq/rubocop")
+    (license license:expat)))
+
 (define-public ruby-contest
   (package
     (name "ruby-contest")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 10/15] gnu: Add ruby-ast.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-10-mail@cbaines.net

Required for ruby-parser.

* gnu/packages/ruby.scm (ruby-ast): New variable.

---

gnu/packages/ruby.scm | 47 +++++++++++++++++++++++++++++++++++++++++++

1 file changed, 47 insertions(+)

Toggle diff (60 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index e0c09f59ab..2bb9ea1cff 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -699,6 +699,53 @@ AsciiDoc content to HTML5, DocBook 5 (or 4.5), PDF, and other formats.")
   (home-page "https://asciidoctor.org")
   (license license:expat)))
 
+(define-public ruby-ast
+  (package
+    (name "ruby-ast")
+    (version "2.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "ast" version))
+       (sha256
+        (base32
+         "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-coveralls-requirement
+           (lambda _
+             (substitute* "test/helper.rb"
+               (("require 'coveralls'") "")
+               (("Coveralls::SimpleCov::Formatter") ""))
+             #t))
+         (add-after 'extract-gemspec 'remove-unnecessary-requirements
+           (lambda _
+             (substitute* "ast.gemspec"
+               ((".*coveralls.*") "\n")
+               (("%q<rest-client>.*") "%q<rest-client>.freeze, [\">= 0\"])\n")
+               (("%q<mime-types>.*") "%q<mime-types>.freeze, [\">= 0\"])\n")
+               (("%q<rake>.*") "%q<rake>.freeze, [\">= 0\"])\n"))
+             #t)))))
+    (native-inputs
+     `(("bundler" ,bundler)
+       ("ruby-simplecov" ,ruby-simplecov)
+       ("ruby-json-pure" ,ruby-json-pure)
+       ("ruby-mime-times" ,ruby-mime-types)
+       ("ruby-yard" ,ruby-yard)
+       ("ruby-kramdown" ,ruby-kramdown)
+       ("ruby-rest-client" ,ruby-rest-client)
+       ("ruby-bacon" ,ruby-bacon)
+       ("ruby-bacon-colored-output" ,ruby-bacon-colored-output)
+       ("ruby-racc" ,ruby-racc)))
+    (synopsis "Library for working with Abstract Syntax Trees")
+    (description
+     "@code{ast} is a Ruby library for working with Abstract Syntax Trees.
+It does this through immutable data structures.")
+    (home-page "https://whitequark.github.io/ast/")
+    (license license:expat)))
+
 (define-public ruby-sporkmonger-rack-mount
   ;; Testing the addressable gem requires a newer commit than that released, so
   ;; use an up to date version.
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 13/15] gnu: Add ruby-unicode-display-width.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-13-mail@cbaines.net

Required for ruby-rubocop.

* gnu/packages/ruby.scm (ruby-unicode-display-width): New variable.

---

gnu/packages/ruby.scm | 22 ++++++++++++++++++++++

1 file changed, 22 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index ccc58effa0..c455bd5f7b 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4979,6 +4979,28 @@ requests.  This is useful when testing software.")
     (home-page "https://github.com/bblimke/webmock")
     (license license:expat)))
 
+(define-public ruby-unicode-display-width
+  (package
+    (name "ruby-unicode-display-width")
+    (version "1.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "unicode-display_width" version))
+       (sha256
+        (base32
+         "0bq528fibi8s0jmxz0xzlgzggdq0x4fx46wfqz49478pv8gb2diq"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(;; Test data not included.
+       #:tests? #f))
+    (synopsis "Determine the monospace display width of Ruby strings")
+    (description
+     "@code{Unicode::DisplayWidth} is a Ruby library which can determine the
+display width of strings in Ruby.")
+    (home-page "https://github.com/janlelis/unicode-display_width")
+    (license license:expat)))
+
 (define-public ruby-domain-name
   (package
     (name "ruby-domain-name")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 14/15] gnu: Add ruby-jaro-winkler.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-14-mail@cbaines.net

Required for ruby-rubocop.

* gnu/packages/ruby.scm (ruby-jaro-winkler): New variable.

---

gnu/packages/ruby.scm | 23 +++++++++++++++++++++++

1 file changed, 23 insertions(+)

Toggle diff (36 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index c455bd5f7b..9026251626 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3327,6 +3327,29 @@ when working with Ruby code.")
     ;; There is no mention of the "or later" clause.
     (license license:gpl2)))
 
+(define-public ruby-jaro-winkler
+  (package
+    (name "ruby-jaro-winkler")
+    (version "1.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "jaro_winkler" version))
+       (sha256
+        (base32
+         "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(;; No included tests
+       #:tests? #f))
+    (synopsis "Ruby implementation of Jaro-Winkler distance algorithm")
+    (description
+     "@code{jaro_winkler} is an implementation of Jaro-Winkler distance
+algorithm.  It is written in C extension and will fallback to a pure Ruby
+implementation on platforms where this is unsupported.")
+    (home-page "https://github.com/tonytonyjan/jaro_winkler")
+    (license license:expat)))
+
 (define-public ruby-json
   (package
     (name "ruby-json")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:08

[PATCH 12/15] gnu: Add ruby-parser.

Recipients:(address . 34222@debbugs.gnu.org)

Message-ID:20190127170820.28937-12-mail@cbaines.net

Required for ruby-rubocop.

* gnu/packages/ruby.scm (ruby-parser): New variable.

---

gnu/packages/ruby.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (40 lines)diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 061659e59f..ccc58effa0 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -2818,6 +2818,33 @@ for select languages.")
     (home-page "http://coderay.rubychan.de")
     (license license:expat)))
 
+(define-public ruby-parser
+  (package
+    (name "ruby-parser")
+    (version "2.6.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "parser" version))
+       (sha256
+        (base32
+         "1hhz2k5417vr2k1llwqgjdnmyrhlpqicy0y2arr6r1gp04fg9wlm"))))
+    (build-system ruby-build-system)
+    (native-inputs
+     `(("bundler" ,bundler)
+       ("ruby-cliver" ,ruby-cliver)
+       ("ruby-simplecov" ,ruby-simplecov)
+       ("ruby-racc" ,ruby-racc)))
+    (inputs
+     `(("ragel" ,ragel)))
+    (propagated-inputs
+     `(("ruby-ast" ,ruby-ast)))
+    (synopsis "Ruby parser written in pure Ruby")
+    (description
+     "This package provides a Ruby parser written in pure Ruby.")
+    (home-page "https://github.com/whitequark/parser")
+    (license license:expat)))
+
 (define-public ruby-progress_bar
   (package
     (name "ruby-progress_bar")
-- 
2.20.1

Christopher Baines wrote on 27 Jan 2019 18:09

control message for bug #30689

Recipients:(address . control@debbugs.gnu.org)

Message-ID:87womqgh8q.fsf@cbaines.net

block 30689 by 34222 34217

Ricardo Wurmus wrote on 27 Jan 2019 18:25

Re: [bug#34222] [PATCH 03/15] gnu: Add ruby-rainbow.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:8736pet3l7.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (4 lines)

> Required for ruby-rubocop.

> * gnu/packages/ruby.scm (ruby-rainbow): New variable.

LGTM!

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:27

Re: [bug#34222] [PATCH 04/15] gnu: Add ruby-racc.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:871s4yt3iv.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (3 lines)

> Required for ruby-ast and ruby-parser.

> * gnu/packages/ruby.scm (ruby-racc): New variable.

[…]

Toggle quote (2 lines)

> + (license license:expat)))

On the website it says that the license is “LGPL” (no version is

provided). Could you please confirm the license?

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:29

Re: [bug#34222] [PATCH 06/15] gnu: Add ruby-crack.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87zhrmrou5.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (3 lines)

> Required for ruby-webmock.

> * gnu/packages/ruby.scm (ruby-crack): New variable.

[…]

Toggle quote (8 lines)

> + (replace 'check

> + (lambda _

> + (for-each (lambda (file)

> + (display file)(display "\n")

> + (invoke "ruby" file))

> + (find-files "spec" ".*rb$"))

> + #t)))))

I don’t see a “spec” directory in the git repository. Do the Gem

contents differ from the repo?

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:32

Re: [bug#34222] [PATCH 07/15] gnu: Add ruby-webmock.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87y376ropf.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (5 lines)

> Required by ruby-rest-client. Also at version ~> 2, so don't package 3 just

> yet.

> * gnu/packages/ruby.scm (ruby-webmock): New variable.

[…]

When version 3 is already available, I’d prefer to explicitly name this

“ruby-webmock-2”, so that other people know it is on purpose.

Toggle quote (3 lines)

> + (propagated-inputs

> + `(("bundler" ,bundler)

Does “bundler” really need to be propagated?

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:34

Re: [bug#34222] [PATCH 09/15] gnu: Add ruby-bacon-colored-output.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87va2arolj.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (4 lines)

> This is a requirement of ruby-ast.

> * gnu/packages/ruby.scm (ruby-bacon-colored-output): New variable.

LGTM!

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:20

Re: [bug#34222] [PATCH 01/15] gnu: ruby-rspec-its: Enable tests.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:874l9ut3t4.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (10 lines)> Enable the tests, and also tweak the synopsis and description to hopefully be
> more descriptive.
>
> * gnu/packages/ruby.scm (ruby-rspec-its)[source]: Change to GitHub, and add
> patch.
> [arguments]: Enabled tests, set the #:test-target to "spec", and add the
> phases to tweak the Gemfile and rspec-its.gemspec.
> [native-inputs]: Add bundler, ruby-cucumber and ruby-aruba.
> [synopsis,description]: Make more explicit and descriptive.

Looks good to me.

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:36

Re: [bug#34222] [PATCH 10/15] gnu: Add ruby-ast.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87tvhurohx.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (3 lines)

> Required for ruby-parser.

> * gnu/packages/ruby.scm (ruby-ast): New variable.

[…]

Toggle quote (12 lines)> +    (native-inputs
> +     `(("bundler" ,bundler)
> +       ("ruby-simplecov" ,ruby-simplecov)
> +       ("ruby-json-pure" ,ruby-json-pure)
> +       ("ruby-mime-times" ,ruby-mime-types)
> +       ("ruby-yard" ,ruby-yard)
> +       ("ruby-kramdown" ,ruby-kramdown)
> +       ("ruby-rest-client" ,ruby-rest-client)
> +       ("ruby-bacon" ,ruby-bacon)
> +       ("ruby-bacon-colored-output" ,ruby-bacon-colored-output)
> +       ("ruby-racc" ,ruby-racc)))

Are really none of these required at run time?

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:38

Re: [bug#34222] [PATCH 11/15] gnu: Add ruby-cliver.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87sgxerofh.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (3 lines)

> Requirement of ruby-parser.

> * gnu/packages/ruby.scm (ruby-cliver): New variable.

[…]

Toggle quote (14 lines)> +    (arguments
> +     '(#:phases
> +       (modify-phases %standard-phases
> +         ;; Avoid this issue with rspec@2
> +         ;; NoMethodError: undefined method `last_comment'
> +         (replace 'check
> +           (lambda* (#:key tests? #:allow-other-keys)
> +             (when tests?
> +               (invoke "rspec"))
> +             #t)))))
> +    (native-inputs
> +     `(("bundler" ,bundler)
> +       ("ruby-rspec" ,ruby-rspec-2)))

Is this a problem that would disappear when using a later version of

Rspec?

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:39

Re: [bug#34222] [PATCH 12/15] gnu: Add ruby-parser.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87r2cyrodx.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (4 lines)

> Required for ruby-rubocop.

> * gnu/packages/ruby.scm (ruby-parser): New variable.

LGTM!

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:39

Re: [bug#34222] [PATCH 13/15] gnu: Add ruby-unicode-display-width.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87pnsirod7.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (4 lines)

> Required for ruby-rubocop.

> * gnu/packages/ruby.scm (ruby-unicode-display-width): New variable.

LGTM!

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:40

Re: [bug#34222] [PATCH 14/15] gnu: Add ruby-jaro-winkler.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87o982robc.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (3 lines)

> Required for ruby-rubocop.

> * gnu/packages/ruby.scm (ruby-jaro-winkler): New variable.

[…]

Toggle quote (5 lines)

> + (description

> + "@code{jaro_winkler} is an implementation of Jaro-Winkler distance

> +algorithm. It is written in C extension and will fallback to a pure Ruby

> +implementation on platforms where this is unsupported.")

“written in C” or “written as a C extension”?

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:41

Re: [bug#34222] [PATCH 15/15] gnu: Add ruby-rubocop.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87munmroaf.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (2 lines)

> * gnu/packages/ruby.scm (ruby-rubocop): New variable.

LGTM!

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:34

Re: [bug#34222] [PATCH 08/15] gnu: Add ruby-rest-client.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87womqromp.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (4 lines)

> Required for ruby-ast.

> * gnu/packages/ruby.scm (ruby-rest-client): New variable.

[…]

Toggle quote (8 lines)

> + (modify-phases %standard-phases

> + (add-before 'check 'fix-dependencies

> + (lambda _

> + (substitute* "rest-client.gemspec"

> + ((".*rubocop.*") "\n")

> + ((".*pry.*") "\n"))

> + #t))

Could you please add a comment here why this is necessary?

Toggle quote (5 lines)

> + (description

> + "@code{rest-client} provides a simple HTTP and REST client for Ruby,

> +inspired by the Sinatra microframework style of specifying actions: get, put,

> +post, delete.")

I would wrap “get”, “put”, “post”, and “delete” in @code{…}.

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:45

Re: [bug#34222] [PATCH 05/15] gnu: Add ruby-hashdiff.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87k1iqro4h.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (4 lines)

> Required for ruby-webmock.

> * gnu/packages/ruby.scm (ruby-hashdiff): New variable.

LGTM!

Ricardo

Christopher Baines wrote on 27 Jan 2019 19:44

Re: [bug#34222] [PATCH 02/15] gnu: Add ruby-powerpack.

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 34222@debbugs.gnu.org)

Message-ID:87va2agctp.fsf@cbaines.net

Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (13 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> Required for ruby-rubocop.
>>
>> * gnu/packages/ruby.scm (ruby-powerpack): New variable.
> […]
>> +    (description
>> +     "This package provides a few useful extensions to core Ruby
>> classes.")
>
> I’d add “, including @code{Array}, @code{Enumerable}, @code{Hash},
> @code{Numeric}, and @code{String}.”

Ok, will do. Thanks for taking a look :)

Christopher Baines wrote on 27 Jan 2019 19:45

Re: [bug#34222] [PATCH 14/15] gnu: Add ruby-jaro-winkler.

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 34222@debbugs.gnu.org)

Message-ID:87tvhugcsp.fsf@cbaines.net

Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (13 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> Required for ruby-rubocop.
>>
>> * gnu/packages/ruby.scm (ruby-jaro-winkler): New variable.
> […]
>> +    (description
>> +     "@code{jaro_winkler} is an implementation of Jaro-Winkler distance
>> +algorithm.  It is written in C extension and will fallback to a pure Ruby
>> +implementation on platforms where this is unsupported.")
>
> “written in C” or “written as a C extension”?

The latter. I've updated the patch to say "written as a C extension".

Christopher Baines wrote on 27 Jan 2019 19:48

Re: [bug#34222] [PATCH 11/15] gnu: Add ruby-cliver.

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 34222@debbugs.gnu.org)

Message-ID:87sgxegcn1.fsf@cbaines.net

Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (24 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> Requirement of ruby-parser.
>>
>> * gnu/packages/ruby.scm (ruby-cliver): New variable.
> […]
>
>> +    (arguments
>> +     '(#:phases
>> +       (modify-phases %standard-phases
>> +         ;; Avoid this issue with rspec@2
>> +         ;; NoMethodError: undefined method `last_comment'
>> +         (replace 'check
>> +           (lambda* (#:key tests? #:allow-other-keys)
>> +             (when tests?
>> +               (invoke "rspec"))
>> +             #t)))))
>> +    (native-inputs
>> +     `(("bundler" ,bundler)
>> +       ("ruby-rspec" ,ruby-rspec-2)))
>
> Is this a problem that would disappear when using a later version of
> Rspec?

I don't think so, I get a different exception which looks to me like an
incompatibility between the tests and rspec@3 in Guix. This
`last_comment' related error is a issue between Rspec 2 and more recent
versions of Rake, and I've updated the comment as below to try and
explain this.

+    (Build-system ruby-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         ;; Avoid a incompatibility between rspec@2 and rake. Using rspec@3
+         ;; would be nice, but the tests look to be incompatible:
+         ;;
+         ;; NoMethodError: undefined method `last_comment'
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "rspec"))
+             #t)))))

Christopher Baines wrote on 27 Jan 2019 19:50

Re: [bug#34222] [PATCH 10/15] gnu: Add ruby-ast.

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 34222@debbugs.gnu.org)

Message-ID:87r2cygck2.fsf@cbaines.net

Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (20 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> Required for ruby-parser.
>>
>> * gnu/packages/ruby.scm (ruby-ast): New variable.
> […]
>> +    (native-inputs
>> +     `(("bundler" ,bundler)
>> +       ("ruby-simplecov" ,ruby-simplecov)
>> +       ("ruby-json-pure" ,ruby-json-pure)
>> +       ("ruby-mime-times" ,ruby-mime-types)
>> +       ("ruby-yard" ,ruby-yard)
>> +       ("ruby-kramdown" ,ruby-kramdown)
>> +       ("ruby-rest-client" ,ruby-rest-client)
>> +       ("ruby-bacon" ,ruby-bacon)
>> +       ("ruby-bacon-colored-output" ,ruby-bacon-colored-output)
>> +       ("ruby-racc" ,ruby-racc)))
>
> Are really none of these required at run time?

According to the gemspec at least [1].

1: https://github.com/whitequark/ast/blob/master/ast.gemspec#L14-L26

I don't know the library at all, but it seems like a AST data structure,

so I think it's possible that it's very dependency light.

Christopher Baines wrote on 27 Jan 2019 19:51

Re: [bug#34222] [PATCH 08/15] gnu: Add ruby-rest-client.

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 34222@debbugs.gnu.org)

Message-ID:87pnsigchz.fsf@cbaines.net

Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (18 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> Required for ruby-ast.
>>
>> * gnu/packages/ruby.scm (ruby-rest-client): New variable.
>
> […]
>
>> +       (modify-phases %standard-phases
>> +         (add-before 'check 'fix-dependencies
>> +           (lambda _
>> +             (substitute* "rest-client.gemspec"
>> +               ((".*rubocop.*") "\n")
>> +               ((".*pry.*") "\n"))
>> +             #t))
>
> Could you please add a comment here why this is necessary?

I've updated the patch to say:

+ (add-before 'check 'remove-unnecessary-development-dependencies

+ (lambda _

+ (substitute* "rest-client.gemspec"

+ ;; Remove rubocop as it's unused. Rubocop also indirectly

+ ;; depends on this package through ruby-parser and ruby-ast so

+ ;; this avoids a dependency loop.

+ ((".*rubocop.*") "\n")

+ ;; Remove pry as it's unused, it's a debugging tool

+ ((".*pry.*") "\n"))

Hopefully that is a bit clearer.

Toggle quote (7 lines)

>> + (description

>> + "@code{rest-client} provides a simple HTTP and REST client for Ruby,

>> +inspired by the Sinatra microframework style of specifying actions: get, put,

>> +post, delete.")

> I would wrap “get”, “put”, “post”, and “delete” in @code{…}.

Ok, I've updated the patch to do this now.

Christopher Baines wrote on 27 Jan 2019 19:53

Re: [bug#34222] [PATCH 07/15] gnu: Add ruby-webmock.

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 34222@debbugs.gnu.org)

Message-ID:87o982gce6.fsf@cbaines.net

Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (12 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> Required by ruby-rest-client. Also at version ~> 2, so don't package 3 just
>> yet.
>>
>> * gnu/packages/ruby.scm (ruby-webmock): New variable.
>
> […]
>
> When version 3 is already available, I’d prefer to explicitly name this
> “ruby-webmock-2”, so that other people know it is on purpose.

Sure, I've updated the patch and the other dependant patches.

Toggle quote (5 lines)

>> + (propagated-inputs

>> + `(("bundler" ,bundler)

> Does “bundler” really need to be propagated?

Good spot. Indeed bundler doesn't need to be propagated, and this wasn't
the only issue with the inputs. They now are as follows:

+    (native-inputs
+     `(("bundler" ,bundler)
+       ("ruby-rspec" ,ruby-rspec)))
+    (propagated-inputs
+     `(("ruby-addressable" ,ruby-addressable)
+       ("ruby-crack" ,ruby-crack)
+       ("ruby-hashdiff" ,ruby-hashdiff)))

Christopher Baines wrote on 27 Jan 2019 19:55

Re: [bug#34222] [PATCH 06/15] gnu: Add ruby-crack.

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 34222@debbugs.gnu.org)

Message-ID:87munmgcb2.fsf@cbaines.net

Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (17 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> Required for ruby-webmock.
>>
>> * gnu/packages/ruby.scm (ruby-crack): New variable.
> […]
>> +         (replace 'check
>> +           (lambda _
>> +             (for-each (lambda (file)
>> +                         (display file)(display "\n")
>> +                         (invoke "ruby" file))
>> +                       (find-files "spec" ".*rb$"))
>> +             #t)))))
>
> I don’t see a “spec” directory in the git repository.  Do the Gem
> contents differ from the repo?

Good spot. There isn't a "spec" directory, it's instead called
"test". So no tests were actually being run. I've fixed this now.

+         (replace 'check
+           (lambda _
+             (for-each (lambda (file)
+                         (display file)(display "\n")
+                         (invoke "ruby" "-Ilib" "-Itest" file))
+                       (find-files "test" ".*rb$"))
+             #t)))))

Christopher Baines wrote on 27 Jan 2019 19:57

Re: [bug#34222] [PATCH 04/15] gnu: Add ruby-racc.

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 34222@debbugs.gnu.org)

Message-ID:87lg36gc8m.fsf@cbaines.net

Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (11 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> Required for ruby-ast and ruby-parser.
>>
>> * gnu/packages/ruby.scm (ruby-racc): New variable.
> […]
>> +    (license license:expat)))
>
> On the website it says that the license is “LGPL” (no version is
> provided).  Could you please confirm the license?

Indeed, the metadata in the gem is wrong. The information on the license
is a bit sparse. LGPL 2.1 is included in the sources, and there is one
file which references this in the header.

The published gem doesn't come from the original author, so I'm guessing
the default in the gemspec simply wasn't changed.

Christopher Baines wrote on 27 Jan 2019 20:06

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 34222@debbugs.gnu.org)

Message-ID:87k1iphqdz.fsf@cbaines.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (17 lines)> Ricardo Wurmus <rekado@elephly.net> writes:
>
>> Christopher Baines <mail@cbaines.net> writes:
>>
>>> Required for ruby-ast and ruby-parser.
>>>
>>> * gnu/packages/ruby.scm (ruby-racc): New variable.
>> […]
>>> +    (license license:expat)))
>>
>> On the website it says that the license is “LGPL” (no version is
>> provided).  Could you please confirm the license?
>
> Indeed, the metadata in the gem is wrong. The information on the license
> is a bit sparse. LGPL 2.1 is included in the sources, and there is one
> file which references this in the header.

Actually, there is a lot more, I forgot to pass "-r" to

licensecheck. There's also 3 files where it says:

You can distribute/modify this program under the same terms of ruby.

So I might put this instead. What do you think?

+ (license (list license:lgpl2.1

+ license:ruby))))

Ricardo Wurmus wrote on 27 Jan 2019 20:26

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87ef8xsxz8.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (29 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> Ricardo Wurmus <rekado@elephly.net> writes:
>>
>>> Christopher Baines <mail@cbaines.net> writes:
>>>
>>>> Required for ruby-ast and ruby-parser.
>>>>
>>>> * gnu/packages/ruby.scm (ruby-racc): New variable.
>>> […]
>>>> +    (license license:expat)))
>>>
>>> On the website it says that the license is “LGPL” (no version is
>>> provided).  Could you please confirm the license?
>>
>> Indeed, the metadata in the gem is wrong. The information on the license
>> is a bit sparse. LGPL 2.1 is included in the sources, and there is one
>> file which references this in the header.
>
> Actually, there is a lot more, I forgot to pass "-r" to
> licensecheck. There's also 3 files where it says:
>
>   You can distribute/modify this program under the same terms of ruby.
>
> So I might put this instead. What do you think?
>
> +    (license (list license:lgpl2.1
> +                   license:ruby))))

This would be fine with a comment.

Thanks!

Ricardo

Ricardo Wurmus wrote on 27 Jan 2019 18:44

Re: [bug#34222] [PATCH 02/15] gnu: Add ruby-powerpack.

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 34222@debbugs.gnu.org)

Message-ID:87lg36ro62.fsf@elephly.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (3 lines)

> Required for ruby-rubocop.

> * gnu/packages/ruby.scm (ruby-powerpack): New variable.

[…]

Toggle quote (4 lines)

> + (description

> + "This package provides a few useful extensions to core Ruby

> classes.")

I’d add “, including @code{Array}, @code{Enumerable}, @code{Hash},

@code{Numeric}, and @code{String}.”

LGTM!

Ricardo

Christopher Baines wrote on 14 Feb 2019 22:57

Ruby on Rails

Recipients:(name . Ben Woodcroft)(address . b.woodcroft@uq.edu.au)

Message-ID:87lg2it4m5.fsf@cbaines.net

So, I've merged 66 patches now which were tracked across these 3 bugs so

the master branch now contains the ruby-rails gem!

I think I've even done this without breaking anything, I believe all the

packages I added or changed build, and all of there dependencies as

reported by guix lint build too.

If anyone still has any comments on the patches, I'd still love to hear

them.

Thanks for everyone who's reviewed these patches so far, and thanks to

Ben for kicking this work off many months ago.

Chris

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 34222@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date