From patchwork Mon Mar 20 17:13: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: 48445 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 5D4F916F3D; Mon, 20 Mar 2023 17:44:01 +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,URIBL_BLOCKED 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 8A4B816F39 for ; Mon, 20 Mar 2023 17:43:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJWv-00007h-2I; Mon, 20 Mar 2023 13:42:45 -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 1peJWi-0008Uw-Jz for guix-patches@gnu.org; Mon, 20 Mar 2023 13:42:33 -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 1peJWE-0005Rb-5U for guix-patches@gnu.org; Mon, 20 Mar 2023 13:42:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJWE-0005Qx-0y for guix-patches@gnu.org; Mon, 20 Mar 2023 13:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 028/223] gnu: ruby-thor: Update to 1.2.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:42:01 +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.167933410920868 (code B ref 62196); Mon, 20 Mar 2023 17:42:01 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:41:49 +0000 Received: from localhost ([127.0.0.1]:56693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJW0-0005QV-Eh for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:41:48 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:33499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJVx-0005QJ-Lp for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:41:46 -0400 Received: by mail-qt1-f178.google.com with SMTP id n2so14100583qtp.0 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679334100; 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=nYXZZ4KkLxH+FQQRjsYaDqMcwaMRigfbzG1bysXvlQE=; b=aWV7Xd7ZofyC32TO6Hj70BVuQHIXI5/FchwRDR9z5Z7OruJryyqThkzGr4dVko5wJb vTNRbDdlZ/KSXbrYik8DnY5I+jl/t73aYvcXfy+F/aRa3p33WjypbAwTq/7vfTgzoVcX 1Rj2vE1RFNQ8Jhz2VgzW9vCosyEdQdm5d+BcdFDyMSa7AzZuDR2qgmq5TBcLL6aPKRQQ 9Mb9wvkOcrbrQJA8lr9xVS4Wn/hBSG71PuPK8FqDYGIMtZICaY8rQT4H3sCx84fMSvXP fMmSqHtiqjnxoUGteSA86t4Tq8zcYG8nYISNCNehMZ8LnjXEEY9VUrDtPX5NW5XNKwSw 1ONQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679334100; 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=nYXZZ4KkLxH+FQQRjsYaDqMcwaMRigfbzG1bysXvlQE=; b=CEvhtg9qtuxn5UsU4JdrizlAmzuRjnqsSr1nGz0+GngmFX6t04mYZxjCyb33YoRd2/ p5WZOo/dgJWeSc7F/e4wm+UUNij5P8fDEfscHcJlHZOVYa2paupFTFWFocn3sOpnSAGP 2/3Dl0scl1zR3UvvQ+Qut+lpf+DCbDEfT/6RZSE7m0UHQ+5Ti4lqhPWiOx6fFYwK/zLg AKwmaPUdpaauvVPNFBzI62pbCU37lZwRg7zH+xLZTrPgK+TDnxxmLqqBmwH6oF1x6MS2 Lt9GBN8NisAMW77WpykSqV/R2VYt0iXnGvfhyAleGLD5ZnxQwUK+yG/Z/NJvZXLlr9wD dU9w== X-Gm-Message-State: AO0yUKWxe5n60pw0NWNGcLrAbdXTURFSKtIblCiyklGGiR1ZJ/7UGjvf m1pf5eWWOWWj0y2kP4Tv+arbJ6odaTM= X-Google-Smtp-Source: AK7set9vwU1ZiOxd9gs+JlQhzrpcExuDhn9vXpQ+SUVQs2UWwR0mnS8OIVRoezfjVy3jP0GEPsbJ/w== X-Received: by 2002:a05:622a:307:b0:3b8:6ae9:b108 with SMTP id q7-20020a05622a030700b003b86ae9b108mr28725568qtw.27.1679332624695; Mon, 20 Mar 2023 10:17:04 -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:04 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:13:20 -0400 Message-Id: <20230320171635.11184-28-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-thor): Update to 1.2.1. [source]: Update URI. [arguments]: Use gexps. Delete trailing #t. [phases] {fix-readline-tests, disable-network-tests} {make-files-writable}: Delete phases. {remove-coveralls-dependency}: Do not remove webmock requires. {disable-quality-tests}: Rename to... {disable-problematic-tests}: ... this. Disable a new failing test. {check}: Honor TESTS?. --- gnu/packages/ruby.scm | 83 ++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 53 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ccd446bdd1..cf270a0d34 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2737,69 +2737,46 @@ (define-public ruby-xml-simple (define-public ruby-thor (package (name "ruby-thor") - (version "1.0.1") + (version "1.2.1") (source (origin ;; Pull from git because the gem has no tests. (method git-fetch) (uri (git-reference - (url "https://github.com/erikhuda/thor") + (url "https://github.com/rails/thor") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1anrx5vynk57hn5c8ig5pgkmcsbj9q5mvckd5rviw1jid7n89k57")))) + "1vjm628ks5kw8q6dskh38dqyz2j8c3n694wsqkj4jb4jrn6rkfzx")))) (build-system ruby-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-readline-tests - (lambda _ - ;; Ensure Readline is initialized before running the - ;; test to avoid a type clash with the mock ::Readline. - ;; See . - (substitute* "spec/line_editor/readline_spec.rb" - (("unless defined\\? ::Readline" all) - (string-append "Thor::LineEditor::Readline.available?\n" - all))) - #t)) - (add-after 'unpack 'remove-coveralls-dependency - (lambda _ - ;; Do not hook the test suite into the online - ;; coveralls service. - (substitute* "Gemfile" - ((".*coveralls.*") "")) - (substitute* "spec/helper.rb" - (("require \"coveralls\"") "") - (("Coveralls::SimpleCov::Formatter") "") - ;; Also drop the WebMock dependency which is only - ;; present to allow a coveralls.io connection, and - ;; would otherwise introduce a circular dependency. - (("require \"webmock/rspec\"") "") - (("WebMock\\.disable_net_connect.*") "")) - #t)) - (add-after 'unpack 'disable-network-tests - (lambda _ - ;; These tests attempt to look up example.com. - (substitute* "spec/actions/file_manipulation_spec.rb" - (("it \"accepts (https?) remote sources" _ proto) - (string-append "xit \"accepts " proto " remote sources"))) - #t)) - (add-after 'unpack 'disable-quality-tests - (lambda _ - ;; These tests attempt to check the git repository for - ;; tabs vs spaces, double vs single quotes, etc, and - ;; depend on the git checkout. - (delete-file "spec/quality_spec.rb") - #t)) - (add-before 'check 'make-files-writable - (lambda _ - ;; The tests needs rw access to the test suite. - (for-each make-file-writable (find-files "spec")) - #t)) - (replace 'check - (lambda _ - (invoke "rspec" "spec")))))) - (native-inputs - (list ruby-rspec ruby-simplecov)) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-coveralls-dependency + (lambda _ + ;; Do not hook the test suite into the online coveralls service. + (substitute* "Gemfile" + ((".*coveralls.*") "")) + (substitute* "spec/helper.rb" + (("require \"coveralls\"") "") + (("Coveralls::SimpleCov::Formatter") "")))) + (add-after 'unpack 'disable-problematic-tests + (lambda _ + ;; These tests attempt to check the git repository for + ;; tabs vs spaces, double vs single quotes, etc, and + ;; depend on the git checkout. + (delete-file "spec/quality_spec.rb") + (substitute* "spec/parser/options_spec.rb" + ;; This test fails for unknown reasons (see: + ;; https://github.com/rails/thor/issues/814). + (("it \"raises an error for unknown switches" all) + (string-append "x" all))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec" "spec" ))))))) + (native-inputs (list ruby-rspec ruby-simplecov ruby-webmock)) (synopsis "Ruby toolkit for building command-line interfaces") (description "Thor is a toolkit for building powerful command-line interfaces.")