Merge branch 'alpha' of github.com:Wandalen/wTools into alpha

Cargo.toml

@@ -18,7 +18,7 @@ branches = [ "master", "alpha" ]
 master_branch = "alpha"
 project_name = "wtools"
 repo_url = "https://github.com/Wandalen/wTools"
-discord_id = "m3YfbXpUUY"
+discord_url = "https://discord.gg/m3YfbXpUUY"
 
 # [metadata.cargo-suppress-warnings]
 # unused-manifest-key = true

module/move/willbe/Cargo.toml

@@ -55,6 +55,7 @@ tracing-subscriber = { version = "0.3", optional = true }
 indicatif = { version = "0.17", optional = true }
 prettytable-rs = "0.10"
 serde_json = "1.0" # for CargoMetadata::Package::metadata (need serde_json::Value)
+serde = "1.0" # for CargoMetadata::Package
 
 ## internal
 crates_tools = { workspace = true }

module/move/willbe/src/action/list.rs

@@ -24,11 +24,7 @@ mod private
   };
   // aaa : for Petro : don't use cargo_metadata and Package directly, use facade
   // aaa : ✅
-  use cargo_metadata::
-  {
-    Dependency,
-    DependencyKind,
-  };
+
   use petgraph::prelude::{ Dfs, EdgeRef };
   use former::Former;
 
@@ -312,40 +308,40 @@ mod private
     visited : &mut HashSet< String >
   )
   {
-    for dependency in package.dependencies()
+    for dependency in &package.dependencies()
     {
-      if dependency.path.is_some() && !args.dependency_sources.contains( &DependencySource::Local ) { continue; }
-      if dependency.path.is_none() && !args.dependency_sources.contains( &DependencySource::Remote ) { continue; }
-      let dep_id = format!( "{}+{}+{}", dependency.name, dependency.req, dependency.path.as_ref().map( | p | p.join( "Cargo.toml" ) ).unwrap_or_default() );
+      if dependency.path().is_some() && !args.dependency_sources.contains( &DependencySource::Local ) { continue; }
+      if dependency.path().is_none() && !args.dependency_sources.contains( &DependencySource::Remote ) { continue; }
+      let dep_id = format!( "{}+{}+{}", dependency.name(), dependency.req(), dependency.path().as_ref().map( | p | p.join( "Cargo.toml" ) ).unwrap_or_default() );
 
       let mut temp_vis = visited.clone();
       let dependency_rep = process_dependency( workspace, dependency, args, &mut temp_vis );
 
-      match dependency.kind
+      match dependency.kind()
       {
-        DependencyKind::Normal if args.dependency_categories.contains( &DependencyCategory::Primary ) => dep_rep.normal_dependencies.push( dependency_rep ),
-        DependencyKind::Development if args.dependency_categories.contains( &DependencyCategory::Dev ) => dep_rep.dev_dependencies.push( dependency_rep ),
-        DependencyKind::Build if args.dependency_categories.contains( &DependencyCategory::Build ) => dep_rep.build_dependencies.push( dependency_rep ),
+        workspace::DependencyKind::Normal if args.dependency_categories.contains( &DependencyCategory::Primary ) => dep_rep.normal_dependencies.push( dependency_rep ),
+        workspace::DependencyKind::Development if args.dependency_categories.contains( &DependencyCategory::Dev ) => dep_rep.dev_dependencies.push( dependency_rep ),
+        workspace::DependencyKind::Build if args.dependency_categories.contains( &DependencyCategory::Build ) => dep_rep.build_dependencies.push( dependency_rep ),
         _ => { visited.remove( &dep_id ); std::mem::swap( &mut temp_vis, visited ); }
       }
 
       *visited = std::mem::take( &mut temp_vis );
     }
   }
 
