small cargo improvements

Author: ilijaljubicic

Cargo.toml

@@ -10,8 +10,11 @@ version = "0.2.2"
 edition = "2021"
 rust-version = "1.86"
 license = "Apache-2.0"
-authors = ["Ilija Ljubicic"]
+authors = ["Ilija Ljubicic <iliya.ljubicic@gmail.com>"]
 description = "An agile Model-Based Systems Engineering (MBSE) framework designed to integrate with Git workflows"
+repository = "https://github.com/ilijaljubicic/ReqFlow"
+homepage = "https://github.com/ilijaljubicic/ReqFlow"
+documentation = "https://github.com/ilijaljubicic/ReqFlow#readme"
 
 [workspace.dependencies]
 clap = { version = "4.4", features = ["derive"] }

Makefile

@@ -1,37 +1,17 @@
-# Set default version increment (major, minor, or patch)
-VERSION_INCREMENT ?= patch
+CARGO_TOML := Cargo.toml
 
-CARGO_TOML = Cargo.toml
+# Extract version from Cargo.toml
+define get_version
+$(shell grep -m1 '^version' $(CARGO_TOML) | sed 's/.*"\(.*\)".*/\1/')
+endef
 
-VERSION_FILE = version.tmp
+.PHONY: create_tag
 
-bump_version:
-	@echo "Bumping version in Cargo.toml"
-	# Bump version using cargo-release or manually (patch, minor, or major)
-	cargo release $(VERSION_INCREMENT) --no-publish --no-verify
-
-	# Get the new version from the Cargo.toml
-	NEW_VERSION=$(shell grep -oP 'version\s*=\s*"\K[0-9\.]+' $(CARGO_TOML))
-
-	# Display new version
-	@echo "New version: $(NEW_VERSION)"
-
-# Create a Git tag based on the bumped version
-create_tag: bump_version
-	@echo "Creating Git tag for version $(NEW_VERSION)"
-	git tag -a v$(NEW_VERSION) -m "Release version v$(NEW_VERSION)"
-	git push origin v$(NEW_VERSION)
-
-# Default target to bump the version and create a tag for patch
-release_patch: bump_patch create_tag
-	@echo "Release created with version $(NEW_VERSION) and tag v$(NEW_VERSION)"
-
-# Default target to bump the version and create a tag for minor
-release_minor: bump_minor create_tag
-	@echo "Release created with version $(NEW_VERSION) and tag v$(NEW_VERSION)"
-
-# Default target to bump the version and create a tag for major
-release_major: bump_major create_tag
-	@echo "Release created with version $(NEW_VERSION) and tag v$(NEW_VERSION)"
+create_tag:
+	@echo "Creating tag..."
+	$(eval VERSION := $(call get_version))
+	@echo "New version: $(VERSION)"
+	git tag -a v$(VERSION) -m "Release version v$(VERSION)"
+	git push origin v$(VERSION)
 
 

cli/Cargo.toml

@@ -1,16 +1,20 @@
 [package]
-name = "reqflow-cli"
+name = "cli"
 version.workspace = true
 edition.workspace = true
 description.workspace = true
 license.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
 
 [[bin]]
 name = "reqflow"
 path = "src/main.rs"
 
 [dependencies]
-reqflow = { workspace = true }
+reqflow = { workspace = true, version.workspace = true  }
 
 # CLI
 clap = { workspace = true }
@@ -33,4 +37,4 @@ globset = { workspace = true }
 [dev-dependencies]
 assert_fs = { workspace = true }
 predicates = { workspace = true }
-tempfile = { workspace = true }
+tempfile = { workspace = true }

core/Cargo.toml

@@ -4,6 +4,9 @@ version.workspace = true
 edition.workspace = true
 description.workspace = true
 license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+documentation.workspace = true
 
 [dependencies]
 # Parsing and content manipulation
@@ -41,4 +44,4 @@ termcolor = { workspace = true }
 [dev-dependencies]
 assert_fs = { workspace = true }
 predicates = { workspace = true }
-tempfile = { workspace = true }
+tempfile = { workspace = true }