Merge pull request #16 from ChristophWurst/release/030

Version bump

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "krankerl"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Christoph Wurst <[email protected]>"]
 description = "A CLI helper to manage Nextcloud apps"
 

src/config/app.rs

@@ -7,6 +7,7 @@ use std::path::Path;
 
 use toml;
 
+use super::{ConfigFileReader, ConfigReader};
 use super::super::error;
 
 #[derive(Debug, Deserialize)]
@@ -105,15 +106,16 @@ exclude = [
     Ok(())
 }
 
-fn load_config(path: &Path) -> Result<String, error::Error> {
+fn load_config<R>(path: &Path, reader: &R) -> Result<String, error::Error>
+where
+    R: ConfigReader,
+{
     let mut path_buf = path.to_path_buf();
     path_buf.push("krankerl.toml");
 
-    let mut file = File::open(path_buf)?;
-    let mut contents = String::new();
-    file.read_to_string(&mut contents)?;
+    let as_string = reader.read(&path_buf)?;
 
-    Ok(contents)
+    Ok(as_string)
 }
 
 fn parse_config(config: String) -> Result<ParsedAppConfig, error::Error> {
@@ -126,7 +128,8 @@ fn parse_config(config: String) -> Result<ParsedAppConfig, error::Error> {
 }
 
 pub fn get_config(path: &Path) -> Result<AppConfig, error::Error> {
-    let config_str = load_config(path)?;
+    let reader = ConfigFileReader::new();
+    let config_str = load_config(path, &reader)?;
     parse_config(config_str).map(|config| config.into())
 }
 
@@ -140,6 +143,24 @@ mod tests {
 
     use super::*;
 
+    struct StaticReader {}
+
+    impl ConfigReader for StaticReader {
+        fn read(&self, path: &Path) -> Result<String, error::Error> {
+            Ok(path.to_str().unwrap().to_owned())
+        }
+    }
+
+    #[test]
+    fn test_load_config() {
+        let reader = StaticReader {};
+        let path = Path::new("my/app");
+
+        let conf = load_config(&path, &reader).unwrap();
+
+        assert_eq!("my/app/krankerl.toml".to_owned(), conf);
+    }
+
     fn prepare_fs_test(id: &'static str) -> (PathBuf, TempDir) {
         let mut src = PathBuf::from("./tests/apps");
         src.push(id);
@@ -182,10 +203,11 @@ mod tests {
     }
 
     #[test]
-    fn test_load_config() {
+    fn test_load_real_config() {
         let (app_path, tmp) = prepare_fs_test("app3");
+        let reader = ConfigFileReader::new();
 
-        load_config(&app_path).unwrap();
+        load_config(&app_path, &reader).unwrap();
 
         tmp.close().unwrap();
     }

src/config/mod.rs

@@ -1,2 +1,5 @@
 pub mod app;
 pub mod krankerl;
+mod reader;
+
+pub use self::reader::{ConfigFileReader, ConfigReader};

src/config/reader.rs

@@ -0,0 +1,27 @@
+use std::fs::File;
+use std::io::Read;
+use std::path::Path;
+
+use error;
+
+pub trait ConfigReader {
+    fn read(&self, path: &Path) -> Result<String, error::Error>;
+}
+
+pub struct ConfigFileReader {}
+
+impl ConfigFileReader {
+    pub fn new() -> Self {
+        ConfigFileReader {}
+    }
+}
+
+impl ConfigReader for ConfigFileReader {
+    fn read(&self, path: &Path) -> Result<String, error::Error> {
+        let mut file = File::open(path)?;
+        let mut contents = String::new();
+        file.read_to_string(&mut contents)?;
+
+        Ok(contents)
+    }
+}

src/lib.rs

@@ -6,6 +6,7 @@ extern crate futures;
 extern crate futures_cpupool;
 extern crate globset;
 extern crate hex;
+
 extern crate nextcloud_appinfo;
 extern crate nextcloud_appsignature;
 extern crate nextcloud_appstore;

src/main.rs

@@ -17,7 +17,7 @@ use krankerl::packaging::package_app;
 use tokio_core::reactor::Core;
 
 const USAGE: &'static str = "
-Krankerl. A CLI tool for the Nextcloud app store.
+Krankerl. A CLI helper to manage Nextcloud apps.
 
 Usage:
   krankerl enable
@@ -149,6 +149,6 @@ fn main() {
             println!("an error occured: {}", e);
         });
     } else if args.flag_version {
-        println!("v0.2.0");
+        println!(env!("CARGO_PKG_VERSION"));
     }
 }