GNU bug report logs - #74201
[PATCH] gnu: ruby-ethon: Enable tests.

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 4 Nov 2024 07:15:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Nov 04 02:15:22 2024
Received: from localhost ([127.0.0.1]:37872 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t7rJ4-00087r-8M
	for submit <at> debbugs.gnu.org; Mon, 04 Nov 2024 02:15:22 -0500
Received: from lists.gnu.org ([209.51.188.17]:59802)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <gemmaro.dev@HIDDEN>) id 1t7rJ2-00087l-A3
 for submit <at> debbugs.gnu.org; Mon, 04 Nov 2024 02:15:21 -0500
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 <gemmaro.dev@HIDDEN>)
 id 1t7rJ1-00016i-Ql
 for guix-patches@HIDDEN; Mon, 04 Nov 2024 02:15:20 -0500
Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <gemmaro.dev@HIDDEN>)
 id 1t7rJ0-0004TG-1E
 for guix-patches@HIDDEN; Mon, 04 Nov 2024 02:15:19 -0500
Received: by mail-pf1-x431.google.com with SMTP id
 d2e1a72fcca58-71ec997ad06so3118602b3a.3
 for <guix-patches@HIDDEN>; Sun, 03 Nov 2024 23:15:16 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1730704515; x=1731309315; darn=gnu.org;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=2BrKhYrIqnyeKh8BqCe4HOY8zzYeXfBs1cRd+tvBPDw=;
 b=cTtYq8LXm2JKOSyISxbq/2IQ2lz3ahi9kejuKpGCgWjPCl+Zli5qZFZGwHj6TzjXwF
 AemDrGjC/Md5UHat6kgWl4Pl42OC6gNrd4+PwqlE/yVbISQ4L6Mw/g1of2xN3XI3D/MR
 pdsfTZqAw84zsl2jyCMeiTDrvwPuOsamwJ0LHg3yzUTgSXkXvENAYX1G4DTD5DkZ9zin
 FgIgH1ENarxJzIocL+Z26h8n7liSRIo6eSbSk/WHhVZqYiS5UrF9bQWvZZDx6Xj4qBHk
 dAOWVOt1MKj97R87WptZ1StjT/eOa/mR29QvD41vUs3oOm/gFqfXEArO/kUGcHmTgxCd
 9cYw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1730704515; x=1731309315;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=2BrKhYrIqnyeKh8BqCe4HOY8zzYeXfBs1cRd+tvBPDw=;
 b=jEL3aPay6TKelB+NhsKBLfmvfFGfpJtKG9AmFemwLQKASI61VKH3lWecdNzTe2GC4D
 asFz7fTS8ZwdO26fQ2Gzpxev+9NWpZNmJcRx0V20E9YmkeNNy1GKD9o282u0KrghBzXE
 nSfxDDqxE7VclCBvdPj+pVMzXhqF6fe+yuKgqbYS7wnYhPgMgXXBw1SgLH/r/WqLFJfh
 18ddhzh0rjl+Lwi+qQ7G+7gi0wxkoCvxx95T/V8x/6TVboQidiFbjOz3DrIC2sTC/+nF
 mQJU1LxFJjDNWn8oxm16NlAaNF9O3zuZTeLKuDLutkB94koodKy8myvQkYX/qKC4uqfv
 2LAg==
X-Gm-Message-State: AOJu0Yw2u9rELZBR+PvANRyX+Rj9mX063ohAxxtC+UOb73d2jCgGng2o
 h6x4Aiancli6IQhFdvAWsN6equJ+nF43L/8lDzOPJRPHOAde7QAWmYtTxi1R
X-Google-Smtp-Source: AGHT+IGZWAS+plxUDCnYdb+Pt6ge/jL9iKo8PHDP1hAiHIRkpqTMH2OoJNCeOBUGQD34Y6otf/vgdA==
X-Received: by 2002:a05:6a00:331b:b0:721:19bc:4bf4 with SMTP id
 d2e1a72fcca58-72119bc986cmr6719007b3a.23.1730704515478; 
 Sun, 03 Nov 2024 23:15:15 -0800 (PST)
Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3])
 by smtp.gmail.com with ESMTPSA id
 d2e1a72fcca58-720bc31680fsm6762726b3a.207.2024.11.03.23.15.13
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sun, 03 Nov 2024 23:15:14 -0800 (PST)
From: gemmaro <gemmaro.dev@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: ruby-ethon: Enable tests.
Date: Mon,  4 Nov 2024 16:14:28 +0900
Message-ID: <9e9174d6e714f9ce79d8e725130e4ad669b65fd4.1730704468.git.gemmaro.dev@HIDDEN>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
X-Debbugs-Cc: Christopher Baines <guix@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::431;
 envelope-from=gemmaro.dev@HIDDEN; helo=mail-pf1-x431.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
Cc: gemmaro <gemmaro.dev@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

* gnu/packages/ruby.scm (ruby-ethon): Enable tests.
[source]: Switch to use the Git repository, which includes test files.
[arguments]<#:tests?>: Remove it to enable tests by default.
<#:phases>: Add a phase to relax the mime-types gem version constraint.
Add a phase to remove Bundler setup, and replace the check phase to directly
run RSpec, in order to avoid perf dependencies.
Because of this, #:test-target is not needed to be "spec".
[native-inputs]: Add test dependencies.

Change-Id: Ie46d682ccb5e9b5048a109cd8587e2178c34f8ec
---
 gnu/packages/ruby.scm | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 12c439b3a9..3f0d32e8b5 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3082,22 +3082,44 @@ (define-public ruby-ethon
     (version "0.12.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (rubygems-uri "ethon" version))
+       (method git-fetch) ;for tests
+       (uri (git-reference
+             (url "https://github.com/typhoeus/ethon")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"))))
+         "0f29h4slja66kkc675rk4nnsxzhlgb143whx4ffx250w36ih0aq3"))))
     (build-system ruby-build-system)
     (arguments
      (list
-      #:tests? #f  ; no included tests
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'libcurl-use-absolute-reference
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "lib/ethon/curls/settings.rb"
                 (("libcurl', 'libcurl\\.so\\.4")
-                 (search-input-file inputs "/lib/libcurl.so"))))))))
+                 (search-input-file inputs "/lib/libcurl.so")))))
+          (add-after 'extract-gemspec 'remove-MIME-types-version-constraint
+            (lambda _
+              (substitute* "Gemfile"
+                (("(gem \"mime-types\").*" _ gem)
+                 gem))))
+
+          ;; Tell Bundler not to request perf dependencies
+          (add-after 'extract-gemspec 'remove-Bundler-setup
+            (lambda _
+              (substitute* "spec/spec_helper.rb"
+                (("Bundler.setup")
+                 ""))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (for-each (lambda (file)
+                            (invoke "ruby" "-Ispec" file))
+                          (find-files "spec" "_spec\\.rb$"))))))))
+    (native-inputs (list ruby-rspec ruby-sinatra ruby-mustermann
+                         ruby-mime-types ruby-webrick))
     (inputs
      (list curl))
     (propagated-inputs

base-commit: 547d97180471e90e404a948015f65431961aa273
-- 
2.46.0