-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: split main.rs into modules
- Loading branch information
Showing
3 changed files
with
187 additions
and
131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| use std::collections::HashMap; | ||
|
|
||
| use crate::pipfile_lock::Dependency; | ||
|
|
||
| #[derive(Clone, Debug, Default)] | ||
| pub struct Diff { | ||
| pub changed: HashMap<String, (Dependency, Dependency)>, | ||
| pub new: HashMap<String, Dependency>, | ||
| pub deleted: HashMap<String, Dependency>, | ||
| } | ||
|
|
||
| impl Diff { | ||
| pub fn compare_dependencies( | ||
| new: &HashMap<String, Dependency>, | ||
| old: &HashMap<String, Dependency>, | ||
| ) -> Self { | ||
| let mut diff = Diff::default(); | ||
|
|
||
| for (dep_name, new_dep) in new.iter() { | ||
| if let Some(old_dep) = old.get(dep_name) { | ||
| if new_dep != old_dep { | ||
| diff.changed | ||
| .insert(dep_name.clone(), (new_dep.clone(), old_dep.clone())); | ||
| } | ||
| } else { | ||
| diff.new.insert(dep_name.clone(), new_dep.clone()); | ||
| } | ||
| } | ||
|
|
||
| for (dep_name, old_dep) in old.iter() { | ||
| if new.get(dep_name).is_none() { | ||
| diff.deleted.insert(dep_name.clone(), old_dep.clone()); | ||
| } | ||
| } | ||
|
|
||
| diff | ||
| } | ||
| } | ||
|
|
||
| pub fn print_diff(diff: &Diff) { | ||
| if !diff.changed.is_empty() { | ||
| println!("Changed:"); | ||
| for (dep_name, (new, old)) in diff.changed.iter() { | ||
| println!(" {dep_name}: {} => {}", old, new); | ||
| } | ||
| } | ||
|
|
||
| if !diff.new.is_empty() { | ||
| println!("New:"); | ||
| for (dep_name, new) in diff.new.iter() { | ||
| println!(" {dep_name}: {}", new); | ||
| } | ||
| } | ||
|
|
||
| if !diff.deleted.is_empty() { | ||
| println!("Deleted:"); | ||
| for (dep_name, deleted) in diff.deleted.iter() { | ||
| println!(" {dep_name}: {}", deleted); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn test_compare_dependencies() { | ||
| let new = HashMap::from([ | ||
| ( | ||
| "lib1".to_owned(), | ||
| Dependency::Pip { | ||
| version: "3.2.0".to_owned(), | ||
| }, | ||
| ), | ||
| ( | ||
| "lib2".to_owned(), | ||
| Dependency::Git { | ||
| git_ref: "abcdef".to_owned(), | ||
| }, | ||
| ), | ||
| ( | ||
| "lib3".to_owned(), | ||
| Dependency::Pip { | ||
| version: "1.2".to_owned(), | ||
| }, | ||
| ), | ||
| ]); | ||
| let old = HashMap::from([ | ||
| ( | ||
| "lib1".to_owned(), | ||
| Dependency::Pip { | ||
| version: "3.2.0".to_owned(), | ||
| }, | ||
| ), | ||
| ( | ||
| "lib2".to_owned(), | ||
| Dependency::Git { | ||
| git_ref: "abcdef".to_owned(), | ||
| }, | ||
| ), | ||
| ( | ||
| "lib4".to_owned(), | ||
| Dependency::Pip { | ||
| version: "0.1".to_owned(), | ||
| }, | ||
| ), | ||
| ]); | ||
|
|
||
| let diff = compare_dependencies(&new, &old); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| use std::{collections::HashMap, fmt::Display, io::Read}; | ||
|
|
||
| use serde::Deserialize; | ||
|
|
||
| #[derive(Debug, Deserialize)] | ||
| pub struct Meta { | ||
| #[serde(rename = "pipfile-spec")] | ||
| pub pipfile_spec: i32, | ||
| } | ||
|
|
||
| #[derive(Clone, Debug, Deserialize, PartialEq, Eq)] | ||
| #[serde(untagged)] | ||
| pub enum Dependency { | ||
| Git { | ||
| #[serde(rename = "ref")] | ||
| git_ref: String, | ||
| }, | ||
| Pip { | ||
| version: String, | ||
| }, | ||
| } | ||
|
|
||
| impl Display for Dependency { | ||
| fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
| match self { | ||
| Self::Git { git_ref } => write!(f, "{git_ref}"), | ||
| Self::Pip { version } => write!(f, "{}", version.trim_start_matches("==")), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Deserialize)] | ||
| pub struct PipfileLock { | ||
| #[serde(rename = "_meta")] | ||
| pub meta: Meta, | ||
| pub default: HashMap<String, Dependency>, | ||
| pub develop: HashMap<String, Dependency>, | ||
| } | ||
|
|
||
| #[derive(Debug, thiserror::Error)] | ||
| pub enum Error { | ||
| #[error("Incompatble Pipfile.lock spec: {0}")] | ||
| IncompatiblePipfileLockSpec(i32), | ||
| #[error("Deserialize error: {0}")] | ||
| Deserialize(#[from] serde_json::Error), | ||
| } | ||
|
|
||
| impl PipfileLock { | ||
| fn validate(self) -> Result<Self, Error> { | ||
| if self.meta.pipfile_spec != 6 { | ||
| return Err(Error::IncompatiblePipfileLockSpec(self.meta.pipfile_spec)); | ||
| } | ||
|
|
||
| Ok(self) | ||
| } | ||
|
|
||
| pub fn from_reader<R: Read>(reader: R) -> Result<Self, Error> { | ||
| let pipfile: PipfileLock = serde_json::from_reader(reader)?; | ||
|
|
||
| pipfile.validate() | ||
| } | ||
|
|
||
| pub fn from_slice(slice: &[u8]) -> Result<Self, Error> { | ||
| let pipfile: PipfileLock = serde_json::from_slice(slice)?; | ||
|
|
||
| pipfile.validate() | ||
| } | ||
| } |