TakeV/spacemacs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
This repository has been archived on 2024-10-22. You can view files and clone it, but cannot push or open issues or pull requests.
spacemacs/tests/core/core-configuration-layer-utest.el

3233 lines
155 KiB
EmacsLisp
Raw Normal View History

Fix header comments in test files
2015-04-06 01:01:54 +00:00
;;; core-configuration-layer-utest.el --- Spacemacs Unit Test File
Missing unit test file
2015-01-23 03:39:26 +00:00
;;
Happy New Year 2018!
2018-01-04 07:00:25 +00:00
;; Copyright (c) 2012-2018 Sylvain Benner & Contributors
Missing unit test file
2015-01-23 03:39:26 +00:00
;;
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
;; URL: https://github.com/syl20bnr/spacemacs
;;
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
(require 'mocker)
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(require 'core-command-line)
Prefix all core files with `core-`
2015-01-27 03:51:47 +00:00
(require 'core-configuration-layer)
Unit tests for `configuration-layer//declare-layer` First step for the implementation of a buffed variable `dotspacemacs-configuration-layers`
2015-01-25 05:01:43 +00:00
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(defun helper--add-layers (layers &optional usedp)
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
"Set the layer variables given a list of LAYERS objects."
(dolist (layer layers)
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(configuration-layer//add-layer layer usedp))
;; hackish but we need to reverse the list in order to have the layer
;; in the correct order (this reverse in normally performed in function
;; configuration-layer//declare-used-layers )
(when usedp
(setq configuration-layer--used-layers
(reverse configuration-layer--used-layers))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(defun helper--add-packages (packages &optional usedp)
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
"Set the package variables given a list of PACKAGES objects."
(dolist (pkg packages)
(configuration-layer//add-package pkg usedp)))
core: new interactive function to insert lazy installation config New function configuration-layer/insert-lazy-install-configuration This function asks for a layer and then insert the lazy configuration for all the packages owned by this layer.
2016-03-06 04:21:55 +00:00
;; ---------------------------------------------------------------------------
;; class cfgl-layer
;; ---------------------------------------------------------------------------
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
;; method: cfgl-layer-owned-packages
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(ert-deftest test-cfgl-layer-owned-packages--owns-packages-without-props ()
core: new interactive function to insert lazy installation config New function configuration-layer/insert-lazy-install-configuration This function asks for a layer and then insert the lazy configuration for all the packages owned by this layer.
2016-03-06 04:21:55 +00:00
(let ((layer1 (cfgl-layer "layer1"
:name 'layer1
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
:packages '(pkg1
(pkg2 :location foo)
(pkg3 :toggle (eq 1 2))
(pkg4 :toggle (eq 1 1)))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(list (cfgl-package "pkg1" :name 'pkg1 :owners '(layer2))
(cfgl-package "pkg2" :name 'pkg2 :owners '(layer1))
(cfgl-package "pkg3" :name 'pkg3 :owners '(layer1))
(cfgl-package "pkg4" :name 'pkg4 :owners '(layer2))) t)
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(should (equal '(pkg2 pkg3)
core: fix detection of packages to lazy install Make cfgl-layer-owned-packages return a list of package objects instead of just package names. Use this function to correctly excluded non owned package when flagging package for lazy installation. Fixes #5608
2016-03-27 07:23:39 +00:00
(cfgl-layer-owned-packages layer1)))))
core: new interactive function to insert lazy installation config New function configuration-layer/insert-lazy-install-configuration This function asks for a layer and then insert the lazy configuration for all the packages owned by this layer.
2016-03-06 04:21:55 +00:00
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(ert-deftest test-cfgl-layer-owned-packages--owns-packages-with-props ()
(let ((layer1 (cfgl-layer "layer1"
:name 'layer1
:packages '(pkg1
(pkg2 :location foo)
(pkg3 :toggle (eq 1 2))
(pkg4 :toggle (eq 1 1))
pkg5)))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(list (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1))
(cfgl-package "pkg2" :name 'pkg2 :owners '(layer1))
(cfgl-package "pkg3" :name 'pkg3 :owners '(layer1))
(cfgl-package "pkg4" :name 'pkg4 :owners '(layer2))
(cfgl-package "pkg5" :name 'pkg5 :owners '(layer2))) t)
(should (equal '(pkg1 (pkg2 :location foo)
(pkg3 :toggle (eq 1 2)))
(cfgl-layer-owned-packages layer1 'with-props)))))
core: new interactive function to insert lazy installation config New function configuration-layer/insert-lazy-install-configuration This function asks for a layer and then insert the lazy configuration for all the packages owned by this layer.
2016-03-06 04:21:55 +00:00
(ert-deftest test-cfgl-layer-owned-packages--nil-layer-returns-nil ()
(should (null (cfgl-layer-owned-packages nil))))
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(ert-deftest test-cfgl-layer-owned-packages--nil-layer-returns-nil-with-props ()
(should (null (cfgl-layer-owned-packages nil 'with-props))))
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
;; method: cfgl-layer-get-packages
(ert-deftest test-cfgl-layer-get-packages--all-packages-selected-default ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:packages '((pkg1 :location local)
pkg2
(pkg3 :location built-in)))))
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(should (equal '(pkg1 pkg2 pkg3)
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(cfgl-layer-get-packages layer)))))
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(ert-deftest test-cfgl-layer-get-packages--all-packages-selected-default-with-props ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:packages '((pkg1 :location local)
pkg2
(pkg3 :location built-in)))))
(should (equal '((pkg1 :location local) pkg2 (pkg3 :location built-in))
(cfgl-layer-get-packages layer 'with-props)))))
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(ert-deftest test-cfgl-layer-get-packages--all-packages-selected-explicitly ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:packages '((pkg1 :location local)
pkg2
(pkg3 :location built-in))
:selected-packages 'all)))
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(should (equal '(pkg1 pkg2 pkg3)
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(cfgl-layer-get-packages layer)))))
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(ert-deftest test-cfgl-layer-get-packages--all-packages-selected-explicitly-with-props ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:packages '((pkg1 :location local)
pkg2
(pkg3 :location built-in))
:selected-packages 'all)))
(should (equal '((pkg1 :location local) pkg2 (pkg3 :location built-in))
(cfgl-layer-get-packages layer 'with-props)))))
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(ert-deftest test-cfgl-layer-get-packages--selected-packages ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:packages '((pkg1 :location local)
pkg2
(pkg3 :location built-in))
:selected-packages '(pkg1 pkg2))))
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(should (equal '(pkg1 pkg2)
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(cfgl-layer-get-packages layer)))))
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(ert-deftest test-cfgl-layer-get-packages--selected-packages-with-props ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:packages '((pkg1 :location local)
pkg2
(pkg3 :location built-in))
:selected-packages '(pkg1 pkg2))))
(should (equal '((pkg1 :location local) pkg2)
(cfgl-layer-get-packages layer 'with-props)))))
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(ert-deftest test-cfgl-layer-get-packages--selected-packages-ignore-unknown ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:packages '((pkg1 :location local)
pkg2
(pkg3 :location built-in))
:selected-packages '(pkg1 pkg2 pkg-unknown))))
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(should (equal '(pkg1 pkg2)
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(cfgl-layer-get-packages layer)))))
core: fix computation of package installation lazyness Fix computation of package installation lazyness when the variable dotspacemacs-enable-lazy-installation is set to all. Improve methods on cfgl-layer class to be able to return a list of packages with or without their properties. Update tests to reflect the changes.
2017-01-22 18:37:12 +00:00
(ert-deftest test-cfgl-layer-get-packages--selected-packages-ignore-unknown-with-props ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:packages '((pkg1 :location local)
pkg2
(pkg3 :location built-in))
:selected-packages '(pkg1 pkg2 pkg-unknown))))
(should (equal '((pkg1 :location local) pkg2)
(cfgl-layer-get-packages layer 'with-props)))))
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(ert-deftest test-cfgl-layer-get-packages--nil-packages-return-nil ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:packages '())))
(should (null (cfgl-layer-get-packages layer)))))
(ert-deftest test-cfgl-layer-get-packages--nil-packages-with-unknown-selected-packages-return-nil ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:packages '()
:selected-packages '(pkg-unknown))))
(should (null (cfgl-layer-get-packages layer)))))
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
;; method: cfgl-layer-get-shadowing-layers
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(ert-deftest test-cfgl-layer-get-shadowing-layers--l2-declared-after-l1-shadows-l1 ()
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(layer2 (cfgl-layer "layer2" :name 'layer2))
(configuration-layer--used-layers nil)
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers `(,layer1 ,layer2) 'used)
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(configuration-layer/declare-shadow-relation 'layer1 'layer2)
(should (and (equal '(layer2) (cfgl-layer-get-shadowing-layers layer1))
(equal '() (cfgl-layer-get-shadowing-layers layer2))))))
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(ert-deftest test-cfgl-layer-get-shadowing-layers--l1-declared-after-l2-shadows-l2 ()
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(layer2 (cfgl-layer "layer2" :name 'layer2))
(configuration-layer--used-layers nil)
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(helper--add-layers `(,layer1 ,layer2) 'used)
(configuration-layer/declare-shadow-relation 'layer1 'layer2)
(should (and (equal '(layer2) (cfgl-layer-get-shadowing-layers layer1))
(equal '() (cfgl-layer-get-shadowing-layers layer2))))))
(ert-deftest test-cfgl-layer-get-shadowing-layers--prevent-l2-from-shadowing-l1 ()
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(layer2 (cfgl-layer "layer2" :name 'layer2 :can-shadow nil))
(configuration-layer--used-layers nil)
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers `(,layer1 ,layer2) 'used)
(configuration-layer/declare-shadow-relation 'layer2 'layer1)
(should (null (cfgl-layer-get-shadowing-layers layer1)))))
(ert-deftest test-cfgl-layer-get-shadowing-layers--prevent-l2-from-shadowing-l1-alternative ()
;; using the commutative property of the can-shadow relation
;; setting :can-shadow to nil on layer1 produces the same effect as the more
;; intuitive test-cfgl-layer-get-shadowing-layers--prevent-l2-from-shadowing-l1
(let ((layer1 (cfgl-layer "layer1" :name 'layer1 :can-shadow nil))
(layer2 (cfgl-layer "layer2" :name 'layer2))
(configuration-layer--used-layers nil)
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers `(,layer1 ,layer2) 'used)
(configuration-layer/declare-shadow-relation 'layer2 'layer1)
(should (null (cfgl-layer-get-shadowing-layers layer1)))))
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer/layer-used-p
;; ---------------------------------------------------------------------------
(ert-deftest test-layer-used-p--returns-true-when-layer-is-used ()
(let (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers `(,(cfgl-layer "usedlayer" :name 'usedlayer)) 'used)
(helper--add-layers `(,(cfgl-layer "notusedlayer" :name 'notusedlayer)))
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(should (configuration-layer/layer-used-p 'usedlayer))))
(ert-deftest test-layer-used-p--returns-false-when-layer-is-not-used ()
(let (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers `(,(cfgl-layer "usedlayer" :name 'usedlayer)) 'used)
(helper--add-layers `(,(cfgl-layer "notusedlayer" :name 'notusedlayer)))
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(should (null (configuration-layer/layer-used-p 'notusedlayer)))))
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(ert-deftest test-layer-used-p--returns-false-when-layer-is-shadowed ()
(let ((usedlayer1 (cfgl-layer "usedlayer1" :name 'usedlayer1))
(usedlayer2 (cfgl-layer "usedlayer2" :name 'usedlayer2))
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers `(,usedlayer1 ,usedlayer2) 'used)
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(configuration-layer/declare-shadow-relation 'usedlayer2 'usedlayer1)
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(should (not (configuration-layer/layer-used-p 'usedlayer1)))))
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(ert-deftest test-layer-used-p--dotfile-layer-is-always-used ()
(should (configuration-layer/layer-used-p 'dotfile)))
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
;; ---------------------------------------------------------------------------
;; class cfgl-package
;; ---------------------------------------------------------------------------
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
;; method: cfgl-package-enabled-p
core: add overriding rules for :toggle :toggle is ignored if not used in the owner of a package, it can be overridden by new owners or by the dotfile.
2016-03-19 22:24:59 +00:00
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(ert-deftest test-cfgl-package-enabled-p--default-toggle-eval-non-nil ()
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(let ((pkg (cfgl-package "testpkg" :name 'testpkg)))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(should (cfgl-package-enabled-p pkg))))
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(ert-deftest test-cfgl-package-enabled-p--symbol-toggle-eval-non-nil-example ()
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(let ((pkg (cfgl-package "testpkg" :name 'testpkg :toggle 'package-toggle))
(package-toggle t))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(should (cfgl-package-enabled-p pkg))))
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(ert-deftest test-cfgl-package-enabled-p--symbol-toggle-eval-nil-example ()
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(let ((pkg (cfgl-package "testpkg" :name 'testpkg :toggle 'package-toggle))
(package-toggle nil))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(should (null (cfgl-package-enabled-p pkg)))))
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(ert-deftest test-cfgl-package-enabled-p--list-toggle-eval-non-nil-example ()
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(let ((pkg (cfgl-package "testpkg"
:name 'testpkg
:toggle '(memq package-toggle '(foo bar))))
(package-toggle 'foo))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(should (cfgl-package-enabled-p pkg))))
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(ert-deftest test-cfgl-package-enabled-p--list-toggle-eval-nil-example ()
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(let ((pkg (cfgl-package "testpkg"
:name 'testpkg
:toggle '(memq package-toggle '(foo bar))))
(package-toggle 'other))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(should (null (cfgl-package-enabled-p pkg)))))
(ert-deftest test-cfgl-package-enabled-p--depends-satisfied ()
(let ((pkg-a (cfgl-package "pkg-a"
:name 'pkg-a
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-b)))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(pkg-b (cfgl-package "pkg-b"
:name 'pkg-b))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
(configuration-layer//add-package pkg-b)
(should (cfgl-package-enabled-p pkg-a))))
(ert-deftest test-cfgl-package-enabled-p--depends-nonexistent ()
(let ((pkg-a (cfgl-package "pkg-a"
:name 'pkg-a
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-b)))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
(should (null (cfgl-package-enabled-p pkg-a)))))
(ert-deftest test-cfgl-package-enabled-p--depends-toggled-off ()
(let ((pkg-a (cfgl-package "pkg-a"
:name 'pkg-a
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-b)))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(pkg-b (cfgl-package "pkg-b"
:name 'pkg-b
:toggle nil))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
(configuration-layer//add-package pkg-b)
(should (null (cfgl-package-enabled-p pkg-a)))))
(ert-deftest test-cfgl-package-enabled-p--depends-excluded ()
(let ((pkg-a (cfgl-package "pkg-a"
:name 'pkg-a
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-b)))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(pkg-b (cfgl-package "pkg-b"
:name 'pkg-b
:excluded t))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
(configuration-layer//add-package pkg-b)
(should (null (cfgl-package-enabled-p pkg-a)))))
(ert-deftest test-cfgl-package-enabled-p--depends-transitive ()
(let ((pkg-a (cfgl-package "pkg-a"
:name 'pkg-a
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-b)))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(pkg-b (cfgl-package "pkg-b"
:name 'pkg-b
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-c)))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(pkg-c (cfgl-package "pkg-c"
:name 'pkg-c))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
(configuration-layer//add-package pkg-b)
(configuration-layer//add-package pkg-c)
(should (cfgl-package-enabled-p pkg-a))))
(ert-deftest test-cfgl-package-enabled-p--depends-transitive-not-satisfied ()
(let ((pkg-a (cfgl-package "pkg-a"
:name 'pkg-a
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-b)))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(pkg-b (cfgl-package "pkg-b"
:name 'pkg-b
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-c)))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
(pkg-c (cfgl-package "pkg-c"
:name 'pkg-c
:excluded t))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
(configuration-layer//add-package pkg-b)
(configuration-layer//add-package pkg-c)
(should (null (cfgl-package-enabled-p pkg-a)))))
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
core: add method cfgl-package-get-safe-owner Safe method to get the owner of a package.
2016-06-11 02:35:59 +00:00
;; method: cfgl-package-get-safe-owner
(ert-deftest test-cfgl-package-get-safe-owner--return-car ()
(let ((pkg (cfgl-package "testpkg" :name 'testpkg :owners '(layer1 layer2)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
,(cfgl-layer "layer2" :name 'layer2)) t)
core: add method cfgl-package-get-safe-owner Safe method to get the owner of a package.
2016-06-11 02:35:59 +00:00
(should (eq 'layer1 (cfgl-package-get-safe-owner pkg)))))
(ert-deftest test-cfgl-package-get-safe-owner--return-cadr ()
(let ((pkg (cfgl-package "testpkg" :name 'testpkg :owners '(layer1 layer2)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
;; layer1 is not used so it cannot be the owner
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)))
(helper--add-layers `(,(cfgl-layer "layer2" :name 'layer2)) t)
core: add method cfgl-package-get-safe-owner Safe method to get the owner of a package.
2016-06-11 02:35:59 +00:00
(should (eq 'layer2 (cfgl-package-get-safe-owner pkg)))))
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
;; method: cfgl-package-distant-p
(ert-deftest test-cfgl-package-distant-p--by-default-is-distant ()
(let ((pkg (cfgl-package "testpkg"
:name 'testpkg
:owners '(layer1))))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(should (cfgl-package-distant-p pkg))))
(ert-deftest test-cfgl-package-distant-p--from-elpa-repo-is-distant ()
(let ((pkg (cfgl-package "testpkg"
:name 'testpkg
:owners '(layer1)
:location 'elpa)))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(should (cfgl-package-distant-p pkg))))
(ert-deftest test-cfgl-package-distant-p--from-recipe-is-distant ()
(let ((pkg (cfgl-package "testpkg"
:name 'testpkg
:owners '(layer1)
:location '(recipe blahblah))))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(should (cfgl-package-distant-p pkg))))
(ert-deftest test-cfgl-package-distant-p--built-in-is-not-distant ()
(let ((pkg (cfgl-package "testpkg"
:name 'testpkg
:owners '(layer1)
:location 'built-in)))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(should (not (cfgl-package-distant-p pkg)))))
(ert-deftest test-cfgl-package-distant-p--site-is-not-distant ()
(let ((pkg (cfgl-package "testpkg"
:name 'testpkg
:owners '(layer1)
:location 'site)))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(should (not (cfgl-package-distant-p pkg)))))
(ert-deftest test-cfgl-package-distant-p--local-is-not-distant ()
(let ((pkg (cfgl-package "testpkg"
:name 'testpkg
:owners '(layer1)
:location 'local)))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(should (not (cfgl-package-distant-p pkg)))))
(ert-deftest test-cfgl-package-distant-p--location-is-a-path ()
(let ((pkg (cfgl-package "testpkg"
:name 'testpkg
:owners '(layer1)
:location "/a/path/to/pkg")))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(should (not (cfgl-package-distant-p pkg)))))
;; method: cfgl-package-used-p
(ert-deftest test-cfgl-package-used-p--if-owned-by-layer-pkg-is-used ()
(let ((pkg (cfgl-package "testpkg" :name 'testpkg :owners '(layer1))))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(should (cfgl-package-used-p pkg))))
(ert-deftest test-cfgl-package-used-p--if-no-owner-pkg-is-not-used ()
(let ((pkg (cfgl-package "testpkg" :name 'testpkg)))
(should (not (cfgl-package-used-p pkg)))))
(ert-deftest test-cfgl-package-used-p--if-excluded-pkg-is-not-used ()
(let ((pkg (cfgl-package "testpkg" :name
'testpkg :owners '(layer1)
:excluded t)))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(should (not (cfgl-package-used-p pkg)))))
[core] Add unit tests for cfgl-package-reqs-satisfied-p
2019-11-03 03:27:02 +00:00
;; method: cfgl-package-reqs-satisfied-p
(ert-deftest test-cfgl-package-reqs-satisfied-p--ok-with-single-required-used-enabled-package ()
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(layer2 (cfgl-layer "layer2" :name 'layer2))
(pkg1 (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1) :requires '(pkg2)))
(pkg2 (cfgl-package "pkg2" :name 'pkg2 :owners '(layer2)))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers (list layer1 layer2) t)
(helper--add-packages (list pkg1 pkg2) t)
(should (cfgl-package-reqs-satisfied-p pkg1))))
(ert-deftest test-cfgl-package-reqs-satisfied-p--ok-with-single-required-unused-enabled-package ()
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(layer2 (cfgl-layer "layer2" :name 'layer2))
(pkg1 (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1) :requires '(pkg2)))
(pkg2 (cfgl-package "pkg2" :name 'pkg2 :owners '(layer2)))
configuration-layer--used-layers
configuration-layer--used-packages
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
(helper--add-layers (list layer1) t)
(helper--add-layers (list layer2))
(helper--add-packages (list pkg1) t)
(helper--add-packages (list pkg2))
(should (cfgl-package-reqs-satisfied-p pkg1))))
(ert-deftest test-cfgl-package-reqs-satisfied-p--not-ok-with-single-required-used-not-enabled-package ()
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(layer2 (cfgl-layer "layer2" :name 'layer2))
(pkg1 (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1) :requires '(pkg2)))
(pkg2 (cfgl-package "pkg2" :name 'pkg2 :toggle nil :owners '(layer3)))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers (list layer1 layer2) t)
(helper--add-packages (list pkg1 pkg2) t)
(should (not (cfgl-package-reqs-satisfied-p pkg1)))))
(ert-deftest test-cfgl-package-reqs-satisfied-p--not-ok-with-single-required-not-existing-package ()
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(pkg1 (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1) :requires '(pkg2)))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers (list layer1) t)
(helper--add-packages (list pkg1) t)
(should (not (cfgl-package-reqs-satisfied-p pkg1)))))
(ert-deftest test-cfgl-package-reqs-satisfied-p--ok-with-multiple-required-used-enabled-package ()
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(layer2 (cfgl-layer "layer2" :name 'layer2))
(layer3 (cfgl-layer "layer3" :name 'layer3))
(pkg1 (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1) :requires '(pkg2 pkg3)))
(pkg2 (cfgl-package "pkg2" :name 'pkg2 :owners '(layer2)))
(pkg3 (cfgl-package "pkg3" :name 'pkg3 :owners '(layer3)))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers (list layer1 layer2 layer3) t)
(helper--add-packages (list pkg1 pkg2 pkg3) t)
(should (cfgl-package-reqs-satisfied-p pkg1))))
(ert-deftest test-cfgl-package-reqs-satisfied-p--ok-with-multiple-required-unused-enabled-package ()
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(layer2 (cfgl-layer "layer2" :name 'layer2))
(layer3 (cfgl-layer "layer3" :name 'layer3))
(pkg1 (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1) :requires '(pkg2 pkg3)))
(pkg2 (cfgl-package "pkg2" :name 'pkg2 :owners '(layer2)))
(pkg3 (cfgl-package "pkg3" :name 'pkg3 :owners '(layer3)))
configuration-layer--used-layers
configuration-layer--used-packages
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
(helper--add-layers (list layer1 layer3) t)
(helper--add-layers (list layer2))
(helper--add-packages (list pkg1 pkg3) t)
(helper--add-packages (list pkg2))
(should (cfgl-package-reqs-satisfied-p pkg1))))
(ert-deftest test-cfgl-package-reqs-satisfied-p--not-ok-with-multiple-required-used-not-enabled-package ()
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(layer2 (cfgl-layer "layer2" :name 'layer2))
(layer3 (cfgl-layer "layer3" :name 'layer3))
(pkg1 (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1) :requires '(pkg2 pkg3)))
(pkg2 (cfgl-package "pkg2" :name 'pkg2 :toggle nil :owners '(layer3)))
(pkg3 (cfgl-package "pkg3" :name 'pkg3 :owners '(layer3)))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers (list layer1 layer2 layer3) t)
(helper--add-packages (list pkg1 pkg2 pkg3) t)
(should (not (cfgl-package-reqs-satisfied-p pkg1)))))
(ert-deftest test-cfgl-package-reqs-satisfied-p--not-ok-with-multiple-required-not-existing-package ()
(let ((layer1 (cfgl-layer "layer1" :name 'layer1))
(layer3 (cfgl-layer "layer3" :name 'layer3))
(pkg1 (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1) :requires '(pkg2 pkg3)))
(pkg3 (cfgl-package "pkg3" :name 'pkg3 :owners '(layer3)))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers (list layer1 layer3) t)
(helper--add-packages (list pkg1 pkg3) t)
(should (not (cfgl-package-reqs-satisfied-p pkg1)))))
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//package-enabled-p
;; ---------------------------------------------------------------------------
(ert-deftest test-package-enabled-p--pre ()
(let ((owner (cfgl-layer "owner" :name 'owner))
(layer (cfgl-layer "layer" :name 'layer))
(pkg (cfgl-package "pkg"
:name 'pkg
:owners '(owner)
:pre-layers '(layer)))
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(configuration-layer//add-layer owner)
(configuration-layer//add-layer layer)
(configuration-layer//add-package pkg)
(should (configuration-layer//package-enabled-p pkg 'layer))))
(ert-deftest test-package-enabled-p--post ()
(let ((owner (cfgl-layer "owner" :name 'owner))
(layer (cfgl-layer "layer" :name 'layer))
(pkg (cfgl-package "pkg"
:name 'pkg
:owners '(owner)
:post-layers '(layer)))
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(configuration-layer//add-layer owner)
(configuration-layer//add-layer layer)
(should (configuration-layer//package-enabled-p pkg 'layer))))
(ert-deftest test-package-enabled-p--disabled ()
(let ((owner (cfgl-layer "owner" :name 'owner :disabled-for '(layer)))
(layer (cfgl-layer "layer" :name 'layer))
(pkg (cfgl-package "pkg"
:name 'pkg
:owners '(owner)
:post-layers '(layer)))
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(configuration-layer//add-layer owner)
(configuration-layer//add-layer layer)
(should (null (configuration-layer//package-enabled-p pkg 'layer)))))
(ert-deftest test-package-enabled-p--enabled-precedence ()
(let ((owner (cfgl-layer "owner" :name 'owner :disabled-for '(layer) :enabled-for '(layer)))
(layer (cfgl-layer "layer" :name 'layer))
(pkg (cfgl-package "pkg"
:name 'pkg
:owners '(owner)
:post-layers '(layer)))
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(configuration-layer//add-layer owner)
(configuration-layer//add-layer layer)
(should (configuration-layer//package-enabled-p pkg 'layer))))
(ert-deftest test-package-enabled-p--enabled-for-none ()
(let ((owner (cfgl-layer "owner" :name 'owner :enabled-for '()))
(layer (cfgl-layer "layer" :name 'layer))
(pkg (cfgl-package "pkg"
:name 'pkg
:owners '(owner)
:post-layers '(layer)))
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(configuration-layer//add-layer owner)
(configuration-layer//add-layer layer)
(should (null (configuration-layer//package-enabled-p pkg 'layer)))))
(ert-deftest test-package-enabled-p--depends-on-disabled ()
(let ((owner-a (cfgl-layer "owner-a" :name 'owner-a))
(owner-b (cfgl-layer "owner-b" :name 'owner-b :disabled-for '(layer)))
(layer (cfgl-layer "layer" :name 'layer))
(pkg-a (cfgl-package "pkg-a"
:name 'pkg-a
:owners '(owner-a)
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-b)
core: implement :depends for package declarations This replaces the older pattern :toggle (configuration-layer/package-usedp ..) This implementation ensures that :disabled-for honors dependent packages, i.e. if package a depends on package b, which is owned by layer c, and layer c is disabled for layer d, then neither package a nor b will be configured for layer d. Previously, this was only true for package a, but not b. This commit also fixes: - configuration-layer/describe-package now shows which post-init and pre-init functions are disabled, if any - Does not recreate all layer objects unconditionally when calling configuration-layer/discover-layers. Previously, this led to all layers being recreated after e.g. `SPC h SPC`, without any of the dotfile information. Since this information is now necessary for configuration-layer/describe-package, it’s important that we don’t clear the indexed layers when invoking this function.
2017-06-21 10:27:59 +00:00
:post-layers '(layer)))
(pkg-b (cfgl-package "pkg-b"
:name 'pkg-b
:owners '(owner-b)))
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(configuration-layer//add-layer owner-a)
(configuration-layer//add-layer owner-b)
(configuration-layer//add-layer layer)
(configuration-layer//add-package pkg-b)
(should (null (configuration-layer//package-enabled-p pkg-a 'layer)))))
Fix: Check owner of dependent packages
2017-07-01 08:33:43 +00:00
(ert-deftest test-package-enabled-p--depends-on-non-owned ()
(let ((layer (cfgl-layer "layer" :name 'layer))
(owner (cfgl-layer "owner" :name 'owner))
(pkg-a (cfgl-package "pkg-a"
:name 'pkg-a
:owners '(owner)
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-b)
Fix: Check owner of dependent packages
2017-07-01 08:33:43 +00:00
:post-layers '(layer)))
(pkg-b (cfgl-package "pkg-b" :name 'pkg-b))
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(configuration-layer//add-layer owner)
(configuration-layer//add-package pkg-b)
(should (null (configuration-layer//package-enabled-p pkg-a layer)))))
tests: simple move of code
2017-07-02 14:02:32 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer/package-used-p
;; ---------------------------------------------------------------------------
(ert-deftest test-package-usedp--package-with-owner-can-be-used ()
(let* ((layer1 (cfgl-layer "layer1" :name 'layer1 :dir "/path/"))
(layer1-packages '(pkg1 pkg2 pkg3))
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
configuration-layer--used-layers
tests: simple move of code
2017-07-02 14:02:32 +00:00
configuration-layer--used-packages
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(configuration-layer--indexed-layers (make-hash-table :size 2048))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer1) t)
(helper--add-packages
tests: simple move of code
2017-07-02 14:02:32 +00:00
(list (cfgl-package "pkg3" :name 'pkg3 :owners '(layer1))
(cfgl-package "pkg2" :name 'pkg2 :owners '(layer1))
(cfgl-package "pkg1" :name 'pkg1 :owners '(layer1))) t)
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(should (configuration-layer/package-used-p
(nth (random 3) layer1-packages)))))
tests: simple move of code
2017-07-02 14:02:32 +00:00
(ert-deftest test-package-usedp--package-with-no-owner-cannot-be-used ()
(let* ((layer1 (cfgl-layer "layer1" :name 'layer1 :dir "/path/"))
(layers (list layer1))
(layer1-packages '(pkg1 pkg2 pkg3))
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
configuration-layer--used-layers
tests: simple move of code
2017-07-02 14:02:32 +00:00
(configuration-layer--used-packages
(list (cfgl-package "pkg3" :name 'pkg3)
(cfgl-package "pkg2" :name 'pkg2)
(cfgl-package "pkg1" :name 'pkg1))))
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(should (null (configuration-layer/package-used-p
(nth (random 3) layer1-packages))))))
(ert-deftest test-package-usedp--excluded-package-cannot-be-used ()
(let* ((layer1 (cfgl-layer "layer1" :name 'layer1 :dir "/path/"))
(layer1-packages '(pkg1 pkg2 pkg3))
configuration-layer--used-layers
configuration-layer--used-packages
(configuration-layer--indexed-layers (make-hash-table :size 2048))
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer1) t)
(helper--add-packages
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(list (cfgl-package "pkg3" :name 'pkg3 :owners '(layer1) :excluded t)
(cfgl-package "pkg2" :name 'pkg2 :owners '(layer1) :excluded t)
(cfgl-package "pkg1" :name 'pkg1 :owners '(layer1) :excluded t)) t)
(should (null (configuration-layer/package-used-p
(nth (random 3) layer1-packages))))))
[core] Rename test functions testing :requires functionality These functions were still using "depends-on" which is now inacurrate.
2019-11-03 03:32:05 +00:00
(ert-deftest test-package-usedp--used-pkg-requires-used-pkg-can-be-used ()
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(let* ((layer1 (cfgl-layer "layer1" :name 'layer1 :dir "/path/"))
(layer1-packages '(pkg1))
(layer2 (cfgl-layer "layer2" :name 'layer2 :dir "/path/"))
(layer2-packages '(pkg2))
configuration-layer--used-layers
configuration-layer--used-packages
(configuration-layer--indexed-layers (make-hash-table :size 2048))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer1 layer2) 'used)
(helper--add-packages
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(list (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1))
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
(cfgl-package "pkg2" :name 'pkg2 :owners '(layer2) :requires '(pkg1)))
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
'used)
(should (configuration-layer/package-used-p 'pkg2))))
[core] Rename test functions testing :requires functionality These functions were still using "depends-on" which is now inacurrate.
2019-11-03 03:32:05 +00:00
(ert-deftest test-package-usedp--used-pkg3-requires-used-pkg2-depends-on-used-pkg1-can-be-used ()
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(let* ((layer1 (cfgl-layer "layer1" :name 'layer1 :dir "/path/"))
(layer1-packages '(pkg1))
(layer2 (cfgl-layer "layer2" :name 'layer2 :dir "/path/"))
(layer2-packages '(pkg2))
(layer3 (cfgl-layer "layer3" :name 'layer3 :dir "/path/"))
(layer3-packages '(pkg3))
configuration-layer--used-layers
configuration-layer--used-packages
(configuration-layer--indexed-layers (make-hash-table :size 2048))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer1 layer2 layer3) 'used)
(helper--add-packages
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(list (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1))
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
(cfgl-package "pkg2" :name 'pkg2 :owners '(layer2) :requires '(pkg1))
(cfgl-package "pkg3" :name 'pkg3 :owners '(layer3) :requires '(pkg2))
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
)
'used)
(should (configuration-layer/package-used-p 'pkg3))))
[core] Rename test functions testing :requires functionality These functions were still using "depends-on" which is now inacurrate.
2019-11-03 03:32:05 +00:00
(ert-deftest test-package-usedp--used-pkg2-requires-unused-pkg1-cannot-be-used ()
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(let* ((layer1 (cfgl-layer "layer1" :name 'layer1 :dir "/path/"))
(layer1-packages '(pkg1))
(layer2 (cfgl-layer "layer2" :name 'layer2 :dir "/path/"))
(layer2-packages '(pkg2))
configuration-layer--used-layers
configuration-layer--used-packages
(configuration-layer--indexed-layers (make-hash-table :size 2048))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer1))
(helper--add-layers (list layer2) 'used)
(helper--add-packages
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(list (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1))))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
(list (cfgl-package "pkg2" :name 'pkg2 :owners '(layer2) :requires '(pkg1)))
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
'used)
(should (null (configuration-layer/package-used-p 'pkg2)))))
[core] Rename test functions testing :requires functionality These functions were still using "depends-on" which is now inacurrate.
2019-11-03 03:32:05 +00:00
(ert-deftest test-package-usedp--used-pkg3-requires-used-pkg2-requires-unused-pkg1-cannot-be-used ()
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(let* ((layer1 (cfgl-layer "layer1" :name 'layer1 :dir "/path/"))
(layer1-packages '(pkg1))
(layer2 (cfgl-layer "layer2" :name 'layer2 :dir "/path/"))
(layer2-packages '(pkg2))
(layer3 (cfgl-layer "layer3" :name 'layer3 :dir "/path/"))
(layer3-packages '(pkg3))
configuration-layer--used-layers
configuration-layer--used-packages
(configuration-layer--indexed-layers (make-hash-table :size 2048))
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer1))
(helper--add-layers (list layer2 layer3) 'used)
(helper--add-packages
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
(list (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1))))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
(list (cfgl-package "pkg2" :name 'pkg2 :owners '(layer2) :requires '(pkg1))
(cfgl-package "pkg3" :name 'pkg3 :owners '(layer3) :requires '(pkg2)))
tests: add tests for all code paths of layer-used-p and package-used-p
2017-07-02 14:51:33 +00:00
'used)
(should (null (configuration-layer/package-used-p 'pkg3)))))
tests: simple move of code
2017-07-02 14:02:32 +00:00
Fix: Check dependencies for owned packages too Fixes #9134
2017-06-23 16:29:15 +00:00
;; ---------------------------------------------------------------------------
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
;; configuration-layer//package-reqs-used-p
Fix: Check dependencies for owned packages too Fixes #9134
2017-06-23 16:29:15 +00:00
;; ---------------------------------------------------------------------------
[core] Rename test functions testing :requires functionality These functions were still using "depends-on" which is now inacurrate.
2019-11-03 03:32:05 +00:00
(ert-deftest test-package-reqs-used-p--no-requires ()
Fix: Check dependencies for owned packages too Fixes #9134
2017-06-23 16:29:15 +00:00
(let ((pkg-a (cfgl-package "pkg-a"
:name 'pkg-a)))
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
(should (configuration-layer//package-reqs-used-p pkg-a))))
Fix: Check dependencies for owned packages too Fixes #9134
2017-06-23 16:29:15 +00:00
[core] Rename test functions testing :requires functionality These functions were still using "depends-on" which is now inacurrate.
2019-11-03 03:32:05 +00:00
(ert-deftest test-package-reqs-used-p--requires-used-package ()
Fix: Check dependencies for owned packages too Fixes #9134
2017-06-23 16:29:15 +00:00
(let ((pkg-a (cfgl-package "pkg-a"
:name 'pkg-a
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-b)))
Fix: Check dependencies for owned packages too Fixes #9134
2017-06-23 16:29:15 +00:00
(pkg-b (cfgl-package "pkg-b"
:name 'pkg-b
:owners '(owner)))
(owner (cfgl-layer "owner" :name 'owner))
configuration-layer--used-layers
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(configuration-layer//add-package pkg-b)
(configuration-layer//add-layer owner 'used)
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
(should (configuration-layer//package-reqs-used-p pkg-a))))
Fix: Check dependencies for owned packages too Fixes #9134
2017-06-23 16:29:15 +00:00
[core] Rename test functions testing :requires functionality These functions were still using "depends-on" which is now inacurrate.
2019-11-03 03:32:05 +00:00
(ert-deftest test-package-reqs-used-p--requires-unused-package ()
Fix: Check dependencies for owned packages too Fixes #9134
2017-06-23 16:29:15 +00:00
(let ((pkg-a (cfgl-package "pkg-a"
:name 'pkg-a
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
:requires '(pkg-b)
Fix: Check dependencies for owned packages too Fixes #9134
2017-06-23 16:29:15 +00:00
:owners '(owner)))
(pkg-b (cfgl-package "pkg-b"
:name 'pkg-b))
(owner (cfgl-layer "owner" :name 'owner))
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(configuration-layer--indexed-layers (make-hash-table :size 1024)))
(configuration-layer//add-package pkg-b)
(configuration-layer//add-layer owner nil)
Rename :depends to :requires
2017-07-03 07:52:54 +00:00
(should (null (configuration-layer//package-reqs-used-p pkg-a)))))
Fix: Check dependencies for owned packages too Fixes #9134
2017-06-23 16:29:15 +00:00
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
;; ---------------------------------------------------------------------------
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
;; configuration-layer//package-archive-absolute-path-p
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
;; ---------------------------------------------------------------------------
(ert-deftest test-package-archive-absolute-pathp--http-absolute-path ()
(let ((input '("melpa" . "http://melpa.org/packages/")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (configuration-layer//package-archive-absolute-path-p input))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
(ert-deftest test-package-archive-absolute-pathp--https-absolute-path ()
(let ((input '("melpa" . "https://melpa.org/packages/")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (configuration-layer//package-archive-absolute-path-p input))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
(ert-deftest test-package-archive-absolute-pathp--user-home-tilde-absolute-path ()
(let ((input '("spacelpa" . "~/.elpa/spacelpa")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (configuration-layer//package-archive-absolute-path-p input))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
(ert-deftest test-package-archive-absolute-pathp--user-home-slash-absolute-path ()
(let ((input '("spacelpa" . "/home/rms/.elpa/spacelpa")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (configuration-layer//package-archive-absolute-path-p input))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
Fix handling of windows paths of package archives - the configuration-layer//resolve-package-archives function was adding extra `http://` for windows paths
2017-12-05 09:40:14 +00:00
(ert-deftest test-package-archive-absolute-pathp--windows-absolute-path ()
(let ((input '("spacelpa" . "c:/Users/My User/.elpa/spacelpa")))
(should (configuration-layer//package-archive-absolute-path-p input))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
(ert-deftest test-package-archive-absolute-pathp--relative-path-local ()
(let ((input '("melpa" . "../.elpa/spacelpa")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (not (configuration-layer//package-archive-absolute-path-p input)))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
(ert-deftest test-package-archive-absolute-pathp--not-absolute-path-remote ()
(let ((input '("melpa" . "melpa.org/spacelpa")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (not (configuration-layer//package-archive-absolute-path-p input)))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
;; ---------------------------------------------------------------------------
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
;; configuration-layer//package-archive-local-path-p
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
;; ---------------------------------------------------------------------------
(ert-deftest test-package-archive-local-pathp--http-not-local-path ()
(let ((input '("melpa" . "http://melpa.org/packages/")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (not (configuration-layer//package-archive-local-path-p input)))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
(ert-deftest test-package-archive-local-pathp--https-not-local-path ()
(let ((input '("melpa" . "https://melpa.org/packages/")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (not (configuration-layer//package-archive-local-path-p input)))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
(ert-deftest test-package-archive-local-pathp--user-home-tilde-local-path ()
(let ((input '("spacelpa" . "~/.elpa/spacelpa")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (configuration-layer//package-archive-local-path-p input))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
(ert-deftest test-package-archive-local-pathp--user-home-slash-local-path ()
(let ((input '("spacelpa" . "/home/rms/.elpa/spacelpa")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (configuration-layer//package-archive-local-path-p input))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
Fix handling of windows paths of package archives - the configuration-layer//resolve-package-archives function was adding extra `http://` for windows paths
2017-12-05 09:40:14 +00:00
(ert-deftest test-package-archive-local-pathp--windows-local-path ()
(let ((input '("spacelpa" . "c:/Users/My User/.elpa/spacelpa")))
(should (configuration-layer//package-archive-local-path-p input))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
(ert-deftest test-package-archive-local-pathp--relative-local-path-local ()
(let ((input '("melpa" . "../.elpa/spacelpa")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (configuration-layer//package-archive-local-path-p input))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
(ert-deftest test-package-archive-local-pathp--default-not-local-path-remote ()
(let ((input '("melpa" . "melpa.org/spacelpa")))
core: change <function>p to <function>-p suffixes for consistency Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 13:48:06 +00:00
(should (not (configuration-layer//package-archive-local-path-p input)))))
core: add support for local elpa repositories It is now possible to add local elpa repositories to private variable configuration-layer--elpa-archives for instance: (defvar configuration-layer--elpa-archives '(("spacelpa" . "~/.emacs.d/.cache/spacelpa/")) "List of ELPA archives required by Spacemacs.") New functions: - configuration-layer//package-archive-absolute-pathp - configuration-layer//package-archive-local-pathp
2017-01-22 22:55:59 +00:00
core: use request.el to check elpa archive availability Add request.el to core/libs Refactor package.el initialization in configuration-layer.el Cosmetic improvements to loading messages Remove redefinition of package-refresh-packages
2015-12-03 04:25:00 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//resolve-package-archives
;; ---------------------------------------------------------------------------
(ert-deftest test-resolve-package-archives--simple-https ()
(let ((input '(("melpa" . "melpa.org/packages/")))
(dotspacemacs-elpa-https t))
(should (equal '(("melpa" . "https://melpa.org/packages/"))
(configuration-layer//resolve-package-archives input)))))
(ert-deftest test-resolve-package-archives--simple-http ()
(let ((input '(("melpa" . "melpa.org/packages/")))
dotspacemacs-elpa-https)
(should (equal '(("melpa" . "http://melpa.org/packages/"))
(configuration-layer//resolve-package-archives input)))))
core: Use https for org package repo
2018-01-22 18:21:03 +00:00
(ert-deftest test-resolve-package-archives--org-supports-https ()
core: use request.el to check elpa archive availability Add request.el to core/libs Refactor package.el initialization in configuration-layer.el Cosmetic improvements to loading messages Remove redefinition of package-refresh-packages
2015-12-03 04:25:00 +00:00
(let ((input '(("org" . "orgmode.org/elpa/")))
Fix test test-resolve-package-archives--org-supports-https
2018-01-23 04:51:30 +00:00
(dotspacemacs-elpa-https t))
core: Use https for org package repo
2018-01-22 18:21:03 +00:00
(should (equal '(("org" . "https://orgmode.org/elpa/"))
core: use request.el to check elpa archive availability Add request.el to core/libs Refactor package.el initialization in configuration-layer.el Cosmetic improvements to loading messages Remove redefinition of package-refresh-packages
2015-12-03 04:25:00 +00:00
(configuration-layer//resolve-package-archives input)))))
(ert-deftest test-resolve-package-archives--idempotent-when-already-http-prefix ()
(let ((input '(("melpa" . "http://melpa.org/packages/")))
(dotspacemacs-elpa-https t))
(should (equal '(("melpa" . "http://melpa.org/packages/"))
(configuration-layer//resolve-package-archives input)))))
(ert-deftest test-resolve-package-archives--idempotent-when-already-https-prefix ()
(let ((input '(("melpa" . "https://melpa.org/packages/")))
dotspacemacs-elpa-https)
(should (equal '(("melpa" . "https://melpa.org/packages/"))
(configuration-layer//resolve-package-archives input)))))
Fix unusable Emacs when an ELPA repository is down
2016-02-20 03:14:45 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer/retrieve-package-archives
;; ---------------------------------------------------------------------------
(ert-deftest test-retrieve-package-archives--catch-time-out-error ()
(let ((package-archives '(("gnu" . "https://elpa.gnu.org/packages/")))
(configuration-layer--package-archives-refreshed nil)
(dotspacemacs-elpa-timeout -1))
(mocker-let
((message (format-string &rest args)
((:record-cls 'mocker-stub-record :output nil))))
(configuration-layer/retrieve-package-archives))))
(ert-deftest test-retrieve-package-archives--catch-connection-errors ()
(let ((package-archives '(("gnu" . "https://elpa.gnu.org/packages/")))
(configuration-layer--package-archives-refreshed nil))
(cl-letf (((symbol-function 'url-retrieve-synchronously)
(lambda (x)
(signal 'file-error '("make client process failed"
"connection refused"
:name "elpa.gnu.org"
:buffer dummy
:host "elpa.gnu.org"
:service 443
:nowait nil))))
((symbol-function 'message) 'ignore))
(configuration-layer/retrieve-package-archives))))
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//select-packages
;; ---------------------------------------------------------------------------
(ert-deftest test-select-packages--all-is-default ()
(let ((layer '(layer :variables var1 t var2 t))
(packages '((pkg1 :location local) pkg2)))
(should (eq 'all (configuration-layer//select-packages layer packages)))))
(ert-deftest test-select-packages--all-returns-all ()
(let ((layer '(layer :variables var1 t var2 t :packages all))
(packages '((pkg1 :location local) pkg2)))
(should (eq 'all (configuration-layer//select-packages layer packages)))))
(ert-deftest test-select-packages--select-packages ()
(let ((layer '(layer :variables var1 t var2 t :packages pkg1 pkg3))
(packages '((pkg1 :location local)
pkg2
pkg3
(pkg4 :location built-in))))
(should (equal '(pkg1 pkg3)
(configuration-layer//select-packages layer packages)))))
(ert-deftest test-select-packages--unselect-packages-with-a-list ()
(let ((layer '(layer :variables var1 t var2 t :packages (not pkg1 pkg3)))
(packages '((pkg1 :location local)
pkg2
pkg3
(pkg4 :location built-in))))
(should (equal '(pkg2 pkg4)
(configuration-layer//select-packages layer packages)))))
(ert-deftest test-select-packages--unselect-packages-without-a-list ()
(let ((layer '(layer :variables var1 t var2 t :packages not pkg1 pkg3))
(packages '((pkg1 :location local)
pkg2
pkg3
(pkg4 :location built-in))))
(should (equal '(pkg2 pkg4)
(configuration-layer//select-packages layer packages)))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
;; ---------------------------------------------------------------------------
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
;; configuration-layer/make-layer
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
;; ---------------------------------------------------------------------------
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
;; layer directory
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(ert-deftest test-make-layer--make-layer-from-symbol-with-a-dir ()
(should (equal (cfgl-layer "layer"
:name 'layer
:dir spacemacs-start-directory)
(configuration-layer/make-layer
'layer nil nil spacemacs-start-directory))))
(ert-deftest test-make-layer--make-layer-from-spec-with-a-dir ()
(should (equal (cfgl-layer "layer"
:name 'layer
:dir spacemacs-start-directory)
(configuration-layer/make-layer
'(layer :name 'layer) nil nil spacemacs-start-directory))))
(ert-deftest test-make-layer--cannot-make-layer-without-a-directory ()
(mocker-let
((configuration-layer//warning
(msg &rest args)
((:record-cls 'mocker-stub-record :output nil :occur 1))))
(should (null (configuration-layer/make-layer 'layer)))))
(ert-deftest test-make-layer--cannot-make-layer-with-a-non-existing-directory ()
(mocker-let
((configuration-layer//warning
(msg &rest args)
((:record-cls 'mocker-stub-record :output nil :occur 1))))
(should (null (configuration-layer/make-layer 'layer nil nil "/a/dir/")))))
(ert-deftest test-make-layer--make-layer-without-a-dir-requires-an-initial-obj ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:dir spacemacs-start-directory)))
(should (equal (cfgl-layer "layer"
:name 'layer
:dir spacemacs-start-directory)
(configuration-layer/make-layer 'layer layer)))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
;; load packages
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(ert-deftest test-make-layer--make-used-layer-loads-packages-file ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:dir spacemacs-start-directory))
(layer-packages '(pkg1 pkg2 pkg3))
(mocker-mock-default-record-cls 'mocker-stub-record))
(mocker-let
((file-exists-p (f) ((:output t :occur 2)))
core: fix unit tests
2018-05-20 07:22:08 +00:00
(load (f &optional noerr nomsg) ((:output nil :occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (equal (cfgl-layer "layer"
:name 'layer
:disabled-for nil
:variables nil
:packages '(pkg1 pkg2 pkg3)
:selected-packages 'all
:dir spacemacs-start-directory)
(configuration-layer/make-layer 'layer layer 'used))))))
(ert-deftest test-make-layer--make-layer-force-load-packages-file-with-var ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:dir spacemacs-start-directory))
(layer-packages '(pkg1 pkg2 pkg3))
(configuration-layer--load-packages-files t)
(mocker-mock-default-record-cls 'mocker-stub-record))
(mocker-let
((file-exists-p (f) ((:output t :occur 2)))
core: fix unit tests
2018-05-20 07:22:08 +00:00
(load (f &optional noerr nomsg) ((:output nil :occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (equal (cfgl-layer "layer"
:name 'layer
:disabled-for nil
:variables nil
:packages '(pkg1 pkg2 pkg3)
:selected-packages 'all
:dir spacemacs-start-directory)
(configuration-layer/make-layer 'layer layer))))))
(ert-deftest test-make-layer--make-layer-does-not-load-packages-file-by-default ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:dir spacemacs-start-directory))
(layer-packages '(pkg1))
(mocker-mock-default-record-cls 'mocker-stub-record))
(mocker-let
((file-exists-p (f) ((:output t :occur 1))))
(configuration-layer/make-layer 'layer layer))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
;; set/override properties
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(ert-deftest test-make-layer--make-used-layer-can-set-additional-properties ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:dir spacemacs-start-directory))
(layer-specs '(layer :disabled-for pkg8 pkg9
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow layer2 layer3
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
:variables foo bar toto 1))
(layer-packages '(pkg1 pkg2 pkg3))
(mocker-mock-default-record-cls 'mocker-stub-record))
(mocker-let
((file-exists-p (f) ((:output t :occur 2)))
core: fix unit tests
2018-05-20 07:22:08 +00:00
(load (f &optional noerr nomsg) ((:output nil :occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (equal (cfgl-layer "layer"
:name 'layer
:disabled-for '(pkg8 pkg9)
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow '(layer2 layer3)
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
:variables '(foo bar toto 1)
:packages '(pkg1 pkg2 pkg3)
:selected-packages 'all
:dir spacemacs-start-directory)
(configuration-layer/make-layer layer-specs layer 'used))))))
(ert-deftest test-make-layer--make-not-used-layer-cannot-set-additional-properties ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:dir spacemacs-start-directory))
(layer-specs '(layer :disabled-for pkg8 pkg9
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow layer2
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
:variables foo bar toto 1))
(layer-packages '(pkg1 pkg2 pkg3)))
(should (equal (cfgl-layer "layer"
:name 'layer
:disabled-for nil
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow 'unspecified
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
:variables nil
:packages nil
:selected-packages 'all
:dir spacemacs-start-directory)
(configuration-layer/make-layer layer-specs layer)))))
(ert-deftest test-make-layer--make-used-layer-can-override-additional-properties ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:disabled-for '(pkg10)
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow '()
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
:variables '(titi tata tutu 1)
:dir spacemacs-start-directory))
(layer-specs '(layer :disabled-for pkg8 pkg9
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow layer2
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
:variables foo bar toto 1))
(layer-packages '(pkg1 pkg2 pkg3))
(mocker-mock-default-record-cls 'mocker-stub-record))
(mocker-let
((file-exists-p (f) ((:output t :occur 2)))
core: fix unit tests
2018-05-20 07:22:08 +00:00
(load (f &optional noerr nomsg) ((:output nil :occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (equal (cfgl-layer "layer"
:name 'layer
:disabled-for '(pkg8 pkg9)
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow '(layer2)
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
:variables '(foo bar toto 1)
:packages '(pkg1 pkg2 pkg3)
:selected-packages 'all
:dir spacemacs-start-directory)
(configuration-layer/make-layer layer-specs layer 'used))))))
(ert-deftest test-make-layer--make-not-used-layer-cannot-override-additional-properties ()
(let ((layer (cfgl-layer "layer"
:name 'layer
:disabled-for '(pkg10)
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow '()
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
:variables '(titi tata tutu 1)
:packages '(pkg1 pkg2 pkg3)
:selected-packages 'all
:dir spacemacs-start-directory))
(layer-specs '(layer :disabled-for pkg8 pkg9
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow '(layer2)
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
:variables foo bar toto 1))
(mocker-mock-default-record-cls 'mocker-stub-record))
(should (equal (cfgl-layer "layer"
:name 'layer
:disabled-for '(pkg10)
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow '()
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
:variables '(titi tata tutu 1)
:packages '(pkg1 pkg2 pkg3)
:selected-packages 'all
:dir spacemacs-start-directory)
(configuration-layer/make-layer layer-specs layer)))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
;; ---------------------------------------------------------------------------
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
;; configuration-layer//declare-shadow-relation
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
;; ---------------------------------------------------------------------------
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(ert-deftest test-declare-shadow-relation--is-commutative ()
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(let ((configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers
`(,(cfgl-layer "layer-shadow-1" :name 'layer-shadow-1)
,(cfgl-layer "layer-shadow-2" :name 'layer-shadow-2)))
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(configuration-layer/declare-shadow-relation
'layer-shadow-1
'layer-shadow-2)
(should (and
(equal '(layer-shadow-1) (oref (configuration-layer/get-layer
'layer-shadow-2)
:can-shadow))
(equal '(layer-shadow-2) (oref (configuration-layer/get-layer
'layer-shadow-1)
:can-shadow))))))
(ert-deftest test-declare-shadow-relation--is-idempotent ()
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(let ((configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers
`(,(cfgl-layer "layer-shadow-1" :name 'layer-shadow-1)
,(cfgl-layer "layer-shadow-2" :name 'layer-shadow-2)))
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(dotimes (i 3)
(configuration-layer/declare-shadow-relation
'layer-shadow-1
'layer-shadow-2))
(dotimes (i 3)
(configuration-layer/declare-shadow-relation
'layer-shadow-2
'layer-shadow-1))
(should (and (equal '(layer-shadow-1)
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(oref (configuration-layer/get-layer 'layer-shadow-2)
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
:can-shadow))
(equal '(layer-shadow-2)
(oref (configuration-layer/get-layer 'layer-shadow-1)
:can-shadow))))))
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(ert-deftest test-declare-shadow-relation--layer-1-shadows-multiple-layers ()
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(let ((configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers
`(,(cfgl-layer "layer-shadow-1" :name 'layer-shadow-1)
,(cfgl-layer "layer-shadow-2" :name 'layer-shadow-2)
,(cfgl-layer "layer-shadow-3" :name 'layer-shadow-3)))
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(configuration-layer/declare-shadow-relation
'layer-shadow-1
'layer-shadow-2
'layer-shadow-3)
(should (equal '(layer-shadow-1)
(oref (configuration-layer/get-layer 'layer-shadow-2)
:can-shadow)))
(should (equal '(layer-shadow-1)
(oref (configuration-layer/get-layer 'layer-shadow-3)
:can-shadow)))
(should (equal '(layer-shadow-3 layer-shadow-2)
(oref (configuration-layer/get-layer 'layer-shadow-1)
:can-shadow)))))
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(ert-deftest test-declare-shadow-relation--unknown-layer-shadows-known-layer ()
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(let ((configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers
`(,(cfgl-layer "layer-shadow-2" :name 'layer-shadow-2)))
(mocker-let
((configuration-layer//warning
(msg &rest args)
((:record-cls 'mocker-stub-record :output nil :occur 1))))
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(configuration-layer/declare-shadow-relation
'layer-shadow-1
'layer-shadow-2)
(should (eq 'unspecified
(oref (configuration-layer/get-layer 'layer-shadow-2)
:can-shadow))))))
(ert-deftest test-declare-shadow-relation--known-layer-shadows-unknown-layer ()
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(let ((configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers
`(,(cfgl-layer "layer-shadow-1" :name 'layer-shadow-1)))
(mocker-let
((configuration-layer//warning
(msg &rest args)
((:record-cls 'mocker-stub-record :output nil :occur 1))))
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(configuration-layer/declare-shadow-relation 'layer-shadow-1 'layer-shadow-2))))
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(ert-deftest test-declare-shadow-relation--unknown-layer-shadows-unknown-layer ()
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
(let ((configuration-layer--indexed-layers (make-hash-table :size 1024)))
(mocker-let
((configuration-layer//warning
(msg &rest args)
((:record-cls 'mocker-stub-record :output nil :occur 2))))
core: refactor shadow mechanism Shadowing is now control by layer property ':can-shadow' only. can-shadow is a commutative relation, if layer1 can shadow layer2 then layer2 can shadow layer1. the shadow operator is a binary operator accepting two layer names, it is not commutative and the order of the operands is determined by the order of the layers in the dotfile (like the ownership stealing mechanism). If ':can-shadow' is set explicity to nil in the dotfile then the layer won't shadow any layer. For instance to install both ivy and helm layer: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) ) note that due to the commutative relation the above example can also be written (in this case, ':can-shadow' should be read ':can-be-shawdowed'): (setq dotspacemacs-configuration-layers '( (ivy :can-shadow nil) helm )
2017-09-26 02:55:08 +00:00
(configuration-layer/declare-shadow-relation 'layer-shadow-1 'layer-shadow-2))))
core: add layer shadowing system Layers can now declare in their layers.el file that they shadow one or more layers using the following functions: - configuration-layer/shadow-layers - configuration-layer/shadow-layer Those function are commutative so: (configuration-layer/shadow-layer 'layer1 'layer2) is the same as (configuration-layer/shadow-layer 'layer2 'layer1) and means that layer1 shadows layer2 and layer2 shadows layer1 The typical use-case is helm and ivy layers. Helm shadows the ivy layer and Ivy shadows the helm layer. Shadowing is sensitive to the order of declaration of layers in the dotfile, for instance: (setq dotspacemacs-configuration-layers '( helm ivy )) means that ivy shadows helm so helm layer is effectively ignored, whereas (setq dotspacemacs-configuration-layers '( ivy helm )) means that helm shadows ivy so ivy layer is effectively ignored. This mechanism can be turned off using the :can-shadow keyword: (setq dotspacemacs-configuration-layers '( ivy (helm :can-shadow nil) )) means that both ivy and helm layers will be installed (not recommended in this case) Note that the `:can-shadow` mechanism will be fully implemented in a next commit.
2017-09-22 03:47:20 +00:00
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//set-layers-variables
;; ---------------------------------------------------------------------------
(ert-deftest test-set-layers-variables--none ()
core: re-evaluate layer variables after package configuration It allows to put package variable with a default value set by spacemacs in the layer variables. For instance to set treemacs position to the right, you can now do it like this: (treemacs :variables treemacs-position 'right)
2018-05-28 15:17:44 +00:00
(let ((configuration-layer--indexed-layers (make-hash-table :size 1024))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(var 'foo))
core: re-evaluate layer variables after package configuration It allows to put package variable with a default value set by spacemacs in the layer variables. For instance to set treemacs position to the right, you can now do it like this: (treemacs :variables treemacs-position 'right)
2018-05-28 15:17:44 +00:00
(helper--add-layers
`(,(cfgl-layer "layer"
:name 'layer
:dir "/a/path/")))
(configuration-layer//set-layers-variables '(layer))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(should (eq var 'foo))))
(ert-deftest test-set-layers-variables--one-value ()
core: re-evaluate layer variables after package configuration It allows to put package variable with a default value set by spacemacs in the layer variables. For instance to set treemacs position to the right, you can now do it like this: (treemacs :variables treemacs-position 'right)
2018-05-28 15:17:44 +00:00
(let ((configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers
`(,(cfgl-layer "layer"
:name 'layer
:dir "/a/path/"
:variables '(var1 'bar))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(setq var1 'foo)
core: re-evaluate layer variables after package configuration It allows to put package variable with a default value set by spacemacs in the layer variables. For instance to set treemacs position to the right, you can now do it like this: (treemacs :variables treemacs-position 'right)
2018-05-28 15:17:44 +00:00
(configuration-layer//set-layers-variables '(layer))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(should (eq var1 'bar))))
(ert-deftest test-set-layers-variables--multiple-values ()
core: re-evaluate layer variables after package configuration It allows to put package variable with a default value set by spacemacs in the layer variables. For instance to set treemacs position to the right, you can now do it like this: (treemacs :variables treemacs-position 'right)
2018-05-28 15:17:44 +00:00
(let ((configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers
`(,(cfgl-layer "layer"
:name 'layer
:dir "/a/path/"
:variables '(var1 'bar1 var2 'bar2 var3 'bar3))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(setq var1 'foo)
(setq var2 'foo)
(setq var3 'foo)
core: re-evaluate layer variables after package configuration It allows to put package variable with a default value set by spacemacs in the layer variables. For instance to set treemacs position to the right, you can now do it like this: (treemacs :variables treemacs-position 'right)
2018-05-28 15:17:44 +00:00
(configuration-layer//set-layers-variables '(layer))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(should (eq var1 'bar1))
(should (eq var2 'bar2))
(should (eq var3 'bar3))))
(ert-deftest test-set-layers-variables--odd-number-of-values ()
core: re-evaluate layer variables after package configuration It allows to put package variable with a default value set by spacemacs in the layer variables. For instance to set treemacs position to the right, you can now do it like this: (treemacs :variables treemacs-position 'right)
2018-05-28 15:17:44 +00:00
(let ((configuration-layer--indexed-layers (make-hash-table :size 1024)))
(helper--add-layers
`(,(cfgl-layer "layer"
:name 'layer
:dir "/a/path/"
:variables '(var1 'bar var2))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(mocker-let
Fix tests Mock the correct function configuration-layer//warning
2016-06-11 04:00:46 +00:00
((configuration-layer//warning
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(msg &rest args)
((:record-cls 'mocker-stub-record :output nil :occur 1))))
(setq var1 'foo)
(setq var2 'foo)
core: re-evaluate layer variables after package configuration It allows to put package variable with a default value set by spacemacs in the layer variables. For instance to set treemacs position to the right, you can now do it like this: (treemacs :variables treemacs-position 'right)
2018-05-28 15:17:44 +00:00
(configuration-layer//set-layers-variables '(layer))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(should (eq var1 'bar))
(should (eq var2 'foo)))))
;; ---------------------------------------------------------------------------
;; configuration-layer/make-package
;; ---------------------------------------------------------------------------
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(ert-deftest test-make-package--make-package-from-symbol ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(input 'testpkg)
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(expected (cfgl-package "testpkg"
:name 'testpkg
:location 'elpa
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
:owners '(layer-make-pkg-1)
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
:pre-layers nil
:post-layers nil
:step nil
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
:excluded nil)))
(defun layer-make-pkg-1/init-testpkg nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(cfgl-layer "layer-make-pkg-1" :name 'layer-make-pkg-1)) t)
(should
(equal
expected
(configuration-layer/make-package input 'layer-make-pkg-1)))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(ert-deftest test-make-package--make-package-from-list ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(input '(testpkg :location local :step pre))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(expected (cfgl-package "testpkg"
:name 'testpkg
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
:owners '(layer-make-pkg-2)
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
:location 'local
:pre-layers nil
:post-layers nil
:step 'pre
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
:excluded nil)))
(defun layer-make-pkg-2/init-testpkg nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(cfgl-layer "layer-make-pkg-2" :name 'layer-make-pkg-2)) t)
(should
(equal
expected
(configuration-layer/make-package input 'layer-make-pkg-2)))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
core: fix make-package multiple calls side effects Calling multiple times configuration-layer/make-package appends the same layers to :owners, :pre-layers and :post-layers slot. Use object-add-to-list instead of push. Add some tests and mock some warning messages.
2016-09-05 19:01:35 +00:00
(ert-deftest test-make-package--multiple-calls-invariants ()
(defun layer-make-pkg-3/init-testpkg nil)
(defun layer-make-pkg-4/pre-init-testpkg nil)
(defun layer-make-pkg-5/post-init-testpkg nil)
(let* (configuration-layer--used-layers
configuration-layer--protected-packages
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(input '(testpkg :protected t))
(expected-pkg (cfgl-package "testpkg"
:name 'testpkg
:location 'elpa
:owners '(layer-make-pkg-3)
:pre-layers '(layer-make-pkg-4)
:post-layers '(layer-make-pkg-5)
:step nil
:protected t
:excluded nil))
(expected-protected-list '(testpkg)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: fix make-package multiple calls side effects Calling multiple times configuration-layer/make-package appends the same layers to :owners, :pre-layers and :post-layers slot. Use object-add-to-list instead of push. Add some tests and mock some warning messages.
2016-09-05 19:01:35 +00:00
`(,(cfgl-layer "layer-make-pkg-3" :name 'layer-make-pkg-3)
,(cfgl-layer "layer-make-pkg-4" :name 'layer-make-pkg-4)
,(cfgl-layer "layer-make-pkg-5" :name 'layer-make-pkg-5)) t)
(let ((obj (configuration-layer/make-package input 'layer-make-pkg-3)))
(dotimes (x 3)
(configuration-layer/make-package input 'layer-make-pkg-3 obj)
(configuration-layer/make-package input 'layer-make-pkg-4 obj)
(configuration-layer/make-package input 'layer-make-pkg-5 obj))
(should (equal expected-pkg obj))
(should (equal expected-protected-list
configuration-layer--protected-packages)))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-package--can-override-toggle ()
(let (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(obj (cfgl-package "testpkg" :name 'testpkg :toggle 'foo))
(pkg '(testpkg :toggle bar))
(expected (cfgl-package "testpkg"
:name 'testpkg
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
:owners '(layer-make-pkg-6)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
:toggle 'bar)))
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(defun layer-make-pkg-6/init-testpkg nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
`(,(cfgl-layer "layer-make-pkg-6" :name 'layer-make-pkg-6))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
t)
(should
(equal
expected
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(configuration-layer/make-package pkg 'layer-make-pkg-6 obj)))))
core: add tests for make-package
2016-07-04 00:58:28 +00:00
(ert-deftest test-make-package--can-override-location ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(obj (cfgl-package "testpkg"
core: add tests for make-package
2016-07-04 00:58:28 +00:00
:name 'testpkg
:location 'elpa))
(pkg '(testpkg :location local))
(expected (cfgl-package "testpkg"
:name 'testpkg
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
:owners '(layer-make-pkg-7)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
:location 'local)))
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(defun layer-make-pkg-7/init-testpkg nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
`(,(cfgl-layer "layer-make-pkg-7" :name 'layer-make-pkg-7)) t)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(should
(equal expected
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(configuration-layer/make-package pkg 'layer-make-pkg-7 obj)))))
core: add tests for make-package
2016-07-04 00:58:28 +00:00
(ert-deftest test-make-package--can-override-step ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(obj (cfgl-package "testpkg"
core: add tests for make-package
2016-07-04 00:58:28 +00:00
:name 'testpkg
:step nil))
(pkg '(testpkg :step pre))
(expected (cfgl-package "testpkg"
:name 'testpkg
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
:owners '(layer-make-pkg-8)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
:step 'pre)))
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(defun layer-make-pkg-8/init-testpkg nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
`(,(cfgl-layer "layer-make-pkg-8" :name 'layer-make-pkg-8)) t)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(should
(equal
expected
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(configuration-layer/make-package pkg 'layer-make-pkg-8 obj)))))
core: add tests for make-package
2016-07-04 00:58:28 +00:00
(ert-deftest test-make-package--cannot-override-protected ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(obj (cfgl-package "testpkg"
core: add tests for make-package
2016-07-04 00:58:28 +00:00
:name 'testpkg
:protected t))
(pkg '(testpkg :protected nil))
(expected (cfgl-package "testpkg"
:name 'testpkg
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
:owners '(layer-make-pkg-9)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
:protected t)))
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(defun layer-make-pkg-9/init-testpkg nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
`(,(cfgl-layer "layer-make-pkg-9"
:name 'layer-make-pkg-9)) t)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(should
(equal
expected
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(configuration-layer/make-package pkg 'layer-make-pkg-9 obj)))))
core: add tests for make-package
2016-07-04 00:58:28 +00:00
(ert-deftest test-make-package--cannot-unexclude-excluded-package ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(obj (cfgl-package "testpkg"
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
:name 'testpkg
:excluded t))
core: add tests for make-package
2016-07-04 00:58:28 +00:00
(pkg '(testpkg :excluded nil))
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
(expected (cfgl-package "testpkg"
:name 'testpkg
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
:excluded t)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
`(,(cfgl-layer "layer-make-pkg-10" :name 'layer-make-pkg-10)) t)
(should
(equal expected
(configuration-layer/make-package pkg 'layer-make-pkg-10 obj)))))
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
core: Split configuration-layer/make-packages-from-layers Split the function in two functions: - configuration-layer/make-packages-from-layers - configuration-layer/make-packages-from-dotfile
2016-09-05 16:40:44 +00:00
(ert-deftest test-make-package--bootstrap-package-are-protected ()
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(pkg '(testpkg :step bootstrap))
(expected (cfgl-package "testpkg"
:name 'testpkg
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
:owners '(layer-make-pkg-11)
core: Split configuration-layer/make-packages-from-layers Split the function in two functions: - configuration-layer/make-packages-from-layers - configuration-layer/make-packages-from-dotfile
2016-09-05 16:40:44 +00:00
:step 'bootstrap
:protected t)))
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(defun layer-make-pkg-11/init-testpkg nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
`(,(cfgl-layer "layer-make-pkg-11" :name 'layer-make-pkg-11)) t)
core: Split configuration-layer/make-packages-from-layers Split the function in two functions: - configuration-layer/make-packages-from-layers - configuration-layer/make-packages-from-dotfile
2016-09-05 16:40:44 +00:00
(should
(equal
expected
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(configuration-layer/make-package pkg 'layer-make-pkg-11)))))
core: Split configuration-layer/make-packages-from-layers Split the function in two functions: - configuration-layer/make-packages-from-layers - configuration-layer/make-packages-from-dotfile
2016-09-05 16:40:44 +00:00
[core] Add tests showing that list is required with multiple symbols It means that: (helm-company :requires helm) is OK, but (helm-company :requires helm pkg2) is not OK, list is mandatory (helm-company :requires (helm pkg2))
2019-11-03 03:57:06 +00:00
(ert-deftest test-make-package--make-package-requires-with-single-symbol ()
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(input '(testpkg :location local :step pre :requires requiredpkg))
(expected (cfgl-package "testpkg"
:name 'testpkg
:owners '(layer-make-pkg-12)
:location 'local
:requires '(requiredpkg)
:pre-layers nil
:post-layers nil
:step 'pre
:excluded nil)))
(defun layer-make-pkg-12/init-testpkg nil)
(helper--add-layers
`(,(cfgl-layer "layer-make-pkg-12" :name 'layer-make-pkg-12)) t)
(should
(equal
expected
(configuration-layer/make-package input 'layer-make-pkg-12)))))
(ert-deftest test-make-package--error-when-make-package-requires-with-multiple-symbols-no-list ()
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(input '(testpkg :location local :step pre :requires pkg1 pkg2 pkg3))
(expected (cfgl-package "testpkg"
:name 'testpkg
:owners '(layer-make-pkg-13)
:location 'local
:requires '(pkg1 pkg2 pkg3)
:pre-layers nil
:post-layers nil
:step 'pre
:excluded nil)))
(defun layer-make-pkg-13/init-testpkg nil)
(helper--add-layers
`(,(cfgl-layer "layer-make-pkg-13" :name 'layer-make-pkg-13)) t)
;; (message "%s" (configuration-layer/make-package input 'layer-make-pkg-13))
(should
(not (equal
expected
(configuration-layer/make-package input 'layer-make-pkg-13))))))
(ert-deftest test-make-package--make-package-requires-list-when-multiple-symbols ()
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(input '(testpkg :location local :step pre :requires (pkg1 pkg2 pkg3)))
(expected (cfgl-package "testpkg"
:name 'testpkg
:owners '(layer-make-pkg-14)
:location 'local
:requires '(pkg1 pkg2 pkg3)
:pre-layers nil
:post-layers nil
:step 'pre
:excluded nil)))
(defun layer-make-pkg-14/init-testpkg nil)
(helper--add-layers
`(,(cfgl-layer "layer-make-pkg-14" :name 'layer-make-pkg-14)) t)
(message "%s" (configuration-layer/make-package input 'layer-make-pkg-14))
(should
(equal
expected
(configuration-layer/make-package input 'layer-make-pkg-14)))))
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
;; ---------------------------------------------------------------------------
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
;; configuration-layer//filter-distant-packages
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
;; ---------------------------------------------------------------------------
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
(defvar test-filter-distant-packages--test-data
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
`(,(cfgl-package "pkg18" :name 'pkg18 :owners nil)
,(cfgl-package "pkg17" :name 'pkg17 :owners nil :location 'elpa)
,(cfgl-package "pkg16" :name 'pkg16 :owners nil :toggle nil)
,(cfgl-package "pkg15" :name 'pkg15 :owners nil :toggle t)
,(cfgl-package "pkg14" :name 'pkg14 :owners nil :location '(recipe))
,(cfgl-package "pkg13" :name 'pkg13 :owners nil :location 'built-in)
,(cfgl-package "pkg12" :name 'pkg12 :owners nil :location 'local)
,(cfgl-package "pkg11" :name 'pkg11 :owners nil :location 'site)
,(cfgl-package "pkg10" :name 'pkg10 :owners nil :location "/path")
,(cfgl-package "pkg9" :name 'pkg9 :owners '(layer))
,(cfgl-package "pkg8" :name 'pkg8 :owners '(layer) :location 'elpa)
,(cfgl-package "pkg7" :name 'pkg7 :owners '(layer) :toggle nil)
,(cfgl-package "pkg6" :name 'pkg6 :owners '(layer) :toggle t)
,(cfgl-package "pkg5" :name 'pkg5 :owners '(layer) :location '(recipe))
,(cfgl-package "pkg4" :name 'pkg4 :owners '(layer) :location 'built-in)
,(cfgl-package "pkg3" :name 'pkg3 :owners '(layer) :location 'local)
,(cfgl-package "pkg2" :name 'pkg2 :owners '(layer) :location 'site)
,(cfgl-package "pkg1" :name 'pkg1 :owners '(layer) :location "/path")))
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
(ert-deftest test-filter-distant-packages--return-only-used-packages ()
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(let* ((packages (mapcar 'car (object-assoc-list
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
:name test-filter-distant-packages--test-data)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
(helper--add-packages test-filter-distant-packages--test-data t)
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
(should
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(equal '(pkg9 pkg8 pkg6 pkg5)
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
(configuration-layer//filter-distant-packages packages t)))))
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
(ert-deftest test-filter-distant-packages--return-only-unused-packages ()
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(let ((packages (mapcar 'car (object-assoc-list
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
:name test-filter-distant-packages--test-data)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
(helper--add-packages test-filter-distant-packages--test-data t)
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
(should
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(equal '(pkg18 pkg17 pkg16 pkg15 pkg14 pkg9 pkg8 pkg7 pkg6 pkg5)
core: remove variable configuration-layer--used-distant-packages - remove variable configuration-layer--used-distant-packages - rename function configuration-layer//get-distant-packages to configuration-layer//filter-distant-packages to better reflect what it does - Add argument PREDICATE to configuration-layer//filter-distant-packages - New cfgl-package methods: cfgl-package-used-p and cfgl-package-distant-p - Add unit tests
2017-07-30 16:50:39 +00:00
(configuration-layer//filter-distant-packages packages nil)))))
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
;; ---------------------------------------------------------------------------
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
;; configuration-layer/make-packages-from-layers
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
;; ---------------------------------------------------------------------------
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--symbols-only ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer1 (cfgl-layer "layer1"
:name 'layer1
:dir "/path/"
:packages '(pkg1 pkg2 pkg3)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer1) t)
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(defun layer1/init-pkg1 nil)
(defun layer1/init-pkg2 nil)
(defun layer1/init-pkg3 nil)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer1))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should
(and (equal (cfgl-package "pkg3" :name 'pkg3 :owners '(layer1))
(ht-get configuration-layer--indexed-packages 'pkg3))
(equal (cfgl-package "pkg2" :name 'pkg2 :owners '(layer1))
(ht-get configuration-layer--indexed-packages 'pkg2))
(equal (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1))
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--lists-only ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer1 (cfgl-layer "layer1"
:name 'layer1
:dir "/path/"
:packages '((pkg1 :location elpa :excluded t)
(pkg2 :location (recipe blahblah))
(pkg3 :location local :step pre))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer1) t)
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(defun layer1/init-pkg1 nil)
(defun layer1/init-pkg2 nil)
(defun layer1/init-pkg3 nil)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer1))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should
(and (equal (cfgl-package "pkg3"
:name 'pkg3
:owners '(layer1)
:location 'local
:step 'pre)
(ht-get configuration-layer--indexed-packages 'pkg3))
(equal (cfgl-package "pkg2"
:name 'pkg2
:owners '(layer1)
:location '(recipe blahblah))
(ht-get configuration-layer--indexed-packages 'pkg2))
(equal (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1) :excluded t)
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--symbols-and-lists ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer1 (cfgl-layer "layer1"
:name 'layer1
:dir "/path/"
:packages '(pkg1
(pkg2 :location (recipe blahblah))
(pkg3 :location local :step pre)
pkg4)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer1) t)
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(defun layer1/init-pkg1 nil)
(defun layer1/init-pkg2 nil)
(defun layer1/init-pkg3 nil)
(defun layer1/init-pkg4 nil)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer1))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should
(and (equal (cfgl-package "pkg4" :name 'pkg4 :owners '(layer1))
(ht-get configuration-layer--indexed-packages 'pkg4))
(equal (cfgl-package "pkg3"
:name 'pkg3
:owners '(layer1)
:location 'local
:step 'pre)
(ht-get configuration-layer--indexed-packages 'pkg3))
(equal (cfgl-package "pkg2"
:name 'pkg2
:owners '(layer1)
:location '(recipe blahblah))
(ht-get configuration-layer--indexed-packages 'pkg2))
(equal (cfgl-package "pkg1" :name 'pkg1 :owners '(layer1))
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--pkg2-has-no-owner-because-no-init-function ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer2 (cfgl-layer "layer2"
:name 'layer2
:dir "/path/"
:packages '(pkg1 pkg2 pkg3)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer2) t)
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(defun layer2/init-pkg1 nil)
(defun layer2/init-pkg3 nil)
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
(mocker-let
core: fix make-package multiple calls side effects Calling multiple times configuration-layer/make-package appends the same layers to :owners, :pre-layers and :post-layers slot. Use object-add-to-list instead of push. Add some tests and mock some warning messages.
2016-09-05 19:01:35 +00:00
((configuration-layer//warning (msg &rest args) ((:output nil :occur 1))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer2))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should
(and (equal (cfgl-package "pkg3" :name 'pkg3 :owners '(layer2))
(ht-get configuration-layer--indexed-packages 'pkg3))
(equal (cfgl-package "pkg2" :name 'pkg2)
(ht-get configuration-layer--indexed-packages 'pkg2))
(equal (cfgl-package "pkg1" :name 'pkg1 :owners '(layer2))
(ht-get configuration-layer--indexed-packages 'pkg1)))))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--pre-init-function ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer3 (cfgl-layer "layer3"
:name 'layer3
:dir "/path/"
:packages '(pkg1)))
(layer4 (cfgl-layer "layer4"
:name 'layer4
:dir "/path/"
:packages '(pkg1)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer3 layer4) t)
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(defun layer3/init-pkg1 nil)
(defun layer4/pre-init-pkg1 nil)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer3 layer4))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer3)
:pre-layers '(layer4))
(ht-get configuration-layer--indexed-packages 'pkg1)))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--post-init-function ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer3 (cfgl-layer "layer3"
:name 'layer3
:dir "/path/"
:packages '(pkg1)))
(layer5 (cfgl-layer "layer5"
:name 'layer5
:dir "/path/"
:packages '(pkg1)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer3 layer5) t)
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(defun layer3/init-pkg1 nil)
(defun layer5/post-init-pkg1 nil)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer3 layer5))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer3)
:post-layers '(layer5))
(ht-get configuration-layer--indexed-packages 'pkg1)))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--pre-and-post-init-functions ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer3 (cfgl-layer "layer3"
:name 'layer3
:dir "/path/"
:packages '(pkg1)))
(layer6 (cfgl-layer "layer6"
:name 'layer6
:dir "/path/"
:packages '(pkg1)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer3 layer6) t)
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(defun layer3/init-pkg1 nil)
(defun layer6/pre-init-pkg1 nil)
(defun layer6/post-init-pkg1 nil)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer3 layer6))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer3)
:pre-layers '(layer6)
:post-layers '(layer6))
(ht-get configuration-layer--indexed-packages 'pkg1)))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--several-init-functions-last-one-is-the-owner ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer7 (cfgl-layer "layer7"
:name 'layer7
:dir "/path/"
:packages '(pkg1)))
(layer8 (cfgl-layer "layer8"
:name 'layer8
:dir "/path/"
:packages '(pkg1)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer7 layer8) t)
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(defun layer7/init-pkg1 nil)
(defun layer8/init-pkg1 nil)
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
(mocker-let
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
((configuration-layer//warning (msg &rest args) ((:output nil :occur 1))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer7 layer8))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer8 layer7))
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--layer-10-excludes-pkg2-in-layer-9 ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer9 (cfgl-layer "layer9"
:name 'layer9
:dir "/path/"
:packages '(pkg1 pkg2)))
(layer10 (cfgl-layer "layer10"
:name 'layer10
:dir "/path/"
:packages '(pkg3 (pkg2 :excluded t))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer9 layer10) t)
core: package-list-v2 new class cfgl-package
2015-08-06 03:39:39 +00:00
(defun layer9/init-pkg1 nil)
(defun layer9/init-pkg2 nil)
(defun layer10/init-pkg3 nil)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer9 layer10))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should
(and (equal (cfgl-package "pkg3" :name 'pkg3 :owners '(layer10))
(ht-get configuration-layer--indexed-packages 'pkg3))
(equal (cfgl-package "pkg2" :name 'pkg2 :owners '(layer9) :excluded t)
(ht-get configuration-layer--indexed-packages 'pkg2))
(equal (cfgl-package "pkg1" :name 'pkg1 :owners '(layer9))
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--last-owner-can-overwrite-location ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer13 (cfgl-layer "layer13"
:name 'layer13
:dir "/path/"
:packages '((pkg1 :location elpa))))
(layer14 (cfgl-layer "layer14"
:name 'layer14
:dir "/path/"
:packages '((pkg1 :location local))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer13 layer14) t)
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
(defun layer13/init-pkg1 nil)
(defun layer14/init-pkg1 nil)
core: fix make-package multiple calls side effects Calling multiple times configuration-layer/make-package appends the same layers to :owners, :pre-layers and :post-layers slot. Use object-add-to-list instead of push. Add some tests and mock some warning messages.
2016-09-05 19:01:35 +00:00
(mocker-let
((configuration-layer//warning (msg &rest args) ((:output nil :occur 1))))
(configuration-layer/make-packages-from-layers '(layer13 layer14))
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer14 layer13)
:location 'local)
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--last-owner-can-overwrite-step-nil-to-pre ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer15 (cfgl-layer "layer15"
:name 'layer15
:dir "/path/"
:packages '((pkg1 :step nil))))
(layer16 (cfgl-layer "layer16"
:name 'layer16
:dir "/path/"
:packages '((pkg1 :step pre))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
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.
2015-09-24 04:02:02 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer15 layer16) t)
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.
2015-09-24 04:02:02 +00:00
(defun layer15/init-pkg1 nil)
(defun layer16/init-pkg1 nil)
core: fix make-package multiple calls side effects Calling multiple times configuration-layer/make-package appends the same layers to :owners, :pre-layers and :post-layers slot. Use object-add-to-list instead of push. Add some tests and mock some warning messages.
2016-09-05 19:01:35 +00:00
(mocker-let
((configuration-layer//warning (msg &rest args) ((:output nil :occur 1))))
(configuration-layer/make-packages-from-layers '(layer15 layer16))
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer16 layer15)
:step 'pre)
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--last-owner-cannot-overwrite-step-pre-to-nil ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer15 (cfgl-layer "layer15"
:name 'layer15
:dir "/path/"
:packages '((pkg1 :step pre))))
(layer16 (cfgl-layer "layer16"
:name 'layer16
:dir "/path/"
:packages '((pkg1 :step nil))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer15 layer16) t)
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
(defun layer15/init-pkg1 nil)
(defun layer16/init-pkg1 nil)
core: fix make-package multiple calls side effects Calling multiple times configuration-layer/make-package appends the same layers to :owners, :pre-layers and :post-layers slot. Use object-add-to-list instead of push. Add some tests and mock some warning messages.
2016-09-05 19:01:35 +00:00
(mocker-let
((configuration-layer//warning (msg &rest args) ((:output nil :occur 1))))
(configuration-layer/make-packages-from-layers '(layer15 layer16))
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer16 layer15)
:step 'pre)
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--last-owner-can-overwrite-exclude ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer17 (cfgl-layer "layer17"
:name 'layer17
:dir "/path/"
:packages '(pkg1)))
(layer18 (cfgl-layer "layer18"
:name 'layer18
:dir "/path/"
:packages '((pkg1 :excluded t))
))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer17 layer18) t)
core: the owner of a package can override some properties Allowed properties to be overridden are: location, step and excluded This mechanism allow the user to alter the location of a given package, for instance if she wants to use her own fork instead of the version in ELPA. Note that for now there is no easy way to override the package recipes.
2015-08-13 05:23:39 +00:00
(defun layer17/init-pkg1 nil)
(defun layer18/init-pkg1 nil)
core: fix make-package multiple calls side effects Calling multiple times configuration-layer/make-package appends the same layers to :owners, :pre-layers and :post-layers slot. Use object-add-to-list instead of push. Add some tests and mock some warning messages.
2016-09-05 19:01:35 +00:00
(mocker-let
((configuration-layer//warning (msg &rest args) ((:output nil :occur 1))))
(configuration-layer/make-packages-from-layers '(layer17 layer18))
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer18 layer17)
:excluded t)
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--owner-layer-can-define-toggle ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer19 (cfgl-layer "layer19"
:name 'layer19
:dir "/path/"
:packages '((pkg1 :toggle (foo-toggle)))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer19) t)
core: add overriding rules for :toggle :toggle is ignored if not used in the owner of a package, it can be overridden by new owners or by the dotfile.
2016-03-19 22:24:59 +00:00
(defun layer19/init-pkg1 nil)
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(let (configuration-layer--used-packages))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer19))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer19)
:toggle '(foo-toggle))
(ht-get configuration-layer--indexed-packages 'pkg1)))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--not-owner-layer-can-define-toggle-with-warning ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer20 (cfgl-layer "layer20"
:name 'layer20
:dir "/path/"
:packages '(pkg1)))
(layer21 (cfgl-layer "layer21"
:name 'layer21
:dir "/path/"
:packages '((pkg1 :toggle (foo-toggle)))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: add overriding rules for :toggle :toggle is ignored if not used in the owner of a package, it can be overridden by new owners or by the dotfile.
2016-03-19 22:24:59 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer20 layer21) t)
core: add overriding rules for :toggle :toggle is ignored if not used in the owner of a package, it can be overridden by new owners or by the dotfile.
2016-03-19 22:24:59 +00:00
(defun layer20/init-pkg1 nil)
(defun layer21/post-init-pkg1 nil)
(mocker-let
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
((configuration-layer//warning (msg &rest args) ((:output nil :occur 1))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer20 layer21))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer20)
:post-layers '(layer21)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
:toggle '(foo-toggle))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: Split configuration-layer/make-packages-from-layers Split the function in two functions: - configuration-layer/make-packages-from-layers - configuration-layer/make-packages-from-dotfile
2016-09-05 16:40:44 +00:00
(ert-deftest test-make-packages-from-layers--layer-can-override-toggle ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer22 (cfgl-layer "layer22"
:name 'layer22
:dir "/path/"
:packages '((pkg1 :toggle (foo-toggle)))))
(layer23 (cfgl-layer "layer23"
:name 'layer23
:dir "/path/"
:packages '((pkg1 :toggle (bar-toggle)))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: add overriding rules for :toggle :toggle is ignored if not used in the owner of a package, it can be overridden by new owners or by the dotfile.
2016-03-19 22:24:59 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer22 layer23) t)
core: add overriding rules for :toggle :toggle is ignored if not used in the owner of a package, it can be overridden by new owners or by the dotfile.
2016-03-19 22:24:59 +00:00
(defun layer22/init-pkg1 nil)
(defun layer23/init-pkg1 nil)
core: fix make-package multiple calls side effects Calling multiple times configuration-layer/make-package appends the same layers to :owners, :pre-layers and :post-layers slot. Use object-add-to-list instead of push. Add some tests and mock some warning messages.
2016-09-05 19:01:35 +00:00
(mocker-let
((configuration-layer//warning (msg &rest args) ((:output nil :occur 1))))
(configuration-layer/make-packages-from-layers '(layer22 layer23))
(should (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer23 layer22)
:toggle '(bar-toggle))
(ht-get configuration-layer--indexed-packages 'pkg1))))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--not-selected-packages-are-not-excluded ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer24 (cfgl-layer "layer24"
:name 'layer24
:dir "/path/"
:packages '(pkg1 (pkg2 :location local))
:selected-packages '(pkg2)))
(layer25 (cfgl-layer "layer25"
:name 'layer25
:dir "/path/"
:packages '(pkg1 (pkg2 :location local))
:selected-packages '(pkg1)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer24 layer25))
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(defun layer24/post-init-pkg1 nil)
(defun layer24/init-pkg2 nil)
(defun layer25/init-pkg1 nil)
(defun layer25/post-init-pkg2 nil)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer24 layer25))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should
(and (equal (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer25)
:excluded nil)
(ht-get configuration-layer--indexed-packages 'pkg1))
(equal (cfgl-package "pkg2"
:name 'pkg2
:owners '(layer24)
:location 'local
:excluded nil)
(ht-get configuration-layer--indexed-packages 'pkg2))))))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(ert-deftest test-make-packages-from-layers--not-selected-package-in-a-layer-can-still-be-created-with-no-owner ()
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(let* ((layer26 (cfgl-layer "layer26"
:name 'layer26
:dir "/path/"
:packages '(pkg1 (pkg2 :location local))
:selected-packages '(pkg2)))
(layer27 (cfgl-layer "layer27"
:name 'layer27
:dir "/path/"
:packages '(pkg1 pkg2)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer26 layer27))
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
(defun layer26/init-pkg1 nil)
(defun layer26/init-pkg2 nil)
(defun layer27/post-init-pkg1 nil)
(defun layer27/post-init-pkg2 nil)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(configuration-layer/make-packages-from-layers '(layer26 layer27))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should
(and (equal (cfgl-package "pkg1"
:name 'pkg1
:post-layers '(layer27)
:owners nil)
(ht-get configuration-layer--indexed-packages 'pkg1))
(equal (cfgl-package "pkg2"
:name 'pkg2
:owners '(layer26)
:post-layers '(layer27)
:location 'local)
(ht-get configuration-layer--indexed-packages 'pkg2))))))
core: reimplement :packages keyword and update documentation Old implementation excluded package that were not selected, this implementation does not excluded them, it simply ignore it in the layer where they are not selected. This reimplementation comes from a refactor of the way packages.el files are loaded, instead of loading these files at the moment of resolving the list of used packages, they are now loaded when making the layer objects. A neat consequence is that side effects is better confined and the configuration-layer/get-packages is now pure (at least a lot more pure than before). In the `cfgl-layer` class the slot `:user-packages` has been renamed to `:selected-packages` which defaults to `'all` meaning that all the packages in `:packages` are selected. `:selected-packages` value is given by the new function `configuration-layer//select-packages`. Effectively selected packages are given by a new method for `cfgl-layer` class called `cfgl-layer-get-packages`. Tests have been updated to reflect the changes. Also documentation on configuration layer declaration in the dotfile section of DOCUMENTATION.org has been greatly improved (I hope) and reflect the last feature added to the `dotspacemacs-configuration-layers` list.
2016-06-21 00:48:25 +00:00
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(ert-deftest test-make-packages-from-layers--package-properties-read-only ()
;; we expect that :excluded is still nil
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(layer28 (cfgl-layer "layer28"
:name 'layer28
:packages '((pkg1 :excluded nil))))
(layer29 (cfgl-layer "layer29"
:name 'layer29
:packages '((pkg1 :excluded t))))
(expected (cfgl-package "pkg1"
:name 'pkg1
:owners '(layer28)
:excluded nil))
(mocker-mock-default-record-cls 'mocker-stub-record))
(defun layer28/init-pkg1 nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer28) t)
(helper--add-layers (list layer29))
core: contain side effects when loading packages for SPC h SPC Fixes some edge cases like SPC f e R performed after SPC h SPC which could wrongly install or uninstall packages. Side effects is contained using the variable configuration-layer--package-properties-read-onlyp, if non nil then properties value of a package cannot be overwritten.
2016-09-06 00:54:07 +00:00
(mocker-let
((configuration-layer//warning (msg &rest args) ((:output nil :occur 1))))
(configuration-layer/make-packages-from-layers '(layer28) t)
(let ((configuration-layer--package-properties-read-onlyp t))
(configuration-layer/make-packages-from-layers '(layer28 layer29)))
(should
(equal expected (ht-get configuration-layer--indexed-packages 'pkg1))))))
core: Split configuration-layer/make-packages-from-layers Split the function in two functions: - configuration-layer/make-packages-from-layers - configuration-layer/make-packages-from-dotfile
2016-09-05 16:40:44 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer/make-packages-from-dotfile
;; ---------------------------------------------------------------------------
(ert-deftest test-make-packages-from-dotfile--dotfile-declares-and-owns-one-additional-package ()
(let* ((layer-dotfile-1 (cfgl-layer "layer-dotfile-1"
:name 'layer-dotfile-1
:dir "/path/"
:packages '(pkg1 pkg2)))
(dotspacemacs-additional-packages '(pkg3))
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
(defun layer-dotfile-1/init-pkg1 nil)
(defun layer-dotfile-1/init-pkg2 nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer-dotfile-1) t)
core: Split configuration-layer/make-packages-from-layers Split the function in two functions: - configuration-layer/make-packages-from-layers - configuration-layer/make-packages-from-dotfile
2016-09-05 16:40:44 +00:00
(configuration-layer/make-packages-from-layers '(layer-dotfile-1) 'used)
(configuration-layer/make-packages-from-dotfile 'used)
(should
(and (equal (cfgl-package "pkg3" :name 'pkg3 :owners '(dotfile))
(ht-get configuration-layer--indexed-packages 'pkg3))
(equal (cfgl-package "pkg2" :name 'pkg2 :owners '(layer-dotfile-1))
(ht-get configuration-layer--indexed-packages 'pkg2))
(equal (cfgl-package "pkg1" :name 'pkg1 :owners '(layer-dotfile-1))
(ht-get configuration-layer--indexed-packages 'pkg1))))))
(ert-deftest test-make-packages-from-dotfile--dotfile-cannot-own-package-owned-by-layer ()
(let* ((layer-dotfile-2 (cfgl-layer "layer-dotfile-2"
:name 'layer-dotfile-2
:dir "/path/"
:packages '(pkg1)))
(dotspacemacs-additional-packages '(pkg1))
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
(defun layer-dotfile-2/init-pkg1 nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer-dotfile-2) t)
core: Split configuration-layer/make-packages-from-layers Split the function in two functions: - configuration-layer/make-packages-from-layers - configuration-layer/make-packages-from-dotfile
2016-09-05 16:40:44 +00:00
(configuration-layer/make-packages-from-layers '(layer-dotfile-2) 'used)
(configuration-layer/make-packages-from-dotfile 'used)
(should
(equal (cfgl-package "pkg1" :name 'pkg1 :owners '(layer-dotfile-2))
(ht-get configuration-layer--indexed-packages 'pkg1)))))
(ert-deftest test-make-packages-from-dotfile--dotfile-excludes-pkg2-in-layer-11 ()
(let* ((layer-dotfile-3 (cfgl-layer "layer-dotfile-3"
:name 'layer-dotfile-3
:dir "/path/"
:packages '(pkg1 pkg2 pkg3)))
(dotspacemacs-excluded-packages '(pkg2))
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(mocker-mock-default-record-cls 'mocker-stub-record))
(defun layer-dotfile-3/init-pkg1 nil)
(defun layer-dotfile-3/init-pkg2 nil)
(defun layer-dotfile-3/init-pkg3 nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers (list layer-dotfile-3) t)
core: Split configuration-layer/make-packages-from-layers Split the function in two functions: - configuration-layer/make-packages-from-layers - configuration-layer/make-packages-from-dotfile
2016-09-05 16:40:44 +00:00
(configuration-layer/make-packages-from-layers '(layer-dotfile-3) 'used)
(configuration-layer/make-packages-from-dotfile 'used)
(should
(and (equal (cfgl-package "pkg3" :name 'pkg3 :owners '(layer-dotfile-3))
(ht-get configuration-layer--indexed-packages 'pkg3))
core: fix make-package multiple calls side effects Calling multiple times configuration-layer/make-package appends the same layers to :owners, :pre-layers and :post-layers slot. Use object-add-to-list instead of push. Add some tests and mock some warning messages.
2016-09-05 19:01:35 +00:00
(equal (cfgl-package "pkg2" :name 'pkg2 :owners '(layer-dotfile-3)
:excluded t)
core: Split configuration-layer/make-packages-from-layers Split the function in two functions: - configuration-layer/make-packages-from-layers - configuration-layer/make-packages-from-dotfile
2016-09-05 16:40:44 +00:00
(ht-get configuration-layer--indexed-packages 'pkg2))
(equal (cfgl-package "pkg1" :name 'pkg1 :owners '(layer-dotfile-3))
(ht-get configuration-layer--indexed-packages 'pkg1))))))
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
;; ---------------------------------------------------------------------------
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
;; configuration-layer/make-all-packages
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
;; ---------------------------------------------------------------------------
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(ert-deftest test-make-all-packages ()
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
core: fix unit tests Awkward patch since the function configuration-layer/declare-layer is not tested. We should add tests for this function and then this patch would be more acceptable.
2017-01-16 04:11:22 +00:00
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
`(,(cfgl-layer "layerall1"
:name 'layerall1
:packages '(pkg1)
:dir "/layerall1/")
,(cfgl-layer "layerall2"
:name 'layerall2
:packages '(pkg2 pkg6)
:dir "/layerall2/")
,(cfgl-layer "layerall3"
:name 'layerall3
:packages '(pkg3)
:dir "/layerall3/")
,(cfgl-layer "layerall4"
:name 'layerall4
:packages '(pkg4 pkg7 pkg8)
:dir "/layerall4/")
,(cfgl-layer "layerall5"
:name 'layerall5
:packages '(pkg5 pkg9)
:dir "/layerall5/")))
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
(defun layerall1/init-pkg1 nil)
(defun layerall2/init-pkg2 nil)
(defun layerall2/init-pkg6 nil)
(defun layerall3/init-pkg3 nil)
(defun layerall4/init-pkg4 nil)
(defun layerall4/init-pkg7 nil)
(defun layerall4/init-pkg8 nil)
(defun layerall5/init-pkg5 nil)
(defun layerall5/init-pkg9 nil)
core: fix unit tests Awkward patch since the function configuration-layer/declare-layer is not tested. We should add tests for this function and then this patch would be more acceptable.
2017-01-16 04:11:22 +00:00
(mocker-let
;; skip layer declaration since we manually set
;; the variable `configuration-layer--indexed-layers'
;; Moreover `configuration-layer/declare-layers' requires a valid
;; path on disk etc...
((configuration-layer/declare-layers (layers-specs) ((:output nil))))
(configuration-layer/make-all-packages 'no-discovery)
(should (null configuration-layer--used-packages))
(should (equal '(pkg1
pkg6
pkg2
pkg3
pkg8
pkg7
pkg4
pkg9
pkg5)
(ht-keys configuration-layer--indexed-packages))))))
New dotfile variable dotspacemacs-download-packages This new variable replace dotspacemacs-delete-orphan-packages It defines the behaviour of Spacemacs when downloading packages. Possible values are `used', `used-but-keep-unused' and `all'. - `used' will download only explicitly used packages and remove any unused packages as well as their dependencies. - `used-but-keep-unused' will download only the used packages but won't delete them if they become unused. - `all' will download all the packages regardless if they are used or not and packages won't be deleted by Spacemacs. Default value is `used`.
2016-05-31 02:58:59 +00:00
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
;; ---------------------------------------------------------------------------
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
;; configuration-layer//pre-configure-package
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
;; ---------------------------------------------------------------------------
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
(ert-deftest test-pre-configure-package--pre-init-is-evaluated ()
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :pre-layers '(layer2)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)
,(cfgl-layer "layer2" :name 'layer2)) t)
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(defun layer1/init-pkg nil)
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
(defun layer2/pre-init-pkg nil)
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(mocker-let
((spacemacs-buffer/message (m) ((:output nil)))
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
(layer2/pre-init-pkg nil ((:output nil :occur 1))))
(configuration-layer//pre-configure-package pkg))))
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
;; ---------------------------------------------------------------------------
core: process all post-init function after all the init functions With this commit, the new loading order for package configuration is: - pre-init functions for all packages - init function of all packages - post-init functions for all packages
2018-01-12 04:52:18 +00:00
;; configuration-layer//post-configure-package
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
;; ---------------------------------------------------------------------------
core: process all post-init function after all the init functions With this commit, the new loading order for package configuration is: - pre-init functions for all packages - init function of all packages - post-init functions for all packages
2018-01-12 04:52:18 +00:00
(ert-deftest test-post-configure-package--post-init-is-evaluated ()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :post-layers '(layer2)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
,(cfgl-layer "layer2" :name 'layer2)) t)
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(defun layer1/init-pkg nil)
(defun layer2/post-init-pkg nil)
(mocker-let
((spacemacs-buffer/message (m) ((:output nil)))
(layer2/post-init-pkg nil ((:output nil :occur 1))))
core: process all post-init function after all the init functions With this commit, the new loading order for package configuration is: - pre-init functions for all packages - init function of all packages - post-init functions for all packages
2018-01-12 04:52:18 +00:00
(configuration-layer//post-configure-package pkg))))
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
core: process all post-init function after all the init functions With this commit, the new loading order for package configuration is: - pre-init functions for all packages - init function of all packages - post-init functions for all packages
2018-01-12 04:52:18 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//configure-package
;; ---------------------------------------------------------------------------
(ert-deftest test-configure-package--init-is-evaluated ()
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
core: process all post-init function after all the init functions With this commit, the new loading order for package configuration is: - pre-init functions for all packages - init function of all packages - post-init functions for all packages
2018-01-12 04:52:18 +00:00
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(defun layer1/init-pkg nil)
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil)))
core: process all post-init function after all the init functions With this commit, the new loading order for package configuration is: - pre-init functions for all packages - init function of all packages - post-init functions for all packages
2018-01-12 04:52:18 +00:00
(layer1/init-pkg nil ((:output nil :occur 1))))
(configuration-layer//configure-package pkg))))
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(ert-deftest test-configure-package--disabled-for-does-not-call-pre-post-init ()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1)
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
:pre-layers '(layer2)
:post-layers '(layer3)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(witness nil)
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
`(,(cfgl-layer "layer1" :name 'layer1 :disabled-for '(layer2 layer3))
,(cfgl-layer "layer2" :name 'layer2)
,(cfgl-layer "layer2" :name 'layer3)) t)
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(defun layer1/init-pkg () (push 'init witness))
(defun layer2/pre-init-pkg () (push 'pre-init witness))
(defun layer3/post-init-pkg () (push 'post-init witness))
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil))))
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
(configuration-layer//configure-package pkg)
core: actually read :disabled-for layer property Also it is not need to pass a list, example: ``` (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for org git))) ``` Will disable auto-completion for org and git layers.
2015-09-03 17:17:02 +00:00
(should (equal '(init) witness)))))
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
Implement :enabled-for layer keyword
2016-08-30 09:26:38 +00:00
(ert-deftest test-configure-package--enabled-for-unspecified-does-call-pre-post-init ()
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1)
:pre-layers '(layer2)
:post-layers '(layer3)))
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(witness nil)
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
Implement :enabled-for layer keyword
2016-08-30 09:26:38 +00:00
`(,(cfgl-layer "layer1" :name 'layer1 :enabled-for 'unspecified)
,(cfgl-layer "layer2" :name 'layer2)
,(cfgl-layer "layer2" :name 'layer3)) t)
(defun layer1/init-pkg () (push 'init witness))
(defun layer2/pre-init-pkg () (push 'pre-init witness))
(defun layer3/post-init-pkg () (push 'post-init witness))
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil))))
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
(configuration-layer//pre-configure-package pkg)
Implement :enabled-for layer keyword
2016-08-30 09:26:38 +00:00
(configuration-layer//configure-package pkg)
core: process all post-init function after all the init functions With this commit, the new loading order for package configuration is: - pre-init functions for all packages - init function of all packages - post-init functions for all packages
2018-01-12 04:52:18 +00:00
(configuration-layer//post-configure-package pkg)
Implement :enabled-for layer keyword
2016-08-30 09:26:38 +00:00
(should (equal '(post-init init pre-init) witness)))))
(ert-deftest test-configure-package--enabled-for-nil-does-not-call-pre-post-init ()
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1)
:pre-layers '(layer2)
:post-layers '(layer3)))
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(witness nil)
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
Implement :enabled-for layer keyword
2016-08-30 09:26:38 +00:00
`(,(cfgl-layer "layer1" :name 'layer1 :enabled-for nil)
,(cfgl-layer "layer2" :name 'layer2)
,(cfgl-layer "layer2" :name 'layer3)) t)
(defun layer1/init-pkg () (push 'init witness))
(defun layer2/pre-init-pkg () (push 'pre-init witness))
(defun layer3/post-init-pkg () (push 'post-init witness))
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil))))
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
(configuration-layer//configure-package pkg)
(should (equal '(init) witness)))))
Implement :enabled-for layer keyword
2016-08-30 09:26:38 +00:00
(ert-deftest test-configure-package--enabled-for-partial ()
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1)
:pre-layers '(layer2)
:post-layers '(layer3)))
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(witness nil)
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
Implement :enabled-for layer keyword
2016-08-30 09:26:38 +00:00
`(,(cfgl-layer "layer1" :name 'layer1 :enabled-for '(layer2))
,(cfgl-layer "layer2" :name 'layer2)
,(cfgl-layer "layer2" :name 'layer3)) t)
(defun layer1/init-pkg () (push 'init witness))
(defun layer2/pre-init-pkg () (push 'pre-init witness))
(defun layer3/post-init-pkg () (push 'post-init witness))
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil))))
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
(configuration-layer//pre-configure-package pkg)
(configuration-layer//configure-package pkg)
(should (equal '(init pre-init) witness)))))
Implement :enabled-for layer keyword
2016-08-30 09:26:38 +00:00
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//configure-packages-2
;; ---------------------------------------------------------------------------
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
(ert-deftest test-configure-packages-2--pre-init-is-evaluated-before-init ()
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :pre-layers '(layer2)))
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(witness nil)
(mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)
,(cfgl-layer "layer2" :name 'layer2)) t)
(helper--add-packages (list pkg) t)
(defun layer1/init-pkg () (push 'init witness))
(defun layer2/pre-init-pkg () (push 'pre-init witness))
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(should (equal '(init pre-init) witness))))
core: execute all pre-init function before init and post-init Fixes loading order issues when declaring use-package hooks. Fixes #9979
2018-01-11 04:23:49 +00:00
core: process all post-init function after all the init functions With this commit, the new loading order for package configuration is: - pre-init functions for all packages - init function of all packages - post-init functions for all packages
2018-01-12 04:52:18 +00:00
(ert-deftest test-configure-packages-2--post-init-is-evaluated-after-init ()
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :post-layers '(layer2)))
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
(witness nil)
(mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)
,(cfgl-layer "layer2" :name 'layer2)) t)
(helper--add-packages (list pkg) t)
(defun layer1/init-pkg () (push 'init witness))
(defun layer2/post-init-pkg () (push 'post-init witness))
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(should (equal '(post-init init) witness))))
core: process all post-init function after all the init functions With this commit, the new loading order for package configuration is: - pre-init functions for all packages - init function of all packages - post-init functions for all packages
2018-01-12 04:52:18 +00:00
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(ert-deftest test-configure-packages-2--package-w/-layer-owner-is-configured()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((configuration-layer//configure-package (p) ((:occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
core: replace package keyword :skip-install by :location site
2016-02-21 04:05:36 +00:00
(ert-deftest test-configure-packages-2--site-package-is-configured()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :location 'site))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: add package keyword :protected A protected package cannot be uninstalled nor excluded.
2015-11-19 05:53:57 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: add package keyword :protected A protected package cannot be uninstalled nor excluded.
2015-11-19 05:53:57 +00:00
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((configuration-layer//configure-package (p) ((:occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: add package keyword :protected A protected package cannot be uninstalled nor excluded.
2015-11-19 05:53:57 +00:00
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(ert-deftest test-configure-packages-2--toggle-t-is-configured ()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :toggle t))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((configuration-layer//configure-package (p) ((:occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(ert-deftest test-configure-packages-2--toggle-nil-is-not-configured ()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :toggle nil))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
(mocker-let
((configuration-layer//configure-package (p) nil)
(spacemacs-buffer/message (m) ((:output nil))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: new package keyword :toggle This new keyword allows to add all the packages to the <layer>-packages even when a package is not toggled on by a given layer variable. This fixes an issue of the layer system where we had to choose between discoverability (ie. the list of package in helm or ivy with SPC h SPC) and installation of package (because any package listed in the variable <layer>-packages were installed).
2016-02-21 05:01:39 +00:00
core: replace package keyword :skip-install by :location site
2016-02-21 04:05:36 +00:00
(ert-deftest test-configure-packages-2--protected-package-is-configured()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :protected t))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: add package keyword :protected A protected package cannot be uninstalled nor excluded.
2015-11-19 05:53:57 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: add package keyword :protected A protected package cannot be uninstalled nor excluded.
2015-11-19 05:53:57 +00:00
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((configuration-layer//configure-package (p) ((:occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: add package keyword :protected A protected package cannot be uninstalled nor excluded.
2015-11-19 05:53:57 +00:00
core: replace package keyword :skip-install by :location site
2016-02-21 04:05:36 +00:00
(ert-deftest test-configure-packages-2--protected-excluded-package-is-configured()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :excluded t :protected t))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: new keyword :skip-install
2016-01-18 04:27:30 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: new keyword :skip-install
2016-01-18 04:27:30 +00:00
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((configuration-layer//configure-package (p) ((:occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: new keyword :skip-install
2016-01-18 04:27:30 +00:00
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(ert-deftest test-configure-packages-2--excluded-package-is-not-configured()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :excluded t))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(mocker-let
((configuration-layer//configure-package (p) nil)
(spacemacs-buffer/message (m) ((:output nil))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(ert-deftest test-configure-packages-2--package-w/o-owner-is-not-configured()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners nil))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(mocker-let
((configuration-layer//configure-package (p) nil)
(spacemacs-buffer/message (m) ((:output nil))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(ert-deftest
test-configure-packages-2--package-owned-by-dotfile-is-not-configured()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(dotfile)))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(mocker-let
((configuration-layer//configure-package (p) nil)
(spacemacs-buffer/message (m) ((:output nil))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
core: don't configure package marked for lazy install
2016-03-26 07:23:18 +00:00
(ert-deftest test-configure-packages-2--lazy-install-package-is-not-configured()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer) :lazy-install t))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: don't configure package marked for lazy install
2016-03-26 07:23:18 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: don't configure package marked for lazy install
2016-03-26 07:23:18 +00:00
(mocker-let
((configuration-layer//configure-package (p) nil)
(spacemacs-buffer/message (m) ((:output nil))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: don't configure package marked for lazy install
2016-03-26 07:23:18 +00:00
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(ert-deftest
test-configure-packages-2--local-package-w/-layer-owner-update-load-path()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :location 'local))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(expected-load-path load-path)
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1 :dir "/path/")) t)
(helper--add-packages (list pkg) t)
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((configuration-layer//configure-package (p) ((:occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(push "/path/local/pkg/" expected-load-path)
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(should (equal expected-load-path load-path)))))
(ert-deftest
test-configure-packages-2--local-package-w/-dotfile-owner-update-load-path()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(dotfile) :location 'local))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(expected-load-path load-path)
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(push (file-name-as-directory
(concat spacemacs-private-directory "local/pkg"))
expected-load-path)
(should (equal expected-load-path load-path))))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(ert-deftest
test-configure-packages-2--local-package-w/o-owner-doesnt-update-load-path()
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners nil :location 'local))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(old-load-path load-path)
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((spacemacs-buffer/message (m) ((:output nil))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))
core: remove 'private value for :location While doing the tests I encountered an edge case where a package owned by the dotfile could be passed either a 'private or 'local location which is ambiguous (moreover where do we put packages with 'local location ?). We remove the ambiguity by removing the 'private value and push the path ~/.emacs.d/private/local/pkg/ when the owner of a local package PKG is the dotfile. When the owner of a local package is a layer then the load path is in the "local" subdirectory of the layer directory. It adds no value to use the old 'private location in this case.
2015-09-20 04:49:18 +00:00
(should (equal load-path old-load-path)))))
core: perform local path existence check at configuration time In order to be able to log the not found path as a warning instead of crashing. Also adds unit test to test both valid and invalid local paths.
2015-10-23 02:39:53 +00:00
(ert-deftest
test-configure-packages-2--local-package-w/-string-location-update-load-path()
(let ((pkg (cfgl-package "pkg"
:name 'pkg
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
:owners '(dotfile)
core: perform local path existence check at configuration time In order to be able to log the not found path as a warning instead of crashing. Also adds unit test to test both valid and invalid local paths.
2015-10-23 02:39:53 +00:00
:location spacemacs-docs-directory))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: perform local path existence check at configuration time In order to be able to log the not found path as a warning instead of crashing. Also adds unit test to test both valid and invalid local paths.
2015-10-23 02:39:53 +00:00
(expected-load-path load-path)
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(push spacemacs-docs-directory expected-load-path)
(should (equal expected-load-path load-path))))
core: perform local path existence check at configuration time In order to be able to log the not found path as a warning instead of crashing. Also adds unit test to test both valid and invalid local paths.
2015-10-23 02:39:53 +00:00
(ert-deftest
test-configure-packages-2--local-package-w/-bad-string-location-gives-warning()
(let ((pkg (cfgl-package "pkg"
:name 'pkg
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
:owners '(dotfile)
core: perform local path existence check at configuration time In order to be able to log the not found path as a warning instead of crashing. Also adds unit test to test both valid and invalid local paths.
2015-10-23 02:39:53 +00:00
:location "/this/directory/does/not/exist/"))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: perform local path existence check at configuration time In order to be able to log the not found path as a warning instead of crashing. Also adds unit test to test both valid and invalid local paths.
2015-10-23 02:39:53 +00:00
(mocker-mock-default-record-cls 'mocker-stub-record))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages (list pkg) t)
core: perform local path existence check at configuration time In order to be able to log the not found path as a warning instead of crashing. Also adds unit test to test both valid and invalid local paths.
2015-10-23 02:39:53 +00:00
(mocker-let
tests: fix mocks for spacemacs/update-progress-bar
2018-07-05 04:02:17 +00:00
((configuration-layer//warning
core: perform local path existence check at configuration time In order to be able to log the not found path as a warning instead of crashing. Also adds unit test to test both valid and invalid local paths.
2015-10-23 02:39:53 +00:00
(msg &rest args)
((:record-cls 'mocker-stub-record :output nil :occur 1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
core: perform local path existence check at configuration time In order to be able to log the not found path as a warning instead of crashing. Also adds unit test to test both valid and invalid local paths.
2015-10-23 02:39:53 +00:00
core: package-list-v2 sort package list
2015-08-08 02:51:27 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//sort-packages
;; ---------------------------------------------------------------------------
(ert-deftest test-sort-packages--example ()
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(let ((pkgs '(pkg4 pkg3 pkg6 pkg2 pkg1)))
(should (equal '(pkg1 pkg2 pkg3 pkg4 pkg6)
core: package-list-v2 sort package list
2015-08-08 02:51:27 +00:00
(configuration-layer//sort-packages pkgs)))))
core: add support for recipe update
2015-08-15 04:07:56 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//package-has-recipe-p
;; ---------------------------------------------------------------------------
(ert-deftest test-package-has-a-recipe-p--true ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(let (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(helper--add-packages
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(configuration-layer/make-package '(pkg1 :location (recipe blah))
'layer1)
,(configuration-layer/make-package '(pkg2 :location elpa) 'layer1)) t)
core: add support for recipe update
2015-08-15 04:07:56 +00:00
(should (configuration-layer//package-has-recipe-p 'pkg1))))
(ert-deftest test-package-has-a-recipe-p--false ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(let (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(helper--add-packages
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(configuration-layer/make-package '(pkg1 :location (recipe blah))
'layer1)
,(configuration-layer/make-package '(pkg2 :location elpa) 'layer1)) t)
core: add support for recipe update
2015-08-15 04:07:56 +00:00
(should (not (configuration-layer//package-has-recipe-p 'pkg2)))))
;; ---------------------------------------------------------------------------
;; configuration-layer//get-package-recipe
;; ---------------------------------------------------------------------------
(ert-deftest test-get-package-recipe--return-recipe-if-package-has-one ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(let (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(defun layer-no-recipe-1/init-pkg1 nil)
(defun layer-no-recipe-1/init-pkg2 nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(cfgl-layer "layer-no-recipe-1" :name 'layer-no-recipe-1)) t)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(configuration-layer/make-package '(pkg1 :location (recipe blah))
'layer-no-recipe-1)
,(configuration-layer/make-package '(pkg2 :location elpa)
'layer-no-recipe-1)) t)
Correct the format of recipe when check for update
2016-10-01 01:40:56 +00:00
(should (eq 'pkg1
core: add support for recipe update
2015-08-15 04:07:56 +00:00
(car (configuration-layer//get-package-recipe 'pkg1))))))
(ert-deftest test-get-package-recipe--return-nil-if-package-has-no-recipe ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(let (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(defun layer-no-recipe-2/init-pkg1 nil)
(defun layer-no-recipe-2/init-pkg2 nil)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(cfgl-layer "layer-no-recipe-2" :name 'layer-no-recipe-2)) t)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(configuration-layer/make-package '(pkg1 :location (recipe blah))
'layer-no-recipe-2)
,(configuration-layer/make-package '(pkg2 :location elpa)
'layer-no-recipe-2)) t)
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(should (null (configuration-layer//get-package-recipe 'pkg2)))))
core: add support for recipe update
2015-08-15 04:07:56 +00:00
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
;; ---------------------------------------------------------------------------
core: add :disabled-for keyword for declared layers Example: (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)))) Will not run any org/pre-init-xxx or org/post-init-xxx functions where xxx is a package owned by the auto-completion layer. Limitation: If ownership of an auto-completion package P is stolen by another layer L then :disabled-for must also be declared with L, otherwise the P will be configured for org. (setq dotspacemacs-configuration-layers '((auto-completion :disabled-for (org)) (L :disabled-for (org))) The user should not change the default owner of a layer unless really required (for instance to use his own fork).
2015-09-03 03:01:26 +00:00
;; configuration-layer/filter-objects
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
;; ---------------------------------------------------------------------------
core: fix unit tests for emacs 25 snapshot
2015-08-09 15:34:03 +00:00
(ert-deftest test-filter-packages--example-filter-excluded-packages ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(defun layer-filter-1/init-pkg1 nil)
(defun layer-filter-1/init-pkg2 nil)
(defun layer-filter-1/init-pkg3 nil)
(defun layer-filter-1/init-pkg4 nil)
(defun layer-filter-1/init-pkg5 nil)
(defun layer-filter-1/init-pkg6 nil)
(defun layer-filter-1/init-pkg7 nil)
(defun layer-filter-1/init-pkg8 nil)
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(pkg1 (configuration-layer/make-package 'pkg1 'layer-filter-1))
(pkg2 (configuration-layer/make-package 'pkg2 'layer-filter-1))
(pkg3 (configuration-layer/make-package 'pkg3 'layer-filter-1))
(pkg4 (configuration-layer/make-package 'pkg4 'layer-filter-1))
(pkg5 (configuration-layer/make-package 'pkg5 'layer-filter-1))
(pkg6 (configuration-layer/make-package 'pkg6 'layer-filter-1))
(pkg7 (configuration-layer/make-package 'pkg7 'layer-filter-1))
(pkg8 (configuration-layer/make-package 'pkg8 'layer-filter-1))
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
(pkgs (list pkg1 pkg2 pkg3 pkg4 pkg5 pkg6 pkg7 pkg8)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(cfgl-layer "layer-filter-1" :name 'layer-filter-1)) t)
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
(oset pkg1 :excluded t)
(oset pkg3 :excluded t)
(oset pkg5 :excluded t)
(oset pkg6 :excluded t)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(should
(equal (list (cfgl-package "pkg2" :name 'pkg2 :owners '(layer-filter-1))
(cfgl-package "pkg4" :name 'pkg4 :owners '(layer-filter-1))
(cfgl-package "pkg7" :name 'pkg7 :owners '(layer-filter-1))
(cfgl-package "pkg8" :name 'pkg8 :owners '(layer-filter-1)))
(configuration-layer/filter-objects
pkgs (lambda (x)
(not (oref x :excluded))))))))
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
core: fix unit tests for emacs 25 snapshot
2015-08-09 15:34:03 +00:00
(ert-deftest test-filter-packages--expample-filter-local-packages ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(defun layer-filter-2/init-pkg1 nil)
(defun layer-filter-2/init-pkg2 nil)
(defun layer-filter-2/init-pkg3 nil)
(defun layer-filter-2/init-pkg4 nil)
(defun layer-filter-2/init-pkg5 nil)
(defun layer-filter-2/init-pkg6 nil)
(defun layer-filter-2/init-pkg7 nil)
(defun layer-filter-2/init-pkg8 nil)
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(pkg1 (configuration-layer/make-package 'pkg1 'layer-filter-2))
(pkg2 (configuration-layer/make-package 'pkg2 'layer-filter-2))
(pkg3 (configuration-layer/make-package 'pkg3 'layer-filter-2))
(pkg4 (configuration-layer/make-package 'pkg4 'layer-filter-2))
(pkg5 (configuration-layer/make-package 'pkg5 'layer-filter-2))
(pkg6 (configuration-layer/make-package 'pkg6 'layer-filter-2))
(pkg7 (configuration-layer/make-package 'pkg7 'layer-filter-2))
(pkg8 (configuration-layer/make-package 'pkg8 'layer-filter-2))
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
(pkgs (list pkg1 pkg2 pkg3 pkg4 pkg5 pkg6 pkg7 pkg8)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(cfgl-layer "layer-filter-2" :name 'layer-filter-2)) t)
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
(oset pkg1 :location 'local)
(oset pkg3 :location 'local)
(oset pkg5 :location 'local)
(oset pkg6 :location 'local)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(should
(equal (list (cfgl-package "pkg2" :name 'pkg2 :owners '(layer-filter-2))
(cfgl-package "pkg4" :name 'pkg4 :owners '(layer-filter-2))
(cfgl-package "pkg7" :name 'pkg7 :owners '(layer-filter-2))
(cfgl-package "pkg8" :name 'pkg8 :owners '(layer-filter-2)))
(configuration-layer/filter-objects
pkgs (lambda (x)
(not (eq 'local (oref x :location)))))))))
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
core: fix unit tests for emacs 25 snapshot
2015-08-09 15:34:03 +00:00
(ert-deftest test-filter-packages--example-filter-packages-local-or-excluded ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(defun layer-filter-3/init-pkg1 nil)
(defun layer-filter-3/init-pkg2 nil)
(defun layer-filter-3/init-pkg3 nil)
(defun layer-filter-3/init-pkg4 nil)
(defun layer-filter-3/init-pkg5 nil)
(defun layer-filter-3/init-pkg6 nil)
(defun layer-filter-3/init-pkg7 nil)
(defun layer-filter-3/init-pkg8 nil)
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(pkg1 (configuration-layer/make-package 'pkg1 'layer-filter-3))
(pkg2 (configuration-layer/make-package 'pkg2 'layer-filter-3))
(pkg3 (configuration-layer/make-package 'pkg3 'layer-filter-3))
(pkg4 (configuration-layer/make-package 'pkg4 'layer-filter-3))
(pkg5 (configuration-layer/make-package 'pkg5 'layer-filter-3))
(pkg6 (configuration-layer/make-package 'pkg6 'layer-filter-3))
(pkg7 (configuration-layer/make-package 'pkg7 'layer-filter-3))
(pkg8 (configuration-layer/make-package 'pkg8 'layer-filter-3))
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
(pkgs (list pkg1 pkg2 pkg3 pkg4 pkg5 pkg6 pkg7 pkg8)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(cfgl-layer "layer-filter-4" :name 'layer-filter-4)) t)
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
(oset pkg1 :location 'local)
(oset pkg1 :excluded t)
(oset pkg3 :location 'local)
(oset pkg5 :location 'local)
(oset pkg6 :location 'local)
(oset pkg6 :excluded t)
(oset pkg7 :excluded t)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(should
(equal (list (cfgl-package "pkg2" :name 'pkg2 :owners '(layer-filter-3))
(cfgl-package "pkg4" :name 'pkg4 :owners '(layer-filter-3))
(cfgl-package "pkg8" :name 'pkg8 :owners '(layer-filter-3)))
(configuration-layer/filter-objects
pkgs (lambda (x)
(and (not (eq 'local (oref x :location)))
(not (oref x :excluded)))))))))
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
core: fix unit tests for emacs 25 snapshot
2015-08-09 15:34:03 +00:00
(ert-deftest test-filter-packages--example-filter-packages-both-local-and-excluded ()
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(defun layer-filter-4/init-pkg1 nil)
(defun layer-filter-4/init-pkg2 nil)
(defun layer-filter-4/init-pkg3 nil)
(defun layer-filter-4/init-pkg4 nil)
(defun layer-filter-4/init-pkg5 nil)
(defun layer-filter-4/init-pkg6 nil)
(defun layer-filter-4/init-pkg7 nil)
(defun layer-filter-4/init-pkg8 nil)
(let* (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
(pkg1 (configuration-layer/make-package 'pkg1 'layer-filter-4))
(pkg2 (configuration-layer/make-package 'pkg2 'layer-filter-4))
(pkg3 (configuration-layer/make-package 'pkg3 'layer-filter-4))
(pkg4 (configuration-layer/make-package 'pkg4 'layer-filter-4))
(pkg5 (configuration-layer/make-package 'pkg5 'layer-filter-4))
(pkg6 (configuration-layer/make-package 'pkg6 'layer-filter-4))
(pkg7 (configuration-layer/make-package 'pkg7 'layer-filter-4))
(pkg8 (configuration-layer/make-package 'pkg8 'layer-filter-4))
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
(pkgs (list pkg1 pkg2 pkg3 pkg4 pkg5 pkg6 pkg7 pkg8)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
`(,(cfgl-layer "layer-filter-4" :name 'layer-filter-4)) t)
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
(oset pkg1 :location 'local)
(oset pkg1 :excluded t)
(oset pkg3 :location 'local)
(oset pkg5 :excluded t)
(oset pkg6 :location 'local)
(oset pkg6 :excluded t)
core: refactor make-package and make-packages Rename configuration-layers/make-packages to configuration-layers/make-packages-from-layers Move all package initialization logic to configuration-layers/make-package instead of having it split between make-packages and make-package.
2016-09-05 15:54:29 +00:00
(should
(equal (list (cfgl-package "pkg2"
:name 'pkg2
:owners '(layer-filter-4))
(cfgl-package "pkg3"
:name 'pkg3
:location 'local
:owners '(layer-filter-4))
(cfgl-package "pkg4" :name 'pkg4
:owners '(layer-filter-4))
(cfgl-package "pkg5" :name 'pkg5
:excluded t
:owners '(layer-filter-4))
(cfgl-package "pkg7" :name 'pkg7
:owners '(layer-filter-4))
(cfgl-package "pkg8" :name 'pkg8
:owners '(layer-filter-4)))
(configuration-layer/filter-objects
pkgs (lambda (x)
(or (not (eq 'local (oref x :location)))
(not (oref x :excluded)))))))))
core: package-list-v2 install and orphan detection Still need to clean the orphan detection though Packages are not configured for now
2015-08-08 04:01:36 +00:00
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//directory-type
;; ---------------------------------------------------------------------------
(ert-deftest test-directory-type--input-is-a-file ()
(let ((input "/a/path/to/a/layer/file"))
(mocker-let
((file-directory-p (f)
core: fix bug in package-usedp It returned t even if the package has no owner. Fixes #2601
2015-08-12 03:25:00 +00:00
((:record-cls 'mocker-stub-record
:output nil
:occur 1))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(should (null (configuration-layer//directory-type input))))))
(ert-deftest test-directory-type--category ()
Use + instead of ! for layer categories Helm seems to treat "!" specially in pattern matching, so having a ! in the pattern string when traversing directories is problematic. This change fixes #2737, because as far as I can tell "+" has no special meaning in a helm pattern. Of course, we can choose a different character, but I'm fond of "+" as representing "more layers here".
2015-09-11 00:21:27 +00:00
(let ((input (concat configuration-layer-directory "+vim/")))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(mocker-let
((file-directory-p (f)
((:record-cls 'mocker-stub-record :output t :occur 1))))
(should (eq 'category (configuration-layer//directory-type input))))))
(ert-deftest test-directory-type--input-is-an-empty-directory ()
(let ((input "/a/path/to/a/layer/"))
(mocker-let
((file-directory-p (f)
((:record-cls 'mocker-stub-record :output t :occur 1)))
(directory-files
(directory &optional full match nosort)
((:record-cls 'mocker-stub-record :output nil :occur 1))))
(should (null (configuration-layer//directory-type input))))))
(ert-deftest test-directory-type--input-is-directory-and-not-a-layer ()
(let ((input "/a/path/to/a/layer/"))
(mocker-let
((file-directory-p (f)
((:record-cls 'mocker-stub-record :output t :occur 1)))
(directory-files
(directory &optional full match nosort)
core: fix bug in package-usedp It returned t even if the package has no owner. Fixes #2601
2015-08-12 03:25:00 +00:00
((:record-cls 'mocker-stub-record
:output '("toto.el" "tata.el")
:occur 1))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(should (null (configuration-layer//directory-type input))))))
(ert-deftest test-directory-type--layer-with-packages.el ()
(let ((input "/a/path/to/a/layer/"))
(mocker-let
((file-directory-p (f)
((:record-cls 'mocker-stub-record :output t :occur 1)))
(directory-files
(directory &optional full match nosort)
((:record-cls 'mocker-stub-record :output '("packages.el") :occur 1))))
(should (eq 'layer (configuration-layer//directory-type input))))))
(ert-deftest test-directory-type--layer-with-config.el ()
(let ((input "/a/path/to/a/layer/"))
(mocker-let
((file-directory-p (f)
((:record-cls 'mocker-stub-record :output t :occur 1)))
(directory-files
(directory &optional full match nosort)
((:record-cls 'mocker-stub-record :output '("config.el") :occur 1))))
(should (eq 'layer (configuration-layer//directory-type input))))))
(ert-deftest test-directory-type--layer-with-keybindings.el ()
(let ((input "/a/path/to/a/layer/"))
(mocker-let
((file-directory-p (f)
((:record-cls 'mocker-stub-record :output t :occur 1)))
(directory-files
(directory &optional full match nosort)
core: fix bug in package-usedp It returned t even if the package has no owner. Fixes #2601
2015-08-12 03:25:00 +00:00
((:record-cls 'mocker-stub-record
:output '("keybindings.el")
:occur 1))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(should (eq 'layer (configuration-layer//directory-type input))))))
(ert-deftest test-directory-type--layer-with-funcs.el ()
(let ((input "/a/path/to/a/layer/"))
(mocker-let
((file-directory-p (f)
((:record-cls 'mocker-stub-record :output t :occur 1)))
(directory-files
(directory &optional full match nosort)
((:record-cls 'mocker-stub-record :output '("funcs.el") :occur 1))))
(should (eq 'layer (configuration-layer//directory-type input))))))
;; ---------------------------------------------------------------------------
;; configuration-layer//get-category-from-path
;; ---------------------------------------------------------------------------
(ert-deftest test-get-category-from-path--input-is-a-file ()
(let ((input "/a/path/to/a/file"))
(mocker-let
((file-directory-p (f)
core: fix bug in package-usedp It returned t even if the package has no owner. Fixes #2601
2015-08-12 03:25:00 +00:00
((:record-cls 'mocker-stub-record
:output nil
:occur 1))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(should (null (configuration-layer//get-category-from-path input))))))
(ert-deftest test-get-category-from-path--input-is-a-regular-directory ()
(let ((input "/a/path/to/a/layer/"))
(mocker-let
((file-directory-p (f)
core: fix bug in package-usedp It returned t even if the package has no owner. Fixes #2601
2015-08-12 03:25:00 +00:00
((:record-cls 'mocker-stub-record
:output t
:occur 1))))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(should (null (configuration-layer//get-category-from-path input))))))
(ert-deftest test-get-category-from-path--return-category ()
Use + instead of ! for layer categories Helm seems to treat "!" specially in pattern matching, so having a ! in the pattern string when traversing directories is problematic. This change fixes #2737, because as far as I can tell "+" has no special meaning in a helm pattern. Of course, we can choose a different character, but I'm fond of "+" as representing "more layers here".
2015-09-11 00:21:27 +00:00
(let ((input "/a/path/to/a/+cat/"))
core: package-list-v2 fix layer variables
2015-08-08 02:35:28 +00:00
(mocker-let
((file-directory-p (f)
((:record-cls 'mocker-stub-record :output t :occur 1))))
(should (eq 'cat (configuration-layer//get-category-from-path input))))))
core: new interactive function to insert lazy installation config New function configuration-layer/insert-lazy-install-configuration This function asks for a layer and then insert the lazy configuration for all the packages owned by this layer.
2016-03-06 04:21:55 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//gather-auto-mode-extensions
;; ---------------------------------------------------------------------------
(ert-deftest test-gather-auto-mode-extensions--one-entry-in-auto-mode-alist ()
(let ((auto-mode-alist '(("\\.spacemacs\\'" . mode))))
(should (equal
"\\(\\.spacemacs\\'\\)"
(configuration-layer//gather-auto-mode-extensions 'mode)))))
(ert-deftest test-gather-auto-mode-extensions--several-entries-in-auto-mode-alist ()
(let ((auto-mode-alist '(("\\.spacemacs\\'" . mode)
("\\.dotspacemacs\\'" . mode)
("\\.spacelayer\\'" . mode))))
(should (equal
"\\(\\.spacelayer\\'\\|\\.dotspacemacs\\'\\|\\.spacemacs\\'\\)"
(configuration-layer//gather-auto-mode-extensions 'mode)))))
(ert-deftest test-gather-auto-mode-extensions--ext-entry-is-not-symbol ()
(let ((auto-mode-alist '(((nil t) . mode))))
(should (null (configuration-layer//gather-auto-mode-extensions 'mode)))))
(ert-deftest test-gather-auto-mode-extensions--mode-entry-is-not-symbol ()
(let ((auto-mode-alist '(("ext" . (lambda nil nil)))))
(should (null (configuration-layer//gather-auto-mode-extensions 'mode)))))
(ert-deftest test-gather-auto-mode-extensions--regexp-correctness ()
"Correctness is a big word here :-)"
(let ((regexp (configuration-layer//gather-auto-mode-extensions
'emacs-lisp-mode)))
(should (string-match-p regexp "/_emacs"))
(should (string-match-p regexp "/.toto_gnus"))
(should (string-match-p regexp "/.toto_viper"))
(should (string-match-p regexp "/toto/emacs.el"))
(should (string-match-p regexp "/toto/project.ede"))
(should (not (string-match-p regexp "/toto/emacs.dummy")))))
;; ---------------------------------------------------------------------------
;; configuration-layer//lazy-install-extensions-for-layer
;; ---------------------------------------------------------------------------
(ert-deftest test-lazy-install-extensions-for-layer--owned-packages ()
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(let (configuration-layer--used-layers
(configuration-layer--indexed-layers (make-hash-table :size 1024))
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048))
core: new interactive function to insert lazy installation config New function configuration-layer/insert-lazy-install-configuration This function asks for a layer and then insert the lazy configuration for all the packages owned by this layer.
2016-03-06 04:21:55 +00:00
(auto-mode-alist '(("\\.pkg1\\'" . pkg1)
("\\.pkg2\\'" . pkg2))))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-layers
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(list (cfgl-layer "layer" :name 'layer :packages '(pkg1 pkg2))) t)
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(list (cfgl-package "pkg1" :name 'pkg1 :owners '(layer))
(cfgl-package "pkg2" :name 'pkg2 :owners '(layer))) t)
core: new interactive function to insert lazy installation config New function configuration-layer/insert-lazy-install-configuration This function asks for a layer and then insert the lazy configuration for all the packages owned by this layer.
2016-03-06 04:21:55 +00:00
(should (equal '((pkg2 . "\\(\\.pkg2\\'\\)")
(pkg1 . "\\(\\.pkg1\\'\\)"))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer//lazy-install-extensions-for-layer
'layer)))))
core: new interactive function to insert lazy installation config New function configuration-layer/insert-lazy-install-configuration This function asks for a layer and then insert the lazy configuration for all the packages owned by this layer.
2016-03-06 04:21:55 +00:00
(ert-deftest test-lazy-install-extensions-for-layer--not-owned-package ()
(let ((configuration-layer--layers
(list (cfgl-layer "layer" :name 'layer :packages '(pkg1))))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer--used-packages
core: change cfgl-package :owner slot to :owners The car of :owners is the real owner. Now we can easily gather the list of all owners of a package. Also fix unit tests about missing spacemacs-insecure variable.
2016-06-11 01:37:32 +00:00
(list (cfgl-package "pkg1" :name 'pkg1 :owners '(other))))
core: new interactive function to insert lazy installation config New function configuration-layer/insert-lazy-install-configuration This function asks for a layer and then insert the lazy configuration for all the packages owned by this layer.
2016-03-06 04:21:55 +00:00
(auto-mode-alist '(("\\.pkg1\\'" . pkg1))))
(should (null (configuration-layer//lazy-install-extensions-for-layer 'layer)))))
;; ---------------------------------------------------------------------------
;; configuration-layer//insert-lazy-install-form
;; ---------------------------------------------------------------------------
(ert-deftest test-insert-lazy-install-form ()
(cl-letf (((symbol-function 'insert) 'identity))
(should
(equal
Fix unit-test test-insert-lazy-install-form
2016-03-25 05:48:05 +00:00
(concat "(configuration-layer/lazy-install 'layer "
":extensions '(\"\\\\(\\\\.ext\\\\'\\\\)\" mode))\n")
(configuration-layer//insert-lazy-install-form 'layer 'mode "\\(\\.ext\\'\\)")))))
core: add package breakdown in summary message e: elpa r: recipe l: local b: built-in
2016-04-03 16:02:28 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer/configured-packages-stats
;; ---------------------------------------------------------------------------
(ert-deftest test-configured-packages-stats--correct-counts ()
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(let (configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(list (cfgl-package "pkg1" :name 'pkg1 :location 'built-in)
(cfgl-package "pkg2" :name 'pkg2 :location 'built-in)
(cfgl-package "pkg3" :name 'pkg3 :location 'elpa)
(cfgl-package "pkg4" :name 'pkg4 :location 'elpa)
(cfgl-package "pkg5" :name 'pkg5 :location 'elpa)
(cfgl-package "pkg6" :name 'pkg6 :location 'local)
(cfgl-package "pkg7" :name 'pkg7 :location '(recipe :foo bar))
(cfgl-package "pkg8" :name 'pkg8 :location '(recipe :foo bar))) t)
core: add package breakdown in summary message e: elpa r: recipe l: local b: built-in
2016-04-03 16:02:28 +00:00
(should (equal '((total 8)
(elpa 3)
(recipe 2)
(local 1)
(built-in 2))
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(configuration-layer/configured-packages-stats
configuration-layer--used-packages)))))
core: add package breakdown in summary message e: elpa r: recipe l: local b: built-in
2016-04-03 16:02:28 +00:00
(ert-deftest test-configured-packages-stats--sum-is-correct ()
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(let (stats
configuration-layer--used-packages
(configuration-layer--indexed-packages (make-hash-table :size 2048)))
tests: rename helper functions helper--set-layers -> helper--add-layers helper--set-packages -> helper--add-packages
2017-07-02 14:53:26 +00:00
(helper--add-packages
core: refactor layer system TL;DR Should get 20~25% speed improvement on startup, should get a big improvement when using ivy or helm SPC h SPC. Users with layers.el files in their layers must use `configuration-layer/declare-used-layer` instead of `configuration-layer/declare-layer` The implementation of the layer system made heavy use of `object-assoc` and `object-assoc-list` functions which are not efficient. This PR mainly replaces those object lists with hash maps in order to index the objects by their name and achieve an O(1) access time. The old object lists `configuration-layer--layers` and `configuration-layer--packages` have been each by two variables each: - `configuration-layer--indexed-layers` which is a hash-map of all the layer objects and `configuration-layer--used-layers` which is a list of all _used_ layers symbols, - symmetrically `configuration-layer--indexed-packages` which is a hash-map of all the package objects and `configuration-layer--used-packages` which is a list of all _used_ packages symbols. The hash map `configuration-layer--layer-paths` is gone, now we create directly layer objects when discovering the layers and set the :dir property. Note that previously the layer paths were the parent directory of the layer, now :dir is the layer path. The function `configuration-layer//make-layer` is now similar to its counterpart `configuration-layer//make-package` in the sense that it takes an optional `obj` to be able to override its properties. The functions `configuration-layer/declare-layer` and `configuration-layer/declare-layers` now takes an optional parameter `usedp` in order to declare used or not used layers. For convenience new functions have been added: `configuration-layer/declare-used-layer` and `configuration-layer/declare-used-layers`, users _must_ update all occurrences of `configuration-layer/declare-layer` by `configuration-layer/declare-used-layers` in their `layers.el` files. `helm-spacemacs-help` and `ivy-spacemacs-help` are updated to match the changes in `core-configuration-layer.el`. Rename some variables to make them more explicit: `configuration-layer-no-layer` -> `configuration-layer-exclude-all-layers` `configuration-layer-distribution` -> `configuration-layer-force-distribution`
2016-07-17 19:00:43 +00:00
(list (cfgl-package "pkg1" :name 'pkg1 :location 'built-in)
(cfgl-package "pkg2" :name 'pkg2 :location 'built-in)
(cfgl-package "pkg3" :name 'pkg3 :location 'elpa)
(cfgl-package "pkg4" :name 'pkg4 :location 'elpa)
(cfgl-package "pkg5" :name 'pkg5 :location 'elpa)
(cfgl-package "pkg6" :name 'pkg6 :location 'local)
(cfgl-package "pkg7" :name 'pkg7 :location '(recipe :foo bar))
(cfgl-package "pkg8" :name 'pkg8 :location '(recipe :foo bar))) t)
(setq stats (configuration-layer/configured-packages-stats
configuration-layer--used-packages))
core: add package breakdown in summary message e: elpa r: recipe l: local b: built-in
2016-04-03 16:02:28 +00:00
(should (equal 8 (+ (cadr (assq 'elpa stats))
(cadr (assq 'recipe stats))
(cadr (assq 'local stats))
(cadr (assq 'built-in stats)))))))
core: force installation of org-contrib-plus instead of org Thanks to the power provided by Lisp, hack package-install to patch on the fly org and org dependencies installations in order to install org-plus-contrib instead.
2017-01-23 04:23:39 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//package-install-org
;; ---------------------------------------------------------------------------
(defun --test-package-install-org--symbol-name (pkg-name)
(mocker-let
((package-installed-p (org-plus-contrib)
((:record-cls 'mocker-stub-record
:output nil :occur 1)))
(identity (x) ((:input '(org-plus-contrib) :output nil :occur 1))))
(configuration-layer//package-install-org 'identity pkg-name)))
(defun --package-install-org--symbol-name-already-installed (pkg-name)
(mocker-let
((package-installed-p (org-plus-contrib)
((:record-cls 'mocker-stub-record
:output t :occur 1))))
(configuration-layer//package-install-org 'identity pkg-name)))
(defun --test-package-install-org--package-desc-name (pkg-desc)
(mocker-let
((package-installed-p (org-plus-contrib)
((:record-cls 'mocker-stub-record
:output nil :occur 1)))
(identity (x) ((:input `(,pkg-desc) :output nil :occur 1))))
(configuration-layer//package-install-org 'identity pkg-desc)))
(defun --package-install-org--package-desc-name-already-installed (pkg-desc)
(mocker-let
((package-installed-p (org-plus-contrib)
((:record-cls 'mocker-stub-record
:output t :occur 1))))
(configuration-layer//package-install-org 'identity pkg-desc)))
(defun --test-package-install-org--package-desc-reqs (pkg-desc)
(mocker-let
((package-installed-p (x) ((:record-cls 'mocker-stub-record
:output nil :occur 1))))
(configuration-layer//package-install-org 'identity pkg-desc)))
(ert-deftest test-package-install-org--symbol-name-org ()
(--test-package-install-org--symbol-name 'org))
(ert-deftest test-package-install-org--symbol-name-org-plus-contrib ()
(--test-package-install-org--symbol-name 'org-plus-contrib))
(ert-deftest test-package-install-org--symbol-name-org-already-installed ()
(should (null (--package-install-org--symbol-name-already-installed 'org))))
(ert-deftest
test-package-install-org--symbol-name-org-plus-contrib-already-installed ()
(should (null (--package-install-org--symbol-name-already-installed
'org-plus-contrib))))
(ert-deftest test-package-install-org--no-effect-on-symbol-name-other-packages ()
(let ((pkg (configuration-layer//package-install-org 'identity 'foo)))
(should (eq 'foo pkg ))))
(ert-deftest test-package-install-org--package-desc-name-org ()
(let ((pkg (package-desc-create :name 'org
:version '(7)
:summary "Dummy Org package desc"
:reqs nil)))
(--test-package-install-org--package-desc-name pkg)))
(ert-deftest test-package-install-org--package-desc-name-org-already-installed ()
(let ((pkg (package-desc-create :name 'org
:version '(7)
:summary "Dummy Org package desc"
:reqs nil)))
(--package-install-org--package-desc-name-already-installed pkg)))
(ert-deftest test-package-install-org--package-desc-name-org-plus-contrib ()
(let ((pkg (package-desc-create :name 'org-plus-contrib
:version '(7)
:summary "Dummy org-plus-contrib package desc"
:reqs nil)))
(--test-package-install-org--package-desc-name pkg)))
(ert-deftest
test-package-install-org--package-desc-name-org-plus-contrib-already-installed ()
(let ((pkg (package-desc-create :name 'org-plus-contrib
:version '(7)
:summary "Dummy org-plus-contrib package desc"
:reqs nil)))
(--package-install-org--package-desc-name-already-installed pkg)))
(ert-deftest test-package-install-org--package-desc-reqs-org ()
(let ((pkg (package-desc-create :name 'dummy
:version '(7)
:summary "Dummy package desc"
:reqs '((org 7)))))
(mocker-let
((package-installed-p (x) ((:record-cls 'mocker-stub-record
:output nil :occur 1))))
(let ((patched-pkg (configuration-layer//package-install-org
'identity pkg)))
(should (equal
(package-desc-create :name 'dummy
:version '(7)
:summary "Dummy package desc"
:reqs '((org-plus-contrib 7)))
patched-pkg))))))
(ert-deftest test-package-install-org--package-desc-reqs-org-contrib-plus ()
(let ((pkg (package-desc-create :name 'dummy
:version '(7)
:summary "Dummy package desc"
:reqs '((org-plus-contrib 7)))))
(let ((patched-pkg (configuration-layer//package-install-org 'identity pkg)))
(should (equal pkg patched-pkg)))))
(ert-deftest test-package-install-org--no-effect-on-package-desc-other-packages ()
(let ((pkg (package-desc-create :name 'dummy
:version '(7)
:summary "Dummy package desc"
:reqs '((foo 7)))))
(let ((patched-pkg (configuration-layer//package-install-org 'identity pkg)))
(should (equal pkg patched-pkg)))))
[core] Add "unit" and functional tests for archvie verification
2019-08-25 02:49:48 +00:00
;; ---------------------------------------------------------------------------
;; configuration-layer//stable-elpa-verify-archive
;; ---------------------------------------------------------------------------
(ert-deftest test-stable-elpa-verify-archive--archive-not-found-is-fatal-error ()
(mocker-let
((configuration-layer//stable-elpa-tarball-local-file
nil ((:record-cls 'mocker-stub-record
:output
(concat spacemacs-test-directory
"core/data/not-found.tar.gz")
:occur 1)))
(configuration-layer//stable-elpa-tarball-local-sign-file
nil ((:record-cls 'mocker-stub-record
:output
(concat spacemacs-test-directory
"core/data/stable-elpa.sig")
:occur 1)))
(configuration-layer//error
(msg &rest args) ((:record-cls 'mocker-stub-record :occur 1))))
(should (null (configuration-layer//stable-elpa-verify-archive)))))
(ert-deftest test-stable-elpa-verify-archive--signature-not-found-is-fatal-error ()
(mocker-let
((configuration-layer//stable-elpa-tarball-local-file
nil ((:record-cls 'mocker-stub-record
:output
(concat spacemacs-test-directory
"core/data/signed-stable-elpa.tar.gz")
:occur 1)))
(configuration-layer//stable-elpa-tarball-local-sign-file
nil ((:record-cls 'mocker-stub-record
:output
(concat spacemacs-test-directory
"core/data/not-found.sig")
:occur 1)))
(configuration-layer//error
(msg &rest args) ((:record-cls 'mocker-stub-record :occur 1))))
(should (null (configuration-layer//stable-elpa-verify-archive)))))
Reference in a new issue Copy permalink