feat: exclude_dev_dependencies flag for .publish and .publish.diff. Default value is true

Author: Barsik-sus

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

@@ -109,6 +109,7 @@ mod private
   ///
   /// # Arguments
   /// * `patterns` - A vector of patterns specifying the folders to search for packages.
+  /// * `exclude_dev_dependencies` - A boolean value indicating whether to exclude dev dependencies from manifest before publish.
   /// * `dry` - A boolean value indicating whether to perform a dry run.
   /// * `temp` - A boolean value indicating whether to use a temporary directory.
   ///
@@ -119,6 +120,7 @@ mod private
   (
     patterns : Vec< String >,
     channel : channel::Channel,
+    exclude_dev_dependencies : bool,
     dry : bool,
     temp : bool
   )
@@ -233,6 +235,7 @@ mod private
     .channel( channel )
     .workspace_dir( CrateDir::try_from( workspace_root_dir ).unwrap() )
     .option_base_temp_dir( dir.clone() )
+    .exclude_dev_dependencies( exclude_dev_dependencies )
     .dry( dry )
     .roots( roots )
     .packages( queue )

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

@@ -22,6 +22,7 @@ mod private
   pub struct PublishDiffOptions
   {
     path : PathBuf,
+    exclude_dev_dependencies : bool,
     keep_archive : Option< PathBuf >,
   }
 
@@ -141,16 +142,17 @@ mod private
       let name = &package.name()?;
       let version = &package.version()?;
 
-    _ = cargo::pack
-    (
-      cargo::PackOptions::former()
-      .path( dir.as_ref() )
-      .allow_dirty( true )
-      .checking_consistency( false )
-      .dry( false ).form()
-    )?;
-    let l = CrateArchive::read( packed_crate::local_path( name, version, dir )? )?;
-    let r = CrateArchive::download_crates_io( name, version ).unwrap();
+      _ = cargo::pack
+      (
+        cargo::PackOptions::former()
+        .path( dir.as_ref() )
+        .allow_dirty( true )
+        .checking_consistency( false )
+        .exclude_dev_dependencies( o.exclude_dev_dependencies)
+        .dry( false ).form()
+      )?;
+      let l = CrateArchive::read( packed_crate::local_path( name, version, dir )? )?;
+      let r = CrateArchive::download_crates_io( name, version ).unwrap();
 
 
       if let Some( out_path ) = &o.keep_archive

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

@@ -25,6 +25,11 @@ mod private
         .kind( Type::String )
         .optional( true )
         .end()
+      .property( "exclude_dev_dependencies" )
+        .hint( "Setting this option to true will temporarily remove development dependencies before executing the command, then restore them afterward. Default is `true`." )
+        .kind( Type::Bool )
+        .optional( true )
+        .end()
       .property( "dry" )
         .hint( "Enables 'dry run'. Does not publish, only simulates. Default is `true`." )
         .kind( Type::Bool )
@@ -47,6 +52,11 @@ mod private
         .kind( Type::Path )
         .optional( true )
         .end()
+      .property( "exclude_dev_dependencies" )
+        .hint( "Setting this option to true will temporarily remove development dependencies before executing the command, then restore them afterward. Default is `true`." )
+        .kind( Type::Bool )
+        .optional( true )
+        .end()
       .property( "keep_archive" )
         .hint( "Save remote package version to the specified path" )
         .kind( Type::Path )

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

@@ -16,6 +16,8 @@ mod private
     #[ former( default = Channel::Stable ) ]
     channel : Channel,
     #[ former( default = true ) ]
+    exclude_dev_dependencies : bool,
+    #[ former( default = true ) ]
     dry : bool,
     #[ former( default = true ) ]
     temp : bool,
@@ -52,10 +54,11 @@ mod private
     let PublishProperties
     {
       channel,
+      exclude_dev_dependencies,
       dry,
       temp
     } = o.props.try_into()?;
