rename all crates

2023-02-14 13:12:08 +01:00
parent c7841ae346
commit e7cb7d9321
42 changed files with 119 additions and 93 deletions
@@ -76,23 +76,6 @@ dependencies = [
 "os_str_bytes",
 ]

-[[package]]
-name = "core"
-version = "1.0.0-beta2"
-dependencies = [
- "alpm",
- "anyhow",
- "clap",
- "macros",
- "path-absolutize",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "serde_yaml",
- "termios",
-]
-
 [[package]]
 name = "errno"
 version = "0.2.8"
@@ -176,23 +159,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"

-[[package]]
-name = "macros"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "main"
-version = "1.0.0-beta2"
-dependencies = [
- "anyhow",
- "core",
-]
-
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -218,8 +184,8 @@ dependencies = [
 "alpm",
 "anyhow",
 "clap",
- "core",
- "macros",
+ "pacdef_core",
+ "pacdef_macros",
 "path-absolutize",
 "regex",
 "serde",
@@ -229,6 +195,40 @@ dependencies = [
 "termios",
 ]

+[[package]]
+name = "pacdef_core"
+version = "1.0.0-beta2"
+dependencies = [
+ "alpm",
+ "anyhow",
+ "clap",
+ "pacdef_macros",
+ "path-absolutize",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_yaml",
+ "termios",
+]
+
+[[package]]
+name = "pacdef_macros"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pacdef_main"
+version = "1.0.0-beta2"
+dependencies = [
+ "anyhow",
+ "pacdef_core",
+]
+
 [[package]]
 name = "path-absolutize"
 version = "3.0.14"
@@ -5,9 +5,12 @@ edition = "2021"
 description = "declarative package manager for Arch Linux"
 license = "GPLv3"
 repository = "https://github.com/steven-omaha/pacdef"
+readme = "README.md"
+keywords = ["package-manager", "linux", "declarative", "cli"]
+categories = ["command-line-utilities"]

 [workspace]
-members = ["crates/main", "crates/macros", "crates/core"]
+members = ["crates/pacdef_main", "crates/pacdef_macros", "crates/pacdef_core"]

 [dependencies]
 alpm = "2.2"
@@ -22,12 +25,12 @@ serde_yaml = "0.9"
 serde_derive = "1.0"
 serde = "1.0"

-macros = {path = "crates/macros", version = "0.1"}
-core = {path = "crates/core", version = "1.0.0-beta2"}
+pacdef_macros = {path = "crates/pacdef_macros", version = "0.1"}
+pacdef_core = {path = "crates/pacdef_core", version = "1.0.0-beta2"}

 [[bin]]
 name = "pacdef"
-path = "crates/main/main.rs"
+path = "crates/pacdef_main/main.rs"

 [profile.release]
 lto = "off"
@@ -208,6 +208,4 @@ topgrade

 ## TODO

-* add license
-* in outermost Cargo.toml, add categories, keywords, readme
-
+none at this time
@@ -1,20 +0,0 @@
-[package]
-name = "core"
-version = "1.0.0-beta2"
-edition = "2021"
-description = "pacdef main library"
-
-[dependencies]
-alpm = "2.2"
-anyhow = "1.0"
-clap = "4.1"
-path-absolutize = "3.0"
-regex = "1.7"
-termios = "0.3"
-
-serde_json = "1.0"
-serde_yaml = "0.9"
-serde_derive = "1.0"
-serde = "1.0"
-
-macros = {path = "../macros", version = "0.1"}
@@ -1,13 +0,0 @@
-[package]
-name = "macros"
-version = "0.1.0"
-edition = "2021"
-description = "procedural macros for pacdef"
-
-[dependencies]
-proc-macro2 = "1.0"
-quote = "1.0"
-syn = "1.0"
-
-[lib]
-proc-macro = true
@@ -1,13 +0,0 @@
-[package]
-name = "main"
-version = "1.0.0-beta2"
-edition = "2021"
-description = "main program for pacdef"
-
-[[bin]]
-name = "pacdef"
-path = "main.rs"
-
-[dependencies]
-anyhow = "1.0"
-core = { path = "../core", version = "1.0.0-beta2" }
@@ -0,0 +1,25 @@
+[package]
+name = "pacdef_core"
+version = "1.0.0-beta2"
+edition = "2021"
+description = "pacdef core library"
+license = "GPLv3"
+repository = "https://github.com/steven-omaha/pacdef"
+readme = "README.md"
+keywords = ["package-manager", "linux", "declarative", "cli"]
+categories = ["command-line-utilities"]
+
+[dependencies]
+alpm = "2.2"
+anyhow = "1.0"
+clap = "4.1"
+path-absolutize = "3.0"
+regex = "1.7"
+termios = "0.3"
+
+serde_json = "1.0"
+serde_yaml = "0.9"
+serde_derive = "1.0"
+serde = "1.0"
+
+pacdef_macros = {path = "../pacdef_macros", version = "0.1"}
@@ -0,0 +1,3 @@
+# pacdef_core
+
+core library for pacdef
@@ -1,4 +1,4 @@
-use macros::Action;
+use pacdef_macros::Action;

 #[derive(Debug, Action)]
 pub enum Actions {
@@ -8,7 +8,7 @@ pub use backend_trait::Backend;
 pub use iter::BackendIter;
 pub use todo_per_backend::ToDoPerBackend;

-use ::macros::Register;
+use pacdef_macros::Register;

 #[derive(Debug, Register)]
 pub enum Backends {
@@ -28,4 +28,4 @@ pub use crate::grouping::Group;
 pub(crate) use crate::grouping::Package;
 pub use crate::search::NO_PACKAGES_FOUND;

-extern crate macros;
+extern crate pacdef_macros;
@@ -0,0 +1,18 @@
+[package]
+name = "pacdef_macros"
+version = "0.1.0"
+edition = "2021"
+license = "GPLv3"
+readme = "README.md"
+repository = "https://github.com/steven-omaha/pacdef"
+description = "procedural macros for pacdef"
+keywords = ["macro", "proc-macro"]
+categories = ["command-line-utilities"]
+
+[dependencies]
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = "1.0"
+
+[lib]
+proc-macro = true
@@ -0,0 +1,3 @@
+# pacdef_macros
+
+procedural macros for pacdef
@@ -0,0 +1,18 @@
+[package]
+name = "pacdef_main"
+version = "1.0.0-beta2"
+edition = "2021"
+description = "main program for pacdef"
+license = "GPLv3"
+repository = "https://github.com/steven-omaha/pacdef"
+readme = "README.md"
+keywords = ["package-manager", "linux", "declarative", "cli"]
+categories = ["command-line-utilities"]
+
+[[bin]]
+name = "pacdef"
+path = "main.rs"
+
+[dependencies]
+anyhow = "1.0"
+pacdef_core = { path = "../pacdef_core", version = "1.0.0-beta2" }
@@ -0,0 +1,3 @@
+# pacdef_main
+
+main program for pacdef
@@ -2,7 +2,8 @@ use std::process::{ExitCode, Termination};

 use anyhow::{Context, Result};

-use core::{args, Config, Group, Pacdef};
+use pacdef_core as core;
+use pacdef_core::{args, Config, Group, Pacdef};

 fn main() -> ExitCode {
    handle_final_result(main_inner())