.github/workflows/test.yml

@@ -18,21 +18,18 @@ jobs:
       matrix:
         emacs_version:
           - 27.2
-          - 27.1
+          # - 27.1
           - 26.3
-          - 26.2
-          - 26.1
+          # - 26.2
+          # - 26.1
           - 25.3
-          - 25.2
-          - 25.1
+          # - 25.2
+          # - 25.1
           - 24.5
           - 24.4
           - snapshot
     env:
-      # We only generate a coverage report for one Emacs version
-      # (generally the latest release version) in order to avoid
-      # duplicate reports.
-      coveralls_emacs_version: 27.2
+      coveralls_skip_versions: "" # Empty list
     steps:
     - name: Set up Emacs
       uses: purcell/setup-emacs@master
@@ -57,9 +54,20 @@ jobs:
         eldev -p -S '(load-file "./Eldev-flx-ido")' -dtT test
 
     - name: Run the test suite in source mode (for undercover)
-      if: ${{ matrix.emacs_version == env.coveralls_emacs_version }}
+      if: ${{ ! contains(env.coveralls_skip_versions, matrix.emacs_version) }}
       env:
-        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        COVERALLS_FLAG_NAME: Emacs ${{ matrix.emacs_version }}
+        COVERALLS_PARALLEL: 1
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         eldev -s -dtT test
         eldev -s -S '(load-file "./Eldev-flx-ido")' -dtT test
+
+  finalize:
+    runs-on: ubuntu-latest
+    if: always()
+    needs: test
+    steps:
+    - name: Finalize Coveralls
+      run: |
+        curl "https://coveralls.io/webhook?repo_name=$GITHUB_REPOSITORY&repo_token=${{ secrets.GITHUB_TOKEN }}" -d "payload[build_num]=$GITHUB_RUN_NUMBER&payload[status]=done"

Eldev

