0.1.0

Author: nbari

Cargo.toml

@@ -1,10 +1,14 @@
 [package]
 name = "pgmon"
 version = "0.1.0"
-edition = "2021"
-authors = ["nbari"]
+edition = "2024"
+authors = ["Nicolas Embriz <nbari@tequila.io>"]
 description = "A PostgreSQL monitoring TUI"
 license = "BSD-3-Clause"
+readme = "README.md"
+repository = "https://github.com/nbari/pgmon"
+keywords = ["postgresql", "monitoring", "tui", "database"]
+categories = ["command-line-utilities", "database"]
 
 [lints.rust]
 warnings = "deny"

src/cli/commands/mod.rs

@@ -1,6 +1,6 @@
 use clap::{
-    builder::styling::{AnsiColor, Effects, Styles},
     Arg, ArgAction, ColorChoice, Command,
+    builder::styling::{AnsiColor, Effects, Styles},
 };
 
 pub mod built_info {
@@ -101,7 +101,10 @@ mod tests {
 
     #[test]
     fn test_cli_dsn_required() {
-        std::env::remove_var("PGMON_DSN");
+        // SAFETY: This is a test environment and we're ensuring PGMON_DSN is cleared.
+        unsafe {
+            std::env::remove_var("PGMON_DSN");
+        }
         let cmd = new();
         let matches = cmd.try_get_matches_from(vec!["pgmon"]);
         assert!(matches.is_err());

src/cli/telemetry.rs

@@ -1,4 +1,4 @@
-use tracing_subscriber::{fmt, prelude::*, EnvFilter};
+use tracing_subscriber::{EnvFilter, fmt, prelude::*};
 
 pub fn init(verbosity: u8) {
     let level = match verbosity {

src/pg/client.rs

@@ -75,7 +75,7 @@ impl PgClient {
     pub fn fetch_io_stats(&mut self) -> Result<Vec<Vec<String>>> {
         if !self.view_exists("pg_stat_io")? {
             return Ok(vec![vec![
-                "pg_stat_io not available (PG 16+ required)".to_string()
+                "pg_stat_io not available (PG 16+ required)".to_string(),
             ]]);
         }
         let rows = self.client.query(IO_QUERY, &[])?;
@@ -102,7 +102,7 @@ impl PgClient {
             Err(e) => {
                 if e.to_string().contains("shared_preload_libraries") {
                     return Ok(vec![vec![
-                        "pg_stat_statements library not loaded".to_string()
+                        "pg_stat_statements library not loaded".to_string(),
                     ]]);
                 }
                 return Err(e.into());

src/tui/app.rs

@@ -3,9 +3,9 @@ use anyhow::Result;
 use crossterm::{
     event::{self, DisableMouseCapture, EnableMouseCapture, Event, KeyCode},
     execute,
-    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
+    terminal::{EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode},
 };
-use ratatui::{backend::CrosstermBackend, Terminal};
+use ratatui::{Terminal, backend::CrosstermBackend};
 use std::{
     io,
     sync::mpsc,
@@ -84,27 +84,27 @@ impl App {
         while !self.should_quit {
             terminal.draw(|f| crate::tui::ui::draw(f, self))?;
 
-            if let Ok(true) = event::poll(Duration::from_millis(50)) {
-                if let Event::Key(key) = event::read()? {
-                    match key.code {
-                        KeyCode::Char('q') => self.should_quit = true,
-                        KeyCode::Char('1') => self.set_tab(Tab::Activity),
-                        KeyCode::Char('2') => self.set_tab(Tab::Database),
-                        KeyCode::Char('3') => self.set_tab(Tab::Locks),
-                        KeyCode::Char('4') => self.set_tab(Tab::IO),
-                        KeyCode::Char('5') => self.set_tab(Tab::Statements),
-                        KeyCode::Down => {
-                            if !self.data.is_empty() && self.selected_row < self.data.len() - 1 {
-                                self.selected_row += 1;
-                            }
+            if let Ok(true) = event::poll(Duration::from_millis(50))
+                && let Event::Key(key) = event::read()?
+            {
+                match key.code {
+                    KeyCode::Char('q') => self.should_quit = true,
+                    KeyCode::Char('1') => self.set_tab(Tab::Activity),
+                    KeyCode::Char('2') => self.set_tab(Tab::Database),
+                    KeyCode::Char('3') => self.set_tab(Tab::Locks),
+                    KeyCode::Char('4') => self.set_tab(Tab::IO),
+                    KeyCode::Char('5') => self.set_tab(Tab::Statements),
+                    KeyCode::Down => {
+                        if !self.data.is_empty() && self.selected_row < self.data.len() - 1 {
+                            self.selected_row += 1;
                         }
-                        KeyCode::Up => {
-                            if self.selected_row > 0 {
-                                self.selected_row -= 1;
-                            }
+                    }
+                    KeyCode::Up => {
+                        if self.selected_row > 0 {
+                            self.selected_row -= 1;
                         }
-                        _ => {}
                     }
+                    _ => {}
                 }
             }
 

src/tui/ui.rs

@@ -1,10 +1,10 @@
 use crate::tui::app::{App, Tab};
 use ratatui::{
+    Frame,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, Cell, Paragraph, Row, Table, Tabs},
-    Frame,
 };
 
 pub fn draw(f: &mut Frame, app: &mut App) {