-    let plan = action::publish_plan( patterns, channel, dry, temp )
+    let plan = action::publish_plan( patterns, channel, exclude_dev_dependencies, dry, temp )
     .context( "Failed to plan the publication process" )?;
 
     let mut formatted_plan = String::new();
@@ -110,6 +113,8 @@ mod private
       else
       { this };
 
+      this = if let Some( v ) = value
+      .get_owned( "exclude_dev_dependencies" ) { this.exclude_dev_dependencies::< bool >( v ) } else { this };
       this = if let Some( v ) = value
       .get_owned( "dry" ) { this.dry::< bool >( v ) } else { this };
       this = if let Some( v ) = value

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

@@ -13,6 +13,8 @@ mod private
   #[ derive( former::Former ) ]
   struct PublishDiffProperties
   {
+    #[ former( default = true ) ]
+    exclude_dev_dependencies : bool,
     keep_archive : Option< PathBuf >,
   }
 
@@ -33,10 +35,11 @@ mod private
   pub fn publish_diff( o : VerifiedCommand ) -> error::untyped::Result< () > // qqq : use typed error
   {
     let path : PathBuf = o.args.get_owned( 0 ).unwrap_or( std::env::current_dir()? );
-    let PublishDiffProperties { keep_archive } = o.props.try_into()?;
+    let PublishDiffProperties { keep_archive, exclude_dev_dependencies } = o.props.try_into()?;
 
     let mut o = action::PublishDiffOptions::former()
-    .path( path );
+    .path( path )
+    .exclude_dev_dependencies( exclude_dev_dependencies );
     if let Some( k ) = keep_archive.clone() { o = o.keep_archive( k ); }
     let o = o.form();
 
@@ -57,6 +60,12 @@ mod private
     {
       let mut this = Self::former();
 
+      this = if let Some( v ) = value
+      .get_owned( "exclude_dev_dependencies" )
+      { this.exclude_dev_dependencies::< bool >( v ) }
+      else
+      { this };
+
       this = if let Some( v ) = value
       .get_owned( "keep_archive" )
       { this.keep_archive::< PathBuf >( v ) }

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

@@ -42,6 +42,7 @@ mod private
     package : package::Package< 'a >,
     channel : channel::Channel,
     base_temp_dir : Option< path::PathBuf >,
+    exclude_dev_dependencies : bool,
     #[ former( default = true ) ]
     dry : bool,
   }
@@ -58,6 +59,7 @@ mod private
         channel : self.channel,
         allow_dirty : self.dry,
         checking_consistency : !self.dry,
+        exclude_dev_dependencies : self.exclude_dev_dependencies,
         temp_path : self.base_temp_dir.clone(),
         dry : self.dry,
       };
@@ -84,6 +86,7 @@ mod private
       {
         path : crate_dir.clone().absolute_path().inner(),
         temp_path : self.base_temp_dir.clone(),
+        exclude_dev_dependencies : self.exclude_dev_dependencies,
         retry_count : 2,
         dry : self.dry,
       };
@@ -121,6 +124,10 @@ mod private
     /// Release channels for rust.
     pub channel : channel::Channel,
 
+    /// Setting this option to true will temporarily remove development dependencies before executing the command, then restore them afterward.
+    #[ allow( dead_code ) ] // former related
+    pub( crate ) exclude_dev_dependencies : bool,
+
     /// `dry` - A boolean value indicating whether to do a dry run. If set to `true`, the application performs
     /// a simulated run without making any actual changes. If set to `false`, the operations are actually executed.
     /// This property is optional and defaults to `true`.
@@ -246,6 +253,10 @@ mod private
       {
         plan = plan.dry( dry );
       }
+      if let Some( exclude_dev_dependencies ) = &self.storage.exclude_dev_dependencies
+      {
+        plan = plan.exclude_dev_dependencies( *exclude_dev_dependencies )
+      }
       let plan = plan
       .channel( channel )
       .package( package )

module/move/willbe/src/tool/cargo.rs

