Update `eldev--global-cache-url-retrieve-synchronously' for changes in commit 6459ae9, otherwise packages from custom remote package archives were effectively uninstallable (issue #32).

Author: doublep

eldev.el

@@ -1657,8 +1657,11 @@ Since 0.2."
                                  ;; somehow includes a slash.
                                  (when (string-match-p (rx bos (1+ (any "a-zA-Z0-9" "-" ".+_@")) eos) filename)
                                    (dolist (known eldev--known-package-archives)
-                                     (when (string= archive-url (cdr (nth 1 known)))
-                                       (throw 'dir (symbol-name (car known)))))
+                                     (let ((known-archive-url (cdr (nth 1 known))))
+                                       ;; Because of stable/unstable archive, URL is, in
+                                       ;; fact, not necessarily an URL.
+                                       (when (and (stringp known-archive-url) (string= archive-url known-archive-url))
+                                         (throw 'dir (symbol-name (car known))))))
                                    ;; Contents of other archives also gets cached, but
                                    ;; with encoded URL as directory name in case different
                                    ;; projects use the same archive under different names

test/README

@@ -28,6 +28,11 @@ package-archive-*/
     makes results more predictable, because real packages in real
     archives could change.
 
+org-pseudoarchive/
+
+    Archive emulating Org snapshot archive, used to test that Eldev
+    knows how to install more recent versions of built-in packages.
+
 dependency-*/
 
     Test "projects" also available from the local test archives above.

test/integration/misc.el

@@ -31,5 +31,21 @@
       (should (string-match-p (rx "version 999.999 is required") stderr))
       (should (= exit-code 1)))))
 
+;; https://github.com/doublep/eldev/issues/32
+;;
+;; Eldev would fail to provide Org snapshot to a project that depends on Org version newer
+;; than what is built into Emacs, even if appropriate package archive was configured.  Was
+;; triggered by the bug in `eldev--global-cache-url-retrieve-synchronously'.
+(ert-deftest eldev-issue-32 ()
+  (let ((eldev--test-project "issue-32-project"))
+    (eldev--test-delete-cache)
+    ;; Test that it fails when no archive is configured.
+    (eldev--test-run nil ("prepare")
+      (should (= exit-code 1)))
+    (eldev--test-delete-cache)
+    ;; But with an appropriate archive it should work.
+    (eldev--test-run nil ("--setup" `(eldev-use-package-archive `("org" . "https://orgmode.org/elpa/")) "prepare")
+      (should (= exit-code 0)))))
+
 
 (provide 'test/integration/misc)

test/issue-32-project/issue-32-project.el

@@ -0,0 +1,13 @@
+;;; issue-32-project.el --- A project that needs Org newer than what is built into Emacs
+
+;; Version: 1.0
+;; Homepage: https://example.com/
+;; Package-Requires: ((org "20000000"))
+
+;;; Commentary:
+
+;;; Code:
+
+(provide 'issue-32-project)
+
+;;; issue-32-project.el ends here

test/misc.el

@@ -12,4 +12,23 @@
     (should (= exit-code 1))))
 
 
+;; https://github.com/doublep/eldev/issues/32
+;;
+;; Eldev would fail to provide Org snapshot to a project that depends on Org version newer
+;; than what is built into Emacs, even if appropriate package archive was configured.  It
+;; actually worked locally (bug in our `eldev--global-cache-url-retrieve-synchronously',
+;; was triggered only for remote URLs), see corresponding integration tests.  This one is
+;; added for completeness, to catch potential errors in the future.
+(ert-deftest eldev-issue-32-local ()
+  (let ((eldev--test-project "issue-32-project"))
+    (eldev--test-delete-cache)
+    ;; Test that it fails when no archive is configured.
+    (eldev--test-run nil ("prepare")
+      (should (= exit-code 1)))
+    (eldev--test-delete-cache)
+    ;; But with an appropriate archive it should work.
+    (eldev--test-run nil ("--setup" `(eldev-use-package-archive `("org-pseudoarchive" . ,(expand-file-name "../org-pseudoarchive"))) "prepare")
+      (should (= exit-code 0)))))
+
+
 (provide 'test/integration/misc)

test/org-pseudoarchive/archive-contents

@@ -0,0 +1,2 @@
+(1
+ (org . [(99999999 9999) nil "Fake of an Org snapshot" single nil]))

test/org-pseudoarchive/org-99999999.9999.el

@@ -0,0 +1,9 @@
+;;; org.el --- Fake of an Org snapshot
+
+;; Version: 99999999.9999
+
+(defvar org-version "99999999.9999")
+
+(provide 'org)
+
+;;; org.el ends here