GNU bug report logs - #44880
[PATCH] gnu: ruby-rubocop: Update to 1.4.2

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 44880 in the body.
You can then email your comments to 44880 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Tomás Ortín Fernández <tomasortin <at> mailbox.org>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: ruby-rubocop: Update to 1.4.2
Date: Thu, 26 Nov 2020 10:21:18 +0100

* gnu/packages/ruby.scm (ruby-rubocop): Update to 1.4.2
---
gnu/packages/ruby.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2753403834..f2a3e3b3f9 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -7052,7 +7052,7 @@ run.")
 (define-public ruby-rubocop
   (package
     (name "ruby-rubocop")
-    (version "0.88.0")
+    (version "1.4.2")
     (source
      (origin
        (method git-fetch)               ;no tests in distributed gem
@@ -7062,7 +7062,7 @@ run.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1d06893jp8pd85fvgp5d16vqcf31bafi430v4f4y746ihyvhzz5r"))
+         "1kvzhzhzcdd5bqwjilb0fpp51sqjniww2b0g713n0cvhnlgchn2y"))
        (patches (search-patches "ruby-rubocop-break-dependency-cycle.patch"))))
     (build-system ruby-build-system)
     (arguments

Message #8 received at 44880 <at> debbugs.gnu.org (full text, mbox):

From: Tomás Ortín Fernández <tomasortin <at> mailbox.org>
To: 44880 <at> debbugs.gnu.org
Subject: Mistake
Date: Fri, 27 Nov 2020 15:56:32 +0100

It seems I made a mistake with the patch. I used the gem hash, but this uses the github source. I didn't check it well enough, sorry: I will package it properly and send the updated patch.

Tomás

Message #11 received at 44880 <at> debbugs.gnu.org (full text, mbox):

From: Tomás Ortín Fernández <tomasortin <at> mailbox.org>
To: 44880 <at> debbugs.gnu.org
Subject: [PATCH] gnu: ruby-rubocop: Update to 1.4.2.
Date: Fri, 27 Nov 2020 20:05:06 +0100

I'm finding it very difficult to package the updated rubocop from git, so here is a patch with rubocop 1.4.2 packaged from the gem. It was packaged from git because the gem doesn't include tests, but I can't figure out how to make the tests work. I have already asked for help at help-guix, and I'm sending this patch in the meanwhile because the current rubocop version is too outdated to be useful at all. As soon as I have the tests figured out, I will send a patch enabling the tests.

Tomás


* gnu/packages/ruby.scm (ruby-rubocop): Update to 1.4.2, fetch from gem, disable tests
---
gnu/packages/ruby.scm | 51 +++++----------------------------------------------
1 file changed, 5 insertions(+), 46 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2753403834..eeabedf3d1 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -7052,58 +7052,17 @@ run.")
 (define-public ruby-rubocop
   (package
     (name "ruby-rubocop")
-    (version "0.88.0")
+    (version "1.4.2")
     (source
      (origin
-       (method git-fetch)               ;no tests in distributed gem
-       (uri (git-reference
-             (url "https://github.com/rubocop-hq/rubocop")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (rubygems-uri "rubocop" version))
        (sha256
         (base32
-         "1d06893jp8pd85fvgp5d16vqcf31bafi430v4f4y746ihyvhzz5r"))
-       (patches (search-patches "ruby-rubocop-break-dependency-cycle.patch"))))
+         "1kvzhzhzcdd5bqwjilb0fpp51sqjniww2b0g713n0cvhnlgchn2y"))))
     (build-system ruby-build-system)
     (arguments
-     '(#:test-target "default"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-problematic-tests
-           ;; These tests depend on Rubocop extensions, which cannot be
-           ;; included as they cause a dependency cycle with Rubocop itself.
-           (lambda _
-             (delete-file "spec/rubocop/config_loader_spec.rb")
-             (substitute* "Gemfile"
-               ((".*'rubocop-performance'.*") "")
-               ((".*'rubocop-rspec'.*") ""))
-             ;; Prevent "Unnecessary disabling of RSpec/* (unknown cop)"
-             ;; errors.
-             (substitute* (find-files "spec/rubocop/cop/" "_spec\\.rb$")
-               (("# (rubocop:(enable|disable) RSpec.*)" _ what)
-                (string-append "# Disabled: " what)))
-             #t))
-         (add-after 'unpack 'disable-bundler
-           (lambda _
-             (substitute* "Rakefile"
-               (("Bundler\\.setup.*") "nil\n"))
-             #t))
-         (replace 'replace-git-ls-files
-           (lambda _
-             (substitute* "rubocop.gemspec"
-               (("`git ls-files(.*)`" _ files)
-                (format #f "`find ~a -type f| sort`" files)))
-             #t))
-         (add-before 'check 'set-home
-           (lambda _
-             (setenv "HOME" (getcwd))
-             #t))
-         (add-before 'check 'make-adoc-files-writable
-           (lambda _
-             (let ((adoc-files (find-files "docs/modules/ROOT/pages"
-                                           "\\.adoc$")))
-               (for-each make-file-writable adoc-files))
-             #t)))))
+     '(#:tests? #f))  ;no tests in distributed gem
     (native-inputs
      `(("ruby-bump" ,ruby-bump)
        ("ruby-pry" ,ruby-pry)

Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Tomás Ortín Fernández via Guix-patches via
 <guix-patches <at> gnu.org>
Cc: 44880 <at> debbugs.gnu.org
Subject: Re: [bug#44880] [PATCH] gnu: ruby-rubocop: Update to 1.4.2.
Date: Fri, 4 Dec 2020 14:58:33 -0500

On Fri, Nov 27, 2020 at 08:05:06PM +0100, Tomás Ortín Fernández via Guix-patches via wrote:
> I'm finding it very difficult to package the updated rubocop from git, so here is a patch with rubocop 1.4.2 packaged from the gem. It was packaged from git because the gem doesn't include tests, but I can't figure out how to make the tests work. I have already asked for help at help-guix, and I'm sending this patch in the meanwhile because the current rubocop version is too outdated to be useful at all. As soon as I have the tests figured out, I will send a patch enabling the tests.
> 
> * gnu/packages/ruby.scm (ruby-rubocop): Update to 1.4.2, fetch from gem, disable tests

Thanks! Did you check if the packages that depend on ruby-rubocop still
work after this upgrade? You can get the list of such packages with
`guix refresh --list-dependent ruby-rubocop` and then try building each
one.

Message #20 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: Tomás Ortín Fernández via Guix-patches via
 <guix-patches <at> gnu.org>
Cc: 44880-done <at> debbugs.gnu.org,
 Tomás Ortín Fernández <tomasortin <at> mailbox.org>,
 Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#44880] [PATCH] gnu: ruby-rubocop: Update to 1.4.2
Date: Thu, 25 Feb 2021 23:50:45 +0100

[Message part 1 (text/plain, inline)]

Hi Tomás,

On Thu, 26 Nov 2020 10:21:18 +0100
Tomás Ortín Fernández via Guix-patches via <guix-patches <at> gnu.org> wrote:

> * gnu/packages/ruby.scm (ruby-rubocop): Update to 1.4.2

In the meantime, ruby-rubocop was updated to 1.10.0 in commit

301d1bacc1f33ed5f2f546488c3a1dbc66cc3f4f

Closing this patch.

Björn

[Message part 2 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.