-  fn process_dependency( workspace : &Workspace, dep : &Dependency, args : &ListOptions, visited : &mut HashSet< String > ) -> ListNodeReport
+  fn process_dependency( workspace : &Workspace, dep : &workspace::Dependency, args : &ListOptions, visited : &mut HashSet< String > ) -> ListNodeReport
   {
     let mut dep_rep = ListNodeReport
     {
-      name : dep.name.clone(),
-      version : if args.info.contains( &PackageAdditionalInfo::Version ) { Some( dep.req.to_string() ) } else { None },
-      path : if args.info.contains( &PackageAdditionalInfo::Path ) { dep.path.as_ref().map( | p | p.clone().into_std_path_buf() ) } else { None },
+      name : dep.name().clone(),
+      version : if args.info.contains( &PackageAdditionalInfo::Version ) { Some( dep.req().to_string() ) } else { None },
+      path : if args.info.contains( &PackageAdditionalInfo::Path ) { dep.path().as_ref().map( | p | p.clone().into_std_path_buf() ) } else { None },
       normal_dependencies : vec![],
       dev_dependencies : vec![],
       build_dependencies : vec![],
     };
 
-    let dep_id = format!( "{}+{}+{}", dep.name, dep.req, dep.path.as_ref().map( | p | p.join( "Cargo.toml" ) ).unwrap_or_default() );
+    let dep_id = format!( "{}+{}+{}", dep.name(), dep.req(), dep.path().as_ref().map( | p | p.join( "Cargo.toml" ) ).unwrap_or_default() );
     // if this is a cycle (we have visited this node before)
     if visited.contains( &dep_id )
     {
@@ -356,7 +352,7 @@ mod private
 
     // if we have not visited this node before, mark it as visited
     visited.insert( dep_id );
-    if let Some( path ) = &dep.path
+    if let Some( path ) = &dep.path()
     {
       if let Some( package ) = workspace.package_find_by_manifest( path.as_std_path().join( "Cargo.toml" ) )
       {
@@ -447,17 +443,17 @@ mod private
         .map( | m | m[ "name" ].to_string().trim().replace( '\"', "" ) )
         .unwrap_or_default();
 
-        let dep_filter = move | _p : &WorkspacePackage, d : &Dependency |
+        let dep_filter = move | _p : &WorkspacePackage, d : &workspace::Dependency |
         {
           (
-            args.dependency_categories.contains( &DependencyCategory::Primary ) && d.kind == DependencyKind::Normal
-            || args.dependency_categories.contains( &DependencyCategory::Dev ) && d.kind == DependencyKind::Development
-            || args.dependency_categories.contains( &DependencyCategory::Build ) && d.kind == DependencyKind::Build
+            args.dependency_categories.contains( &DependencyCategory::Primary ) && d.kind() == workspace::DependencyKind::Normal
+            || args.dependency_categories.contains( &DependencyCategory::Dev ) && d.kind() == workspace::DependencyKind::Development
+            || args.dependency_categories.contains( &DependencyCategory::Build ) && d.kind() == workspace::DependencyKind::Build
           )
           &&
           (
-            args.dependency_sources.contains( &DependencySource::Remote ) && d.path.is_none()
-            || args.dependency_sources.contains( &DependencySource::Local ) && d.path.is_some()
+            args.dependency_sources.contains( &DependencySource::Remote ) && d.path().is_none()
+            || args.dependency_sources.contains( &DependencySource::Local ) && d.path().is_some()
           )
         };
 

module/move/willbe/src/action/readme_health_table_renew.rs

@@ -10,11 +10,7 @@ mod private
     io::{ Write, Read, Seek, SeekFrom },
     collections::HashMap,
   };
-  use cargo_metadata::
-  {
-    Dependency,
-    DependencyKind,
-  };
+
   // aaa : for Petro : don't use cargo_metadata and Package directly, use facade
   // aaa : ✅
 
@@ -36,9 +32,7 @@ mod private
     }
   };
   use manifest::private::repo_url;
-  use workspace::Workspace;
   use _path::AbsolutePath;
-  use workspace::WorkspacePackage;
 
   static TAG_TEMPLATE: std::sync::OnceLock< Regex > = std::sync::OnceLock::new();
   static CLOSE_TAG: std::sync::OnceLock< Regex > = std::sync::OnceLock::new();
@@ -328,23 +322,23 @@ mod private
   }
 
   /// Return topologically sorted modules name, from packages list, in specified directory.
