From patchwork Mon Mar 20 17:29:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48370 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 8B8F016F3D; Mon, 20 Mar 2023 17:31:34 +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 C7E2C16F1D for ; Mon, 20 Mar 2023 17:31:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJLI-0001rb-33; Mon, 20 Mar 2023 13:30:44 -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 1peJKu-00013T-Ol for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:23 -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 1peJKp-0007Qt-FT for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJKp-0004nY-B3 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 218/223] gnu: ruby-coveralls: Propagate ruby-simplecov and enable tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:30:15 +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.167933341318408 (code B ref 62196); Mon, 20 Mar 2023 17:30:15 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:30:13 +0000 Received: from localhost ([127.0.0.1]:56406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKm-0004mW-Ez for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:30:13 -0400 Received: from mail-qt1-f175.google.com ([209.85.160.175]:35585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKa-0004hx-R1 for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:30:01 -0400 Received: by mail-qt1-f175.google.com with SMTP id ay22so2652353qtb.2 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333395; 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=LGmESttKrbn79a4FaSk0ZcdWmOhXtlLbkHn82G6My+M=; b=lb3hr/WDYxzrwMh6hbXQGT1oG7puPd2eU5a2stFWOprjS/cr52Hqhu3lM5jujSOFJ2 TBjwxUHJ+sNHx+QR2GoO6ZvuGWhYCipcl26biZYo7aIbBKK3dK8JLdHkx4Knx5JCWheq XcOZkdxgS/GqbIH7eiVXcNi5QnLJHRb2x8R7Nhlxnui1gSIoCRel6vHBFD5f03zDdl+W UYPGf2ycTRpCbnq8vihNM03nrllvfQ8Y+Rwf0hw+nFyHyS3iEa2cjMTRo/mFIcrSnvvc U4UgK+j2+h4Qm3t5Fc1YIET1Kjx845+qkDEg60YLfkkVUQ5QRkw1/0K2rZ8uRPegpjJ3 deZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333395; 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=LGmESttKrbn79a4FaSk0ZcdWmOhXtlLbkHn82G6My+M=; b=Y9Qa5ogi8H1ghxhIHhrPxHB9ZgRoZDHIplPlHJqf7fHF3C+3iD66diN3sS1FNktzbp khm/gIC5G5xV/3DRbu3GbvZCqLqbKtwmOp53LWasVHwAm+NoZjzpq+UJuAHgFw32t0Xc bYjkl++TRxHFlR/O4jQDt+OlZgiDWdF5NhYO9r5BsnqpYFQg4nMMnHqeFufiGH9NVv24 kkvvqx61LJ+ixLC7yqnJxhqZc71VSsbUCCgKBKPuTTF4G/XpzsaBCgF+5d3UKI5QhCzj wp3DfWOcDrdr9Sm0u1jaeqQDzh4mWINNFODFmoUhsBchczcxgMzENeLE5Mcq+qg4Yaxr o2nA== X-Gm-Message-State: AO0yUKUcNvEc8gZPrqXLRUH5Y+0t5R5daLkGAJglMsaH1D6AvSzWnd/x O+lkO/7hNeYe6e5crUjBBh9sqD/CD98= X-Google-Smtp-Source: AK7set+lXqbD5jBZgqD1qC69kDflQuQ7YCcIh7MmxxGXT4xgX1FLUuYtyO1e23hzB3RdvgQUCtETag== X-Received: by 2002:a05:622a:15ce:b0:3b9:2c3:675a with SMTP id d14-20020a05622a15ce00b003b902c3675amr26842795qty.62.1679333395193; Mon, 20 Mar 2023 10:29:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:29:54 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:29:28 -0400 Message-Id: <20230320172933.13101-17-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-coveralls) [arguments]: Enable tests. Add disable-problematic-tests phase. Replace strip-version-requirements with relax-requirements. [native-inputs]: New field. [propagated-inputs]: Add ruby-simplecov. --- gnu/packages/ruby.scm | 47 +++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f887882da1..f8e736aecd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9609,23 +9609,40 @@ (define-public ruby-coveralls (base32 "1mv4fn5lfxhy7bc2f1lpnc5yp9mvv97az77j4r7jgrxcqwn8fqxc")))) (build-system ruby-build-system) - ;; The test suite depends on ruby-vcr, which cannot be included in Guix - ;; because of its nonfree, Hippocratic-derived license. (arguments - `(#:tests? #f - #:phases (modify-phases %standard-phases - (add-after 'extract-gemspec 'strip-version-requirements - ;; Keeping strict version requirements can cause problems - ;; to users of the library, such as: Gem::ConflictError: - ;; Unable to activate coveralls-0.8.23, because - ;; simplecov-0.17.1 conflicts with simplecov (~> 0.16.1). - (lambda _ - (substitute* "coveralls-ruby.gemspec" - (("(.*add_.*dependency\\([^,]+), .*" _ stripped) - (string-append stripped ")\n"))) - #t))))) + (list #:test-target "default" + #:phases #~(modify-phases %standard-phases + (add-after 'extract-gemspec 'disable-problematic-tests + (lambda _ + (substitute* "spec/coveralls/coveralls_spec.rb" + ;; This test fails for unknown reasons (perhaps + ;; networking); skip it. + (("it \"sends existing test results\"" all) + (string-append "x" all))) + ;; 3 simplecov tests fail, perhaps due to using a + ;; newer simplecov version. + (delete-file "spec/coveralls/simplecov_spec.rb") + (substitute* "coveralls-ruby.gemspec" + (("\"spec/coveralls/simplecov_spec.rb\".freeze, ") + "")))) + (add-after 'extract-gemspec 'relax-requirements + (lambda _ + (substitute* "coveralls-ruby.gemspec" + (("%q.freeze, \\[\"~> 0.16.1\"]") + "%q.freeze"))))))) + (native-inputs + (list git-minimal/pinned + ruby-pry + ruby-rspec + ruby-truthy + ruby-vcr-expat + ruby-webmock)) (propagated-inputs - (list ruby-json ruby-term-ansicolor ruby-thor ruby-tins)) + (list ruby-json + ruby-term-ansicolor + ruby-thor + ruby-tins + ruby-simplecov)) (synopsis "Ruby implementation of the Coveralls API") (description "This package provides a Ruby implementation of the Coveralls API.")