From patchwork Mon Mar 20 17:13:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48316 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 C379916F34; Mon, 20 Mar 2023 17:29:35 +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 472B416F44 for ; Mon, 20 Mar 2023 17:29:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJGn-0004GI-LT; Mon, 20 Mar 2023 13:26:05 -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 1peJGm-0004FW-SM for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:04 -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 1peJGm-0005LZ-K2 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJGm-0003xF-Gr for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 052/223] gnu: ruby-cucumber: Update to 8.0.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:26:04 +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.167933311514453 (code B ref 62196); Mon, 20 Mar 2023 17:26:04 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:25:15 +0000 Received: from localhost ([127.0.0.1]:56022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJFy-0003kw-UW for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:25:15 -0400 Received: from mail-qt1-f177.google.com ([209.85.160.177]:34631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJ8P-0003FU-V7 for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:17:26 -0400 Received: by mail-qt1-f177.google.com with SMTP id bz27so2198658qtb.1 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679332645; 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=XIWcVpTjpGRlFTrx+kCvplRy8m7KmnqIrTvlvRDj4FQ=; b=pvswgdSHEn4nVzqKI/ReCtK5XYClQsqGH+kZq0KLFYotL3oNbJSe3pW+kjbTAQuReD 27iVS/3ccD+T2YB5+TbPFlNfZuK/jACA40ihVez7OR05NcJRTOL/Nl7LYpRq7pjvaLKe MsZxc0F//PINXA554YeZBiBMY+z39FCSJ6F47b8LnIG/Su3QBKqmTtVOv3dWrJWan31c oNX8rENR9QEpRHkrCyIk/ufexKbSzsHVlp2Y3zAzeeuVbEOOOr1zRH8IQyuGQUf76nI3 czHaw8BgCRx6YJApXbOhUekoKmN9q/ameNMGMmeJTE0YhO2nkCKyou7BK5lxcWVkj7uI GYEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679332645; 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=XIWcVpTjpGRlFTrx+kCvplRy8m7KmnqIrTvlvRDj4FQ=; b=gwSc0Cr8JGndr84oiH3Myiw22bD9NIE1POvt8jYyiJmFhMcL2F3bLZpEIml7tlDHh8 f8DAXUDM8ogA7Wo1ma0JY0cJda6566gLc52z8JBhw5HOHXpCVXpmGJexYMRLPq4U9gT8 rC38Al5FQw+xckvSOejILLdj/vdKlqmY5gE6gCLHJic+1uQdfRwssbPK4Q74sTrSpU+V 6NxLkTqXu/bjzVNDEgUptquUMYuBMTOc4g6heRfwci+cZpNbqJ9CsVlqOkZ/z45sM00p bdP1NbSPg7TiU1EHcbG2kEln9gHt+xO0FOiSd6LjvWf/JY4mJL/BzQR6OkYifOzyRTeg CrZw== X-Gm-Message-State: AO0yUKU8xlBB4xCCGZyCL7nYZCQN08L2K32alkJvvAjxF4TcLTLEFmgk UPa4wyWNqXqnXndc33JYlRPGZgLIM2I= X-Google-Smtp-Source: AK7set9z6p6Wn5Z/JZMi+5Ms67WSr7pMlePApviZOxzFy+WhUs9wgF/nY6zOsWi5SvPHjdmOv04N4A== X-Received: by 2002:a05:622a:1648:b0:3bf:c86b:3d2a with SMTP id y8-20020a05622a164800b003bfc86b3d2amr29048335qtj.9.1679332645419; Mon, 20 Mar 2023 10:17:25 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:17:25 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:13:44 -0400 Message-Id: <20230320171635.11184-52-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-cucumber): Update to 8.0.0. [arguments]: Delete trailing #t. Adjust disable-rubocop phase. Refine the strip-version-requirements phase. Set #:test-target to "spec". [propagated-inputs]: Add ruby-cucumber-ci-environment, ruby-mime-types and ruby-sys-uname. Remove ruby-cucumber-create-meta and ruby-multi-json. [native-inputs]: Remove ruby-aruba-without-tests and ruby-rubocop. Add ruby-cucumber-compatibility-kit. (ruby-aruba-without-tests): Delete variable. --- gnu/packages/ruby.scm | 77 +++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 44 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index eb618d5c2d..d7a5cd81a5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8139,18 +8139,6 @@ (define-public ruby-aruba (home-page "https://github.com/cucumber/aruba") (license license:expat))) -;; A version of ruby-aruba without tests run so that circular dependencies can -;; be avoided. -(define ruby-aruba-without-tests - (package - (inherit ruby-aruba) - (arguments '(#:tests? #f)) - (propagated-inputs - `(("ruby-cucumber" ,ruby-cucumber-without-tests) - ,@(alist-delete "ruby-cucumber" - (package-propagated-inputs ruby-aruba)))) - (native-inputs '()))) - (define-public ruby-sys-uname (package (name "ruby-sys-uname") @@ -8265,7 +8253,7 @@ (define-public ruby-cucumber-ci-environment (define-public ruby-cucumber (package (name "ruby-cucumber") - (version "4.1.0") + (version "8.0.0") (source (origin (method git-fetch) @@ -8275,49 +8263,50 @@ (define-public ruby-cucumber (file-name (git-file-name name version)) (sha256 (base32 - "0g9rqfslbzkkrq2kvl14fgknrhfbji3bjjpjxff5nc9wzd3hd549")))) + "1dz880fdz6rfbh1nwwcq21v65byik46jnf9gppnrqf3p5k61i55r")))) (build-system ruby-build-system) (arguments - '(#:test-target "default" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-rubocop - ;; Rubocop lint check fails with our more recent version. - (lambda _ - (substitute* "Rakefile" - (("spec cucumber rubocop") - "spec cucumber")) - #t)) - (add-after 'extract-gemspec 'strip-version-requirements - (lambda _ - (delete-file "Gemfile") ;do not use Bundler - (substitute* "cucumber.gemspec" - (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped) - (string-append stripped "\n"))) - #t)) - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" (getcwd)) - #t))))) + (list #:test-target "spec" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-rubocop + ;; Remove extraneous Lint checks. + (lambda _ + (substitute* "Rakefile" + (("require 'rubocop/rake_task'") + "") + (("RuboCop::RakeTask.new") + "")))) + (add-after 'extract-gemspec 'strip-version-requirements + (lambda _ + (delete-file "Gemfile") ;do not use Bundler + (substitute* "cucumber.gemspec" + ;; The dependency specifications are often trailing + ;; behind and appear stricter than necessary, since the + ;; test suite passes with the newer component versions. + (("(.*add_.*dependency '[_A-Za-z0-9-]+')(.*)" + _ stripped rest) + (string-append stripped " # " rest "\n"))))) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd))))))) (propagated-inputs (list ruby-builder + ruby-cucumber-ci-environment ruby-cucumber-core - ruby-cucumber-create-meta ruby-cucumber-gherkin ruby-cucumber-html-formatter ruby-cucumber-messages ruby-cucumber-wire ruby-diff-lcs - ruby-multi-json - ruby-multi-test)) + ruby-mime-types + ruby-multi-test + ruby-sys-uname)) (native-inputs - (list ;; Use a untested version of aruba, to avoid a circular dependency, as - ;; ruby-aruba depends on ruby-cucumber. - ruby-aruba-without-tests - ruby-rspec - ruby-pry + (list ruby-cucumber-compatibility-kit ruby-nokogiri - ruby-rubocop)) + ruby-pry + ruby-rspec)) (synopsis "Describe automated tests in plain language") (description "Cucumber is a tool for running automated tests written in plain language. It's designed to support a Behaviour Driven Development (BDD)