From patchwork Thu May 11 20:17:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yovan Naumovski X-Patchwork-Id: 12950 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 B50D827BBF0; Thu, 11 May 2023 21:19:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 DBB5327BBEE for ; Thu, 11 May 2023 21:19:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxCki-0007f5-QN; Thu, 11 May 2023 16:19:04 -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 1pxCkh-0007dQ-KD for guix-patches@gnu.org; Thu, 11 May 2023 16:19:03 -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 1pxCkg-0006ka-Bk for guix-patches@gnu.org; Thu, 11 May 2023 16:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxCkg-0004Ii-7T for guix-patches@gnu.org; Thu, 11 May 2023 16:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63452] [PATCH 5/5] gnu: ruby-terraform: Update to 1.7.0. References: <20230511201429.8353-1-yovan@gorski.stream> In-Reply-To: <20230511201429.8353-1-yovan@gorski.stream> Resent-From: Yovan Naumovski Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2023 20:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63452 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63452@debbugs.gnu.org Cc: Yovan Naumovski Received: via spool by 63452-submit@debbugs.gnu.org id=B63452.168383628116441 (code B ref 63452); Thu, 11 May 2023 20:19:02 +0000 Received: (at 63452) by debbugs.gnu.org; 11 May 2023 20:18:01 +0000 Received: from localhost ([127.0.0.1]:53467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxCjh-0004H1-GM for submit@debbugs.gnu.org; Thu, 11 May 2023 16:18:01 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:39449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxCjf-0004Gi-Hi for 63452@debbugs.gnu.org; Thu, 11 May 2023 16:18:00 -0400 Received: (Authenticated sender: yovan@gorski.stream) by mail.gandi.net (Postfix) with ESMTPSA id BFE8460006; Thu, 11 May 2023 20:17:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gorski.stream; s=gm1; t=1683836273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=7xn/icFyylnEe7oqlafuzA0578EnHyM+W0LcztOkyvM=; b=pEwMlfZ3Lx8su4v+DyyRrfnRlyQ8FNv5GaE/isIxhDZbl63TaoZRdDCA0Daz/6HZMj2RYi lpLnc8Q04Xz5t9scai3eHMBfhJrHtmhnEAHS3TFiLTct6BdlJc/6Vh82QNtT9tuW3t+BKV Rek5wwczT/4ANM4RZGh/mwF9SJ7/6U4By5Zfl4is4BJ1Tjv1ew4kboUZ0xaSL1qHExR+Rg jFJ1cSKd0DP657IGxY+XHz9ThhJn5ISPt+cieklPUmWeKXEoCPaYfQX2yYK3amCn37kNso 2lZnFgGLUzIydC3iAjXSZ2B4I9zt3j9bq9fR8GNdq/qMdQLAd6TYU9V83r3ZCg== Date: Thu, 11 May 2023 23:17:49 +0300 Message-Id: <20230511201749.8687-1-yovan@gorski.stream> X-Mailer: git-send-email 2.39.2 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: , Reply-to: Yovan Naumovski X-ACL-Warn: , Yovan Naumovski via Guix-patches X-Patchwork-Original-From: Yovan Naumovski via Guix-patches via From: Yovan Naumovski 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-terraform): Update to 1.7.0. [source]: Use git-fetch. [arguments]: Enable tests. [native-inputs]: Add ruby-rspec, ruby-faker, ruby-simplecov. [propagated-inputs]: Add ruby-immutable-struct. --- gnu/packages/ruby.scm | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 26a4fea0d7..e0bc6e874b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7377,19 +7377,44 @@ (define-public ruby-faker (define-public ruby-terraform (package (name "ruby-terraform") - (version "0.22.0") + (version "1.7.0") (source (origin - (method url-fetch) - (uri (rubygems-uri "ruby-terraform" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/infrablocks/ruby_terraform") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "13zjkp71cd19j2ds2h9rqwcfr1zdg5nsh63p89l6qcsc9z39z324")))) + "18d1qkf2rbbvc2f0dxni85i2l2g8zn5kzh0v8zr1b86r1wjy6rvd")))) (build-system ruby-build-system) (arguments - '(#:tests? #f)) ; No included tests + (list + #:test-target "spec" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-bundler + (lambda _ + (substitute* "spec/spec_helper.rb" + (("require 'bundler/setup'") "")))) + (add-before 'check 'disable-falinig-tests + (lambda _ + (substitute* "spec/ruby_terraform/commands/plan_spec.rb" + (("it 'logs an error raised when running the command'") + "xit 'logs an error raised when running the command'") + (("it 'raises execution error when an error occurs running the command'") + "xit 'raises execution error when an error occurs running the command'")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec"))))))) + (native-inputs + (list ruby-rspec + ruby-faker + ruby-simplecov)) (propagated-inputs - (list ruby-lino)) + (list ruby-lino ruby-immutable-struct)) (synopsis "Ruby wrapper around the Terraform command line interface") (description "This package provides a Ruby wrapper around the Terraform command line