Added parent_config_file support in configuration file #419
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
||
| # Merge config with default config | ||
| @config = DEFAULT_CONFIG.merge(@config) | ||
|
|
There was a problem hiding this comment.
This set of changes is quite long and should be extracted into its own method. A method that recursively loads config files should do the trick.
|
How about now? |
| raise Nanoc::Errors::GenericTrivial, "Cycle detected. Could not use parent configuration file '#{parent_config_file}'" | ||
| end | ||
| parent_config = load_config(config_path) | ||
| apply_parent_config(parent_config, config_paths << config_path).merge(config) |
There was a problem hiding this comment.
config_paths + config_path rather than << because the latter mutates.
| YAML.load_file(config_path).symbolize_keys_recursively | ||
| end | ||
|
|
||
| def apply_parent_config(config, config_paths = []) |
There was a problem hiding this comment.
I’d prefer config_paths to be a Set rather than an array (there is no need to have it ordered).
A better name for this param would be seen_config_paths.
denisdefreyne
added a commit
that referenced
this pull request
Apr 28, 2014
Added parent_config_file support in configuration file
|
It’s fine! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This replaces #414.