From patchwork Wed Jun 7 23:54:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 50760 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 BF69D27BBE9; Thu, 8 Jun 2023 00:56:28 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 715B027BBE2 for ; Thu, 8 Jun 2023 00:56:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q730W-0000vC-EJ; Wed, 07 Jun 2023 19:56: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 1q730U-0000uU-KO for guix-patches@gnu.org; Wed, 07 Jun 2023 19:56:02 -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 1q730U-0001qM-CO for guix-patches@gnu.org; Wed, 07 Jun 2023 19:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q730U-0004H2-8W; Wed, 07 Jun 2023 19:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63951] [PATCH 1/2] gnu: Add ruby-irb@1.1.1. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, guix-patches@gnu.org Resent-Date: Wed, 07 Jun 2023 23:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63951 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63951@debbugs.gnu.org Cc: gemmaro , Christopher Baines X-Debbugs-Original-Xcc: Christopher Baines Received: via spool by 63951-submit@debbugs.gnu.org id=B63951.168618210716344 (code B ref 63951); Wed, 07 Jun 2023 23:56:02 +0000 Received: (at 63951) by debbugs.gnu.org; 7 Jun 2023 23:55:07 +0000 Received: from localhost ([127.0.0.1]:55193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q72za-0004FW-QA for submit@debbugs.gnu.org; Wed, 07 Jun 2023 19:55:07 -0400 Received: from mail-pl1-f178.google.com ([209.85.214.178]:50276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q72zY-0004Eu-05 for 63951@debbugs.gnu.org; Wed, 07 Jun 2023 19:55:05 -0400 Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1b00ffb4186so46510535ad.0 for <63951@debbugs.gnu.org>; Wed, 07 Jun 2023 16:55:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686182098; x=1688774098; 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=u4rX6HdgRJBKcruAJRhO6OqvgWh2OZGWkRkLoKy2Nek=; b=Cdr6F2cmErhG1j1yuMcWiWLZWjrCSILFHpa7fjiy7jKvcOU9vh/20TcvB2qwIp6Zpq i5LBc6+XDOtV1gv9SWRFXlrsry1FxlKqlclG2EoJ2QZDdWdYGL12S3NoUpC3/n3U8fZP u2mcV2ASLtlO9On5O5d+miD69NLMQfTSLEeXItrVWv1/x3AJmCdPBjZuPA4enc8OEJgL RPYHberruhHd0r2fopx98z5jpjZRZRYduxmbSNVSoaXcb9apCZS22ZH+hMj6RVhxn+rk xa2jtkR5xk37kRrEVGFcoXNXDRolQ58H5sjn9qwGrJVTi+q0DBj3n692z3IG57akRcIS lQFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686182098; x=1688774098; 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=u4rX6HdgRJBKcruAJRhO6OqvgWh2OZGWkRkLoKy2Nek=; b=h5zHJ4qkyLKYYeF+Wae1WZYeHeOBAsdMsL2sSw6e+d1dOc89MCyrrUJEszGtejrdtj T+LwCYr+nN3LpZHmZ29vgSWJZmXTOcpTMZgdv6VPIjSLgfQ8jTrcYlFaGlwtUkXB9Epw qoFSsMjqYsIlHpdHhPwwsibGXuycAfVuBU4DWZWxYmotLPKDpQGU68nh4SwKfsUYhheW fq1ntEGQqWjM3XWTK6V+7XEn2TQdL6lP0qUP10Z8drUpDfKMScthkurtHviKRCm/2ziL V5dBooahx8udxw0qg7nT2+yVhmw1mIDzvR21hdVu+mp5tnG9ouJaCuMMqe0MbE+bmFJ8 nq7Q== X-Gm-Message-State: AC+VfDxWasyaCrKFRO3g+Zx3mp+359oTabHOPeO1U9ux6fJAcpOslvqX J5XVcQrf5LRSwPvhIFByzyKhfcwSVYR5/w== X-Google-Smtp-Source: ACHHUZ7S/vBgPYzYDENHeNHmDoz16hzupldlwrOtOXbyPJvLd5QKLTy0HmTvTy/wFVgoUaQk5H8pXw== X-Received: by 2002:a17:903:493:b0:1b2:4df5:c00e with SMTP id jj19-20020a170903049300b001b24df5c00emr2271480plb.35.1686182097971; Wed, 07 Jun 2023 16:54:57 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 28-20020a17090a1a5c00b0024e4f169931sm2037779pjl.2.2023.06.07.16.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 16:54:57 -0700 (PDT) From: gemmaro Date: Thu, 8 Jun 2023 08:54:49 +0900 Message-Id: <20ba69b64ccb97614bea89b32c16086f6164b7b3.1686181717.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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-irb-1.1.1): New variable. --- gnu/packages/ruby.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index eb84367d151..c5b94ffd15d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -561,6 +561,17 @@ (define-public ruby-irb (home-page "https://github.com/ruby/irb") (license license:bsd-2))) +(define-public ruby-irb-1.1.1 + (package + (inherit ruby-irb) + (version "1.1.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "irb" version)) + (sha256 + (base32 + "0h605w798s2bg9wg681ynvvzgdz1yy69gh387bl0khw9ll7wkn8v")))))) + (define-public ruby-iruby (package (name "ruby-iruby") From patchwork Wed Jun 7 23:54:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 50759 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 7A5A927BBE9; Thu, 8 Jun 2023 00:56:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 3C55527BBE2 for ; Thu, 8 Jun 2023 00:56:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q730W-0000vH-Uq; Wed, 07 Jun 2023 19:56: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 1q730V-0000v3-2K for guix-patches@gnu.org; Wed, 07 Jun 2023 19:56: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 1q730U-0001qT-PI for guix-patches@gnu.org; Wed, 07 Jun 2023 19:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q730U-0004HA-Lx; Wed, 07 Jun 2023 19:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63951] [PATCH 2/2] gnu: ruby-atoulme-saikuro: Fix tests. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, guix-patches@gnu.org Resent-Date: Wed, 07 Jun 2023 23:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63951 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63951@debbugs.gnu.org Cc: gemmaro , Christopher Baines X-Debbugs-Original-Xcc: Christopher Baines Received: via spool by 63951-submit@debbugs.gnu.org id=B63951.168618210816357 (code B ref 63951); Wed, 07 Jun 2023 23:56:02 +0000 Received: (at 63951) by debbugs.gnu.org; 7 Jun 2023 23:55:08 +0000 Received: from localhost ([127.0.0.1]:55195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q72zc-0004Fl-5c for submit@debbugs.gnu.org; Wed, 07 Jun 2023 19:55:08 -0400 Received: from mail-pj1-f50.google.com ([209.85.216.50]:61608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q72zZ-0004Ex-KA for 63951@debbugs.gnu.org; Wed, 07 Jun 2023 19:55:07 -0400 Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-25632c99eecso11322a91.2 for <63951@debbugs.gnu.org>; Wed, 07 Jun 2023 16:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686182100; x=1688774100; 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=hcGDXJEd4fIB1KCQrDXfP2SbWqEH9oHDulFgHiG2cqM=; b=nz9tHV9M6Ce2gY6eyFCuftRw/kNFiPvlQAY+5vaCXgcK2E/9lrVrE7vx9U1hI6mtUT Of644Jtg43d1dYrP3+aTtdDTvgyrlQOh6UQjzwHfJirYErf8Z4kXeYim5mQXvMeXIYan eGIiuoRVph29bp3xLuj6fwP4uHV5r6gtpANrQ4PFkTmBBjTQeZPrIE/aY+GFvX1RUwhk YqDBjM2AWdOkx4aNBpl/PMbRZJauuTDjFIjZ84TiRgLez475qg6oPgF9bde0x1toCagp K0KNoobMTkG4zDD0Fl3tIJM4pPtIyXwAS0R5e5OJ1NQEBrra6YqBtnYIZADZIqikIVa4 X6gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686182100; x=1688774100; 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=hcGDXJEd4fIB1KCQrDXfP2SbWqEH9oHDulFgHiG2cqM=; b=SU0sIPJeLZfYfvxHGwUcK91BCZkzEevy3lgLCCWRZF7t+Zb4xILNpiP+Kxf8RWycaK lKZtjRkNO8fVqHOgn22J34NswHXKnaQw03GRzUfT/kHgJWQW/MJYypAbub61pRHLJ2GW 2PCgXjDOqqzIFKm4b2qD4zVTwui+x/liQJJUJAMvqE6Em4TCIutIR33L3UOaw6dAInlg qxXn4zXV6sFV2I4IJ3dn6Tp26VqLy6jLrLh1Veofal7qcMr4GSC9esnIt4dORrb8NKw7 rRLhXRsrMCEHlTijg/HmM+1C7FdOGGPNtFW8YWyYKTrFWIK3VCFrluayf9Bk/tGGvhy5 NIYQ== X-Gm-Message-State: AC+VfDzn7WacP3fbJKvV6GYhdHup5Q8UOj0tBH7FAg2a4mZaZhJxwowS 8GQV+d8Rmhz4OuizZomw4qUeVNTjJSlPgw== X-Google-Smtp-Source: ACHHUZ5CYgzDPtI3Jnf1T9HUZ63ztuo1n29XxugiHSvK/XNkuERrjWveA4e3JJiFGMSal7vQmcr5tA== X-Received: by 2002:a17:90b:3006:b0:259:b2c3:2ce9 with SMTP id hg6-20020a17090b300600b00259b2c32ce9mr2616851pjb.37.1686182099809; Wed, 07 Jun 2023 16:54:59 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 28-20020a17090a1a5c00b0024e4f169931sm2037779pjl.2.2023.06.07.16.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 16:54:59 -0700 (PDT) From: gemmaro Date: Thu, 8 Jun 2023 08:54:50 +0900 Message-Id: <4ae36dbf9d05d5b605fd93f3cc0a3f6988e08706.1686181717.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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-atoulme-saikuro) [propagated-inputs]: Add ruby-irb-1.1.1 and ruby-e2mmap. [arguments]: Enable tests. --- gnu/packages/ruby.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c5b94ffd15d..37b16ae2fdc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1305,9 +1305,27 @@ (define-public ruby-atoulme-saikuro (base32 "0kvd2nsxffbza61d3q4j94wrbnbv50r1zy3a7q26f6k706fw1f19")))) (build-system ruby-build-system) - ;; FIXME: There are no unit tests. The tests are demonstrations of the - ;; "saikuro" tool. - (arguments `(#:tests? #f)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-module-resolution + (lambda _ + (substitute* "lib/saikuro.rb" + ;; irb 1.2.0 or later doesn't have RubyToken + (("require 'irb/ruby-lex'") + "require 'rubygems'\ngem 'irb', '=1.1.1'\nrequire 'irb/ruby-lex'")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (saikuro (string-append out "/bin/saikuro"))) + (setenv "GEM_PATH" (string-append + (getenv "GEM_PATH") ":" + #$output "/lib/ruby/vendor_ruby")) + (invoke saikuro "--cyclo" "--token" "--input_directory" "tests"))))))) + (propagated-inputs (list ruby-irb-1.1.1 + ruby-e2mmap)) ;required by rubygems (synopsis "Cyclomatic complexity analyzer") (description "Saikuro is a Ruby cyclomatic complexity analyzer. When given Ruby source code Saikuro will generate a report listing the cyclomatic