Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-11-24 13:47:38 +00:00
Code Issues Releases Activity

Remove duplicate tests

Browse Source
This commit is contained in:
Matan Kushner 2019-04-11 20:04:04 -04:00
parent c1f5a733c9
commit 7ffadd37bc
No known key found for this signature in database
GPG Key ID: 4B98C3A8949CA8A4
1 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/modules/nodejs.rs
View File

@ -6,16 +6,21 @@ use std::fs::{self, DirEntry};
use std::process::Command; use std::process::Command;
/// Creates a segment with the current Node.js version /// Creates a segment with the current Node.js version
///
/// Will display the Node.js version if any of the following criteria are met:
/// - Current directory contains a `.js` file
/// - Current directory contains a `node_modules` directory
/// - Current directory contains a `package.json` file
pub fn segment(_: &ArgMatches) -> Segment { pub fn segment(_: &ArgMatches) -> Segment {
const NODE_CHAR: &str = "⬢ "; const NODE_CHAR: &str = "⬢";
const SECTION_COLOR: Color = Color::Green; const SECTION_COLOR: Color = Color::Green;
let current_path = env::current_dir().expect("Unable to identify current directory"); let current_path = env::current_dir().expect("Unable to identify current directory");
let files = fs::read_dir(&current_path).unwrap(); let files = fs::read_dir(&current_path).unwrap();
// Early return if there are no JS project files
let is_js_project = files.filter_map(Result::ok).any(has_js_files); let is_js_project = files.filter_map(Result::ok).any(has_js_files);
if !is_js_project {
if is_js_project {
return Segment::default(); return Segment::default();
} }
@ -27,47 +32,22 @@ pub fn segment(_: &ArgMatches) -> Segment {
}; };
Segment { Segment {
value: format!("{}{}", NODE_CHAR, version), value: format!("{} {}", NODE_CHAR, version),
style: Style::from(SECTION_COLOR), style: Style::from(SECTION_COLOR),
..Default::default() ..Default::default()
} }
} }
fn has_js_files(dir_entry: DirEntry) -> bool { fn has_js_files(dir_entry: DirEntry) -> bool {
let is_js_file = let is_js_file = |d: &DirEntry| -> bool {
|d: &DirEntry| d.path().is_file() && d.path().extension().unwrap_or_default() == "js"; d.path().is_file() && d.path().extension().unwrap_or_default() == "js"
let is_node_modules = |d: &DirEntry| { };
let is_node_modules = |d: &DirEntry| -> bool {
d.path().is_dir() && d.path().file_name().unwrap_or_default() == "node_modules" d.path().is_dir() && d.path().file_name().unwrap_or_default() == "node_modules"
}; };
let is_package_json = |d: &DirEntry| { let is_package_json = |d: &DirEntry| -> bool {
d.path().is_file() && d.path().file_name().unwrap_or_default() == "package.json" d.path().is_file() && d.path().file_name().unwrap_or_default() == "package.json"
}; };
is_js_file(&dir_entry) || is_node_modules(&dir_entry) || is_package_json(&dir_entry) is_js_file(&dir_entry) || is_node_modules(&dir_entry) || is_package_json(&dir_entry)
} }
#[cfg(test)]
mod tests {
use super::*;
use clap::{App, Arg};
#[test]
fn char_section_success_status() {
let args = App::new("starship")
.arg(Arg::with_name("status_code"))
.get_matches_from(vec!["starship", "0"]);
let segment = segment(&args);
assert_eq!(segment.style, Style::from(Color::Green));
}
#[test]
fn char_section_failure_status() {
let args = App::new("starship")
.arg(Arg::with_name("status_code"))
.get_matches_from(vec!["starship", "1"]);
let segment = segment(&args);
assert_eq!(segment.style, Style::from(Color::Red));
}
}