Merge branch 'next'

Govcraft · Jun 29, 2024 · bf1f7d9 · bf1f7d9
2 parents ce5f2b5 + 44fd922
commit bf1f7d9
Show file tree

Hide file tree

Showing 50 changed files with 52 additions and 237 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,48 @@
-[workspace]
-members = [
-    "ntangler",
-    "entanglement_server/server", "entanglement_server/lib"]
-resolver = "2"
+[package]
+name = "ntangler"
+version = "3.5.2"
+edition = "2021"
+
+[[bin]]
+name = "ntangler"
+path = "src/main.rs"
+
+[features]
+demo = []
+
+[dependencies]
+git2 = "0.19.0"
+reqwest = { version = "0.12.4", features = ["json"] }
+serde = { version = "1.0.203", features = ["derive"] }
+tokio = { version = "1.38.0", features = ["full"] }
+toml = "0.8.13"
+tokio-macros = "2.3.0"
+anyhow = "1.0.86"
+akton = { git = "https://[email protected]/GovCraft/akton-framework.git", akton = "quasar", branch = "main" }
+dashmap = "5.5.3"
+tracing-subscriber = "0.3.18"
+tracing = "0.1.40"
+async-openai = "0.23.2"
+futures = "0.3.30"
+rand = "0.8.5"
+serde_json = "1.0.117"
+time = "0.3.36"
+chrono = "0.4.38"
+unicode-width = "0.1.13"
+console = { version = "0.15.8", features = ["windows-console-colors"] }
+regex = "1.10.5"
+lazy_static = "1.4.0"
+owo-colors = "4.0.0"
+derive_more = "0.99.18"
+derive-new = "0.6.0"
+uuid = { version = "1.9.1", features = ["v3"] }
+tracing-appender = "0.2.3"
+failsafe = "1.2.0"
+
+[dev-dependencies]
+pretty_assertions = "1.4.0"
+lazy_static = "1.4.0"
+rand = "0.8.5"
+tracing-test = "0.2.5"
 
 
diff --git a/entanglement_server/lib/Cargo.toml b/entanglement_server/lib/Cargo.toml
diff --git a/entanglement_server/lib/src/lib.rs b/entanglement_server/lib/src/lib.rs
diff --git a/entanglement_server/server/Cargo.toml b/entanglement_server/server/Cargo.toml
diff --git a/entanglement_server/server/src/main.rs b/entanglement_server/server/src/main.rs
diff --git a/ntangler/Cargo.toml b/ntangler/Cargo.toml
diff --git a/ntangler/src/actors.rs → src/actors.rs b/ntangler/src/actors.rs → src/actors.rs
diff --git a/ntangler/src/actors/generators.rs → src/actors/generators.rs b/ntangler/src/actors/generators.rs → src/actors/generators.rs
diff --git a/ntangler/src/actors/ntangler.rs → src/actors/ntangler.rs b/ntangler/src/actors/ntangler.rs → src/actors/ntangler.rs
diff --git a/ntangler/src/actors/repositories.rs → src/actors/repositories.rs b/ntangler/src/actors/repositories.rs → src/actors/repositories.rs
@@ -100,6 +100,7 @@ impl GitRepository {
                 diff_options.pathspec(target_file.as_os_str());
                 diff_options.include_untracked(true);
                 diff_options.recurse_untracked_dirs(true);
+                diff_options.include_typechange(true);
                 diff_options.disable_pathspec_match(true);
 
                 // Generate the diff
@@ -113,7 +114,10 @@ impl GitRepository {
                 })
                     .expect("Failed to print diff");
                 let changes = String::from_utf8_lossy(&diff_text).to_string();
