feat: Move data type and retrieval crates into hc_data

libs/hc_analysis/Cargo.toml

@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 hc_common = { path = "../hc_common" }
-hc_git = { path = "../hc_git" }
+hc_data = { path = "../hc_data" }
 hc_metric = { path = "../hc_metric" }
 hc_config = { path = "../hc_config" }
 hc_report = { path = "../hc_report" }

libs/hc_analysis/src/lib.rs

@@ -6,7 +6,7 @@ use hc_common::{
 	salsa, F64,
 };
 use hc_config::{AttacksConfigQuery, CommitConfigQuery, FuzzConfigQuery, PracticesConfigQuery};
-use hc_git::GitProvider;
+use hc_data::git::GitProvider;
 use hc_metric::{affiliation::AffiliatedType, MetricProvider};
 use hc_report::{Concern, PrConcern};
 use std::collections::{HashMap, HashSet};

libs/hc_data/Cargo.toml

@@ -6,13 +6,19 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
+dirs = "5.0.1"
+graphql_client = "0.14.0"
 hc_common = { path = "../hc_common" }
 hc_config = { path = "../hc_config" }
-hc_eslint = { path = "../hc_eslint" }
-hc_git = { path = "../hc_git" }
-hc_github = { path = "../hc_github" }
-hc_npm = { path = "../hc_npm" }
-hc_source = { path = "../hc_source" }
+hc_git_command = { path = "../hc_git_command" }
+hc_hash = { path = "../hc_hash" }
+hc_shell = { path = "../hc_shell" }
 hc_version = { path = "../hc_version" }
-hc_modules = { path = "../hc_modules" }
+nom = "7.1.3"
 petgraph = { version = "0.6.0", features = ["serde-1"] }
+serde = { path = "../hc_serde", package = "hc_serde" }
+ureq = { version = "2.9.7", default-features = false, features = ["json", "native-tls"] }
+
+[dev-dependencies]
+dirs = "5.0.1"
+tempfile = "3.2.0"

libs/hc_data/src/code_quality.rs

@@ -2,9 +2,9 @@
 
 use std::path::{Path, PathBuf};
 
+use crate::es_lint::data::{ESLintMessage, ESLintReports};
+use crate::es_lint::get_eslint_reports;
 use hc_common::{error::Result, hc_error};
-use hc_eslint::data::{ESLintMessage, ESLintReports};
-use hc_eslint::get_eslint_reports;
 
 pub type CodeQualityReport = Vec<FileFindings>;
 

libs/hc_eslint/src/lib.rs → libs/hc_data/src/es_lint/mod.rs

@@ -11,10 +11,12 @@ use hc_common::{error::Result, semver::Version, serde_json};
 pub mod command;
 pub mod data;
 
+#[allow(unused)]
 pub fn get_eslint_version() -> Result<String> {
 	ESLintCommand::internal([OsStr::new("--version")])?.output()
 }
 
