Refactors

.travis.yml

@@ -1,3 +1,9 @@
+# Build only pushed (merged) master or any pull request. This avoids the
+# pull request to be build twice.
+branches:
+  only:
+    - master
+
 language: rust
 
 rust:
@@ -27,4 +33,4 @@ script:
   - rustc --version
   - if [ "$TRAVIS_RUST_VERSION" = "stable" ]; then cargo fmt --all -- --check; fi
   - cargo build
-  - cargo test --all-features -- --nocapture --test-threads 1
+  - cargo test --all-features -- --nocapture --test-threads 1

CHANGELOG.md

@@ -21,7 +21,7 @@
 
 - Introduced more `Attributes`
 - Introduced easier ways to style text [issue 87](https://github.com/crossterm-rs/crossterm/issues/87).
-- Removed `ColorType` since it was unnecessary.
+- Removed `Color` since it was unnecessary.
 
 # Version 0.1.0
 

Cargo.toml

@@ -14,6 +14,7 @@ edition = "2018"
 [target.'cfg(windows)'.dependencies]
 winapi = { version =  "0.3.8", features = ["wincon"] }
 crossterm_winapi = { version = "0.2.1" }
+lazy_static = "1.4"
 
 [dependencies]
 crossterm_utils = { version = "0.3.1" }

README.md

@@ -41,7 +41,7 @@ crossterm_style = "0.5"
 And import the `crossterm_style` modules you want to use.
 
 ```rust  
-pub use crossterm_style::{color, style, Attribute, Color, ColorType, ObjectStyle, StyledObject, TerminalColor, Colorize, Styler};
+pub use crossterm_style::{color, style, Attribute, Color, Color, ObjectStyle, StyledObject, TerminalColor, Colorize, Styler};
 ```
 
 ### Useful Links

src/enums/attribute.rs

@@ -3,7 +3,7 @@ use std::fmt::Display;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use crossterm_utils::csi;
+use crate::SetAttr;
 
 /// Enum with the different attributes to style your test.
 ///
@@ -17,7 +17,9 @@ use crossterm_utils::csi;
 /// # Example
 /// You can use an attribute in a write statement to apply the attribute to the terminal output.
 ///
-/// ```ignore
+/// ```no_run
+/// use crossterm_style::Attribute;
+///
 /// println!(
 ///     "{} Underlined {} No Underline",
 ///     Attribute::Underlined,
@@ -26,12 +28,12 @@ use crossterm_utils::csi;
 /// ```
 ///
 /// You can also call attribute functions on a `&'static str`:
-/// ```ignore
-/// use Colorizer;
+/// ```no_run
+/// use crossterm_style::Styler;
 ///
-/// println!("{}", style("Bold text").bold());
-/// println!("{}", style("Underlined text").underlined());
-/// println!("{}", style("Negative text").negative());
+/// println!("{}", "Bold text".bold());
+/// println!("{}", "Underlined text".underlined());
+/// println!("{}", "Negative text".negative());
 /// ```
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)]
@@ -142,7 +144,7 @@ pub enum Attribute {
 
 impl Display for Attribute {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> std::result::Result<(), std::fmt::Error> {
-        write!(f, "{}", format!(csi!("{}m"), *self as i16))?;
+        write!(f, "{}", SetAttr(*self))?;
         Ok(())
     }
 }

src/enums/colored.rs

@@ -3,32 +3,26 @@ use std::fmt::Display;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use crate::color::color;
+use crate::color;
 use crate::enums::Color;
 
-/// Could be used to color the foreground or background color.
-///
-/// `Colored::Fg` represents the foreground color.
-/// `Color::Bg` represents the background color.
+/// Can be used to easily change the front and back ground color
 ///
 /// # Example
 ///
-/// You can use `Colored` in a write statement to apply the attribute to the terminal output.
+/// `Colored` implements `Display` therefore you can use it in any `write` operation.
 ///
-/// ```ignore
+/// ```no_run
+/// use crossterm_style::{Colored, Color};
 /// println!("{} Red foreground color", Colored::Fg(Color::Red));
 /// println!("{} Blue background color", Colored::Bg(Color::Blue));
 /// ```
-///
-/// You can also call coloring functions on a `&'static str`:
-/// ```ignore
-/// let styled_text = "Red forground color on blue background.".red().on_blue();
-/// println!("{}", styled_text);
-/// ```
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)]
 pub enum Colored {
+    /// Use this if you want to change the foreground color
     Fg(Color),
+    /// Use this if you want to change the background color
     Bg(Color),
 }