From patchwork Mon Mar 20 17:13:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48426 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 2F4DB16F32; Mon, 20 Mar 2023 17:43:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A694716EC7 for ; Mon, 20 Mar 2023 17:43:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJVQ-0007kX-N1; Mon, 20 Mar 2023 13:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peJVL-0007eI-Jc for guix-patches@gnu.org; Mon, 20 Mar 2023 13:41:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peJVK-000552-Oy for guix-patches@gnu.org; Mon, 20 Mar 2023 13:41:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJVK-0005LA-Kp for guix-patches@gnu.org; Mon, 20 Mar 2023 13:41:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 027/223] gnu: ruby-rubocop: Update to 1.48.1 Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:41:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62196@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 62196-submit@debbugs.gnu.org id=B62196.167933401820122 (code B ref 62196); Mon, 20 Mar 2023 17:41:06 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:40:18 +0000 Received: from localhost ([127.0.0.1]:56566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJUY-0005EO-8o for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:40:18 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:43957) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJ84-0003Et-Af for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:17:05 -0400 Received: by mail-qt1-f178.google.com with SMTP id c10so2742734qtj.10 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679332624; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DHYnBCYOrqffbxNF995Zk0y94m28ayy2Dr3DUT/EX2U=; b=DZJ90hoDTRxow6uDER5LiIEXEiBfr1DZCIryu124v09jVYi8ftJnqmt5x9n4iQ1d2r /fBiCM9RloeorXzYzPlu5FuD/KDWA7QuBZwI6Cd61RQ1Ln/avI3xzR+np2aelRg8ds+F Sl8xX/mpO6niwPyDMqIYPJFVXPZV33IV858ICZBxWky0mn4Fc8tgFT4VX+Bp5awu4tfJ q28oQT5kTNuHn5DB+Hqr02odUod9NoPUhrZVyHuIJelu3myKW1/EMIGeripqa5xjfn9H 5rK8AaEZEcRWTCSyXsqa11t8pJkEgxbmvqA/Vg5laC18STaGoXEWg/rgNMi8QinnRTAd TbDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679332624; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DHYnBCYOrqffbxNF995Zk0y94m28ayy2Dr3DUT/EX2U=; b=qxXi6PXYOkJKmJlIh1yAF1g7zmfosknlmKda9nkbcalF4Wp1aAv8S3L0FMTiDOlbAh i5w4NwEHxWv5GJfN4KOYWbiS6dYBCc+aj+FFr0Y3dSEprzOsCIBgEWpgicnDKy+XRU+Q NBDCwX/OFll1bYkIr5tNQd3G2hCx8z2m58VpWmiK0kiybdZtkEOz9npafrfLCMgDyuFj 3vnjZ34ZMIohd2ey7wM3ULO3xql1+EJAO7qP+3Z2ey9Z5gfPpiH+B7xK0+N7cV8JWA+B a3ptLtAB1iagsNOEjgc31nusJj1o0tZDCCfl13dkS8NZei78pgriUlgUG77tT1oV02Zw pnPQ== X-Gm-Message-State: AO0yUKUXI5EXEuLbx0a3bXJQagLXRqz1i4x+d9rSbs3UJUFLjPlFuhHP 5nrFqynXVq4ghp2IiOvvXBoM6crBiHc= X-Google-Smtp-Source: AK7set93HOREJJDOdLOUOMAjCKBn1I0LDe56Kd589iLR69v4qXXqO9x7gJiwbtsxVyI87QSJmYvo5g== X-Received: by 2002:ac8:5dd4:0:b0:3b6:3995:2ec2 with SMTP id e20-20020ac85dd4000000b003b639952ec2mr28050292qtx.19.1679332623809; Mon, 20 Mar 2023 10:17:03 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id p17-20020a374211000000b007428e743508sm7673809qka.70.2023.03.20.10.17.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:17:03 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:13:19 -0400 Message-Id: <20230320171635.11184-27-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320171635.11184-1-maxim.cournoyer@gmail.com> References: <20230320171635.11184-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ruby.scm (ruby-rubocop): Update to 1.48.1. [phases]: Delete trailing #t. Remove make-adoc-files-writable phase. [native-inputs]: Delete labels. Remove ruby-bump. Add ruby-rubocop-ast, ruby-rubocop-capybara-minimal and ruby-rubocop-rake-minimal. Sort. [inputs]: Add ruby-json and ruby-rexml. Sort. --- gnu/packages/ruby.scm | 52 ++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 28e98e5189..ccd446bdd1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7391,17 +7391,17 @@ (define-public ruby-test-queue (define-public ruby-rubocop (package (name "ruby-rubocop") - (version "1.10.0") + (version "1.48.1") (source (origin (method git-fetch) ;no tests in distributed gem (uri (git-reference - (url "https://github.com/rubocop-hq/rubocop") + (url "https://github.com/rubocop/rubocop") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0wjw9vpzr4f3nf1zf010bag71w4hdi0haybdn7r5rlmw45pmim29")))) + "1l4j99mbrdjy2bzcnky30pjgjv8sxjr187jzliyqmldvpf7dizbp")))) (build-system ruby-build-system) (arguments `(#:test-target "default" @@ -7412,8 +7412,7 @@ (define-public ruby-rubocop (modify-phases %standard-phases (add-before 'check 'set-home (lambda _ - (setenv "HOME" (getcwd)) - #t)) + (setenv "HOME" (getcwd)))) ;; Rubocop depends on itself for tests, directly and indirectly. By ;; regenerating the TODO list we test rubocop against itself and ;; forgo adjusting the test suite to our environment each release. @@ -7421,40 +7420,37 @@ (define-public ruby-rubocop (lambda* (#:key tests? #:allow-other-keys) (when tests? (make-file-writable ".rubocop_todo.yml") - (invoke "./exe/rubocop" "--auto-gen-config")) - #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))))) + (invoke "./exe/rubocop" "--auto-gen-config"))))))) (native-inputs - `(("ruby-bump" ,ruby-bump) - ("ruby-pry" ,ruby-pry) - ("ruby-rake" ,ruby-rake) - ("ruby-rspec" ,ruby-rspec) - ("ruby-rubocop-minimal" ,ruby-rubocop-minimal) - ("ruby-rubocop-performance-minimal" ,ruby-rubocop-performance-minimal) - ("ruby-rubocop-rspec-minimal" ,ruby-rubocop-rspec-minimal) - ("ruby-simplecov" ,ruby-simplecov) - ("ruby-stackprof" ,ruby-stackprof) - ("ruby-test-queue" ,ruby-test-queue) - ("ruby-webmock" ,ruby-webmock) - ("ruby-yard" ,ruby-yard))) + (list ruby-pry + ruby-rake + ruby-rspec + ruby-rubocop-ast + ruby-rubocop-capybara-minimal + ruby-rubocop-minimal + ruby-rubocop-performance-minimal + ruby-rubocop-rake-minimal + ruby-rubocop-rspec-minimal + ruby-simplecov + ruby-stackprof + ruby-test-queue + ruby-webmock + ruby-yard)) (propagated-inputs - (list ruby-parallel + (list ruby-json + ruby-parallel ruby-parser + ruby-progressbar ruby-rainbow ruby-regexp-parser + ruby-rexml ruby-rubocop-ast - ruby-progressbar 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") + (home-page "https://github.com/rubocop/rubocop") (license license:expat))) (define-public ruby-rubocop-minimal