@@ -1,6 +1,8 @@
 /// Internal namespace.
 mod private
 {
+  use crate::*;
+
   #[ allow( unused_imports ) ]
   use crate::tool::*;
 
@@ -47,6 +49,9 @@ mod private
     // aaa : don't abuse negative form, rename to checking_consistency
     // renamed and changed logic
     pub( crate ) checking_consistency : bool,
+    /// Setting this option to true will temporarily remove development dependencies before executing the command, then restore them afterward.
+    #[ former( default = true ) ]
+    pub( crate ) exclude_dev_dependencies : bool,
     /// An optional temporary path to be used during packaging.
     ///
     /// This field may contain a path to a temporary directory that will be used during the packaging process.
@@ -79,6 +84,53 @@ mod private
     }
   }
 
+  #[ derive( Debug ) ]
+  struct TemporaryManifestFile
+  {
+    original : PathBuf,
+    temporary : PathBuf,
+  }
+
+  impl TemporaryManifestFile
+  {
+    /// Creates a backup copy of the original file, allowing the original file location to serve as a temporary workspace.
+    /// When the object is dropped, the temporary file at the original location is replaced by the backup, restoring the original file.
+    fn new( path : impl Into< PathBuf > ) -> error::untyped::Result< Self >
+    {
+      let path = path.into();
+      if !path.ends_with( "Cargo.toml" )
+      {
+        error::untyped::bail!( "Wrong path to temporary manifest" );
+      }
+
+      let mut index = 0;
+      let original = loop
+      {
+        let temp_path = PathBuf::from( format!( "{}.temp_{index}", path.display() ) );
+        if !temp_path.exists()
+        {
+          _ = std::fs::copy( &path, &temp_path )?;
+          break temp_path;
+        }
+        index += 1;
+      };
+
+      Ok( Self
+      {
+        original,
+        temporary : path,
+      })
+    }
+  }
+
+  impl Drop for TemporaryManifestFile
+  {
+    fn drop( &mut self )
+    {
+      _ = std::fs::rename( &self.original, &self.temporary ).ok();
+    }
+  }
+
   ///
   /// Assemble the local package into a distributable tarball.
   ///
@@ -96,6 +148,17 @@ mod private
   // qqq : use typed error
   pub fn pack( args : PackOptions ) -> error::untyped::Result< process::Report >
   {
+    let _temp = if args.exclude_dev_dependencies
+    {
+      let manifest = TemporaryManifestFile::new( args.path.join( "Cargo.toml" ) )?;
+      let mut file = Manifest::try_from( ManifestFile::try_from( &manifest.temporary )? )?;
+      let data = file.data();
+
+      _ = data.remove( "dev-dependencies" );
+      file.store()?;
+
+      Some( manifest )
+    } else { None };
     let ( program, options ) = ( "rustup", args.to_pack_args() );
 
     if args.dry
@@ -129,6 +192,7 @@ mod private
   {
     pub( crate ) path : PathBuf,
     pub( crate ) temp_path : Option< PathBuf >,
+    pub( crate ) exclude_dev_dependencies : bool,
     #[ former( default = 0usize ) ]
     pub( crate ) retry_count : usize,
     pub( crate ) dry : bool,
@@ -162,6 +226,17 @@ mod private
   pub fn publish( args : PublishOptions ) -> error::untyped::Result< process::Report >
   // qqq : use typed error
   {
+    let _temp = if args.exclude_dev_dependencies
+    {
+      let manifest = TemporaryManifestFile::new( args.path.join( "Cargo.toml" ) )?;
+      let mut file = Manifest::try_from( ManifestFile::try_from( &manifest.temporary )? )?;
+      let data = file.data();
+
+      _ = data.remove( "dev-dependencies" );
+      file.store()?;
+
+      Some( manifest )
+    } else { None };
     let ( program, arguments) = ( "cargo", args.as_publish_args() );
 
     if args.dry