Rename tui package to ratatui

Macchina-CLI · Jun 28, 2023 · 089c831 · 089c831
1 parent 3114b61
commit 089c831
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 85 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ dirs = "4.0.0"
 toml = "0.5.10"
 serde_json = "1.0.91"
 thiserror = "1.0.38"
-tui = { package = "ratatui", version = "0.20.1", default-features = false, features = ["crossterm"] }
+ratatui = { version = "0.*", default-features = false, features = ["crossterm"] }
 serde = { version = "1.0.152", features = ["derive"] }
 
 [build-dependencies.vergen]

diff --git a/src/ascii.rs b/src/ascii.rs
@@ -5,8 +5,8 @@ use io::Read;
 use std::fs::File;
 use std::io::{self, BufReader};
 use std::path::Path;
-use tui::style::{Color, Style};
-use tui::text::{Span, Spans, Text};
+use ratatui::style::{Color, Style};
+use ratatui::text::{Span, Line, Text};
 
 lazy_static! {
     static ref BLUE: Style = Style::default().fg(Color::Blue);
@@ -106,8 +106,8 @@ pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
 
             vec![Text::from(
                 art.iter()
-                    .map(|f| Spans::from(f.to_owned()))
-                    .collect::<Vec<Spans>>(),
+                    .map(|f| Line::from(f.to_owned()))
+                    .collect::<Vec<Line>>(),
             )]
         }
         AsciiSize::Small => {
@@ -124,8 +124,8 @@ pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
 
             vec![Text::from(
                 art.iter()
-                    .map(|f| Spans::from(f.to_owned()))
-                    .collect::<Vec<Spans>>(),
+                    .map(|f| Line::from(f.to_owned()))
+                    .collect::<Vec<Line>>(),
             )]
         }
     }
@@ -153,8 +153,8 @@ pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
 
             vec![Text::from(
                 art.iter()
-                    .map(|f| Spans::from(f.to_owned()))
-                    .collect::<Vec<Spans>>(),
+                    .map(|f| Line::from(f.to_owned()))
+                    .collect::<Vec<Line>>(),
             )]
         }
         AsciiSize::Small => {
@@ -169,8 +169,8 @@ pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
 
             vec![Text::from(
                 art.iter()
-                    .map(|f| Spans::from(f.to_owned()))
-                    .collect::<Vec<Spans>>(),
+                    .map(|f| Line::from(f.to_owned()))
+                    .collect::<Vec<Line>>(),
             )]
         }
     }
@@ -201,8 +201,8 @@ pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
 
             vec![Text::from(
                 art.iter()
-                    .map(|f| Spans::from(f.to_owned()))
-                    .collect::<Vec<Spans>>(),
+                    .map(|f| Line::from(f.to_owned()))
+                    .collect::<Vec<Line>>(),
             )]
         }
         AsciiSize::Small => {
@@ -218,8 +218,8 @@ pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
 
             vec![Text::from(
                 art.iter()
-                    .map(|f| Spans::from(f.to_owned()))
-                    .collect::<Vec<Spans>>(),
+                    .map(|f| Line::from(f.to_owned()))
+                    .collect::<Vec<Line>>(),
             )]
         }
     }
