Use "context" to contain run details (#14)

* Create "context" to contain run details

* Use context in tests and benchmarks

5 files changed, 24 insertions, 23 deletions

diff --git a/src/modules/character.rs b/src/modules/character.rs
index 359ff61fb..f624e19f2 100644
--- a/src/modules/character.rs
+++ b/src/modules/character.rs
@@ -1,7 +1,7 @@
-use super::Segment;
 use ansi_term::Color;
-use clap::ArgMatches;
-use std::path::Path;
+
+use super::Segment;
+use crate::context::Context;
 
 /// Creates a segment for the prompt character
 ///
@@ -11,14 +11,15 @@ use std::path::Path;
 /// (green by default)
 /// - If the exit-code was anything else, the arrow will be formatted with
 /// `COLOR_FAILURE` (red by default)
-pub fn segment(_current_dir: &Path, args: &ArgMatches) -> Option<Segment> {
+pub fn segment(context: &Context) -> Option<Segment> {
     const PROMPT_CHAR: &str = "➜";
     const COLOR_SUCCESS: Color = Color::Green;
     const COLOR_FAILURE: Color = Color::Red;
 
     let mut segment = Segment::new("char");
+    let arguments = &context.arguments;
 
-    if args.value_of("status_code").unwrap() == "0" {
+    if arguments.value_of("status_code").unwrap() == "0" {
         segment.set_style(COLOR_SUCCESS);
     } else {
         segment.set_style(COLOR_FAILURE);
diff --git a/src/modules/directory.rs b/src/modules/directory.rs
index 8048a3620..265b90a3c 100644
--- a/src/modules/directory.rs
+++ b/src/modules/directory.rs
@@ -1,10 +1,10 @@
-use super::Segment;
 use ansi_term::Color;
-use clap::ArgMatches;
-use dirs;
 use git2::Repository;
 use std::path::Path;
 
+use super::Segment;
+use crate::context::Context;
+
 /// Creates a segment with the current directory
 ///
 /// Will perform path contraction and truncation.
@@ -14,12 +14,13 @@ use std::path::Path;
 ///
 /// **Truncation**
 /// Paths will be limited in length to `3` path components by default.
-pub fn segment(current_dir: &Path, _args: &ArgMatches) -> Option<Segment> {
+pub fn segment(context: &Context) -> Option<Segment> {
     const HOME_SYMBOL: &str = "~";
     const DIR_TRUNCATION_LENGTH: usize = 3;
     const SECTION_COLOR: Color = Color::Cyan;
 
     let mut segment = Segment::new("dir");
+    let current_dir = &context.current_dir;
 
     let dir_string;
     if let Ok(repo) = git2::Repository::discover(current_dir) {
diff --git a/src/modules/line_break.rs b/src/modules/line_break.rs
index a7bda251e..de0e6f9be 100644
--- a/src/modules/line_break.rs
+++ b/src/modules/line_break.rs
@@ -1,9 +1,8 @@
 use super::Segment;
-use clap::ArgMatches;
-use std::path::Path;
+use crate::context::Context;
 
 /// Creates a segment for the line break
-pub fn segment(_current_dir: &Path, _args: &ArgMatches) -> Option<Segment> {
+pub fn segment(_context: &Context) -> Option<Segment> {
     const LINE_ENDING: &str = "\n";
 
     let mut segment = Segment::new("line_break");
diff --git a/src/modules/mod.rs b/src/modules/mod.rs
index 9efdad46c..abc1e49f7 100644
--- a/src/modules/mod.rs
+++ b/src/modules/mod.rs
@@ -3,16 +3,15 @@ mod directory;
 mod line_break;
 mod nodejs;
 
+use crate::context::Context;
 use crate::segment::Segment;
-use clap::ArgMatches;
-use std::path::Path;
 
-pub fn handle(module: &str, current_dir: &Path, args: &ArgMatches) -> Option<Segment> {
+pub fn handle(module: &str, context: &Context) -> Option<Segment> {
     match module {
-        "dir" | "directory" => directory::segment(current_dir, args),
-        "char" | "character" => character::segment(current_dir, args),
-        "node" | "nodejs" => nodejs::segment(current_dir, args),
-        "line_break" => line_break::segment(current_dir, args),
+        "dir" | "directory" => directory::segment(context),
+        "char" | "character" => character::segment(context),
+        "node" | "nodejs" => nodejs::segment(context),
+        "line_break" => line_break::segment(context),
 
         _ => panic!("Unknown module: {}", module),
     }
diff --git a/src/modules/nodejs.rs b/src/modules/nodejs.rs
index c3ba59f3f..aede7ba63 100644
--- a/src/modules/nodejs.rs
+++ b/src/modules/nodejs.rs
@@ -1,21 +1,22 @@
-use super::Segment;
 use ansi_term::Color;
-use clap::ArgMatches;
 use std::fs::{self, DirEntry};
-use std::path::Path;
 use std::process::Command;
 
+use super::Segment;
+use crate::context::Context;
+
 /// 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(current_dir: &Path, _args: &ArgMatches) -> Option<Segment> {
+pub fn segment(context: &Context) -> Option<Segment> {
     const NODE_CHAR: &str = "⬢";
     const SECTION_COLOR: Color = Color::Green;
 
     let mut segment = Segment::new("node");
+    let current_dir = &context.current_dir;
     let files = fs::read_dir(current_dir).unwrap();
 
     // Early return if there are no JS project files