-  fn directory_names( path : PathBuf, packages : &[ WorkspacePackage ] ) -> Result< Vec< String > >
+  fn directory_names( path : PathBuf, packages : &[ workspace::WorkspacePackage ] ) -> Result< Vec< String > >
   {
     let path_clone = path.clone();
-    let module_package_filter: Option< Box< dyn Fn( &WorkspacePackage ) -> bool > > = Some
+    let module_package_filter: Option< Box< dyn Fn( &workspace::WorkspacePackage ) -> bool > > = Some
     (
       Box::new
       (
         move | p |
         p.publish().is_none() && p.manifest_path().starts_with( &path )
       )
     );
-    let module_dependency_filter: Option< Box< dyn Fn( &WorkspacePackage, &Dependency) -> bool > > = Some
+    let module_dependency_filter: Option< Box< dyn Fn( &workspace::WorkspacePackage, &workspace::Dependency ) -> bool > > = Some
     (
       Box::new
       (
         move | _, d |
-        d.path.is_some() && d.kind != DependencyKind::Development && d.path.as_ref().unwrap().starts_with( &path_clone )
+        d.path().is_some() && d.kind() != workspace::DependencyKind::Development && d.path().as_ref().unwrap().starts_with( &path_clone )
       )
     );
     let module_packages_map = packages::filter
@@ -384,11 +378,11 @@ mod private
   {
     match stability
     {
-      Stability::Experimental => " [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)".into(),
-      Stability::Stable => " [![stability-stable](https://img.shields.io/badge/stability-stable-green.svg)](https://github.com/emersion/stability-badges#stable)".into(),
-      Stability::Deprecated => " [![stability-deprecated](https://img.shields.io/badge/stability-deprecated-red.svg)](https://github.com/emersion/stability-badges#deprecated)".into(),
-      Stability::Unstable => " [![stability-unstable](https://img.shields.io/badge/stability-unstable-yellow.svg)](https://github.com/emersion/stability-badges#unstable)".into(),
-      Stability::Frozen => " [![stability-frozen](https://img.shields.io/badge/stability-frozen-blue.svg)](https://github.com/emersion/stability-badges#frozen)".into(),
+      Stability::Experimental => " [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) |".into(),
+      Stability::Stable => " [![stability-stable](https://img.shields.io/badge/stability-stable-green.svg)](https://github.com/emersion/stability-badges#stable) |".into(),
+      Stability::Deprecated => " [![stability-deprecated](https://img.shields.io/badge/stability-deprecated-red.svg)](https://github.com/emersion/stability-badges#deprecated) |".into(),
+      Stability::Unstable => " [![stability-unstable](https://img.shields.io/badge/stability-unstable-yellow.svg)](https://github.com/emersion/stability-badges#unstable) |".into(),
+      Stability::Frozen => " [![stability-frozen](https://img.shields.io/badge/stability-frozen-blue.svg)](https://github.com/emersion/stability-badges#frozen) |".into(),
     }
   }
 

module/move/willbe/src/command/mod.rs

@@ -101,7 +101,7 @@ pub( crate ) mod private
       .routine( command::list )
       .end()
 
-    .command( "readme.health.table.generate" )
+    .command( "readme.health.table.renew" )
       .hint( "Generate a table for the root `Readme.md`" )
       .long_hint( "Generates a data summary table for the `Readme.md` file located in the root of the workspace." )
       .routine( command::readme_health_table_renew )
@@ -230,13 +230,13 @@ pub( crate ) mod private
       .routine( command::deploy_renew )
       .end()
 
-    .command( "readme.header.generate" )
+    .command( "readme.header.renew" )
       .hint( "Generate header in workspace`s Readme.md file")
       .long_hint( "For use this command you need to specify:\n\n[workspace.metadata]\nmaster_branch = \"alpha\"\nworkspace_name = \"wtools\"\nrepo_url = \"https://github.com/Wandalen/wTools\"\ndiscord_url = \"https://discord.gg/123123\"\n\nin workspace's Cargo.toml.")
       .routine( command::readme_header_renew )
       .end()
 
-    .command( "readme.modules.headers.generate" )
+    .command( "readme.modules.headers.renew" )
       .hint( "Generates header for each workspace member." )
       .long_hint( "For use this command you need to specify:\n\n[package]\nname = \"test_module\"\nrepository = \"https://github.com/Username/ProjectName/tree/master/module/test_module\"\n...\n[package.metadata]\nstability = \"stable\" (Optional)\ndiscord_url = \"https://discord.gg/1234567890\" (Optional)\n\nin module's Cargo.toml." )
       .routine( command::readme_modules_headers_renew )

module/move/willbe/src/entity/package.rs

@@ -10,7 +10,6 @@ mod private
   use std::fmt::Formatter;
   use std::hash::Hash;
   use std::path::PathBuf;
-  use cargo_metadata::{ Dependency, DependencyKind };
 
   use process_tools::process;
   use manifest::{ Manifest, ManifestError };
@@ -763,14 +762,14 @@ mod private
     }
   }
 
-  impl From< &Dependency > for CrateId
+  impl From< &workspace::Dependency > for CrateId
   {
-    fn from( value : &Dependency ) -> Self
+    fn from( value : &workspace::Dependency ) -> Self
     {
       Self
       {
-        name : value.name.clone(),
-        path : value.path.clone().map( | path | AbsolutePath::try_from( path ).unwrap() ),
+        name : value.name().clone(),
+        path : value.path().clone().map( | path | AbsolutePath::try_from( path ).unwrap() ),
       }
     }
   }
@@ -803,7 +802,7 @@ mod private
     let deps = package
     .dependencies()
     .iter()
-    .filter( | dep | ( with_remote || dep.path.is_some() ) && ( with_dev || dep.kind != DependencyKind::Development ) )
+    .filter( | dep | ( with_remote || dep.path().is_some() ) && ( with_dev || dep.kind() != workspace::DependencyKind::Development ) )
     .map( CrateId::from )
     .collect::< HashSet< _ > >();
 

module/move/willbe/src/entity/packages.rs

@@ -6,8 +6,8 @@ mod private
     fmt::Formatter,
     collections::{ HashMap, HashSet },
   };
-  use cargo_metadata::{ Dependency };
   use workspace::WorkspacePackage;
+  use crate::workspace::Dependency;
 
   /// Type aliasing for String
   pub type PackageName = String;
@@ -89,7 +89,7 @@ mod private
         package.dependencies()
         .iter()
         .filter( | &d | dependency_filter( package, d ) )
-        .map( | d | d.name.clone() )
+        .map( | d | d.name().clone() )
         .collect::< HashSet< _ > >()
       )
     )