Merge pull request #4 from quiye/on

add on option

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "varust"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Yuya Ishida <[email protected]>"]
 edition = "2018"
 

README.md

@@ -1,36 +1,45 @@
-# varust
+# Varust
 
 A simple CLI tool to extract environment variables from yaml file.
 
-## install
+## Installing
 
 ```sh
 cargo install --git https://github.com/quiye/varust.git
 ```
 
-## usage
+## Usage
 
 [sample.yaml](sample.yaml) is a simple structured yaml file.
 
 ```sh
 $ cat sample.yaml
+# shared variables
+shared:
+  environment:
+    REPLICATION: 3
+    CONSISTENCY: ONE
+# variables for production
 prod:
   environment:
-    USER: prod
     URL: https://prod-env.com
     PORT: 443
+    REPLICATION: 5
+    CONSISTENCY: ALL
+# variables for develop
 dev:
   environment:
-    USER: dev
     URL: http://dev-env.com
     PORT: 80
+    CONSISTENCY: TWO
 ```
 
 From above file, we can extract productional environment variables by varust.
 
 ```sh
 $ varust prod.environment sample.yaml
-USER=prod
+REPLICATION=5
+CONSISTENCY=ALL
 URL=https://prod-env.com
 PORT=443
 ```
@@ -39,7 +48,23 @@ On the other hand, we can extract variables for develop environment.
 
 ```sh
 $ varust dev.environment sample.yaml
-URL=http://dev-env.com
 PORT=80
-USER=dev
+URL=http://dev-env.com
+CONSISTENCY=TWO
 ```
+
+### Options
+
+#### `-o (--on)`
+
+By using this option, we can expand `dev.environment` on a shared setting `shared.environment`.
+
+Look below !
+
+```sh
+$ varust dev.environment --on shared.environment sample.yaml
+PORT=80
+REPLICATION=3
+CONSISTENCY=TWO
+URL=http://dev-env.com
+```

sample.yaml

@@ -1,10 +1,18 @@
+# shared variables
+shared:
+  environment:
+    REPLICATION: 3
+    CONSISTENCY: ONE
+# variables for production
 prod:
   environment:
-    USER: prod
     URL: https://prod-env.com
     PORT: 443
+    REPLICATION: 5
+    CONSISTENCY: ALL
+# variables for develop
 dev:
   environment:
-    USER: dev
     URL: http://dev-env.com
     PORT: 80
+    CONSISTENCY: TWO

src/main.rs

@@ -5,18 +5,28 @@ use yaml_rust::{Yaml, YamlLoader};
 
 #[derive(StructOpt)]
 struct Cli {
-    root: String,
+    node: String,
     #[structopt(parse(from_os_str))]
     path: std::path::PathBuf,
+    #[structopt(short = "o", long = "on")]
+    base_node: Option<String>,
 }
 
 fn main() {
     let args = Cli::from_args();
     let content = std::fs::read_to_string(&args.path).expect("could not read file");
     let docs = YamlLoader::load_from_str(&content).unwrap();
     let doc = &docs[0];
-    let map = search_nodes(doc, &args.root);
+    let map = search_nodes(doc, &args.node);
+    let mut base_map = match args.base_node {
+        Some(node) => search_nodes(doc, &node),
+        None => HashMap::new(),
+    };
+
     for (k, v) in map {
+        base_map.insert(k, v);
+    }
+    for (k, v) in base_map {
         println!("{}={}", k, v);
     }
 }
@@ -29,7 +39,6 @@ fn search_nodes<'a>(yaml: &'a yaml_rust::Yaml, path: &str) -> HashMap<&'a str, S
     ) -> HashMap<&'a str, String> {
         if pathv.len() == 1 {
             let &node_name = pathv.first().unwrap();
-            // let Yaml::Hash(h) = yaml[node_name];
             match &yaml[node_name] {
                 Yaml::Hash(h) => {
                     let mut map: HashMap<&str, String> = HashMap::new();