From patchwork Mon Mar 20 17:13:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48345 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 BBE6C16F39; Mon, 20 Mar 2023 17:30:47 +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 C27AB16F1D for ; Mon, 20 Mar 2023 17:30:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJHd-00057E-JV; Mon, 20 Mar 2023 13:26:57 -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 1peJHN-0004lx-6d for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:41 -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 1peJHM-0005b2-U3 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJHM-00048Q-Q6 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:40 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 055/223] gnu: ruby-aruba: Update to 2.1.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:26:40 +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.167933317215381 (code B ref 62196); Mon, 20 Mar 2023 17:26:40 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:26:12 +0000 Received: from localhost ([127.0.0.1]:56254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJGt-0003zj-Um for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:26:12 -0400 Received: from mail-pj1-f52.google.com ([209.85.216.52]:40605) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJGN-0003r2-NA for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:25:40 -0400 Received: by mail-pj1-f52.google.com with SMTP id j3-20020a17090adc8300b0023d09aea4a6so17303248pjv.5 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333133; 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=Fu4CfaHGnym8IYa3/MPQNDtxSSjOdBLONb1havx/I50=; b=YuJ3LlUcNZs2uRWENdMCX/B+AKzMiDlBbadEtIjK81yxVnpVtUECRak40bKKrVj9mz ejJ7gWf79+3y32eBoNuMHmSGhxh4WmyEKSzeeVF32X9bb8MikJZZQsTGxC3Kh6ppbeTu bpgcqjLgbHm/fvxFvKVfSn+j0REjP0Kv8Y+KG/5gn572oQ4DyMridRrjDe3gtO/cJYD8 GNJf7UyavH1Wa41/kmVt6+nCk2KXw/GuBvQb30brOcLBUcF/+qG0R8AkKPn/Zulj4WxG yeIQuyFjrWq2ivRww4B0sw2kvScyaHJOhXO6hravk28jJRYtT3JS8/7Ws11vlmM2VIpZ 9qyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333133; 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=Fu4CfaHGnym8IYa3/MPQNDtxSSjOdBLONb1havx/I50=; b=eO2DXEaNkf3/PqAHrt+/P5qZAkxMt4ujpEHkVyogl/GzplOnfOvLbapQ7/gbJi3AQ2 9udnVv3wkLEnQCUmc2povWm9e3WESkq/+5YAc9gq45+oopGza3eJw4dFElEJEW57lYDw nijPkyGNT55ObnJg4awb5ryeat3JLgPaPjhiiHX9BKIuyFTZtUW2QxMfsWsu7Ev30tRu zaEFsW8T+wH2NCGvcCrXMiNnu0UpptyiGHrjsMzuhrHFUrQpTkUU/O//TG9ZoLPTbkM/ V8yY4EX1JM98m80Q1uYxbNYwj5DYwLITKLmjsEeY6nHO9t1u8NFr+vaqCLz8vsciYzYO oqcg== X-Gm-Message-State: AO0yUKWLKDUzYqVagCcGSDtR1jso/mF/tNUQfwJq9nC/jEHdvgfcQzi+ YNK54YaqJ1tVfYhisrO2M7Ms7nn2dzY= X-Google-Smtp-Source: AK7set+3wUGhxeHRYr8a3kHiuBWNM//YMzm+0snSqZnchvccfa2Tgys8NpCo+g328VQpApSoD8REcQ== X-Received: by 2002:ac8:5f4e:0:b0:3d9:6266:86d9 with SMTP id y14-20020ac85f4e000000b003d9626686d9mr21234909qta.10.1679332648778; Mon, 20 Mar 2023 10:17:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:17:28 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:13:47 -0400 Message-Id: <20230320171635.11184-55-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-aruba): Update to 2.1.0. [source]: Use git. [arguments]: Use gexps. Rename patch phase to 'patch-paths, and update. Rename remove-unnecessary-dependencies phase to relax-requirements and update. Move the check phase after the install phase, and add a new set-GEM_PATH phase. [native-inputs]: Remove ruby-fuubar. Add ruby-rake-manifest. Move bundler to... [propagated-inputs]: ... here. Remove ruby-ffi and ruby-yard. --- gnu/packages/ruby.scm | 107 +++++++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 49 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index fe5f4466f3..132a06bc57 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8075,62 +8075,71 @@ (define-public ruby-gherkin-ruby (define-public ruby-aruba (package (name "ruby-aruba") - (version "0.14.14") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "aruba" version)) - (sha256 - (base32 - "0l2mfpdxc03gdrbwc2hv4vdhjhqhfcdp6d02j05j64ncpi9srlqn")))) + (version "2.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cucumber/aruba") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mmlgqhi6yww3z34hmrrnha2rygkv6kx0q962z31dqxjkcv23yfd")))) (build-system ruby-build-system) (arguments - '(#:test-target "spec" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* "spec/aruba/api_spec.rb" - ;; This resolves some errors in the specs - ;; - ;; undefined method `parse' for Time:Class - (("require 'spec_helper'") - "require 'spec_helper'\nrequire 'time'")) - ;; Avoid shebang issues in this spec file - (substitute* "spec/aruba/matchers/command_spec.rb" - (("/usr/bin/env bash") - (which "bash"))) - #t)) - (add-before 'check 'remove-unnecessary-dependencies - (lambda _ - (substitute* "Gemfile" - ((".*byebug.*") "\n") - ((".*pry.*") "\n") - ((".*yaml.*") "\n") - ((".*bcat.*") "\n") - ((".*kramdown.*") "\n") - ((".*rubocop.*") "\n") - ((".*cucumber-pro.*") "\n") - ((".*cucumber.*") "\n") - ((".*license_finder.*") "\n") - ((".*rake.*") "gem 'rake'\n") - ((".*relish.*") "\n")) - (substitute* "aruba.gemspec" - (("spec\\.add\\_runtime\\_dependency 'cucumber'.*") - "spec.add_runtime_dependency 'cucumber'")) - #t)) - (add-before 'check 'set-home - (lambda _ (setenv "HOME" "/tmp") #t))))) + (list + ;; XXX: Only run the "spec" target and not the "cucumber" one, as it is + ;; slow and has multiple unexplained test failures. + #:test-target "spec" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + ;; This test file relies on a dynamically generated script; + ;; patch its #!/bin/bash shebang. + (substitute* "spec/aruba/api/commands_spec.rb" + (("/bin/bash") + (which "bash"))))) + (add-before 'check 'relax-requirements + ;; Many development requirements are not actually needed. + (lambda _ + (substitute* "aruba.gemspec" + (("\\[\">= 0.18.0\", \"< 0.22.0\"]") ;simplecov + "\">= 0.18.0\"") + ((".*appraisal.*") "") + ((".*pry.*") "") + ((".*kramdown.*") "") + ((".*rubocop.*") "") + ((".*yard-junk.*") "")) + (substitute* "Rakefile" + ((".*require \"rubocop/rake_task\".*") "") + ((".*require \"yard-junk/rake\".*") "") + ((".*RuboCop::RakeTask.new.*") "") + ((".*YardJunk::Rake.define_task.*") "")))) + ;; The tests rely on the Gem being installed, so move the check + ;; phase after the install phase. + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'set-GEM_PATH + (lambda _ + (setenv "GEM_PATH" (string-append + (getenv "GEM_PATH") ":" + #$output "/lib/ruby/vendor_ruby")))) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp")))))) (native-inputs - (list bundler ruby-rspec ruby-fuubar ruby-simplecov)) + (list ruby-rake-manifest + ruby-rspec + ruby-simplecov)) (propagated-inputs - (list ruby-childprocess + (list bundler + ruby-childprocess ruby-contracts ruby-cucumber - ruby-ffi ruby-rspec-expectations - ruby-thor - ruby-yard)) + ruby-thor)) (synopsis "Test command-line applications with Cucumber, RSpec or Minitest") (description "Aruba is an extension for Cucumber, RSpec and Minitest for testing