Merge pull request 'fix test dirs' (#35) from fix-test-dirs into main

Reviewed-on: #35

Cargo.toml

@@ -7,6 +7,9 @@ edition = "2024"
 default = []
 log = ["dep:log", "dep:simple_logger"]
 
+[dev-dependencies]
+pretty_assertions = "1.4.1"
+
 [dependencies]
 anyhow = "1.0.95"
 chrono = "0.4.41"

src/comment.rs

@@ -208,19 +208,21 @@ impl Comment {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use pretty_assertions::assert_eq;
 
     #[test]
     fn read_comment_0() {
-        let comment_dir =
+        let comment_dir = std::path::Path::new(
-            std::path::Path::new("test/0001/dd79c8cfb8beeacd0460429944b4ecbe95a31561/comments/9055dac36045fe36545bed7ae7b49347");
+            "test/0001/dd79c8cfb8beeacd0460429944b4ecbe/comments/9055dac36045fe36545bed7ae7b49347",
+        );
         let comment = Comment::new_from_dir(comment_dir).unwrap();
         let expected = Comment {
             uuid: String::from("9055dac36045fe36545bed7ae7b49347"),
             author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
-            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-07T15:26:26-06:00")
+            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T10:08:38-06:00")
                 .unwrap()
                 .with_timezone(&chrono::Local),
-            description: String::from("This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe95a31561\n\nIt has multiple lines\n"),
+            description: String::from("This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe\n\nIt has multiple lines\n"),
             dir: std::path::PathBuf::from(comment_dir),
         };
         assert_eq!(comment, expected);

src/entry.rs

@@ -1,151 +0,0 @@
-use std::io::{Read, Write};
-use thiserror::Error;
-
-// TODO: i think this method of doing error handling probably has bad scoping
-#[derive(Error, Debug)]
-pub enum Error {
-    #[error(transparent)]
-    IoError(#[from] std::io::Error),
-    #[error(transparent)]
-    ParseError(#[from] chrono::ParseError),
-}
-
-pub trait Enterable
-where
-    Self: Sized,
-{
-    // load the type from a directory path
-    // TODO: return a result
-    fn fetch_from_fs(path: &std::path::Path) -> Result<Self, Error>;
-
-    // store self in the FS
-    // TODO: return a result
-    fn store_to_fs(self, path: &std::path::Path) -> Result<(), Error>;
-}
-
-#[derive(PartialEq, Eq, Debug, Clone)]
-pub struct Entry<T: Enterable> {
-    pub id: String,
-    pub author: String,
-    pub creation_time: chrono::DateTime<chrono::Local>,
-    pub entry: T,
-}
-
-impl<T: Enterable> Enterable for Entry<T> {
-    fn fetch_from_fs(path: &std::path::Path) -> Result<Self, Error> {
-        let id_file_path = path.join("id");
-        let mut id_file = std::fs::File::open(&id_file_path)?;
-        let mut id_buffer = String::new();
-        id_file.read_to_string(&mut id_buffer)?;
-
-        // author
-        let author_file_path = path.join("author");
-        let mut author_file = std::fs::File::open(&author_file_path)?;
-        let mut author_buffer = String::new();
-        author_file.read_to_string(&mut author_buffer)?;
-
-        // creation_time
-        let creation_time_file_path = path.join("creation_time");
-        let mut creation_time_file = std::fs::File::open(&creation_time_file_path)?;
-        let mut creation_time_buffer = String::new();
-        creation_time_file.read_to_string(&mut creation_time_buffer)?;
-
-        let entry_file_path_buf = path.join("entry");
-        let entry_file_path = entry_file_path_buf.as_path();
-
-        Ok(Self {
-            id: id_buffer,
-            author: author_buffer,
-            creation_time: chrono::DateTime::<_>::parse_from_rfc3339(&creation_time_buffer)?.into(),
-            entry: <T as Enterable>::fetch_from_fs(entry_file_path)?,
-        })
-    }
-
-    fn store_to_fs(self, path: &std::path::Path) -> Result<(), Error> {
-        // id
-        let id_file_path = path.join("id");
-        let mut id_file = std::fs::File::create(&id_file_path)?;
-        write!(id_file, "{}", self.id)?;
-
-        // author
-        let author_file_path = path.join("author");
-        let mut author_file = std::fs::File::create(&author_file_path)?;
-        write!(author_file, "{}", self.author)?;
-
-        // created
-        let creation_time_file_path = path.join("creation_time");
-        let mut creation_time_file = std::fs::File::create(&creation_time_file_path)?;
-        write!(creation_time_file, "{}", self.creation_time.to_rfc3339())?;
-
-        // entry
-        // TODO: probably need to figure out better naming than "entry"
-        // TODO: fix this pathbuf nonsense woooooof
-        let entry_file_path_buf = path.join("entry");
-        let entry_file_path = entry_file_path_buf.as_path();
-        self.entry.store_to_fs(entry_file_path)?;
-        Ok(())
-    }
-}
-
-mod test {
-
-    use super::*;
-    impl Enterable for String {
-        fn fetch_from_fs(path: &std::path::Path) -> Result<Self, Error> {
-            let mut file = std::fs::File::open(&path)?;
-            let mut buffer = String::new();
-            file.read_to_string(&mut buffer)?;
-            Ok(buffer)
-        }
-        fn store_to_fs(self, path: &std::path::Path) -> Result<(), Error> {
-            let mut file = std::fs::File::create(&path)?;
-            write!(file, "{}", self)?;
-            Ok(())
-        }
-    }
-
-    impl Enterable for Vec<String> {
-        fn fetch_from_fs(path: &std::path::Path) -> Result<Self, Error> {
-            todo!("implement this");
-        }
-        fn store_to_fs(self, path: &std::path::Path) -> Result<(), Error> {
-            todo!("implement this");
-        }
-    }
-
-    #[test]
-    fn store_load_string_entry() {
-        let test_path = std::path::Path::new("./test/entry/0000");
-        let entry = Entry::<String> {
-            id: String::from("87fa3146b90db61c4ea0de182798a0e5"),
-            author: String::from("test"),
-            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-22T21:54:42-06:00")
-                .unwrap()
-                .with_timezone(&chrono::Local),
-            entry: String::from("entry string"),
-        };
-        entry.clone().store_to_fs(test_path).unwrap();
-
-        let fs_entry = Entry::<String>::fetch_from_fs(test_path).unwrap();
-
-        assert_eq!(entry, fs_entry);
-    }
-
-    #[test]
-    fn store_load_vec_string_entry() {
-        let test_path = std::path::Path::new("./test/entry/0001");
-        let entry = Entry::<Vec<String>> {
-            id: String::from("87fa3146b90db61c4ea0de182798a0e5"),
-            author: String::from("test"),
-            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-22T21:54:42-06:00")
-                .unwrap()
-                .with_timezone(&chrono::Local),
-            entry: vec![String::from("string 1"), String::from("string 2")],
-        };
-        entry.clone().store_to_fs(test_path).unwrap();
-
-        let fs_entry = Entry::<Vec<String>>::fetch_from_fs(test_path).unwrap();
-
-        assert_eq!(entry, fs_entry);
-    }
-}

src/git.rs

@@ -502,6 +502,7 @@ fn create_orphan_branch_at_path(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use pretty_assertions::assert_eq;
 
     #[test]
     fn test_worktree() {

src/issue.rs

@@ -143,6 +143,7 @@ impl Issue {
                         .filter(|s| s.len() > 0)
                         .map(|tag| String::from(tag.trim()))
                         .collect();
+                    tags.sort();
                 } else if file_name == "comments" && direntry.metadata()?.is_dir() {
                     Self::read_comments(&mut comments, &direntry.path())?;
                 } else {
@@ -548,22 +549,23 @@ impl Issue {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use pretty_assertions::assert_eq;
 
     #[test]
     fn read_issue_0() {
-        let issue_dir = std::path::Path::new("test/0000/3943fc5c173fdf41c0a22251593cd476d96e6c9f/");
+        let issue_dir = std::path::Path::new("test/0000/3943fc5c173fdf41c0a22251593cd476/");
         let issue = Issue::new_from_dir(issue_dir).unwrap();
         let expected = Issue {
-            id: String::from("3943fc5c173fdf41c0a22251593cd476d96e6c9f"),
+            id: String::from("3943fc5c173fdf41c0a22251593cd476"),
             author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
-            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
+            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:36:25-06:00")
                 .unwrap()
                 .with_timezone(&chrono::Local),
             done_time: None,
             tags: Vec::<String>::from([
-                String::from("tag1"),
                 String::from("TAG2"),
                 String::from("i-am-also-a-tag"),
+                String::from("tag1"),
             ]),
             state: State::New,
             dependencies: None,
@@ -579,12 +581,12 @@ mod tests {
 
     #[test]
     fn read_issue_1() {
-        let issue_dir = std::path::Path::new("test/0000/7792b063eef6d33e7da5dc1856750c149ba678c6/");
+        let issue_dir = std::path::Path::new("test/0000/7792b063eef6d33e7da5dc1856750c14/");
         let issue = Issue::new_from_dir(issue_dir).unwrap();
         let expected = Issue {
-            id: String::from("7792b063eef6d33e7da5dc1856750c149ba678c6"),
+            id: String::from("7792b063eef6d33e7da5dc1856750c14"),
             author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
-            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
+            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:37:07-06:00")
                 .unwrap()
                 .with_timezone(&chrono::Local),
             done_time: None,

src/issues.rs

@@ -87,6 +87,7 @@ impl Issues {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use pretty_assertions::assert_eq;
 
     #[test]
     fn read_issues_0000() {
@@ -95,13 +96,13 @@ mod tests {
 
         let mut expected = Issues::new();
 
-        let uuid = String::from("7792b063eef6d33e7da5dc1856750c149ba678c6");
+        let uuid = String::from("7792b063eef6d33e7da5dc1856750c14");
         let mut dir = std::path::PathBuf::from(issues_dir);
         dir.push(&uuid);
         expected.add_issue(crate::issue::Issue {
             id: uuid,
             author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
-            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
+            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:37:07-06:00")
                 .unwrap()
                 .with_timezone(&chrono::Local),
             done_time: None,
@@ -114,21 +115,21 @@ mod tests {
             dir,
         });
 
-        let uuid = String::from("3943fc5c173fdf41c0a22251593cd476d96e6c9f");
+        let uuid = String::from("3943fc5c173fdf41c0a22251593cd476");
         let mut dir = std::path::PathBuf::from(issues_dir);
         dir.push(&uuid);
         expected.add_issue(
             crate::issue::Issue {
                 id: uuid,
                 author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
-                creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
+                creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:36:25-06:00")
                     .unwrap()
                     .with_timezone(&chrono::Local),
                 done_time: None,
                 tags: Vec::<String>::from([
-                    String::from("tag1"),
                     String::from("TAG2"),
-                    String::from("i-am-also-a-tag")
+                    String::from("i-am-also-a-tag"),
+                    String::from("tag1"),
                 ]),
                 state: crate::issue::State::New,
                 dependencies: None,
@@ -148,13 +149,13 @@ mod tests {
 
         let mut expected = Issues::new();
 
-        let uuid = String::from("3fa5bfd93317ad25772680071d5ac3259cd2384f");
+        let uuid = String::from("3fa5bfd93317ad25772680071d5ac325");
         let mut dir = std::path::PathBuf::from(issues_dir);
         dir.push(&uuid);
         expected.add_issue(crate::issue::Issue {
             id: uuid,
             author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
-            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T11:59:44-06:00")
+            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:37:46-06:00")
                 .unwrap()
                 .with_timezone(&chrono::Local),
             done_time: Some(
@@ -171,7 +172,7 @@ mod tests {
             dir,
         });
 
-        let uuid = String::from("dd79c8cfb8beeacd0460429944b4ecbe95a31561");
+        let uuid = String::from("dd79c8cfb8beeacd0460429944b4ecbe");
         let mut dir = std::path::PathBuf::from(issues_dir);
         dir.push(&uuid);
         let mut comment_dir = dir.clone();
@@ -183,8 +184,8 @@ mod tests {
             crate::comment::Comment {
                 uuid: comment_uuid,
                 author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
-                creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-07T15:26:26-06:00").unwrap().with_timezone(&chrono::Local),
+                creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T10:08:38-06:00").unwrap().with_timezone(&chrono::Local),
-                description: String::from("This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe95a31561\n\nIt has multiple lines\n"),
+                description: String::from("This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe\n\nIt has multiple lines\n"),
                 dir: std::path::PathBuf::from(comment_dir),
             }
         );
@@ -192,7 +193,7 @@ mod tests {
             crate::issue::Issue {
                 id: uuid,
                 author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
-                creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T11:59:44-06:00")
+                creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T10:08:24-06:00")
                     .unwrap()
                     .with_timezone(&chrono::Local),
                 done_time: None,
@@ -215,13 +216,13 @@ mod tests {
 
         let mut expected = Issues::new();
 
-        let uuid = String::from("3fa5bfd93317ad25772680071d5ac3259cd2384f");
+        let uuid = String::from("3fa5bfd93317ad25772680071d5ac325");
         let mut dir = std::path::PathBuf::from(issues_dir);
         dir.push(&uuid);
         expected.add_issue(crate::issue::Issue {
             id: uuid,
             author: String::from("sigil-03 <sigil@glyphs.tech>"),
-            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-05T13:55:49-06:00")
+            creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:38:40-06:00")
                 .unwrap()
                 .with_timezone(&chrono::Local),
             done_time: None,
@@ -234,14 +235,14 @@ mod tests {
             dir,
         });
 
-        let uuid = String::from("dd79c8cfb8beeacd0460429944b4ecbe95a31561");
+        let uuid = String::from("dd79c8cfb8beeacd0460429944b4ecbe");
         let mut dir = std::path::PathBuf::from(issues_dir);
         dir.push(&uuid);
         expected.add_issue(
             crate::issue::Issue {
                 id: uuid,
                 author: String::from("sigil-03 <sigil@glyphs.tech>"),
-                creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-05T13:55:49-06:00")
+                creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:39:20-06:00")
                     .unwrap()
                     .with_timezone(&chrono::Local),
                 done_time: None,
@@ -255,22 +256,22 @@ mod tests {
             },
         );
 
-        let uuid = String::from("a85f81fc5f14cb5d4851dd445dc9744c7f16ccc7");
+        let uuid = String::from("a85f81fc5f14cb5d4851dd445dc9744c");
         let mut dir = std::path::PathBuf::from(issues_dir);
         dir.push(&uuid);
         expected.add_issue(
             crate::issue::Issue {
                 id: uuid,
                 author: String::from("sigil-03 <sigil@glyphs.tech>"),
-                creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-05T13:55:49-06:00")
+                creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:39:02-06:00")
                     .unwrap()
                     .with_timezone(&chrono::Local),
                 done_time: None,
                 tags: Vec::<String>::new(),
                 state: crate::issue::State::WontDo,
                 dependencies: Some(vec![
-                    crate::issue::IssueHandle::from("3fa5bfd93317ad25772680071d5ac3259cd2384f"),
+                    crate::issue::IssueHandle::from("3fa5bfd93317ad25772680071d5ac325"),
-                    crate::issue::IssueHandle::from("dd79c8cfb8beeacd0460429944b4ecbe95a31561"),
+                    crate::issue::IssueHandle::from("dd79c8cfb8beeacd0460429944b4ecbe"),
                 ]),
                 assignee: None,
                 description: String::from("issue with dependencies\n\na test has begun\nfor dependencies we seek\nintertwining life"),

src/lib.rs

@@ -6,8 +6,6 @@ pub mod git;
 pub mod issue;
 pub mod issues;
 
-pub mod entry;
-
 use crate::issue::State;
 
 #[derive(Debug, thiserror::Error)]

test/0001/dd79c8cfb8beeacd0460429944b4ecbe/comments/9055dac36045fe36545bed7ae7b49347/description

@@ -0,0 +1,3 @@
+This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe
+
+It has multiple lines

test/0001/dd79c8cfb8beeacd0460429944b4ecbe95a31561/comments/9055dac36045fe36545bed7ae7b49347/description

@@ -1,3 +0,0 @@
-This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe95a31561
-
-It has multiple lines

test/entry/0000/author

@@ -1 +0,0 @@
-test

test/entry/0000/creation_time

@@ -1 +0,0 @@
-2025-07-22T21:54:42-06:00

test/entry/0000/entry

@@ -1 +0,0 @@
-entry string

test/entry/0000/id

@@ -1 +0,0 @@
-87fa3146b90db61c4ea0de182798a0e5

test/entry/0001/author

@@ -1 +0,0 @@
-test

test/entry/0001/creation_time

@@ -1 +0,0 @@
-2025-07-22T21:54:42-06:00

test/entry/0001/id

@@ -1 +0,0 @@
-87fa3146b90db61c4ea0de182798a0e5