fix(deps): update all dependencies

chore(release): 0.5.0

Co-authored-by: cuddle-please <bot@cuddle.sh>
Reviewed-on: #62

CHANGELOG.md

@@ -6,6 +6,78 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.0] - 2024-12-15
+
+### Added
+- allow taking a local path
+
+### Fixed
+- *(deps)* update rust crate serde to v1.0.216
+- *(deps)* update rust crate prost to v0.13.4
+
+### Other
+- *(deps)* update rust crate clap to v4.5.23
+- *(deps)* update all dependencies
+- *(deps)* update rust crate tracing-subscriber to v0.3.19
+- *(deps)* update rust crate tracing to v0.1.41
+
+## [0.4.0] - 2024-11-23
+
+### Added
+- update hyperlog
+- add hyperlog
+
+### Fixed
+- *(deps)* update rust crate tower-http to v0.6.2
+- *(deps)* update rust crate serde to v1.0.215
+- *(deps)* update rust crate serde to v1.0.214
+- *(deps)* update rust crate serde to v1.0.213
+- *(deps)* update rust crate ratatui to 0.29.0
+- *(deps)* update rust crate serde_json to v1.0.132
+- *(deps)* update rust crate serde_json to v1.0.129
+- *(deps)* update rust crate uuid to v1.11.0
+- *(deps)* update rust crate human-panic to v2.0.2
+- *(deps)* update rust crate tower-http to v0.6.1
+- *(deps)* update rust crate prost to v0.13.3
+- *(deps)* update rust crate tower-http to 0.6.0
+- *(deps)* update rust crate serde to v1.0.210
+- *(deps)* update rust crate sqlx to v0.8.2
+- *(deps)* update rust crate prost to v0.13.2
+- *(deps)* update rust crate ratatui to v0.28.1
+- *(deps)* update rust crate sqlx to v0.8.1
+- *(deps)* update rust crate serde to v1.0.209
+- *(deps)* update rust crate serde_json to v1.0.127
+- *(deps)* update rust crate serde_json to v1.0.126
+- *(deps)* update rust crate prost to 0.13.0
+- *(deps)* update rust crate serde to v1.0.208
+
+### Other
+- *(deps)* update all dependencies
+- *(deps)* update rust crate axum to v0.7.8
+- *(deps)* update rust crate clap to v4.5.21
+- *(deps)* update rust crate tempfile to v3.14.0
+- *(deps)* update rust crate tokio to v1.41.1
+- *(deps)* update rust crate anyhow to v1.0.93
+- *(deps)* update rust crate anyhow to v1.0.92
+- *(deps)* update all dependencies to v1.0.91
+- *(deps)* update all dependencies
+- *(deps)* update rust crate clap to v4.5.20
+- *(deps)* update rust crate futures to v0.3.31
+- *(deps)* update rust crate clap to v4.5.19
+- *(deps)* update rust crate tempfile to v3.13.0
+- *(deps)* update rust crate axum to v0.7.7
+- *(deps)* update tonic monorepo to v0.12.3
+- *(deps)* update all dependencies
+- *(deps)* update rust crate anyhow to v1.0.89
+- *(deps)* update rust crate anyhow to v1.0.88
+- *(deps)* update rust crate anyhow to v1.0.87
+- *(deps)* update rust crate similar-asserts to v1.6.0
+- *(deps)* update all dependencies
+- *(deps)* update rust crate tokio to v1.40.0
+- *(deps)* update tonic monorepo to v0.12.2
+- *(deps)* update tonic monorepo to 0.12.0
+- *(deps)* update all dependencies
+
 ## [0.3.0] - 2024-06-30
 
 ### Added

Cargo.toml

@@ -14,16 +14,16 @@ tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 clap = { version = "4", features = ["derive", "env"] }
 dotenv = { version = "0.15" }
-axum = { version = "0.7" }
+axum = { version = "0.8" }
 serde = { version = "1.0.202", features = ["derive"] }
 serde_json = "1.0.117"
-itertools = "0.13.0"
+itertools = "0.14.0"
 uuid = { version = "1.8.0", features = ["v4"] }
-tonic = { version = "0.11.0", features = ["tls", "tls-roots"] }
+tonic = { version = "0.12.0", features = ["tls", "tls-roots"] }
 futures = { version = "0.3.30" }
 sha2 = { version = "0.10.8" }
 hex = { version = "0.4.3" }
-toml = { version = "0.8.14" }
+toml = { version = "0.9.0" }
 
 [workspace.package]
-version = "0.3.0"
+version = "0.5.0"

buf.yaml

@@ -0,0 +1,4 @@
+version: v2
+modules:
+  - path: crates/hyperlog-protos/proto
+    name: buf.build/noschemaplz/hyperlog

crates/hyperlog-protos/Cargo.toml

