From patchwork Mon Mar 20 17:29:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48361 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 4815D16F2D; Mon, 20 Mar 2023 17:31:21 +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 07D5216F4E for ; Mon, 20 Mar 2023 17:31:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJL9-00019h-2O; Mon, 20 Mar 2023 13:30:35 -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 1peJKm-0000yX-IK for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:15 -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 1peJKk-0007Oz-PQ for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJKk-0004le-Dk for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 210/223] gnu: ruby-single-cov: Update to 1.9.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:30:10 +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.167933340818281 (code B ref 62196); Mon, 20 Mar 2023 17:30:10 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:30:08 +0000 Received: from localhost ([127.0.0.1]:56381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKh-0004kZ-8I for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:30:07 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:45766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKT-0004gR-P7 for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:29:54 -0400 Received: by mail-qt1-f172.google.com with SMTP id d7so13974836qtr.12 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:29:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333388; 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=X1twd2sD9NsaPBB/ONLcML7wvUYKCD/gukipBIFPVi4=; b=Qe3H5d5MiK4ULXw2ms8Jq30aHzHxqnlT9ucE37t7+0taQiE5T4SPduJeFVb3jqEvO1 DOLV6sktn7ErYfWerLWwLqSqZUMV0S3Yle4u7XSTEGwzV5cqr+Cj96Ow8ntEd9/1Qw/d zO1UT9WFExglf0HrzDaYNgMKNbJK42/MIVWG+VL4K0fIpD0EJAkjnrQQhDEDKUoBKkaI i0Mc4WNPrumz3QWvnUcy3cvFSC3R1cFx9gKiECEOeqdbgAbICVtlw9Hg1BGHoDhjXyoo rB4pcaBZPBjxlxW+hSkSknfoxJP6gLKa3UvCQ/xy7uo0NY6bYUnntdWueHe5gcxI5Muv +Lcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333388; 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=X1twd2sD9NsaPBB/ONLcML7wvUYKCD/gukipBIFPVi4=; b=LnUi0pEAj0iGI2qGMDLQ8peB+AQ9RD8srlGKlVBfXmXBKozNmLC9vFfkEzoGiOoo5R xAHz7wQIk3p1YVDQMKsigUZHSCxvI39xpY5sm3JFgBmy2WOSpBycKVHOxQyfDdUMZSlf PTPQmJh8je1mNHhPeIefKEnAa2yPOqZxhhsPCqP/93vjOTXLkmdlquGFudqI7HvtNxLO mnr3LrKLXEus2QMN48Fcti0A1O8rAE5EhZzOgzMOGcpOAA3FOxIx4t/ev6ziwIDYpNbG rNgtG1v1zo3QXh4zUjDByU+baSaTR376Ql6MkUNOGTHcoEwykELdcgx6Rb/BQ8iEuOlz Vjqg== X-Gm-Message-State: AO0yUKUZAkh6vOTQOUKivVe+P57UwbemO+UuCcp04MhfTtzaBhppi886 78DlDJeBf4akuzKSLJqdksDKbWkxLLo= X-Google-Smtp-Source: AK7set9XYeJ6OI5VV0RDmTpPDO/NJoFgkLa3oWmomo5SAFijvY8Fzci/y3T81P8wh8a4hh4JoW+hAg== X-Received: by 2002:a05:622a:cd:b0:3d8:d7fc:d639 with SMTP id p13-20020a05622a00cd00b003d8d7fcd639mr23610759qtw.18.1679333388193; Mon, 20 Mar 2023 10:29:48 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id g2-20020a37b602000000b0071aacb2c76asm7536708qkf.132.2023.03.20.10.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:29:47 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:29:20 -0400 Message-Id: <20230320172933.13101-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172933.13101-1-maxim.cournoyer@gmail.com> References: <20230320172933.13101-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-single-cov): Update to 1.9.1. [arguments]: Use "spec" as #:test-target. Strip trailing #t in phases. Adjust replacement in replace-git-ls-files phase. Remove make-files-writable phase. Add relax-requirements phase. [native-inputs]: Remove ruby-bump. --- gnu/packages/ruby.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a0b8fcae8a..52dcc08b80 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6722,7 +6722,7 @@ (define-public ruby-pry-doc (define-public ruby-single-cov (package (name "ruby-single-cov") - (version "1.3.2") + (version "1.9.1") (home-page "https://github.com/grosser/single_cov") (source (origin (method git-fetch) @@ -6731,28 +6731,29 @@ (define-public ruby-single-cov (file-name (git-file-name name version)) (sha256 (base32 - "05qdzpcai1p23a120gb9bxkfl4y73k9hicx34ch2lsk31lgi9bl7")))) + "1w4k81f2mdg620m6pwkrqayddnz9mr8qx0myqn33mw8k6imfip05")))) (build-system ruby-build-system) (arguments - '(#:test-target "default" + '(#:test-target "spec" ;to avoid rubocop requirement #:phases (modify-phases %standard-phases (replace 'replace-git-ls-files (lambda _ (substitute* "single_cov.gemspec" (("`git ls-files lib/ bin/ MIT-LICENSE`") - "`find lib/ bin/ MIT-LICENSE -type f | sort`")) - #t)) + ;; There no longer appear to be a 'bin' + ;; sub-directory. + "`find lib/ MIT-LICENSE -type f | sort`")))) (add-before 'check 'remove-version-constraints (lambda _ - (delete-file "Gemfile.lock") - #t)) - (add-before 'check 'make-files-writable + (delete-file "Gemfile.lock"))) + (add-before 'check 'relax-requirements (lambda _ - ;; Tests need to create local directories and open files - ;; with write permissions. - (for-each make-file-writable - (find-files "specs" #:directories? #t)) - #t)) + ;; Remove extraneous requirements. + (substitute* "Rakefile" + ((".*require.*bump.*") "")) + (substitute* "Gemfile" + ((".*gem \"bump\".*") "") + ((".*gem \"rubocop\".*") "")))) (add-before 'check 'disable-failing-test (lambda _ ;; XXX: This test copies assets from minitest, but can @@ -6760,10 +6761,8 @@ (define-public ruby-single-cov ;; it for now. (substitute* "specs/single_cov_spec.rb" (("it \"complains when coverage is bad\"") - "xit \"complains when coverage is bad\"")) - #t))))) - (native-inputs - (list ruby-bump ruby-minitest ruby-rspec ruby-simplecov)) + "xit \"complains when coverage is bad\""))))))) + (native-inputs (list ruby-minitest ruby-rspec ruby-simplecov)) (synopsis "Code coverage reporting tool") (description "This package provides actionable code coverage reports for Ruby