Merge pull request #115 from epage/color

feat: Color output
assert-rs · Oct 7, 2021 · 22c478b · 22c478b
2 parents 19019fb + 82af5d0
commit 22c478b
Show file tree

Hide file tree

Showing 20 changed files with 264 additions and 29 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,6 +33,8 @@ normalize-line-endings = { version = "0.3.0", optional = true }
 regex = { version="1.0", optional = true }
 float-cmp = { version="0.9", optional = true }
 itertools = "0.10"
+yansi = { version = "0.5.0", optional = true }
+concolor-control = { version = "0.0.7", optional = true }
 
 [dev-dependencies]
 predicates-tree = { version = "1.0", path = "crates/tree" }
@@ -41,3 +43,5 @@ predicates-tree = { version = "1.0", path = "crates/tree" }
 default = ["diff", "regex", "float-cmp", "normalize-line-endings"]
 diff = ["difflib"]
 unstable = []
+color = ["yansi", "concolor-control/std"]
+color-auto = ["color", "concolor-control/auto"]
diff --git a/crates/tree/Cargo.toml b/crates/tree/Cargo.toml
@@ -17,4 +17,4 @@ predicates-core = { version = "1.0", path = "../core" }
 termtree = "0.2"
 
 [dev-dependencies]
-predicates = { version = "2.0", path = "../.." }
+predicates = { version = "2.0", path = "../..", features = ["color-auto"] }
diff --git a/src/boxed.rs b/src/boxed.rs
@@ -60,7 +60,7 @@ where
     Item: ?Sized,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
+        self.0.fmt(f)
     }
 }
 

diff --git a/src/color.rs b/src/color.rs
@@ -0,0 +1,50 @@
+#[derive(Copy, Clone, Debug, Default)]
+pub(crate) struct Palette {
+    pub(crate) description: styled::Style,
+    pub(crate) var: styled::Style,
+    pub(crate) expected: styled::Style,
+}
+
+impl Palette {
+    #[cfg(feature = "color")]
+    pub(crate) fn current() -> Self {
+        if concolor_control::get(concolor_control::Stream::Either).ansi_color() {
+            Self {
+                description: styled::Style(yansi::Style::new(yansi::Color::Blue).bold()),
+                var: styled::Style(yansi::Style::new(yansi::Color::Red).bold()),
+                expected: styled::Style(yansi::Style::new(yansi::Color::Green).bold()),
+            }
+        } else {
+            Self::default()
+        }
+    }
+
+    #[cfg(not(feature = "color"))]
+    pub(crate) fn current() -> Self {
+        Self::default()
+    }
+}
+
+#[cfg(feature = "color")]
+mod styled {
+    #[derive(Copy, Clone, Debug, Default)]
+    pub(crate) struct Style(pub(crate) yansi::Style);
+
+    impl Style {
+        pub(crate) fn paint<T: std::fmt::Display>(self, item: T) -> impl std::fmt::Display {
+            self.0.paint(item)
+        }
+    }
+}
+
+#[cfg(not(feature = "color"))]
+mod styled {
+    #[derive(Copy, Clone, Debug, Default)]
+    pub(crate) struct Style;
+
+    impl Style {
+        pub(crate) fn paint<T: std::fmt::Display>(self, item: T) -> impl std::fmt::Display {
+            item
+        }
+    }
+}
diff --git a/src/constant.rs b/src/constant.rs
@@ -41,7 +41,8 @@ impl reflection::PredicateReflection for BooleanPredicate {
 
 impl fmt::Display for BooleanPredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.retval)
+        let palette = crate::Palette::current();
+        write!(f, "{}", palette.expected.paint(self.retval))
     }
 }
 

diff --git a/src/float/close.rs b/src/float/close.rs
@@ -124,7 +124,14 @@ impl reflection::PredicateReflection for IsClosePredicate {
 
 impl fmt::Display for IsClosePredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var ~= {}", self.target)
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{} {} {}",
+            palette.var.paint("var"),
+            palette.description.paint("!="),
+            palette.expected.paint(self.target),
+        )
     }
 }
 

diff --git a/src/function.rs b/src/function.rs
@@ -96,7 +96,13 @@ where
     T: ?Sized,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}(var)", self.name)
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{}({})",
+            palette.description.paint(self.name),
+            palette.var.paint("var"),
+        )
     }
 }
 

diff --git a/src/iter.rs b/src/iter.rs
@@ -111,7 +111,14 @@ where
     T: PartialEq + fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var in values")
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{} {} {}",
+            palette.var.paint("var"),
+            palette.description.paint("in"),
+            palette.expected.paint("values")
+        )
     }
 }
 
@@ -212,7 +219,14 @@ where
     T: Ord + fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var in values")
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{} {} {}",
+            palette.var.paint("var"),
+            palette.description.paint("in"),
+            palette.expected.paint("values")
+        )
     }
 }
 
@@ -274,7 +288,14 @@ where
     T: Hash + Eq + fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var in values")
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{} {} {}",
+            palette.var.paint("var"),
+            palette.description.paint("in"),
+            palette.expected.paint("values")
+        )
     }
 }
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -221,4 +221,6 @@ pub mod float;
 pub mod path;
 pub mod str;
 
