Merge remote-tracking branch 'o2sh/master'

Author: pablodiegoss

Diff for: .travis.yml

@@ -17,7 +17,3 @@ notifications:
 branches:
   only:
     - master
-cache:
-  cargo: true
-  directories:
-    - target

Diff for: src/ascii_art.rs

@@ -3,11 +3,12 @@ use colored::{Color, Colorize};
 pub struct AsciiArt<'a> {
     content: Box<dyn 'a + Iterator<Item = &'a str>>,
     colors: Vec<Color>,
+    bold: bool,
     start: usize,
     end: usize,
 }
 impl<'a> AsciiArt<'a> {
-    pub fn new(input: &'a str, colors: Vec<Color>) -> AsciiArt<'a> {
+    pub fn new(input: &'a str, colors: Vec<Color>, bold: bool) -> AsciiArt<'a> {
         let mut lines: Vec<_> = input.lines().skip_while(|line| line.is_empty()).collect();
         while let Some(line) = lines.last() {
             if Tokens(line).is_empty() {
@@ -30,6 +31,7 @@ impl<'a> AsciiArt<'a> {
         AsciiArt {
             content: Box::new(lines.into_iter()),
             colors: colors,
+            bold: bold,
             start: start,
             end: end,
         }
@@ -47,7 +49,7 @@ impl<'a> Iterator for AsciiArt<'a> {
     fn next(&mut self) -> Option<String> {
         self.content
             .next()
-            .map(|line| Tokens(line).render(&self.colors, self.start, self.end))
+            .map(|line| Tokens(line).render(&self.colors, self.start, self.end, self.bold))
     }
 }
 
@@ -152,7 +154,7 @@ impl<'a> Tokens<'a> {
         })
     }
     /// render a truncated line of tokens.
-    fn render(self, colors: &Vec<Color>, start: usize, end: usize) -> String {
+    fn render(self, colors: &Vec<Color>, start: usize, end: usize, bold: bool) -> String {
         assert!(start <= end);
         let mut width = end - start;
         let mut colored_segment = String::new();
@@ -166,7 +168,7 @@ impl<'a> Tokens<'a> {
                     colored_segment.push(chr);
                 }
                 Token::Color(col) => {
-                    add_colored_segment(&mut whole_string, &colored_segment, color);
+                    add_colored_segment(&mut whole_string, &colored_segment, color, bold);
                     colored_segment = String::new();
                     color = colors.get(col as usize).unwrap_or(&Color::White);
                 }
@@ -177,7 +179,7 @@ impl<'a> Tokens<'a> {
             };
         });
 
-        add_colored_segment(&mut whole_string, &colored_segment, color);
+        add_colored_segment(&mut whole_string, &colored_segment, color, bold);
         (0..width).for_each(|_| whole_string.push(' '));
         whole_string
     }
@@ -195,8 +197,12 @@ fn succeed_when<I>(predicate: impl FnOnce(I) -> bool) -> impl FnOnce(I) -> Optio
     }
 }
 
-fn add_colored_segment(base: &mut String, segment: &String, color: &Color) {
-    base.push_str(&format!("{}", segment.color(*color).bold()))
+fn add_colored_segment(base: &mut String, segment: &String, color: &Color, bold: bool) {
+    let mut colored_segment = segment.color(*color);
+    if bold {
+        colored_segment = colored_segment.bold();
+    }
+    base.push_str(&format!("{}", colored_segment));
 }
 
 // Basic combinators
@@ -254,6 +260,61 @@ mod test {
         assert_eq!(Tokens("     a;lksjf;a").leading_spaces(), 5);
         assert_eq!(Tokens("  {1} {5}  {9} a").leading_spaces(), 6);
     }
+
+    #[test]
+    fn render() {
+        let colors_shim = Vec::new();
+
+        assert_eq!(
+            Tokens("").render(&colors_shim, 0, 0, true), 
+            "\u{1b}[1;37m\u{1b}[0m"
+        );
+
+        assert_eq!(
+            Tokens("     ").render(&colors_shim, 0, 0, true),
+            "\u{1b}[1;37m\u{1b}[0m"
+        );
+
+        assert_eq!(
+            Tokens("     ").render(&colors_shim, 0, 5, true),
+            "\u{1b}[1;37m     \u{1b}[0m"
+        );
+
+        assert_eq!(
+            Tokens("     ").render(&colors_shim, 1, 5, true),
+            "\u{1b}[1;37m    \u{1b}[0m"
+        );
+
+        assert_eq!(
+            Tokens("     ").render(&colors_shim, 3, 5, true),
+            "\u{1b}[1;37m  \u{1b}[0m"
+        );
+
+        assert_eq!(
+            Tokens("     ").render(&colors_shim, 0, 4, true),
+            "\u{1b}[1;37m    \u{1b}[0m"
+        );
+
+        assert_eq!(
+            Tokens("     ").render(&colors_shim, 0, 3, true),
+            "\u{1b}[1;37m   \u{1b}[0m"
+        );
+
+        assert_eq!(
+            Tokens("  {1} {5}  {9} a").render(&colors_shim, 4, 10, true),
+            "\u{1b}[1;37m\u{1b}[0m\u{1b}[1;37m\u{1b}[0m\u{1b}[1;37m \u{1b}[0m\u{1b}[1;37m a\u{1b}[0m   "
+        );
+
+        // Tests for bold disabled
+        assert_eq!(
+            Tokens("     ").render(&colors_shim, 0, 0, false),
+            "\u{1b}[37m\u{1b}[0m"
+        );
+        assert_eq!(
+            Tokens("     ").render(&colors_shim, 0, 5, false),
+            "\u{1b}[37m     \u{1b}[0m"
+        );
+    }
 
     #[test]
     fn truncate() {

Diff for: src/info.rs

@@ -4,7 +4,7 @@ use std::fs;
 use std::process::Command;
 use std::str::FromStr;
 
-use colored::{Color, Colorize};
+use colored::{Color, Colorize, ColoredString};
 use git2::Repository;
 use license::License;
 
@@ -32,6 +32,7 @@ pub struct Info {
     custom_logo: Language,
     custom_colors: Vec<String>,
     disable_fields: InfoFieldOn,
+    bold_enabled: bool,
 }
 
 impl std::fmt::Display for Info {
@@ -55,19 +56,19 @@ impl std::fmt::Display for Info {
             write_buf(&mut buf, "", &separator, color)?;
         }
         if !self.disable_fields.project {
-            write_buf(&mut buf, "Project: ", &self.project_name, color)?;
+            write_buf(&mut buf, &self.get_formatted_info_label("Project: ", color), &self.project_name)?;
         }
 
         if !self.disable_fields.head {
-            write_buf(&mut buf, "HEAD: ", &self.current_commit, color)?;
+            write_buf(&mut buf, &self.get_formatted_info_label("HEAD: ", color), &self.current_commit)?;
         }
 
         if !self.disable_fields.version {
-            write_buf(&mut buf, "Version: ", &self.version, color)?;
+            write_buf(&mut buf, &self.get_formatted_info_label("Version: ", color), &self.version)?;
         }
 
         if !self.disable_fields.created {
-            write_buf(&mut buf, "Created: ", &self.creation_date, color)?;
+            write_buf(&mut buf, &self.get_formatted_info_label("Created: ", color), &self.creation_date)?;
         }
 
         if !self.disable_fields.languages && !self.languages.is_empty() {
@@ -83,9 +84,9 @@ impl std::fmt::Display for Info {
                         s = s + &format!("{} ({} %) ", language.0, formatted_number);
                     }
                 }
-                writeln!(buf, "{}{}", title.color(color).bold(), s)?;
+                writeln!(buf, "{}{}", &self.get_formatted_info_label(title, color), s)?;
             } else {
-                write_buf(&mut buf, "Language: ", &self.dominant_language, color)?;
+                write_buf(&mut buf, &self.get_formatted_info_label("Language: ", color), &self.dominant_language)?;
             };
         }
 
@@ -99,7 +100,7 @@ impl std::fmt::Display for Info {
             writeln!(
                 buf,
                 "{}{}% {} {}",
-                title.color(color).bold(),
+                &self.get_formatted_info_label(title, color),
                 self.authors[0].2,
                 self.authors[0].0,
                 self.authors[0].1
@@ -108,10 +109,11 @@ impl std::fmt::Display for Info {
             let title = " ".repeat(title.len());
 
             for author in self.authors.iter().skip(1) {
+
                 writeln!(
                     buf,
                     "{}{}% {} {}",
-                    title.color(color).bold(),
+                    &self.get_formatted_info_label(&title, color),
                     author.2,
                     author.0,
                     author.1
@@ -120,27 +122,27 @@ impl std::fmt::Display for Info {
         }
 
         if !self.disable_fields.last_change {
-            write_buf(&mut buf, "Last change: ", &self.last_change, color)?;
+            write_buf(&mut buf, &self.get_formatted_info_label("Last change: ", color), &self.last_change)?;
         }
 
         if !self.disable_fields.repo {
-            write_buf(&mut buf, "Repo: ", &self.repo, color)?;
+            write_buf(&mut buf, &self.get_formatted_info_label("Repo: ", color), &self.repo)?;
         }
 
         if !self.disable_fields.commits {
-            write_buf(&mut buf, "Commits: ", &self.commits, color)?;
+            write_buf(&mut buf, &self.get_formatted_info_label("Commits: ", color), &self.commits)?;
         }
 
         if !self.disable_fields.lines_of_code {
-            write_buf(&mut buf, "Lines of code: ", &self.number_of_lines, color)?;
+            write_buf(&mut buf, &self.get_formatted_info_label("Lines of code: ", color), &self.number_of_lines)?;
         }
 
         if !self.disable_fields.size {
-            write_buf(&mut buf, "Size: ", &self.repo_size, color)?;
+            write_buf(&mut buf, &self.get_formatted_info_label("Size: ", color), &self.repo_size)?;
         }
 
         if !self.disable_fields.license {
-            write_buf(&mut buf, "License: ", &self.license, color)?;
+            write_buf(&mut buf, &self.get_formatted_info_label("License: ", color), &self.license)?;
         }
 
         writeln!(
@@ -164,7 +166,7 @@ impl std::fmt::Display for Info {
             "   ".on_bright_white(),
         )?;
 
-        let mut logo_lines = AsciiArt::new(self.get_ascii(), self.colors());
+        let mut logo_lines = AsciiArt::new(self.get_ascii(), self.colors(), self.bold_enabled);
         let mut info_lines = buf.lines();
 
         let center_pad = "   ";
@@ -199,6 +201,7 @@ impl Info {
         logo: Language,
         colors: Vec<String>,
         disabled: InfoFieldOn,
+        bold_flag: bool,
     ) -> Result<Info> {
         let authors = Info::get_authors(&dir, 3);
         let (git_v, git_user) = Info::get_git_info(&dir);
@@ -232,6 +235,7 @@ impl Info {
             custom_logo: logo,
             custom_colors: colors,
             disable_fields: disabled,
+            bold_enabled: bold_flag,
         })
     }
 
@@ -573,13 +577,21 @@ impl Info {
         };
         Some(color)
     }
+
+    /// Returns a formatted info label with the desired color and boldness
+    fn get_formatted_info_label(&self, label: &str, color: Color) -> ColoredString {
+        let mut formatted_label = label.color(color);
+        if self.bold_enabled {
+            formatted_label = formatted_label.bold();
+        }
+        formatted_label
+    }
 }
 
 fn write_buf<T: std::fmt::Display>(
     buffer: &mut String,
-    title: &str,
+    title: &ColoredString,
     content: T,
-    color: Color,
 ) -> std::fmt::Result {
-    writeln!(buffer, "{}{}", title.color(color).bold(), content)
+    writeln!(buffer, "{}{}", title, content)
 }

Diff for: src/main.rs

@@ -137,24 +137,29 @@ fn main() -> Result<()> {
                 .help(&format!(
                     "Specifies a preferred color set. Unspecified colors will remain as default.
 Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
-                    "0".black(),
-                    "1".red(),
-                    "2".green(),
-                    "3".yellow(),
-                    "4".blue(),
-                    "5".magenta(),
-                    "6".cyan(),
-                    "7".white(),
-                    "8".bright_black(),
-                    "9".bright_red(),
-                    "10".bright_green(),
-                    "11".bright_yellow(),
-                    "12".bright_blue(),
-                    "13".bright_magenta(),
-                    "14".bright_cyan(),
-                    "15".bright_white(),
-                )),
-        )
+                "0".black(),
+                "1".red(),
+                "2".green(),
+                "3".yellow(),
+                "4".blue(),
+                "5".magenta(),
+                "6".cyan(),
+                "7".white(),
+                "8".bright_black(),
+                "9".bright_red(),
+                "10".bright_green(),
+                "11".bright_yellow(),
+                "12".bright_blue(),
+                "13".bright_magenta(),
+                "14".bright_cyan(),
+                "15".bright_white(),
+            )))
+        .arg(
+            Arg::with_name("no-bold")
+                .short("b")
+                .long("no-bold")
+                .help("Turns off bold formatting for the logo and all labels")
+            )
         .arg(
             Arg::with_name("languages")
                 .short("l")
@@ -213,7 +218,9 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
         Vec::new()
     };
 
-    let info = Info::new(&dir, custom_logo, custom_colors, disable_fields)?;
+    let bold_flag = !matches.is_present("no-bold");
+
+    let info = Info::new(&dir, custom_logo, custom_colors, disable_fields, bold_flag)?;
 
     print!("{}", info);
     Ok(())
@@ -231,4 +238,4 @@ fn is_git_installed() -> bool {
 struct Configuration {
     pub repository_name: String,
     pub repository_url: String,
-}
+}