-
+                if changes.is_empty() {
+                    error!("No diff for file: {}",&event.message.path.display().to_string());
+                    return Context::noop();
+                }
                 let repository_event = BrokerRequest::new(DiffQueued::new(
                     changes,
                     target_file.clone(),
@@ -239,7 +243,7 @@ impl GitRepository {
                 let path = file.clone();
                 let trace_id = id.clone();
                 let repository_event = FileChangeDetected::new(file.into());
-                tokio::spawn(async move{
+                tokio::spawn(async move {
                     outbound_envelope.reply_async(repository_event, None).await;
                 });
                 trace!(

diff --git a/ntangler/src/actors/scribe.rs → src/actors/scribe.rs b/ntangler/src/actors/scribe.rs → src/actors/scribe.rs
diff --git a/ntangler/src/main.rs → src/main.rs b/ntangler/src/main.rs → src/main.rs
diff --git a/ntangler/src/messages.rs → src/messages.rs b/ntangler/src/messages.rs → src/messages.rs
diff --git a/ntangler/src/messages/commit_event.rs → src/messages/commit_event.rs b/ntangler/src/messages/commit_event.rs → src/messages/commit_event.rs
diff --git a/.../src/messages/commit_message_generated.rs → src/messages/commit_message_generated.rs b/.../src/messages/commit_message_generated.rs → src/messages/commit_message_generated.rs
diff --git a/ntangler/src/messages/diff_queued.rs → src/messages/diff_queued.rs b/ntangler/src/messages/diff_queued.rs → src/messages/diff_queued.rs
diff --git a/...gler/src/messages/file_change_detected.rs → src/messages/file_change_detected.rs b/...gler/src/messages/file_change_detected.rs → src/messages/file_change_detected.rs
diff --git a/ntangler/src/messages/finalized_commit.rs → src/messages/finalized_commit.rs b/ntangler/src/messages/finalized_commit.rs → src/messages/finalized_commit.rs
diff --git a/ntangler/src/messages/generation_started.rs → src/messages/generation_started.rs b/ntangler/src/messages/generation_started.rs → src/messages/generation_started.rs
diff --git a/ntangler/src/messages/poll_changes.rs → src/messages/poll_changes.rs b/ntangler/src/messages/poll_changes.rs → src/messages/poll_changes.rs
diff --git a/ntangler/src/messages/system_started.rs → src/messages/system_started.rs b/ntangler/src/messages/system_started.rs → src/messages/system_started.rs
diff --git a/ntangler/src/models.rs → src/models.rs b/ntangler/src/models.rs → src/models.rs
diff --git a/ntangler/src/models/commit_message.rs → src/models/commit_message.rs b/ntangler/src/models/commit_message.rs → src/models/commit_message.rs
diff --git a/ntangler/src/models/commit_type.rs → src/models/commit_type.rs b/ntangler/src/models/commit_type.rs → src/models/commit_type.rs
diff --git a/ntangler/src/models/config.rs → src/models/config.rs b/ntangler/src/models/config.rs → src/models/config.rs
diff --git a/...gler/src/models/config/ntangler_config.rs → src/models/config/ntangler_config.rs b/...gler/src/models/config/ntangler_config.rs → src/models/config/ntangler_config.rs
diff --git a/...er/src/models/config/repository_config.rs → src/models/config/repository_config.rs b/...er/src/models/config/repository_config.rs → src/models/config/repository_config.rs
diff --git a/ntangler/src/models/description.rs → src/models/description.rs b/ntangler/src/models/description.rs → src/models/description.rs
diff --git a/ntangler/src/models/file_name.rs → src/models/file_name.rs b/ntangler/src/models/file_name.rs → src/models/file_name.rs
diff --git a/ntangler/src/models/footer.rs → src/models/footer.rs b/ntangler/src/models/footer.rs → src/models/footer.rs
diff --git a/ntangler/src/models/ntangled_repository.rs → src/models/ntangled_repository.rs b/ntangler/src/models/ntangled_repository.rs → src/models/ntangled_repository.rs
diff --git a/ntangler/src/models/oid.rs → src/models/oid.rs b/ntangler/src/models/oid.rs → src/models/oid.rs
diff --git a/ntangler/src/models/scope.rs → src/models/scope.rs b/ntangler/src/models/scope.rs → src/models/scope.rs
diff --git a/ntangler/src/models/semver_impact.rs → src/models/semver_impact.rs b/ntangler/src/models/semver_impact.rs → src/models/semver_impact.rs
diff --git a/ntangler/src/models/signature.rs → src/models/signature.rs b/ntangler/src/models/signature.rs → src/models/signature.rs
diff --git a/ntangler/src/models/time_stamp.rs → src/models/time_stamp.rs b/ntangler/src/models/time_stamp.rs → src/models/time_stamp.rs
diff --git a/ntangler/src/models/ui.rs → src/models/ui.rs b/ntangler/src/models/ui.rs → src/models/ui.rs
diff --git a/ntangler/src/models/ui/styles.rs → src/models/ui/styles.rs b/ntangler/src/models/ui/styles.rs → src/models/ui/styles.rs
diff --git a/ntangler/src/models/ui/terminal.rs → src/models/ui/terminal.rs b/ntangler/src/models/ui/terminal.rs → src/models/ui/terminal.rs
diff --git a/ntangler/src/models/ui/terminal/app_event.rs → src/models/ui/terminal/app_event.rs b/ntangler/src/models/ui/terminal/app_event.rs → src/models/ui/terminal/app_event.rs
diff --git a/.../src/models/ui/terminal/commit_heading.rs → src/models/ui/terminal/commit_heading.rs b/.../src/models/ui/terminal/commit_heading.rs → src/models/ui/terminal/commit_heading.rs
diff --git a/...ler/src/models/ui/terminal/commit_type.rs → src/models/ui/terminal/commit_type.rs b/...ler/src/models/ui/terminal/commit_type.rs → src/models/ui/terminal/commit_type.rs
diff --git a/...ler/src/models/ui/terminal/description.rs → src/models/ui/terminal/description.rs b/...ler/src/models/ui/terminal/description.rs → src/models/ui/terminal/description.rs
diff --git a/ntangler/src/models/ui/terminal/filename.rs → src/models/ui/terminal/filename.rs b/ntangler/src/models/ui/terminal/filename.rs → src/models/ui/terminal/filename.rs
diff --git a/...ler/src/models/ui/terminal/is_breaking.rs → src/models/ui/terminal/is_breaking.rs b/...ler/src/models/ui/terminal/is_breaking.rs → src/models/ui/terminal/is_breaking.rs
diff --git a/ntangler/src/models/ui/terminal/oid.rs → src/models/ui/terminal/oid.rs b/ntangler/src/models/ui/terminal/oid.rs → src/models/ui/terminal/oid.rs
diff --git a/...gler/src/models/ui/terminal/repository.rs → src/models/ui/terminal/repository.rs b/...gler/src/models/ui/terminal/repository.rs → src/models/ui/terminal/repository.rs
diff --git a/ntangler/src/models/ui/terminal/scope.rs → src/models/ui/terminal/scope.rs b/ntangler/src/models/ui/terminal/scope.rs → src/models/ui/terminal/scope.rs
diff --git a/...r/src/models/ui/terminal/semver_impact.rs → src/models/ui/terminal/semver_impact.rs b/...r/src/models/ui/terminal/semver_impact.rs → src/models/ui/terminal/semver_impact.rs
diff --git a/ntangler/src/models/ui/ui_strings.rs → src/models/ui/ui_strings.rs b/ntangler/src/models/ui/ui_strings.rs → src/models/ui/ui_strings.rs