Skip to content

Commit

Permalink
refactor(id): use ulid instead of uuid v7 due to easier readability a…
Browse files Browse the repository at this point in the history
…nd shorter overall length while still keeping sortability.

Signed-off-by: simonsan <[email protected]>
  • Loading branch information
simonsan committed Feb 19, 2024
1 parent f0a8dbd commit 658dae1
Show file tree
Hide file tree
Showing 14 changed files with 197 additions and 57 deletions.
110 changes: 93 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ eyre = "0.6.12"
pace_cli = { path = "crates/cli", version = "0" }
pace_core = { path = "crates/core", version = "0" }
pace_server = { path = "crates/server", version = "0" }
similar-asserts = { version = "1.5.0", features = ["serde"] }

[package]
name = "pace-rs"
Expand Down Expand Up @@ -54,6 +55,7 @@ pace_cli = { workspace = true }
pace_core = { workspace = true }
serde = "1"
serde_derive = "1"

thiserror = "1.0.57"
toml = { version = "0.8.10", features = ["preserve_order"] }

Expand All @@ -68,6 +70,7 @@ abscissa_core = { version = "0.7.0", features = ["testing"] }
assert_cmd = "2.0.13"
once_cell = "1.19"
predicates = "3.1.0"
similar-asserts = { workspace = true }
tempfile = "3.10.0"

# The profile that 'cargo dist' will build with
Expand Down
18 changes: 9 additions & 9 deletions config/projects.pace.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,38 @@
# TODO: Add a `pace projects init` command to generate a new project configuration file.

[project]
id = "018d84a0-7847-7b2b-9cdb-6ba213f99a1d"
id = "01HPY7F03JBVKSWDNTM2RSBXSJ"
name = "Pace Project"
description = "An example project managed with Pace."
root_tasks_file = "tasks.toml" # Path to the root tasks file
filters = ["*pace*"] # Optional: Define default filters for your project

[defaults]
# Optional: Define a default category for your project
category = { id = "018d85c0-a46f-7e95-8b95-f0bc961d4ee9", name = "Uncategorized", description = "Uncategorized Content" }
category = { id = "01HPY7F03K4AZMA0DVW3A1M0TG", name = "Uncategorized", description = "Uncategorized Content" }

[[categories]]
# Optional: Define categories for your project
id = "018d85c0-7823-7038-8e96-bc9c9330174a"
id = "01HPY7F03K3JCWK5ZJJ02TT12G"
name = "Development"
description = "Development related tasks"
# Optional: Define subcategories for your category
# TODO: Add support for subcategories
subcategories = [
{ id = "018d85d5-e29d-7995-afc9-34175e0ce7b6", name = "Frontend", description = "Frontend Development" },
{ id = "018d85d5-fa35-7bc3-a347-8284843c4188", name = "Backend", description = "Backend Development" },
{ id = "018d85d6-110b-771b-828d-8cd68934fb61", name = "Fullstack", description = "Fullstack Development" },
{ id = "01HPY7F03K1H1A8A7S0K1ZCFX3", name = "Frontend", description = "Frontend Development" },
{ id = "01HPY7F03KSF8TXQQWZDF63DFD", name = "Backend", description = "Backend Development" },
{ id = "01HPY7F03KK3FGAJTHP2MBZA37", name = "Fullstack", description = "Fullstack Development" },
]

[[categories]]
# Optional: Define categories for your project
id = "018d85c0-629b-737b-8f53-c307504d1c0a"
id = "01HPY7F03KS1YHKT86BXSMMEMX"
name = "Design"
description = "Design related tasks"

[[subprojects]]
# Optional: Define subprojects or directories with their own tasks
id = "018d84a0-a2d1-7450-98ef-8b47e0ff42b5"
id = "01HPY7F03K6TT2KKFEYVJT79ZB"
name = "Pace Subproject A"
description = ""
tasks_file = "subproject-a/tasks.toml"
Expand All @@ -49,7 +49,7 @@ filters = [

[[subprojects]]
# Optional: Define subprojects or directories with their own tasks
id = "018d84a0-cc74-71b4-8dd4-d7d26d1f5924"
id = "01HPY7F03KF7VE3K9E51P0H1TB"
name = "Pace Subproject B"
description = ""
tasks_file = "subproject-b/tasks.toml"
Expand Down
4 changes: 2 additions & 2 deletions config/tasks.pace.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# TODO: Add a `pace tasks init` command to generate a new project configuration file.

[[tasks]]
id = "018d84a1-4540-7992-89f2-d87d9ee73524"
id = "01HPY7H596FT2R880SEKH7KN25"
title = "Implement feature X"
created_at = "2024-02-04T12:34:56"
finished_at = "2024-02-05T13:34:56"
Expand All @@ -16,7 +16,7 @@ status = "Pending"
tags = ["feature", "X"]

[[tasks]]
id = "018d84a1-6cc8-7791-a92c-a077ef09de7f"
id = "01HPY7F03JQ6SJF5C97H7G7E0E"
title = "Fix bug Y"
created_at = "2024-02-06T12:34:56"
description = "Detailed description of bug Y to be fixed."
Expand Down
12 changes: 10 additions & 2 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@ include = [
"Cargo.toml",
]

# TODO!: Use features for adding optional dependencies for testing and merging etc.
# [features]
# default = []
# testing = ["dep:arbitrary"]

[dependencies]
# We'd rather have this only for testing but we do integration tests, and this wouldn't be build then
arbitrary = { version = "1", features = ["derive"] }
chrono = { version = "0.4.34", features = ["serde"] }
directories = "5.0.1"
displaydoc = "0.2.4"
Expand All @@ -27,18 +34,19 @@ itertools = "0.12.1"
log = "0.4.20"
merge = "0.1.0"
rayon = "1.8.1"
rusqlite = { version = "0.30.0", features = ["bundled", "chrono", "uuid"] }
rusqlite = { version = "0.31.0", features = ["bundled", "chrono", "uuid"] }
serde = "1.0.196"
serde_derive = "1.0.196"
strum = "0.26.1"
strum_macros = "0.26.1"
thiserror = "1.0.57"
toml = { version = "0.8.10", features = ["indexmap", "preserve_order"] }
typed-builder = "0.18.1"
uuid = { version = "1.7.0", features = ["serde", "fast-rng", "v7"] }
ulid = { version = "1.1.2", features = ["serde"] }

[dev-dependencies]
rstest = "0.18.2"
similar-asserts = { workspace = true }

[lints.rust]
unsafe_code = "forbid"
Expand Down
Loading

0 comments on commit 658dae1

Please sign in to comment.