Signing 2 - hc keygen

Cargo.toml

@@ -2,6 +2,7 @@
 
 members = [
   "cli",
+  "common",
   "conductor",
   "conductor_api",
   "core_api_c_binding",

cli/Cargo.toml

@@ -5,6 +5,7 @@ authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
 
 [dependencies]
 holochain_net = { path = "../net" }
+holochain_common = { path = "../common" }
 holochain_core_types = { path = "../core_types" }
 holochain_core = { path = "../core" }
 holochain_cas_implementations = { path = "../cas_implementations" }

cli/src/cli/keygen.rs

@@ -1,4 +1,5 @@
 use error::DefaultResult;
+use holochain_common::paths::keys_directory;
 use holochain_dpki::{
     bundle::KeyBundle,
     keypair::{Keypair, SEEDSIZE},
@@ -9,7 +10,6 @@ use rpassword;
 use std::{
     fs::{create_dir_all, File},
     io::prelude::*,
-    path::PathBuf,
 };
 
 pub fn keygen() -> DefaultResult<()> {
@@ -36,11 +36,7 @@ pub fn keygen() -> DefaultResult<()> {
         )
         .unwrap();
 
-    let path = match directories::UserDirs::new() {
-        Some(user_dirs) => user_dirs.home_dir().join(".holochain").join("keys"),
-        None => PathBuf::new(),
-    };
-
+    let path = keys_directory();
     create_dir_all(path.clone())?;
     let path = path.join(keypair.pub_keys);
     let mut file = File::create(path.clone())?;

cli/src/main.rs

@@ -1,4 +1,5 @@
 extern crate holochain_cas_implementations;
+extern crate holochain_common;
 extern crate holochain_conductor_api;
 extern crate holochain_core;
 extern crate holochain_core_types;

common/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "holochain_common"
+version = "0.0.3"
+authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
+edition = "2018"
+
+[dependencies]
+directories = "1.0"

common/src/lib.rs

@@ -0,0 +1 @@
+pub mod paths;

common/src/paths.rs

@@ -0,0 +1,23 @@
+use std::path::PathBuf;
+
+pub const QUALIFIER: &'static str = "org";
+pub const ORGANIZATION: &'static str = "holochain";
+pub const APPLICATION: &'static str = "holochain";
+pub const KEYS_DIRECTORY: &'static str = "keys";
+
+/// Returns the path to the root config directory for all of Holochain.
+/// If we can get a user directory it will be an XDG compliant path
+/// like "/home/peter/.config/holochain".
+/// If it can't get a user directory it will default to "/etc/holochain".
+pub fn config_root() -> PathBuf {
+    directories::ProjectDirs::from(QUALIFIER, ORGANIZATION, APPLICATION)
+        .and_then(|dirs| Some(dirs.config_dir().to_owned()))
+        .or(Some(PathBuf::new().join("/etc").join(APPLICATION)))
+        .unwrap()
+}
+
+/// Returns the path to where agent keys are stored and looked for by default.
+/// Something like "~/.config/holochain/keys".
+pub fn keys_directory() -> PathBuf {
+    config_root().join(KEYS_DIRECTORY)
+}