+mod color;
+use color::Palette;
 mod utils;
diff --git a/src/name.rs b/src/name.rs
@@ -75,7 +75,8 @@ where
     Item: ?Sized,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.name)
+        let palette = crate::Palette::current();
+        write!(f, "{}", palette.description.paint(self.name))
     }
 }
 

diff --git a/src/ord.rs b/src/ord.rs
@@ -82,7 +82,14 @@ where
     T: fmt::Debug + PartialEq,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var {} {:?}", self.op, self.constant)
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{} {} {:?}",
+            palette.var.paint("var"),
+            palette.description.paint(self.op),
+            self.constant
+        )
     }
 }
 
@@ -210,7 +217,14 @@ where
     T: fmt::Debug + PartialOrd,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var {} {:?}", self.op, self.constant)
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{} {} {:?}",
+            palette.var.paint("var"),
+            palette.description.paint(self.op),
+            self.constant
+        )
     }
 }
 

diff --git a/src/path/existence.rs b/src/path/existence.rs
@@ -39,7 +39,15 @@ impl reflection::PredicateReflection for ExistencePredicate {}
 
 impl fmt::Display for ExistencePredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}(var)", if self.exists { "exists" } else { "missing" })
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{}({})",
+            palette
+                .description
+                .paint(if self.exists { "exists" } else { "missing" }),
+            palette.var.paint("var")
+        )
     }
 }
 

diff --git a/src/path/fc.rs b/src/path/fc.rs
@@ -56,7 +56,7 @@ where
     P: Predicate<[u8]>,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.p)
+        self.p.fmt(f)
     }
 }
 

diff --git a/src/path/fs.rs b/src/path/fs.rs
@@ -89,7 +89,14 @@ impl reflection::PredicateReflection for BinaryFilePredicate {
 
 impl fmt::Display for BinaryFilePredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var is {}", self.path.display())
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{} {} {}",
+            palette.var.paint("var"),
+            palette.description.paint("is"),
+            palette.expected.paint(self.path.display())
+        )
     }
 }
 
@@ -160,6 +167,13 @@ impl reflection::PredicateReflection for StrFilePredicate {
 
 impl fmt::Display for StrFilePredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var is {}", self.path.display())
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{} {} {}",
+            palette.var.paint("var"),
+            palette.description.paint("is"),
+            palette.expected.paint(self.path.display())
+        )
     }
 }
diff --git a/src/path/ft.rs b/src/path/ft.rs
@@ -135,7 +135,14 @@ impl reflection::PredicateReflection for FileTypePredicate {
 
 impl fmt::Display for FileTypePredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var is {}", self.ft)
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{} {} {}",
+            palette.var.paint("var"),
+            palette.description.paint("is"),
+            palette.expected.paint(self.ft)
+        )
     }
 }
 

diff --git a/src/str/adapters.rs b/src/str/adapters.rs
@@ -54,7 +54,7 @@ where
     P: Predicate<str>,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.p)
+        self.p.fmt(f)
     }
 }
 
@@ -136,7 +136,7 @@ where
     P: Predicate<str>,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.p)
+        self.p.fmt(f)
     }
 }
 

diff --git a/src/str/basics.rs b/src/str/basics.rs
@@ -32,7 +32,13 @@ impl reflection::PredicateReflection for IsEmptyPredicate {}
 
 impl fmt::Display for IsEmptyPredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var.is_empty()")
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{}.{}()",
+            palette.var.paint("var"),
+            palette.description.paint("is_empty"),
+        )
     }
 }
 
@@ -73,7 +79,14 @@ impl reflection::PredicateReflection for StartsWithPredicate {}
 
 impl fmt::Display for StartsWithPredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var.starts_with({:?})", self.pattern)
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{}.{}({:?})",
+            palette.var.paint("var"),
+            palette.description.paint("starts_with"),
+            self.pattern
+        )
     }
 }
 
@@ -119,7 +132,14 @@ impl reflection::PredicateReflection for EndsWithPredicate {}
 
 impl fmt::Display for EndsWithPredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var.ends_with({:?})", self.pattern)
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{}.{}({:?})",
+            palette.var.paint("var"),
+            palette.description.paint("ends_with"),
+            self.pattern
+        )
     }
 }
 
@@ -185,7 +205,14 @@ impl reflection::PredicateReflection for ContainsPredicate {}
 
 impl fmt::Display for ContainsPredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var.contains({:?})", self.pattern)
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{}.{}({})",
+            palette.var.paint("var"),
+            palette.description.paint("contains"),
+            palette.expected.paint(&self.pattern),
+        )
     }
 }
 
@@ -226,7 +253,14 @@ impl reflection::PredicateReflection for MatchesPredicate {
 
 impl fmt::Display for MatchesPredicate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "var.contains({})", self.pattern)
+        let palette = crate::Palette::current();
+        write!(
+            f,
+            "{}.{}({})",
+            palette.var.paint("var"),
+            palette.description.paint("contains"),
+            palette.expected.paint(&self.pattern),
+        )
     }
 }