actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #506 from Michael-F-Bryan/quickfix 

Added a quick fix so if the config isn't found we use a default
This commit is contained in:
Michael Bryan 2017-12-09 21:18:34 +11:00 committed by GitHub
parent f22835f7bc 42ff5a895c
commit dc89a82329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/book/mod.rs
View File

@ -299,8 +299,13 @@ impl MDBook {
pub fn read_config(mut self) -> Result<Self> { pub fn read_config(mut self) -> Result<Self> {
let config_path = self.root.join("book.toml"); let config_path = self.root.join("book.toml");
if config_path.exists() {
debug!("[*] Loading the config from {}", config_path.display()); debug!("[*] Loading the config from {}", config_path.display());
self.config = Config::from_disk(&config_path)?; self.config = Config::from_disk(&config_path)?;
} else {
self.config = Config::default();
}
Ok(self) Ok(self)
} }

11
tests/init.rs
View File

@ -51,3 +51,14 @@ fn run_mdbook_init_with_custom_book_and_src_locations() {
assert!(target.exists(), "{} should have been created by `mdbook init`", file); assert!(target.exists(), "{} should have been created by `mdbook init`", file);
} }
} }
#[test]
fn book_toml_isnt_required() {
let temp = TempDir::new("mdbook").unwrap();
let mut md = MDBook::new(temp.path());
md.init().unwrap();
assert!(!temp.path().join("book.toml").exists());
md.read_config().unwrap().build().unwrap();
}