Merge branch '0.6.0' into keyring-rs-linux

src/system/bookmarks_client.rs

@@ -427,11 +427,12 @@ mod tests {
     use pretty_assertions::assert_eq;
     use std::thread::sleep;
     use std::time::Duration;
+    use tempfile::TempDir;
 
     #[test]
 
     fn test_system_bookmarks_new() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: tempfile::TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         // Initialize a new bookmarks client
         let client: BookmarksClient =
@@ -445,7 +446,12 @@ mod tests {
     }
 
     #[test]
-    #[cfg(any(target_os = "unix", target_os = "linux"))]
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "netbsd"
+    ))]
     fn test_system_bookmarks_new_err() {
         assert!(BookmarksClient::new(
             Path::new("/tmp/oifoif/omar"),
@@ -454,7 +460,7 @@ mod tests {
         )
         .is_err());
 
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: tempfile::TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, _): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         assert!(
             BookmarksClient::new(cfg_path.as_path(), Path::new("/tmp/efnnu/omar"), 16).is_err()
@@ -464,7 +470,7 @@ mod tests {
     #[test]
 
     fn test_system_bookmarks_new_from_existing() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: tempfile::TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         // Initialize a new bookmarks client
         let mut client: BookmarksClient =
@@ -510,7 +516,7 @@ mod tests {
     #[test]
 
     fn test_system_bookmarks_manipulate_bookmarks() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: tempfile::TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         // Initialize a new bookmarks client
         let mut client: BookmarksClient =
@@ -556,7 +562,7 @@ mod tests {
     #[should_panic]
 
     fn test_system_bookmarks_bad_bookmark_name() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: tempfile::TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         // Initialize a new bookmarks client
         let mut client: BookmarksClient =
@@ -575,7 +581,7 @@ mod tests {
     #[test]
 
     fn test_system_bookmarks_manipulate_recents() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: tempfile::TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         // Initialize a new bookmarks client
         let mut client: BookmarksClient =
@@ -610,7 +616,7 @@ mod tests {
     #[test]
 
     fn test_system_bookmarks_dup_recent() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: tempfile::TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         // Initialize a new bookmarks client
         let mut client: BookmarksClient =
@@ -635,7 +641,7 @@ mod tests {
     #[test]
 
     fn test_system_bookmarks_recents_more_than_limit() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: tempfile::TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         // Initialize a new bookmarks client
         let mut client: BookmarksClient =
@@ -681,9 +687,8 @@ mod tests {
 
     #[test]
     #[should_panic]
-
     fn test_system_bookmarks_add_bookmark_empty() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: tempfile::TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         // Initialize a new bookmarks client
         let mut client: BookmarksClient =
@@ -702,19 +707,10 @@ mod tests {
     /// ### get_paths
     ///
     /// Get paths for configuration and key for bookmarks
-
     fn get_paths(dir: &Path) -> (PathBuf, PathBuf) {
         let k: PathBuf = PathBuf::from(dir);
         let mut c: PathBuf = k.clone();
         c.push("bookmarks.toml");
         (c, k)
     }
-
-    /// ### create_tmp_dir
-    ///
-    /// Create temporary directory
-
-    fn create_tmp_dir() -> tempfile::TempDir {
-        tempfile::TempDir::new().ok().unwrap()
-    }
 }

src/system/config_client.rs

@@ -408,10 +408,11 @@ mod tests {
 
     use pretty_assertions::assert_eq;
     use std::io::Read;
+    use tempfile::TempDir;
 
     #[test]
     fn test_system_config_new() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, ssh_keys_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let client: ConfigClient = ConfigClient::new(cfg_path.as_path(), ssh_keys_path.as_path())
             .ok()
@@ -437,14 +438,14 @@ mod tests {
             ConfigClient::new(Path::new("/tmp/oifoif/omar"), Path::new("/tmp/efnnu/omar"),)
                 .is_err()
         );
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, _): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         assert!(ConfigClient::new(cfg_path.as_path(), Path::new("/tmp/efnnu/omar")).is_err());
     }
 
     #[test]
     fn test_system_config_from_existing() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
             .ok()
@@ -477,7 +478,7 @@ mod tests {
 
     #[test]
     fn test_system_config_text_editor() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
             .ok()
@@ -488,7 +489,7 @@ mod tests {
 
     #[test]
     fn test_system_config_default_protocol() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
             .ok()
@@ -502,7 +503,7 @@ mod tests {
 
     #[test]
     fn test_system_config_show_hidden_files() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
             .ok()
@@ -513,7 +514,7 @@ mod tests {
 
     #[test]
     fn test_system_config_check_for_updates() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
             .ok()
@@ -527,7 +528,7 @@ mod tests {
 
     #[test]
     fn test_system_config_group_dirs() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
             .ok()
@@ -540,7 +541,7 @@ mod tests {
 
     #[test]
     fn test_system_config_local_file_fmt() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
             .ok()
@@ -555,7 +556,7 @@ mod tests {
 
     #[test]
     fn test_system_config_remote_file_fmt() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
             .ok()
@@ -573,7 +574,7 @@ mod tests {
 
     #[test]
     fn test_system_config_ssh_keys() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: TempDir = TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
             .ok()
@@ -637,13 +638,6 @@ mod tests {
         (c, k)
     }
 
-    /// ### create_tmp_dir
-    ///
-    /// Create temporary directory
-    fn create_tmp_dir() -> tempfile::TempDir {
-        tempfile::TempDir::new().ok().unwrap()
-    }
-
     fn get_sample_rsa_key() -> String {
         format!(
             "-----BEGIN OPENSSH PRIVATE KEY-----\n{}\n-----END OPENSSH PRIVATE KEY-----",

src/system/sshkey_storage.rs

@@ -87,6 +87,16 @@ impl SshKeyStorage {
     fn make_mapkey(host: &str, username: &str) -> String {
         format!("{}@{}", username, host)
     }
+
+    #[cfg(test)]
+    /// ### add_key
+    ///
+    /// Add a key to storage
+    /// NOTE: available only for tests
+    pub fn add_key(&mut self, host: &str, username: &str, p: PathBuf) {
+        let key: String = Self::make_mapkey(host, username);
+        self.hosts.insert(key, p);
+    }
 }
 
 #[cfg(test)]
@@ -100,7 +110,7 @@ mod tests {
 
     #[test]
     fn test_system_sshkey_storage_new() {
-        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let tmp_dir: tempfile::TempDir = tempfile::TempDir::new().ok().unwrap();
         let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
         let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
             .ok()
@@ -128,6 +138,16 @@ mod tests {
         assert_eq!(storage.hosts.len(), 0);
     }
 
+    #[test]
+    fn test_system_sshkey_storage_add() {
+        let mut storage: SshKeyStorage = SshKeyStorage::empty();
+        storage.add_key("deskichup", "veeso", PathBuf::from("/tmp/omar"));
+        assert_eq!(
+            *storage.resolve("deskichup", "veeso").unwrap(),
+            PathBuf::from("/tmp/omar")
+        );
+    }
+
     /// ### get_paths
     ///
     /// Get paths for configuration and keys directory
@@ -138,11 +158,4 @@ mod tests {
         c.push("config.toml");
         (c, k)
     }
-
-    /// ### create_tmp_dir
-    ///
-    /// Create temporary directory
-    fn create_tmp_dir() -> tempfile::TempDir {
-        tempfile::TempDir::new().ok().unwrap()
-    }
 }