@@ -6,7 +6,7 @@ version.workspace = true
 [dependencies]
 tonic.workspace = true
 
-prost = "0.12.6"
+prost = "0.13.0"
 
 [build-dependencies]
-tonic-build = "0.11.0"
+tonic-build = "0.12.0"

crates/hyperlog-server/Cargo.toml

@@ -16,8 +16,8 @@ serde_json.workspace = true
 uuid.workspace = true
 tonic.workspace = true
 
-tower-http = { version = "0.5.2", features = ["cors", "trace"] }
-sqlx = { version = "0.7.4", features = [
+tower-http = { version = "0.6.0", features = ["cors", "trace"] }
+sqlx = { version = "0.8.0", features = [
   "runtime-tokio",
   "tls-rustls",
   "postgres",

crates/hyperlog-tui/Cargo.toml

@@ -22,13 +22,13 @@ uuid.workspace = true
 hex.workspace = true
 toml.workspace = true
 
-ratatui = "0.26.2"
-crossterm = { version = "0.27.0", features = ["event-stream"] }
-directories = "5.0.1"
+ratatui = "0.29.0"
+crossterm = { version = "0.29.0", features = ["event-stream"] }
+directories = "6.0.0"
 human-panic = "2.0.0"
 ropey = "1.6.1"
 bus = "2.4.1"
-dirs = "5.0.1"
+dirs = "6.0.0"
 
 [dev-dependencies]
 similar-asserts = "1.5.0"

crates/hyperlog-tui/src/app.rs

@@ -221,6 +221,7 @@ impl<'a> App<'a> {
     }
 
     fn open_editor(&self, item: &GraphItem) -> Option<Command> {
+        tracing::info!("entering editor for session");
         match editor::EditorSession::new(item).execute() {
             Ok(None) => {
                 tracing::info!("editor returned without changes, skipping");

crates/hyperlog-tui/src/components/graph_explorer.rs

@@ -392,7 +392,6 @@ impl<'a> StatefulWidget for GraphExplorer<'a> {
 
     fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) {
         let Rect { height, .. } = area;
-        let _height = height as usize;
 
         if let Some(graph) = &state.graph {
             let movement_graph: MovementGraph =

crates/hyperlog-tui/src/core_state.rs

@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use tonic::transport::{Channel, ClientTlsConfig};
 
 use crate::{
@@ -7,34 +9,37 @@ use crate::{
 
 #[allow(dead_code)]
 pub struct State {
-    engine: SharedEngine,
-    pub storage: Storage,
-    events: Events,
-
     pub commander: Commander,
     pub querier: Querier,
+
+    backend: Backend,
 }
 
 pub enum Backend {
-    Local,
+    Local { path_override: Option<PathBuf> },
     Remote { url: String },
 }
 
 impl State {
     pub async fn new(backend: Backend) -> anyhow::Result<Self> {
-        let storage = Storage::new();
-        let engine = storage.load()?;
-        let events = Events::default();
-        let engine = SharedEngine::from(engine);
-
-        let (querier, commander) = match backend {
-            Backend::Local => (
-                Querier::local(&engine),
-                Commander::local(engine.clone(), storage.clone(), events.clone())?,
-            ),
+        let (querier, commander) = match &backend {
+            Backend::Local { path_override } => {
+                let mut storage = Storage::new();
+                if let Some(path_override) = path_override {
+                    storage.with_base(path_override);
+                }
+                let engine = storage.load()?;
+                let events = Events::default();
+                let engine = SharedEngine::from(engine);
+                (
+                    Querier::local(&engine),
+                    Commander::local(engine.clone(), storage.clone(), events.clone())?,
+                )
+            }
             Backend::Remote { url } => {
-                let channel = Channel::from_shared(url)?
-                    .tls_config(ClientTlsConfig::new())?
+                let tls = ClientTlsConfig::new();
+                let channel = Channel::from_shared(url.clone())?
+                    .tls_config(tls.with_native_roots())?
                     .connect()
                     .await?;
 
@@ -46,12 +51,31 @@ impl State {
         };
 
         Ok(Self {
-            engine: engine.clone(),
-            storage: storage.clone(),
-            events: events.clone(),
-
             commander,
             querier,
+            backend,
         })
     }
+
+    pub fn unlock(&self) {
+        if let Backend::Local { path_override } = &self.backend {
+            let mut storage = Storage::new();
+            if let Some(path_override) = path_override {
+                storage.with_base(path_override);
+            }
+            storage.clear_lock_file();
+        }
+    }
+
+    pub fn info(&self) -> Option<anyhow::Result<String>> {
+        if let Backend::Local { path_override } = &self.backend {
+            let mut storage = Storage::new();
+            if let Some(path_override) = path_override {
+                storage.with_base(path_override);
+            }
+            return Some(storage.info());
+        }
+
+        None
+    }
 }

crates/hyperlog-tui/src/editor.rs

@@ -5,6 +5,10 @@ use std::{
 };
 
 use anyhow::{anyhow, Context};
+use crossterm::{
+    terminal::{disable_raw_mode, enable_raw_mode},
+    ExecutableCommand,
+};
 use hyperlog_core::log::{GraphItem, ItemState};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
@@ -127,6 +131,11 @@ impl SessionFile {
 
 impl Drop for SessionFile {
     fn drop(&mut self) {
+        // std::io::stdout()
+        //     .execute(crossterm::terminal::EnterAlternateScreen)
+        //     .expect("to be able to restore alternative mode");
+        // enable_raw_mode().expect("to be able to restore raw mode");
+
         if self.path.exists() {
             tracing::debug!("cleaning up file: {}", self.path.display());
 
@@ -180,6 +189,7 @@ impl<'a> EditorSession<'a> {
                 .as_bytes(),
         )
         .context("failed to write to file")?;
+        file.flush().context("failed to flush to disk")?;
 
         let modified_time = file.metadata()?.modified()?;
 
@@ -209,7 +219,26 @@ impl<'a> EditorSession<'a> {
             editor,
             session_file.get_path().display()
         );
-        if let Err(e) = std::process::Command::new(editor)
+
+        std::io::stdout().flush()?;
+
+        // disable_raw_mode()?;
+        // std::io::stdout().execute(crossterm::terminal::LeaveAlternateScreen)?;
+
+        let path = session_file.get_path();
+        if let Some(parent) = path.parent() {
+            if let Err(e) = std::process::Command::new(editor)
+                .arg(
+                    path.file_name()
+                        .ok_or(anyhow::anyhow!("failed to find file in the given path"))?,
+                )
+                .current_dir(parent)
+                .status()
+            {
+                tracing::error!("failed command with: {}", e);
+                return Ok(None);
+            }
+        } else if let Err(e) = std::process::Command::new(editor)
             .arg(session_file.get_path())
             .status()
         {
@@ -238,7 +267,7 @@ trait ItemExt {
     fn get_digest(&self) -> Option<String>;
 }
 
-impl<'a> ItemExt for &'a GraphItem {
+impl ItemExt for &GraphItem {
     fn get_digest(&self) -> Option<String> {
         if let GraphItem::Item { title, .. } = self {
             let digest = sha2::Sha256::digest(title.as_bytes());

crates/hyperlog-tui/src/lib.rs

@@ -31,7 +31,7 @@ pub mod state;
 mod engine;
 mod events;
 mod querier;
-mod storage;
+pub mod storage;
 
 mod editor;
 mod logging;

crates/hyperlog-tui/src/storage.rs

@@ -80,6 +80,13 @@ impl Storage {
     pub fn clear_lock_file(self) {
         let mut lock_file = self.lock_file.lock().unwrap();
 
+        if let Ok(lock) = self.state_lock() {
+            if lock.exists() {
+                tracing::info!("clearing lock file");
+                std::fs::remove_file(&lock).expect("to be able to remove lockfile");
+            }
+        }
+
         if lock_file.is_some() {
             *lock_file = None;
         }

crates/hyperlog/Cargo.toml

@@ -21,7 +21,7 @@ serde_json.workspace = true
 uuid.workspace = true
 
 bus = "2.4.1"
-dirs = "5.0.1"
+dirs = "6.0.0"
 
 [dev-dependencies]
 similar-asserts = "1.5.0"

crates/hyperlog/src/cli.rs

@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use clap::{Parser, Subcommand, ValueEnum};
 use hyperlog_tui::{
     commander,
@@ -15,6 +17,9 @@ struct Command {
 
     #[arg(long = "backend-url", required_if_eq("backend", "remote"))]
     backend_url: Option<String>,
+
+    #[arg(long = "local-path")]
+    local_path: Option<PathBuf>,
 }
 
 #[derive(ValueEnum, Clone)]
@@ -90,7 +95,9 @@ pub async fn execute() -> anyhow::Result<()> {
     let backend_url = cli.backend_url;
 
     let backend = match backend {
-        BackendArg::Local => Backend::Local,
+        BackendArg::Local => Backend::Local {
+            path_override: cli.local_path.clone(),
+        },
         BackendArg::Remote => Backend::Remote {
             url: backend_url.expect("backend-url to be set"),
         },
@@ -164,11 +171,13 @@ pub async fn execute() -> anyhow::Result<()> {
         }
         Some(Commands::Info {}) => {
             let state = State::new(backend).await?;
-            println!("graph stored at: {}", state.storage.info()?)
+            if let Some(info) = state.info() {
+                println!("graph stored at: {}", info?);
+            }
         }
         Some(Commands::ClearLock {}) => {
             let state = State::new(backend).await?;
-            state.storage.clear_lock_file();
+            state.unlock();
             println!("cleared lock file");
         }
         None => {