TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: remove 'post value for :step property 

post value for package :step property is both useless and considered
harmful. It would hijack the determinism of the loading order.

'pre value is used very very rarely and I even think it is not even
used since most of the time a package that must be loaded in pre step
is a bootstrap package. But we keep 'pre since it can be useful to
have it for _exceptional_ cases.
This commit is contained in:
syl20bnr 2015-09-24 00:02:02 -04:00
parent 5c53427c35
commit 7a2e604741
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-configuration-layer.el
View File

@ -107,7 +107,7 @@
:documentation "Location of the package.")
(step :initarg :step
:initform nil
:type (satisfies (lambda (x) (member x '(nil pre post))))
:type (satisfies (lambda (x) (member x '(nil pre))))
:documentation "Initialization step.")
(excluded :initarg :excluded
:initform nil
@ -328,7 +328,7 @@ Properties that can be copied are `:location', `:step' and `:excluded'."
(when (fboundp post-init-func)
(push name (oref obj :post-layers)))
(oset obj :location 'local)
(oset obj :step step)))))))))))
(oset obj :step (when (eq 'pre step) step))))))))))))
;; additional and excluded packages from dotfile
(when dotfile
(dolist (pkg dotspacemacs-additional-packages)
@ -729,10 +729,7 @@ path."
packages (lambda (x) (eq 'pre (oref x :step)))))
(configuration-layer//configure-packages-2
(configuration-layer/filter-objects
packages (lambda (x) (null (oref x :step)))))
(configuration-layer//configure-packages-2
(configuration-layer/filter-objects
packages (lambda (x) (eq 'post (oref x :step))))))
packages (lambda (x) (null (oref x :step))))))
(defun configuration-layer//configure-packages-2 (packages)
"Configure all passed PACKAGES."

41
tests/core/core-configuration-layer-utest.el
View File

@ -148,7 +148,7 @@
:name 'testpkg
:owner nil
:location 'elpa
:step 'post
:step nil
:excluded t))
(pkg '(testpkg :location local :step pre :excluded nil))
(expected (cfgl-package "testpkg"
@ -388,12 +388,12 @@
(should (equal (list (cfgl-package "pkg1" :name 'pkg1 :owner 'layer14 :location 'local))
(configuration-layer/get-packages layers))))))
(ert-deftest test-get-packages--last-owner-can-overwrite-step ()
(ert-deftest test-get-packages--last-owner-can-overwrite-step-nil-to-pre ()
(let* ((layer15 (cfgl-layer "layer15" :name 'layer15 :dir "/path"))
(layer16 (cfgl-layer "layer16" :name 'layer16 :dir "/path"))
(layers (list layer15 layer16))
(layer15-packages '((pkg1 :step pre)))
(layer16-packages '((pkg1 :step post)))
(layer15-packages '((pkg1 :step nil)))
(layer16-packages '((pkg1 :step pre)))
(mocker-mock-default-record-cls 'mocker-stub-record))
(defun layer15/init-pkg1 nil)
(defun layer16/init-pkg1 nil)
@ -404,7 +404,26 @@
(:output nil :occur 1)))
(spacemacs-buffer/warning (msg &rest args) ((:output nil :occur 1)))
(configuration-layer/layer-usedp (l) ((:output t :occur 2))))
(should (equal (list (cfgl-package "pkg1" :name 'pkg1 :owner 'layer16 :step 'post))
(should (equal (list (cfgl-package "pkg1" :name 'pkg1 :owner 'layer16 :step 'pre))
(configuration-layer/get-packages layers))))))
(ert-deftest test-get-packages--last-owner-cannot-overwrite-step-pre-to-nil ()
(let* ((layer15 (cfgl-layer "layer15" :name 'layer15 :dir "/path"))
(layer16 (cfgl-layer "layer16" :name 'layer16 :dir "/path"))
(layers (list layer15 layer16))
(layer15-packages '((pkg1 :step pre)))
(layer16-packages '((pkg1 :step nil)))
(mocker-mock-default-record-cls 'mocker-stub-record))
(defun layer15/init-pkg1 nil)
(defun layer16/init-pkg1 nil)
(mocker-let
((file-exists-p (f) ((:output t :occur 1)
(:output nil :occur 1)
(:output t :occur 1)
(:output nil :occur 1)))
(spacemacs-buffer/warning (msg &rest args) ((:output nil :occur 1)))
(configuration-layer/layer-usedp (l) ((:output t :occur 2))))
(should (equal (list (cfgl-package "pkg1" :name 'pkg1 :owner 'layer16 :step 'pre))
(configuration-layer/get-packages layers))))))
(ert-deftest test-get-packages--last-owner-can-overwrite-exclude ()
@ -460,9 +479,9 @@
(mocker-let
((file-exists-p (f) ((:output t :occur 2)))
(configuration-layer/layer-usedp (l) ((:output t :occur 2))))
(should (equal (list (cfgl-package "ext3" :name 'ext3 :owner 'layer1 :location 'local :step 'post)
(cfgl-package "ext2" :name 'ext2 :owner 'layer1 :location 'local :step 'post)
(cfgl-package "ext1" :name 'ext1 :owner 'layer1 :location 'local :step 'post)
(should (equal (list (cfgl-package "ext3" :name 'ext3 :owner 'layer1 :location 'local)
(cfgl-package "ext2" :name 'ext2 :owner 'layer1 :location 'local)
(cfgl-package "ext1" :name 'ext1 :owner 'layer1 :location 'local)
(cfgl-package "pkg1" :name 'pkg1 :owner 'layer1))
(configuration-layer/get-packages layers))))))
@ -483,9 +502,9 @@
(mocker-let
((file-exists-p (f) ((:output t :occur 2)))
(configuration-layer/layer-usedp (l) ((:output t :occur 2))))
(should (equal (list (cfgl-package "ext6" :name 'ext6 :owner 'layer1 :location 'local :step 'post)
(cfgl-package "ext5" :name 'ext5 :owner 'layer1 :location 'local :step 'post)
(cfgl-package "ext4" :name 'ext4 :owner 'layer1 :location 'local :step 'post)
(should (equal (list (cfgl-package "ext6" :name 'ext6 :owner 'layer1 :location 'local)
(cfgl-package "ext5" :name 'ext5 :owner 'layer1 :location 'local)
(cfgl-package "ext4" :name 'ext4 :owner 'layer1 :location 'local)
(cfgl-package "ext3" :name 'ext3 :owner 'layer1 :location 'local :step 'pre)
(cfgl-package "ext2" :name 'ext2 :owner 'layer1 :location 'local :step 'pre)
(cfgl-package "ext1" :name 'ext1 :owner 'layer1 :location 'local :step 'pre)