@@ -5,13 +5,13 @@
 (eldev-use-package-archive 'gnu)
 (eldev-use-package-archive 'melpa-unstable)
 
-(setq eldev-project-main-file "ido-completing-read+.el")
-(setq eldev-main-fileset '("ido-completing-read+.el" "ido-ubiquitous.el"))
-
 (setq eldev-test-framework 'buttercup)
 
 (eldev-add-extra-dependencies 'test 'flx-ido)
-(eldev-add-extra-dependencies 'test 'with-simulated-input)
+(eldev-add-extra-dependencies
+ 'test
+ '(:package with-simulated-input
+            :version  "3.0"))
 (eldev-add-extra-dependencies 'test 's)
 
 ;; Tell checkdoc not to demand two spaces after a period.

README.md

@@ -2,8 +2,7 @@
 
 [![MELPA Stable](https://stable.melpa.org/packages/ido-completing-read+-badge.svg)](https://stable.melpa.org/#/ido-completing-read%2B)
 [![Join the chat at https://gitter.im/DarwinAwardWinner/ido-ubiquitous](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/DarwinAwardWinner/ido-ubiquitous?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/DarwinAwardWinner/ido-completing-read-plus.svg?branch=master)](https://travis-ci.org/DarwinAwardWinner/ido-completing-read-plus)
-[![Coverage Status](https://coveralls.io/repos/github/DarwinAwardWinner/ido-completing-read-plus/badge.svg?branch=master)](https://coveralls.io/github/DarwinAwardWinner/ido-completing-read-plus?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/DarwinAwardWinner/ido-completing-read-plus/badge.svg?branch=main)](https://coveralls.io/github/DarwinAwardWinner/ido-completing-read-plus?branch=main)
 
 This package replaces stock emacs completion with ido completion
 wherever it is possible to do so without breaking things (i.e. what
@@ -236,15 +235,15 @@ You can see the bug reports about weird warnings
 
 ## What is the "bleeding-edge" branch? ##
 
-All users should just use the master branch, or better yet, install
-from MELPA. The bleeding-edge branch is where I test experimental and
+All users should just use the main branch, or better yet, install from
+MELPA. The bleeding-edge branch is where I test experimental and
 unfinished features. Because ido-completing-read+ hooks deeply into
 the bowels of Emacs, a bug in ido-completing-read+ could easily freeze
 or crash Emacs entirely. Additionally, some bug only show up when
 ido-completing-read+ is installed and compiled as a package. So I test
 every new feature myself for some time on this branch before pushing
-to the master branch. If you report a bug, I might develop a fix for
-it on the bleeding edge branch and ask then you to try this branch.
+to the main branch. If you report a bug, I might develop a fix for it
+on the bleeding edge branch and ask then you to try this branch.
 Otherwise, normal users don't need to think about this branch.
 
 ## Running the tests

ido-ubiquitous.el

@@ -1,84 +0,0 @@
-;;; ido-ubiquitous.el --- Use ido (nearly) everywhere. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2011-2017 Ryan C. Thompson
-
-;; Author: Ryan C. Thompson
-;; URL: https://github.com/DarwinAwardWinner/ido-ubiquitous
-;; Version: 4.14
-;; Created: 2011-09-01
-;; Keywords: convenience, completion, ido
-;; EmacsWiki: InteractivelyDoThings
-;; Package-Requires: ((ido-completing-read+ "4.14"))
-;; Filename: ido-ubiquitous.el
-
-;; This file is NOT part of GNU Emacs.
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-
-;; Previously a separate package, ido-ubiquitous has now been subsumed
-;; into ido-completing-read+. You should update your config to install that instead.
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or (at
-;; your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(defconst ido-ubiquitous-version "4.14"
-  "Currently running version of ido-ubiquitous.
-
-Note that when you update ido-ubiquitous, this variable may not
-be updated until you restart Emacs.")
-
-(require 'ido-completing-read+)
-
-(display-warning 'ido-ubiquitous "The ido-ubiquitous package is now redundant. All functionality, including ido-ubiquitous-mode, has been merged into the ido-completing-read+ package. You should replace ido-ubiquitous with ido-completing-read+ in your Emacs config. For more information, see:
-https://github.com/DarwinAwardWinner/ido-ubiquitous#version-40-changes")
-
-(define-obsolete-function-alias 'completing-read-ido-ubiquitous 'ido-completing-read+
-  "ido-completing-read+ 4.0")
-(define-obsolete-function-alias 'ido-ubiquitous-update-overrides 'ido-cr+-update-disable-list
-  "ido-completing-read+ 4.0")
-(define-obsolete-function-alias 'ido-ubiquitous--maybe-update-overrides 'ido-cr+-maybe-update-disable-list
-  "ido-completing-read+ 4.0")
-(define-obsolete-variable-alias 'ido-ubiquitous-auto-update-overrides 'ido-cr+-auto-update-disable-list
-  "ido-completing-read+ 4.0")
-
-(make-obsolete-variable
- 'ido-ubiquitous-default-state
- "For the new variables to control which commands have ido completion, see `ido-cr+-disable-list' and `ido-cr+-allow-list'. For information on what happened to \"old-style\" default selection, See the FAQ."
- "ido-completing-read+ 4.0")
-(make-obsolete-variable
- 'ido-ubiquitous-command-overrides
- "For the new variables to control which commands have ido completion, see `ido-cr+-disable-list' and `ido-cr+-allow-list'. For information on what happened to \"old-style\" default selection, See the FAQ."
- "ido-completing-read+ 4.0")
-(make-obsolete-variable
- 'ido-ubiquitous-function-overrides
- "For the new variables to control which commands have ido completion, see `ido-cr+-disable-list' and `ido-cr+-allow-list'. For information on what happened to \"old-style\" default selection, See the FAQ."
- "ido-completing-read+ 4.0")
-(make-obsolete-variable
- 'ido-ubiquitous-allow-on-functional-collection
- "Ido-cr+ now works with most dynamic completion tables (i.e. \"functional collections\"), so this variable is no longer necessary. If a specific command uses a dynamic completion table that conflicts with ido-cr+, add it to `ido-cr+-disable-list' instead."
- "ido-completing-read+ 4.0")
-
-(provide 'ido-ubiquitous)
-
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-;;; ido-ubiquitous.el ends here

tests-with-flx-ido/test-ido-completing-read+-with-flx-ido.el

@@ -226,7 +226,7 @@ also accept a quoted list for the sake of convenience."
 
         (it "should not exit with a unique match if new matches are dynamically added"
           (expect
-           (with-simulated-input '("hell TAB -ld RET")
+           (with-simulated-input ("hell TAB -ld RET")
              (ido-completing-read+ "Say something: " my-dynamic-collection))
            :to-equal
            "hello-world")
@@ -235,7 +235,7 @@ also accept a quoted list for the sake of convenience."
 
         (it "should exit with a match that is still unique after dynamic updating"
           (expect
-           (with-simulated-input '("helic TAB")
+           (with-simulated-input ("helic TAB")
              (ido-completing-read+ "Say something: " my-dynamic-collection))
            :to-equal
            "helicopter")

tests/test-ido-completing-read+.el

@@ -208,16 +208,16 @@ also accept a quoted list for the sake of convenience."
       (let ((eldef-was-showing nil))
         ;; No REQUIRE-MATCH, so electric default should not show
         (with-simulated-input
-            '("blu DEL DEL DEL"
-              (setq eldef-was-showing minibuf-eldef-showing-default-in-prompt)
-              "RET")
+            ("blu DEL DEL DEL"
+             (setq eldef-was-showing minibuf-eldef-showing-default-in-prompt)
+             "RET")
           (ido-completing-read+ "Prompt (default green): " '("blue" "yellow" "green")))
         (expect eldef-was-showing :not :to-be-truthy)
         ;; With REQUIRE-MATCH, so electric default should show
         (with-simulated-input
-            '("blu DEL DEL DEL"
-              (setq eldef-was-showing minibuf-eldef-showing-default-in-prompt)
-              "RET")
+            ("blu DEL DEL DEL"
+             (setq eldef-was-showing minibuf-eldef-showing-default-in-prompt)
+             "RET")
           (ido-completing-read+ "Prompt (default green): " '("blue" "yellow" "green") nil t))
         (expect eldef-was-showing :to-be-truthy)))
 
@@ -511,9 +511,9 @@ also accept a quoted list for the sake of convenience."
       (it "should do a dynamic update when idle"
         (expect
          (with-simulated-input
-             '("h"
-               (wsi-simulate-idle-time (1+ ido-cr+-dynamic-update-idle-time))
-               "-ld RET")
+             ("h"
+              (wsi-simulate-idle-time (1+ ido-cr+-dynamic-update-idle-time))
+              "-ld RET")
            (ido-completing-read+ "Say something: " my-dynamic-collection))
          :to-equal
          "hello-world")
@@ -531,7 +531,7 @@ also accept a quoted list for the sake of convenience."
 
       (it "should not exit with a unique match if new matches are dynamically added"
         (expect
-         (with-simulated-input '("hell TAB -ld RET")
+         (with-simulated-input ("hell TAB -ld RET")
            (ido-completing-read+ "Say something: " my-dynamic-collection))
          :to-equal
          "hello-world")
@@ -540,7 +540,7 @@ also accept a quoted list for the sake of convenience."
 
       (it "should exit with a match that is still unique after dynamic updating"
         (expect
-         (with-simulated-input '("helic TAB")
+         (with-simulated-input ("helic TAB")
            (ido-completing-read+ "Say something: " my-dynamic-collection))
          :to-equal
          "helicopter")
@@ -560,7 +560,7 @@ also accept a quoted list for the sake of convenience."
               ;; was not being debugged.
               (debug-on-error nil))
           (expect
-           (with-simulated-input '("hell TAB RET")
+           (with-simulated-input ("hell TAB RET")
              (ido-completing-read+ "Say something: " collection))
            :to-equal
            "hello")))
@@ -984,26 +984,26 @@ also accept a quoted list for the sake of convenience."
        (progn
          (ido-ubiquitous-mode 1)
          (with-temp-info-buffer
-           (with-simulated-input
-               '((ido-next-match)
-                 (wsi-simulate-idle-time 5)
-                 (ido-next-match)
-                 (wsi-simulate-idle-time 5)
-                 (ido-next-match)
-                 (wsi-simulate-idle-time 5)
-                 (ido-next-match)
-                 (wsi-simulate-idle-time 5)
-                 "RET")
-             (command-execute 'Info-menu))))
+          (with-simulated-input
+              '((ido-next-match)
+                (wsi-simulate-idle-time 5)
+                (ido-next-match)
+                (wsi-simulate-idle-time 5)
+                (ido-next-match)
+                (wsi-simulate-idle-time 5)
+                (ido-next-match)
+                (wsi-simulate-idle-time 5)
+                "RET")
+            (command-execute 'Info-menu))))
        :not :to-throw))
 
     (it "issue #153: should preserve the selected item when doing a deferred dynamic update"
       (expect
        (with-simulated-input
-           '("Emacs"
-             (ido-next-match)
-             (wsi-simulate-idle-time 5)
-             "RET")
+           ("Emacs"
+            (ido-next-match)
+            (wsi-simulate-idle-time 5)
+            "RET")
          (ido-completing-read+
           "Choose: "
           (collection-as-function '("Emacs" "Emacs A" "Emacs B" "Emacs C"))))