+#[allow(unused)]
 pub fn parse_eslint_version(version: &str) -> Result<Version> {
 	// semver's parser will not accept the leading 'v' or trailing newline
 	let version = version.strip_prefix('v').unwrap_or(version);

libs/hc_git/src/lib.rs → libs/hc_data/src/git/mod.rs

@@ -6,9 +6,9 @@ mod query;
 
 pub use data::*;
 pub use hc_git_command::*;
+use parse::*;
 pub use query::*;
 
-use crate::parse::*;
 use hc_common::context::Context as _;
 use hc_common::{
 	error::{Error, Result},

libs/hc_git/src/parse.rs → libs/hc_data/src/git/parse.rs

@@ -2,7 +2,7 @@
 
 #![allow(dead_code)]
 
-use crate::{Contributor, Diff, FileDiff, RawCommit};
+use crate::git::{Contributor, Diff, FileDiff, RawCommit};
 use hc_common::context::Context as _;
 use hc_common::{
 	chrono::{DateTime, FixedOffset},

libs/hc_git/src/query/impls.rs → libs/hc_data/src/git/query/impls.rs

@@ -3,7 +3,7 @@
 //! Derived query implementations for the `GitProvider` query group.
 
 use super::GitProvider;
-use crate::{
+use crate::git::{
 	get_commits, get_commits_from_date, get_diffs, Commit, CommitContributor,
 	CommitContributorView, CommitDiff, CommitSigner, CommitSignerView, Contributor,
 	ContributorView, Diff, GitCommand, RawCommit, SignerKeyView, SignerNameView, SignerView,

libs/hc_git/src/query/mod.rs → libs/hc_data/src/git/query/mod.rs

@@ -5,11 +5,14 @@
 mod impls;
 
 use crate::{
-	Commit, CommitContributor, CommitContributorView, CommitDiff, CommitSigner, CommitSignerView,
-	Contributor, ContributorView, Diff, RawCommit, SignerKeyView, SignerNameView, SignerView,
+	git::{
+		Commit, CommitContributor, CommitContributorView, CommitDiff, CommitSigner,
+		CommitSignerView, Contributor, ContributorView, Diff, RawCommit, SignerKeyView,
+		SignerNameView, SignerView,
+	},
+	source::SourceQuery,
 };
 use hc_common::{chrono::prelude::*, error::Result, salsa};
-use hc_source::SourceQuery;
 use hc_version::VersionQuery;
 use std::rc::Rc;
 

libs/hc_github/src/authenticated_agent.rs → libs/hc_data/src/github/authenticated_agent.rs

@@ -1,6 +1,6 @@
 //! Defines an authenticated [`Agent`] type that adds token auth to all requests.
 
-use crate::hidden::Hidden;
+use crate::github::hidden::Hidden;
 use ureq::{Agent, Request};
 
 /// An [`Agent`] which authenticates requests with token auth.

libs/hc_github/src/code_search.rs → libs/hc_data/src/github/code_search.rs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::authenticated_agent::AuthenticatedAgent;
+use crate::github::authenticated_agent::AuthenticatedAgent;
 use hc_common::{
 	error::{Error, Result},
 	hc_error,

libs/hc_github/src/data.rs → libs/hc_data/src/github/data.rs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-use hc_git::{Diff, RawCommit};
+use crate::git::{Diff, RawCommit};
 
 use serde::Deserialize;
 #[derive(Debug, Deserialize)]

libs/hc_github/src/graphql.rs → libs/hc_data/src/github/graphql.rs

@@ -3,7 +3,7 @@
 use std::convert::TryInto;
 
 use self::reviews::{ResponseData, ReviewsRepositoryPullRequestsNodes as RawPull, Variables};
-use crate::{authenticated_agent::AuthenticatedAgent, data::*};
+use crate::github::{authenticated_agent::AuthenticatedAgent, data::*};
 use graphql_client::{GraphQLQuery, QueryBody, Response};
 use hc_common::{
 	error::{Error, Result},
@@ -17,8 +17,8 @@ const GH_API_V4: &str = "https://api.github.com/graphql";
 /// Defines the query being made against the GitHub API.
 #[derive(GraphQLQuery)]
 #[graphql(
-	schema_path = "src/gh_schema.graphql",
-	query_path = "src/gh_query.graphql",
+	schema_path = "src/github/gh_schema.graphql",
+	query_path = "src/github/gh_query.graphql",
 	response_derives = "Debug"
 )]
 pub struct Reviews;

libs/hc_github/src/graphql_pr.rs → libs/hc_data/src/github/graphql_pr.rs

@@ -4,7 +4,10 @@ use self::review::{
 	ResponseData, ReviewRepositoryPullRequest as RawPull,
 	ReviewRepositoryPullRequestCommitsNodes as RawPullCommit, Variables,
 };
-use crate::{authenticated_agent::AuthenticatedAgent, data::*};
+use crate::{
+	git::{Contributor, RawCommit},
+	github::{authenticated_agent::AuthenticatedAgent, data::*},
+};
 use graphql_client::{GraphQLQuery, QueryBody, Response};
 use hc_common::{
 	chrono::DateTime,
@@ -13,7 +16,6 @@ use hc_common::{
 	hc_error,
 	serde_json::{from_value as from_json_value, to_value as to_json_value},
 };
-use hc_git::{Contributor, RawCommit};
 use std::convert::TryFrom;
 
 /// The URL of the GitHub GraphQL API.
@@ -22,8 +24,8 @@ const GH_API_V4: &str = "https://api.github.com/graphql";
 /// Defines the query being made against the GitHub API.
 #[derive(GraphQLQuery)]
 #[graphql(
-	schema_path = "src/gh_schema.graphql",
-	query_path = "src/gh_query.graphql",
+	schema_path = "src/github/gh_schema.graphql",
+	query_path = "src/github/gh_query.graphql",
 	response_derives = "Debug"
 )]
 pub struct Review;

libs/hc_github/src/lib.rs → libs/hc_data/src/github/mod.rs

@@ -7,14 +7,14 @@ mod graphql;
 mod graphql_pr;
 mod hidden;
 
-use crate::authenticated_agent::AuthenticatedAgent;
 use crate::code_search::search_code_request;
-use crate::data::*;
-use crate::graphql::get_all_reviews;
-use crate::graphql_pr::get_all_pr_reviews;
+use crate::git::parse::github_diff;
+use crate::github::authenticated_agent::AuthenticatedAgent;
+use crate::github::data::*;
+use crate::github::graphql::get_all_reviews;
+use crate::github::graphql_pr::get_all_pr_reviews;
 use hc_common::context::Context as _;
 use hc_common::{error::Result, log};
-use hc_git::parse::github_diff;
 use std::rc::Rc;
 
 pub struct GitHub<'a> {

libs/hc_data/src/lib.rs

@@ -3,24 +3,27 @@
 //! Functions and types for data retrieval.
 
 mod code_quality;
+mod es_lint;
+pub mod git;
+mod github;
+mod modules;
+pub mod npm;
 mod query;
+pub mod source;
 
-pub use hc_git as git;
-pub use hc_modules as modules;
-pub use hc_npm as npm;
 pub use query::*;
 use std::collections::HashSet;
 
+use git::{get_commits_for_file, Commit, CommitContributor, Contributor, Diff};
+use github::*;
 use hc_common::{
 	context::Context,
 	error::Error,
 	error::Result,
 	hc_error, log, pathbuf,
 	serde::{self, Serialize},
 };
-use hc_git::{get_commits_for_file, Commit, CommitContributor, Contributor, Diff};
-use hc_github::*;
-use hc_modules::RawModule;
+use modules::RawModule;
 use petgraph::visit::Dfs;
 use petgraph::Graph;
 use std::path::Path;