@@ -230,72 +230,72 @@ pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
 pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
     match size {
         AsciiSize::Big => {
-            let art: Vec<Spans> = vec![
-                Spans::from(vec![Span::styled("       a8888b.", *WHITE)]),
-                Spans::from(vec![Span::styled("      d888888b.", *WHITE)]),
-                Spans::from(vec![Span::styled("      8P\"YP\"Y88", *WHITE)]),
-                Spans::from(vec![Span::styled("      8|o||o|88", *WHITE)]),
-                Spans::from(vec![
+            let art: Vec<Line> = vec![
+                Line::from(vec![Span::styled("       a8888b.", *WHITE)]),
+                Line::from(vec![Span::styled("      d888888b.", *WHITE)]),
+                Line::from(vec![Span::styled("      8P\"YP\"Y88", *WHITE)]),
+                Line::from(vec![Span::styled("      8|o||o|88", *WHITE)]),
+                Line::from(vec![
                     Span::styled("      8", *WHITE),
                     Span::styled("'    .", *YELLOW),
                     Span::styled("88", *WHITE),
                 ]),
-                Spans::from(vec![
+                Line::from(vec![
                     Span::styled("      8", *WHITE),
                     Span::styled("`._.'", *YELLOW),
                     Span::styled(" Y8.", *WHITE),
                 ]),
-                Spans::from(vec![Span::styled("     d/      `8b.", *WHITE)]),
-                Spans::from(vec![Span::styled("    dP        Y8b.", *WHITE)]),
-                Spans::from(vec![Span::styled("   d8:       ::88b.", *WHITE)]),
-                Spans::from(vec![Span::styled("  d8\"         'Y88b", *WHITE)]),
-                Spans::from(vec![Span::styled(" :8P           :888", *WHITE)]),
-                Spans::from(vec![Span::styled("  8a.         _a88P", *WHITE)]),
-                Spans::from(vec![
+                Line::from(vec![Span::styled("     d/      `8b.", *WHITE)]),
+                Line::from(vec![Span::styled("    dP        Y8b.", *WHITE)]),
+                Line::from(vec![Span::styled("   d8:       ::88b.", *WHITE)]),
+                Line::from(vec![Span::styled("  d8\"         'Y88b", *WHITE)]),
+                Line::from(vec![Span::styled(" :8P           :888", *WHITE)]),
+                Line::from(vec![Span::styled("  8a.         _a88P", *WHITE)]),
+                Line::from(vec![
                     Span::styled("._/\"Y", *YELLOW),
                     Span::styled("aa     .", *WHITE),
                     Span::styled("|", *YELLOW),
                     Span::styled(" 88P", *WHITE),
                     Span::styled("|", *YELLOW),
                 ]),
-                Spans::from(vec![
+                Line::from(vec![
                     Span::styled("\\    Y", *YELLOW),
                     Span::styled("P\"    `", *WHITE),
                     Span::styled("|     `.", *YELLOW),
                 ]),
-                Spans::from(vec![
+                Line::from(vec![
                     Span::styled("/     \\", *YELLOW),
                     Span::styled(".___.d", *WHITE),
                     Span::styled("|    .'", *YELLOW),
                 ]),
-                Spans::from(vec![Span::styled("`--..__)     `._.'", *YELLOW)]),
+                Line::from(vec![Span::styled("`--..__)     `._.'", *YELLOW)]),
             ];
 
             vec![Text::from(
-                art.iter().map(|f| f.to_owned()).collect::<Vec<Spans>>(),
+                art.iter().map(|f| f.to_owned()).collect::<Vec<Line>>(),
             )]
         }
         AsciiSize::Small => {
             // The following penguin ASCII art was found and
             // taken from: https://asciiart.website/index.php
             // Artist attribution missing.
             // Thank you to whoever made it :^)
-            let art: Vec<Spans> = vec![
-                Spans::from(vec![Span::styled("    .--.", *WHITE)]),
-                Spans::from(vec![
+            let art: Vec<Line> = vec![
+                Line::from(vec![Span::styled("    .--.", *WHITE)]),
+                Line::from(vec![
                     Span::styled("   |o", *WHITE),
                     Span::styled("_", *YELLOW),
                     Span::styled("o |", *WHITE),
                 ]),
-                Spans::from(vec![
+                Line::from(vec![
                     Span::styled("   |", *WHITE),
                     Span::styled("\\_/", *YELLOW),
                     Span::styled(" |", *WHITE),
                 ]),
-                Spans::from(vec![Span::styled("  //   \\ \\", *WHITE)]),
-                Spans::from(vec![Span::styled(" (|     | )", *WHITE)]),
-                Spans::from(vec![Span::styled("/'\\_   _/`\\", *WHITE)]),
-                Spans::from(vec![Span::styled("\\___)=(___/", *WHITE)]),
+                Line::from(vec![Span::styled("  //   \\ \\", *WHITE)]),
+                Line::from(vec![Span::styled(" (|     | )", *WHITE)]),
+                Line::from(vec![Span::styled("/'\\_   _/`\\", *WHITE)]),
+                Line::from(vec![Span::styled("\\___)=(___/", *WHITE)]),
             ];
 
             vec![Text::from(art)]
@@ -308,13 +308,13 @@ pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
     // The following ASCII art was made by Dylan Araps
     // and taken from https://github.com/dylanaraps/pfetch
 
-    let art: Vec<Spans> = vec![
-        Spans::from(vec![Span::styled("/\\,-'''''-,/\\", *RED)]),
-        Spans::from(vec![Span::styled("\\_)       (_//", *RED)]),
-        Spans::from(vec![Span::styled(" |           |", *RED)]),
-        Spans::from(vec![Span::styled(" |           |", *RED)]),
-        Spans::from(vec![Span::styled("  ;         ;", *RED)]),
-        Spans::from(vec![Span::styled("   '-_____-'", *RED)]),
+    let art: Vec<Line> = vec![
+        Line::from(vec![Span::styled("/\\,-'''''-,/\\", *RED)]),
+        Line::from(vec![Span::styled("\\_)       (_//", *RED)]),
+        Line::from(vec![Span::styled(" |           |", *RED)]),
+        Line::from(vec![Span::styled(" |           |", *RED)]),
+        Line::from(vec![Span::styled("  ;         ;", *RED)]),
+        Line::from(vec![Span::styled("   '-_____-'", *RED)]),
     ];
 
     vec![Text::from(art)]
@@ -324,53 +324,53 @@ pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
 pub(crate) fn get_ascii_art(size: AsciiSize) -> Vec<Text<'static>> {
     match size {
         AsciiSize::Big => {
-            let art: Vec<Spans> = vec![
-                Spans::from(vec![
+            let art: Vec<Line> = vec![
+                Line::from(vec![
                     Span::styled("\\\\", *WHITE),
                     Span::styled("`-______,----__", *YELLOW),
                 ]),
-                Spans::from(vec![
+                Line::from(vec![
                     Span::styled(" \\\\", *WHITE),
                     Span::styled("        __,---`.", *YELLOW),
                 ]),
-                Spans::from(vec![
+                Line::from(vec![
                     Span::styled("  \\\\", *WHITE),
                     Span::styled("       `.____", *YELLOW),
                 ]),
-                Spans::from(vec![
+                Line::from(vec![
                     Span::styled("   \\\\", *WHITE),
                     Span::styled("-______,----`.", *YELLOW),
                 ]),
-                Spans::from(vec![Span::styled("    \\\\", *WHITE)]),
-                Spans::from(vec![Span::styled("     \\\\", *WHITE)]),
-                Spans::from(vec![Span::styled("      \\\\", *WHITE)]),
-                Spans::from(vec![Span::styled("       \\\\", *WHITE)]),
-                Spans::from(vec![Span::styled("        \\\\", *WHITE)]),
-                Spans::from(vec![Span::styled("         \\\\", *WHITE)]),
-                Spans::from(vec![Span::styled("          \\\\", *WHITE)]),
+                Line::from(vec![Span::styled("    \\\\", *WHITE)]),
+                Line::from(vec![Span::styled("     \\\\", *WHITE)]),
+                Line::from(vec![Span::styled("      \\\\", *WHITE)]),
+                Line::from(vec![Span::styled("       \\\\", *WHITE)]),
+                Line::from(vec![Span::styled("        \\\\", *WHITE)]),
+                Line::from(vec![Span::styled("         \\\\", *WHITE)]),
+                Line::from(vec![Span::styled("          \\\\", *WHITE)]),
             ];
 
             vec![Text::from(
-                art.iter().map(|f| f.to_owned()).collect::<Vec<Spans>>(),
+                art.iter().map(|f| f.to_owned()).collect::<Vec<Line>>(),
             )]
         }
         AsciiSize::Small => {
-            let art: Vec<Spans> = vec![
-                Spans::from(vec![
+            let art: Vec<Line> = vec![
+                Line::from(vec![
                     Span::styled("()", *BLACK),
                     Span::styled("ncncncncncnc", *YELLOW),
                 ]),
-                Spans::from(vec![
+                Line::from(vec![
                     Span::styled(" \\\\", *BLACK),
                     Span::styled("ncncncnc", *YELLOW),
                 ]),
-                Spans::from(vec![
+                Line::from(vec![
                     Span::styled("  \\\\", *BLACK),
                     Span::styled("ncncncncncn", *YELLOW),
                 ]),
-                Spans::from(vec![Span::styled("   \\\\", *BLACK)]),
-                Spans::from(vec![Span::styled("    \\\\", *BLACK)]),
-                Spans::from(vec![Span::styled("     \\\\", *BLACK)]),
+                Line::from(vec![Span::styled("   \\\\", *BLACK)]),
+                Line::from(vec![Span::styled("    \\\\", *BLACK)]),
+                Line::from(vec![Span::styled("     \\\\", *BLACK)]),
             ];
 
             vec![Text::from(art)]

diff --git a/src/buffer.rs b/src/buffer.rs
@@ -4,11 +4,11 @@ use crate::widgets::readout::ReadoutList;
 use atty::Stream;
 use std::io;
 use std::io::Stdout;
-use tui::backend::{Backend, CrosstermBackend};
-use tui::buffer::{Buffer, Cell};
-use tui::layout::{Margin, Rect};
-use tui::text::Text;
-use tui::widgets::{Block, Borders, Paragraph, Widget};
+use ratatui::backend::{Backend, CrosstermBackend};
+use ratatui::buffer::{Buffer, Cell};
+use ratatui::layout::{Margin, Rect};
+use ratatui::text::Text;
+use ratatui::widgets::{Block, Borders, Paragraph, Widget};
 use unicode_width::UnicodeWidthStr;
 
 pub fn create_backend() -> CrosstermBackend<Stdout> {

diff --git a/src/data/mod.rs b/src/data/mod.rs
@@ -7,8 +7,8 @@ use libmacchina::{BatteryReadout, GeneralReadout, KernelReadout, MemoryReadout,
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 use std::fmt::Display;
-use tui::style::{Color, Style};
-use tui::text::{Span, Spans, Text};
+use ratatui::style::{Color, Style};
+use ratatui::text::{Span, Line, Text};
 
 /// This enum contains all the possible keys, e.g. _Host_, _Machine_, _Kernel_, etc.
 #[allow(clippy::upper_case_acronyms)]

diff --git a/src/main.rs b/src/main.rs
@@ -15,7 +15,7 @@ pub mod widgets;
 
 use cli::{Opt, PKG_NAME};
 use error::Result;
-use tui::{backend::Backend, buffer::Buffer, layout::Rect};
+use ratatui::{backend::Backend, buffer::Buffer, layout::Rect};
 
 #[macro_use]
 extern crate lazy_static;

diff --git a/src/theme/base.rs b/src/theme/base.rs
@@ -9,7 +9,7 @@ use dirs;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 use std::path::{Path, PathBuf};
-use tui::style::Color;
+use ratatui::style::Color;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(default)]

diff --git a/src/theme/color.rs b/src/theme/color.rs
@@ -1,6 +1,6 @@
 use rand::seq::SliceRandom;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use tui::style::Color;
+use ratatui::style::Color;
 
 #[derive(Debug, Clone)]
 pub enum ColorTypes {

diff --git a/src/theme/components.rs b/src/theme/components.rs
@@ -3,8 +3,8 @@ use crate::theme::color::*;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
-use tui::style::Color;
-use tui::widgets::BorderType;
+use ratatui::style::Color;
+use ratatui::widgets::BorderType;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Palette {

diff --git a/src/widgets/readout.rs b/src/widgets/readout.rs
@@ -2,11 +2,11 @@ use crate::data::{Readout, ReadoutKey};
 use crate::theme::components::{Palette, PaletteType};
 use crate::theme::Theme;
 use std::collections::HashMap;
-use tui::buffer::Buffer;
-use tui::layout::{Margin, Rect};
-use tui::style::{Color, Style};
-use tui::text::{Span, Spans, Text};
-use tui::widgets::{Block, Paragraph, Widget};
+use ratatui::buffer::Buffer;
+use ratatui::layout::{Margin, Rect};
+use ratatui::style::{Color, Style};
+use ratatui::text::{Span, Line, Text};
+use ratatui::widgets::{Block, Paragraph, Widget};
 
 pub struct ReadoutList<'a> {
     block: Option<Block<'a>>,