From 2245d4f7aa7eeaa65022404b19e471d558de09e2 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Mon, 18 Nov 2024 00:47:20 +0800 Subject: [PATCH 1/3] chore: Simplify naming for fixtures mini.emacs packages --- test/commands/config/run.sh | 2 +- test/commands/docker/run.sh | 2 +- test/commands/global/run.sh | 2 +- test/commands/install/run.sh | 2 +- test/commands/link/run.sh | 4 ++-- test/commands/local/run.sh | 4 ++-- test/fixtures/home/.emacs.d/Eask | 4 ++-- test/fixtures/{mini.emacs.pkg.1 => mini.pkg.1}/Eask | 6 +++--- test/fixtures/{mini.emacs.pkg.1 => mini.pkg.1}/RADME.md | 0 .../files/mini.emacs.pkg.1-1.el | 0 .../files/mini.emacs.pkg.1-2.el | 0 .../mini.emacs.pkg.1.el => mini.pkg.1/mini.pkg.1.el} | 8 ++++---- test/fixtures/{mini.emacs.pkg.2 => mini.pkg.2}/Eask | 6 +++--- test/fixtures/{mini.emacs.pkg.2 => mini.pkg.2}/RADME.md | 0 .../files/mini.emacs.pkg.2-1.el | 0 .../files/mini.emacs.pkg.2-2.el | 0 .../mini.emacs.pkg.2.el => mini.pkg.2/mini.pkg.2.el} | 8 ++++---- 17 files changed, 24 insertions(+), 24 deletions(-) rename test/fixtures/{mini.emacs.pkg.1 => mini.pkg.1}/Eask (86%) rename test/fixtures/{mini.emacs.pkg.1 => mini.pkg.1}/RADME.md (100%) rename test/fixtures/{mini.emacs.pkg.1 => mini.pkg.1}/files/mini.emacs.pkg.1-1.el (100%) rename test/fixtures/{mini.emacs.pkg.1 => mini.pkg.1}/files/mini.emacs.pkg.1-2.el (100%) rename test/fixtures/{mini.emacs.pkg.1/mini.emacs.pkg.1.el => mini.pkg.1/mini.pkg.1.el} (84%) rename test/fixtures/{mini.emacs.pkg.2 => mini.pkg.2}/Eask (83%) rename test/fixtures/{mini.emacs.pkg.2 => mini.pkg.2}/RADME.md (100%) rename test/fixtures/{mini.emacs.pkg.2 => mini.pkg.2}/files/mini.emacs.pkg.2-1.el (100%) rename test/fixtures/{mini.emacs.pkg.2 => mini.pkg.2}/files/mini.emacs.pkg.2-2.el (100%) rename test/fixtures/{mini.emacs.pkg.2/mini.emacs.pkg.2.el => mini.pkg.2/mini.pkg.2.el} (84%) diff --git a/test/commands/config/run.sh b/test/commands/config/run.sh index f7b5e08c..92fd3487 100644 --- a/test/commands/config/run.sh +++ b/test/commands/config/run.sh @@ -20,7 +20,7 @@ # Here we test all config (~/.emacs.d/) that the Emacser can be use daily! # # Notice, to make config commands work; we need a minimum configuration -# (mini.emacs.d), and place it under to the default Emacs directory! +# (home/.emacs.d), and place it under to the default Emacs directory! # set -e diff --git a/test/commands/docker/run.sh b/test/commands/docker/run.sh index 1412f504..a904ff8e 100644 --- a/test/commands/docker/run.sh +++ b/test/commands/docker/run.sh @@ -23,6 +23,6 @@ set -e # Naviate to the test package -cd "./test/fixtures/mini.emacs.pkg.1/" +cd "./test/fixtures/mini.pkg.1/" eask docker 27.1 info diff --git a/test/commands/global/run.sh b/test/commands/global/run.sh index 83014ece..be019a98 100644 --- a/test/commands/global/run.sh +++ b/test/commands/global/run.sh @@ -20,7 +20,7 @@ # Here we test all global (~/.eask/) that the Emacser can be use daily! # # Notice, to make config commands work; we need a minimum configuration -# (mini.emacs.d), and place it under to the default Emacs directory! +# (home/.emacs.d), and place it under to the default Emacs directory! # set -e diff --git a/test/commands/install/run.sh b/test/commands/install/run.sh index 78f91635..4f4af4a8 100644 --- a/test/commands/install/run.sh +++ b/test/commands/install/run.sh @@ -25,7 +25,7 @@ set -e echo "Test commands related to install, and uninstall" # Naviate to the test package -cd "./test/fixtures/mini.emacs.pkg.1/" +cd "./test/fixtures/mini.pkg.1/" echo "Install dependencies" eask install-deps diff --git a/test/commands/link/run.sh b/test/commands/link/run.sh index fe872d9a..57b4501d 100644 --- a/test/commands/link/run.sh +++ b/test/commands/link/run.sh @@ -26,6 +26,6 @@ set -e -eask link add "mini.emacs.pkg.1" "./test/fixtures/mini.emacs.pkg.1/" +eask link add "mini.pkg.1" "./test/fixtures/mini.pkg.1/" eask link list -eask link delete mini.emacs.pkg.1-0.0.1 +eask link delete mini.pkg.1-0.0.1 diff --git a/test/commands/local/run.sh b/test/commands/local/run.sh index 703ddf2f..c3c40bf2 100644 --- a/test/commands/local/run.sh +++ b/test/commands/local/run.sh @@ -27,7 +27,7 @@ set -e # Naviate to the test package -cd "./test/fixtures/mini.emacs.pkg.1/" +cd "./test/fixtures/mini.pkg.1/" echo "Testing local commands..." eask info @@ -73,7 +73,7 @@ eask run command mini-test-3 -- Extra arguments! eask run command --all # Exection -eask eval "(progn (require 'mini.emacs.pkg.1))" +eask eval "(progn (require 'mini.pkg.1))" # Generating eask generate autoloads diff --git a/test/fixtures/home/.emacs.d/Eask b/test/fixtures/home/.emacs.d/Eask index 98fc1cff..961eca06 100644 --- a/test/fixtures/home/.emacs.d/Eask +++ b/test/fixtures/home/.emacs.d/Eask @@ -1,8 +1,8 @@ -(package "mini.emacs.d" +(package ".emacs.d" "0.0.1" "Minimal test configuration") -(website-url "https://github.com/emacs-eask/mini.emacs.d") +(website-url "https://github.com/emacs-eask/cli/tree/master/test/fixtures/home/.emacs.d") (keywords "test") (depends-on "emacs" "26.1") diff --git a/test/fixtures/mini.emacs.pkg.1/Eask b/test/fixtures/mini.pkg.1/Eask similarity index 86% rename from test/fixtures/mini.emacs.pkg.1/Eask rename to test/fixtures/mini.pkg.1/Eask index c24c40ef..4ed76b64 100644 --- a/test/fixtures/mini.emacs.pkg.1/Eask +++ b/test/fixtures/mini.pkg.1/Eask @@ -1,11 +1,11 @@ -(package "mini.emacs.pkg.1" +(package "mini.pkg.1" "0.0.1" "Minimal test package") -(website-url "https://github.com/emacs-eask/mini.emacs.pkg.1") +(website-url "https://github.com/emacs-eask/cli/tree/master/test/fixtures/mini.pkg.1") (keywords "test") -(package-file "mini.emacs.pkg.1.el") +(package-file "mini.pkg.1.el") (files "files/*.el") diff --git a/test/fixtures/mini.emacs.pkg.1/RADME.md b/test/fixtures/mini.pkg.1/RADME.md similarity index 100% rename from test/fixtures/mini.emacs.pkg.1/RADME.md rename to test/fixtures/mini.pkg.1/RADME.md diff --git a/test/fixtures/mini.emacs.pkg.1/files/mini.emacs.pkg.1-1.el b/test/fixtures/mini.pkg.1/files/mini.emacs.pkg.1-1.el similarity index 100% rename from test/fixtures/mini.emacs.pkg.1/files/mini.emacs.pkg.1-1.el rename to test/fixtures/mini.pkg.1/files/mini.emacs.pkg.1-1.el diff --git a/test/fixtures/mini.emacs.pkg.1/files/mini.emacs.pkg.1-2.el b/test/fixtures/mini.pkg.1/files/mini.emacs.pkg.1-2.el similarity index 100% rename from test/fixtures/mini.emacs.pkg.1/files/mini.emacs.pkg.1-2.el rename to test/fixtures/mini.pkg.1/files/mini.emacs.pkg.1-2.el diff --git a/test/fixtures/mini.emacs.pkg.1/mini.emacs.pkg.1.el b/test/fixtures/mini.pkg.1/mini.pkg.1.el similarity index 84% rename from test/fixtures/mini.emacs.pkg.1/mini.emacs.pkg.1.el rename to test/fixtures/mini.pkg.1/mini.pkg.1.el index 4ae410f1..24a8d7a4 100644 --- a/test/fixtures/mini.emacs.pkg.1/mini.emacs.pkg.1.el +++ b/test/fixtures/mini.pkg.1/mini.pkg.1.el @@ -1,10 +1,10 @@ -;;; mini.emacs.pkg.1.el --- Minimal test package -*- lexical-binding: t; -*- +;;; mini.pkg.1.el --- Minimal test package -*- lexical-binding: t; -*- ;; Copyright (C) 2022-2024 the Eask authors. ;; Created date 2022-03-29 01:52:58 ;; Author: Shen, Jen-Chieh -;; URL: https://github.com/emacs-eask/mini.emacs.pkg.1 +;; URL: https://github.com/emacs-eask/mini.pkg.1 ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24.3") (s "1.12.0") (fringe-helper "1.0.1")) ;; Keywords: test @@ -35,5 +35,5 @@ (require 's) (require 'fringe-helper) -(provide 'mini.emacs.pkg.1) -;;; mini.emacs.pkg.1.el ends here +(provide 'mini.pkg.1) +;;; mini.pkg.1.el ends here diff --git a/test/fixtures/mini.emacs.pkg.2/Eask b/test/fixtures/mini.pkg.2/Eask similarity index 83% rename from test/fixtures/mini.emacs.pkg.2/Eask rename to test/fixtures/mini.pkg.2/Eask index 5d604d05..a3b3e955 100644 --- a/test/fixtures/mini.emacs.pkg.2/Eask +++ b/test/fixtures/mini.pkg.2/Eask @@ -1,11 +1,11 @@ -(package "mini.emacs.pkg.2" +(package "mini.pkg.2" "0.0.1" "Minimal test package") -(website-url "https://github.com/emacs-eask/mini.emacs.pkg.2") +(website-url "https://github.com/emacs-eask/cli/tree/master/test/fixtures/mini.pkg.2") (keywords "test") -(package-file "mini.emacs.pkg.2.el") +(package-file "mini.pkg.2.el") (files "files/*.el") diff --git a/test/fixtures/mini.emacs.pkg.2/RADME.md b/test/fixtures/mini.pkg.2/RADME.md similarity index 100% rename from test/fixtures/mini.emacs.pkg.2/RADME.md rename to test/fixtures/mini.pkg.2/RADME.md diff --git a/test/fixtures/mini.emacs.pkg.2/files/mini.emacs.pkg.2-1.el b/test/fixtures/mini.pkg.2/files/mini.emacs.pkg.2-1.el similarity index 100% rename from test/fixtures/mini.emacs.pkg.2/files/mini.emacs.pkg.2-1.el rename to test/fixtures/mini.pkg.2/files/mini.emacs.pkg.2-1.el diff --git a/test/fixtures/mini.emacs.pkg.2/files/mini.emacs.pkg.2-2.el b/test/fixtures/mini.pkg.2/files/mini.emacs.pkg.2-2.el similarity index 100% rename from test/fixtures/mini.emacs.pkg.2/files/mini.emacs.pkg.2-2.el rename to test/fixtures/mini.pkg.2/files/mini.emacs.pkg.2-2.el diff --git a/test/fixtures/mini.emacs.pkg.2/mini.emacs.pkg.2.el b/test/fixtures/mini.pkg.2/mini.pkg.2.el similarity index 84% rename from test/fixtures/mini.emacs.pkg.2/mini.emacs.pkg.2.el rename to test/fixtures/mini.pkg.2/mini.pkg.2.el index 37ae37c1..a26b1a45 100644 --- a/test/fixtures/mini.emacs.pkg.2/mini.emacs.pkg.2.el +++ b/test/fixtures/mini.pkg.2/mini.pkg.2.el @@ -1,10 +1,10 @@ -;;; mini.emacs.pkg.2.el --- Minimal test package -*- lexical-binding: t; -*- +;;; mini.pkg.2.el --- Minimal test package -*- lexical-binding: t; -*- ;; Copyright (C) 2022-2024 the Eask authors. ;; Created date 2022-03-29 01:52:58 ;; Author: Shen, Jen-Chieh -;; URL: https://github.com/emacs-eask/mini.emacs.pkg.2 +;; URL: https://github.com/emacs-eask/mini.pkg.2 ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24.3") (s "1.12.0") (fringe-helper "1.0.1")) ;; Keywords: test @@ -35,5 +35,5 @@ (require 's) (require 'fringe-helper) -(provide 'mini.emacs.pkg.2) -;;; mini.emacs.pkg.2.el ends here +(provide 'mini.pkg.2) +;;; mini.pkg.2.el ends here From 9ad510675983c1078fd8fa82d1862f24d6110175 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Mon, 18 Nov 2024 00:48:37 +0800 Subject: [PATCH 2/3] fix url --- test/fixtures/mini.pkg.1/mini.pkg.1.el | 2 +- test/fixtures/mini.pkg.2/mini.pkg.2.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fixtures/mini.pkg.1/mini.pkg.1.el b/test/fixtures/mini.pkg.1/mini.pkg.1.el index 24a8d7a4..41b87e73 100644 --- a/test/fixtures/mini.pkg.1/mini.pkg.1.el +++ b/test/fixtures/mini.pkg.1/mini.pkg.1.el @@ -4,7 +4,7 @@ ;; Created date 2022-03-29 01:52:58 ;; Author: Shen, Jen-Chieh -;; URL: https://github.com/emacs-eask/mini.pkg.1 +;; URL: https://github.com/emacs-eask/cli/tree/master/test/fixtures/mini.pkg.1 ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24.3") (s "1.12.0") (fringe-helper "1.0.1")) ;; Keywords: test diff --git a/test/fixtures/mini.pkg.2/mini.pkg.2.el b/test/fixtures/mini.pkg.2/mini.pkg.2.el index a26b1a45..e9495c0c 100644 --- a/test/fixtures/mini.pkg.2/mini.pkg.2.el +++ b/test/fixtures/mini.pkg.2/mini.pkg.2.el @@ -4,7 +4,7 @@ ;; Created date 2022-03-29 01:52:58 ;; Author: Shen, Jen-Chieh -;; URL: https://github.com/emacs-eask/mini.pkg.2 +;; URL: https://github.com/emacs-eask/cli/tree/master/test/fixtures/mini.pkg.2 ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24.3") (s "1.12.0") (fringe-helper "1.0.1")) ;; Keywords: test From fa77d18fc34f5c8a35430d5099df88487d546adc Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Mon, 18 Nov 2024 01:02:16 +0800 Subject: [PATCH 3/3] update pkg files --- .../files/{mini.emacs.pkg.1-1.el => mini.pkg.1-1.el} | 10 +++++----- .../files/{mini.emacs.pkg.1-2.el => mini.pkg.1-2.el} | 10 +++++----- .../files/{mini.emacs.pkg.2-1.el => mini.pkg.2-1.el} | 10 +++++----- .../files/{mini.emacs.pkg.2-2.el => mini.pkg.2-2.el} | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) rename test/fixtures/mini.pkg.1/files/{mini.emacs.pkg.1-1.el => mini.pkg.1-1.el} (79%) rename test/fixtures/mini.pkg.1/files/{mini.emacs.pkg.1-2.el => mini.pkg.1-2.el} (79%) rename test/fixtures/mini.pkg.2/files/{mini.emacs.pkg.2-1.el => mini.pkg.2-1.el} (79%) rename test/fixtures/mini.pkg.2/files/{mini.emacs.pkg.2-2.el => mini.pkg.2-2.el} (79%) diff --git a/test/fixtures/mini.pkg.1/files/mini.emacs.pkg.1-1.el b/test/fixtures/mini.pkg.1/files/mini.pkg.1-1.el similarity index 79% rename from test/fixtures/mini.pkg.1/files/mini.emacs.pkg.1-1.el rename to test/fixtures/mini.pkg.1/files/mini.pkg.1-1.el index f0a9690b..1c7e7c73 100644 --- a/test/fixtures/mini.pkg.1/files/mini.emacs.pkg.1-1.el +++ b/test/fixtures/mini.pkg.1/files/mini.pkg.1-1.el @@ -1,4 +1,4 @@ -;;; mini.emacs.pkg.1-1.el --- Extern file 1 -*- lexical-binding: t; -*- +;;; mini.pkg.1-1.el --- Extern file 1 -*- lexical-binding: t; -*- ;; This file is NOT part of GNU Emacs. @@ -17,16 +17,16 @@ ;;; Commentary: ;; -;; files/mini.emacs.pkg.1-1.el +;; files/mini.pkg.1-1.el ;; ;;; Code: -(defun mini.emacs.pkg.1-1 () +(defun mini.pkg.1-1 () "Test function 1." (interactive) ) -(provide 'mini.emacs.pkg.1-1) -;;; mini.emacs.pkg.1-1.el ends here +(provide 'mini.pkg.1-1) +;;; mini.pkg.1-1.el ends here diff --git a/test/fixtures/mini.pkg.1/files/mini.emacs.pkg.1-2.el b/test/fixtures/mini.pkg.1/files/mini.pkg.1-2.el similarity index 79% rename from test/fixtures/mini.pkg.1/files/mini.emacs.pkg.1-2.el rename to test/fixtures/mini.pkg.1/files/mini.pkg.1-2.el index 6c62bb33..09d7eb8c 100644 --- a/test/fixtures/mini.pkg.1/files/mini.emacs.pkg.1-2.el +++ b/test/fixtures/mini.pkg.1/files/mini.pkg.1-2.el @@ -1,4 +1,4 @@ -;;; mini.emacs.pkg.1-2.el --- Extern file 2 -*- lexical-binding: t; -*- +;;; mini.pkg.1-2.el --- Extern file 2 -*- lexical-binding: t; -*- ;; This file is NOT part of GNU Emacs. @@ -17,15 +17,15 @@ ;;; Commentary: ;; -;; files/mini.emacs.pkg.1-2.el +;; files/mini.pkg.1-2.el ;; ;;; Code: -(defun mini.emacs.pkg.1-2 () +(defun mini.pkg.1-2 () "Test function 2." (interactive) ) -(provide 'mini.emacs.pkg.1-2) -;;; mini.emacs.pkg.1-2.el ends here +(provide 'mini.pkg.1-2) +;;; mini.pkg.1-2.el ends here diff --git a/test/fixtures/mini.pkg.2/files/mini.emacs.pkg.2-1.el b/test/fixtures/mini.pkg.2/files/mini.pkg.2-1.el similarity index 79% rename from test/fixtures/mini.pkg.2/files/mini.emacs.pkg.2-1.el rename to test/fixtures/mini.pkg.2/files/mini.pkg.2-1.el index b2e8c561..393ee58b 100644 --- a/test/fixtures/mini.pkg.2/files/mini.emacs.pkg.2-1.el +++ b/test/fixtures/mini.pkg.2/files/mini.pkg.2-1.el @@ -1,4 +1,4 @@ -;;; mini.emacs.pkg.2-1.el --- Extern file 1 -*- lexical-binding: t; -*- +;;; mini.pkg.2-1.el --- Extern file 1 -*- lexical-binding: t; -*- ;; This file is NOT part of GNU Emacs. @@ -17,16 +17,16 @@ ;;; Commentary: ;; -;; files/mini.emacs.pkg.2-1.el +;; files/mini.pkg.2-1.el ;; ;;; Code: -(defun mini.emacs.pkg.2-1 () +(defun mini.pkg.2-1 () "Test function 1." (interactive) ) -(provide 'mini.emacs.pkg.2-1) -;;; mini.emacs.pkg.2-1.el ends here +(provide 'mini.pkg.2-1) +;;; mini.pkg.2-1.el ends here diff --git a/test/fixtures/mini.pkg.2/files/mini.emacs.pkg.2-2.el b/test/fixtures/mini.pkg.2/files/mini.pkg.2-2.el similarity index 79% rename from test/fixtures/mini.pkg.2/files/mini.emacs.pkg.2-2.el rename to test/fixtures/mini.pkg.2/files/mini.pkg.2-2.el index d19294b7..5e1ab0c8 100644 --- a/test/fixtures/mini.pkg.2/files/mini.emacs.pkg.2-2.el +++ b/test/fixtures/mini.pkg.2/files/mini.pkg.2-2.el @@ -1,4 +1,4 @@ -;;; mini.emacs.pkg.2-2.el --- Extern file 2 -*- lexical-binding: t; -*- +;;; mini.pkg.2-2.el --- Extern file 2 -*- lexical-binding: t; -*- ;; This file is NOT part of GNU Emacs. @@ -17,15 +17,15 @@ ;;; Commentary: ;; -;; files/mini.emacs.pkg.2-2.el +;; files/mini.pkg.2-2.el ;; ;;; Code: -(defun mini.emacs.pkg.2-2 () +(defun mini.pkg.2-2 () "Test function 2." (interactive) ) -(provide 'mini.emacs.pkg.2-2) -;;; mini.emacs.pkg.2-2.el ends here +(provide 'mini.pkg.2-2) +;;; mini.pkg.2-2.el ends here