fix: reorganize command deps

Roger-luo · Feb 10, 2023 · 1c1407e · 1c1407e
1 parent 2d6558d
commit 1c1407e
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 60 deletions.
diff --git a/src/bin/ion/commands/mod.rs b/src/bin/ion/commands/mod.rs
@@ -1,7 +1,3 @@
-use clap::{ArgMatches, Command};
-use ion::config::Config;
-use ion::errors::CliResult;
-
 pub mod auth;
 pub mod bump;
 pub mod clone;
@@ -14,6 +10,14 @@ pub mod script;
 pub mod summon;
 pub mod template;
 
+pub use pkg::PackageSpecList;
+pub use clap::parser::ArgMatches;
+pub use clap::{arg, Command, ValueHint};
+pub use ion::config::Config;
+pub use ion::errors::CliResult;
+pub use ion::utils::{assert_julia_version, Julia};
+
+
 pub fn builtin() -> Vec<Command> {
     vec![
         auth::cli(),

diff --git a/src/bin/ion/commands/pkg/add.rs b/src/bin/ion/commands/pkg/add.rs
@@ -1,9 +1,4 @@
-use crate::commands::pkg::package_spec_list;
-use clap::parser::ArgMatches;
-use clap::{arg, Command, ValueHint};
-use ion::config::Config;
-use ion::errors::CliResult;
-use ion::utils::Julia;
+use crate::commands::*;
 
 pub fn cli() -> Command {
     Command::new("add")
@@ -14,7 +9,7 @@ pub fn cli() -> Command {
 }
 
 pub fn exec(config: &mut Config, matches: &ArgMatches) -> CliResult {
-    format!("using Pkg; Pkg.add([{}])", package_spec_list(matches))
+    format!("using Pkg; Pkg.add({})", PackageSpecList::new(matches))
         .julia_exec(config, matches.get_flag("global"))?;
     Ok(())
 }
diff --git a/src/bin/ion/commands/pkg/develop.rs b/src/bin/ion/commands/pkg/develop.rs
@@ -1,9 +1,4 @@
-use crate::commands::pkg::package_spec_list;
-use clap::parser::ArgMatches;
-use clap::{arg, Command, ValueHint};
-use ion::config::Config;
-use ion::errors::CliResult;
-use ion::utils::Julia;
+use crate::commands::*;
 
 pub fn cli() -> Command {
     Command::new("develop")
@@ -18,7 +13,7 @@ pub fn cli() -> Command {
 }
 
 pub fn exec(config: &mut Config, matches: &ArgMatches) -> CliResult {
-    format!("using Pkg; Pkg.develop([{}])", package_spec_list(matches))
+    format!("using Pkg; Pkg.develop({})", PackageSpecList::new(matches))
         .julia_exec(config, matches.get_flag("global"))?;
     Ok(())
 }
diff --git a/src/bin/ion/commands/pkg/free.rs b/src/bin/ion/commands/pkg/free.rs
@@ -1,9 +1,4 @@
-use crate::commands::pkg::package_spec_list;
-use clap::parser::ArgMatches;
-use clap::{arg, Command};
-use ion::config::Config;
-use ion::errors::CliResult;
-use ion::utils::Julia;
+use crate::commands::*;
 
 pub fn cli() -> Command {
     Command::new("free")
@@ -14,7 +9,7 @@ pub fn cli() -> Command {
 }
 
 pub fn exec(config: &mut Config, matches: &ArgMatches) -> CliResult {
-    format!("using Pkg; Pkg.free([{}])", package_spec_list(matches))
+    format!("using Pkg; Pkg.free({})", PackageSpecList::new(matches))
         .julia_exec(config, matches.get_flag("global"))?;
     Ok(())
 }
diff --git a/src/bin/ion/commands/pkg/mod.rs b/src/bin/ion/commands/pkg/mod.rs
@@ -9,4 +9,4 @@ pub mod update;
 pub mod utils;
 pub mod why;
 
-pub use utils::package_spec_list;
+pub use utils::PackageSpecList;
diff --git a/src/bin/ion/commands/pkg/remove.rs b/src/bin/ion/commands/pkg/remove.rs
@@ -1,9 +1,4 @@
-use crate::commands::pkg::package_spec_list;
-use clap::parser::ArgMatches;
-use clap::{arg, Command};
-use ion::config::Config;
-use ion::errors::CliResult;
-use ion::utils::Julia;
+use crate::commands::*;
 
 pub fn cli() -> Command {
     Command::new("remove")
@@ -15,7 +10,7 @@ pub fn cli() -> Command {
 }
 
 pub fn exec(config: &mut Config, matches: &ArgMatches) -> CliResult {
-    format!("using Pkg; Pkg.rm([{}])", package_spec_list(matches))
+    format!("using Pkg; Pkg.rm({})", PackageSpecList::new(matches))
         .julia_exec(config, matches.get_flag("global"))?;
     Ok(())
 }
diff --git a/src/bin/ion/commands/pkg/update.rs b/src/bin/ion/commands/pkg/update.rs
@@ -1,9 +1,4 @@
-use crate::commands::pkg::package_spec_list;
-use clap::parser::ArgMatches;
-use clap::{arg, Command};
-use ion::config::Config;
-use ion::errors::CliResult;
-use ion::utils::Julia;
+use crate::commands::*;
 
 pub fn cli() -> Command {
     Command::new("update")
@@ -14,12 +9,7 @@ pub fn cli() -> Command {
 }
 
 pub fn exec(config: &mut Config, matches: &ArgMatches) -> CliResult {
-    let cmd = if matches.args_present() {
-        format!("using Pkg; Pkg.update([{}])", package_spec_list(matches))
-    } else {
-        "using Pkg; Pkg.update()".into()
-    };
-    cmd.julia_exec(config, matches.get_flag("global"))?;
-
+    format!("using Pkg; Pkg.update({})", PackageSpecList::new(matches))
+        .julia_exec(config, matches.get_flag("global"))?;
     Ok(())
 }
diff --git a/src/bin/ion/commands/pkg/utils.rs b/src/bin/ion/commands/pkg/utils.rs
@@ -1,12 +1,30 @@
+use std::fmt::Display;
+
 use clap::parser::ArgMatches;
 use ion::PackageSpec;
 
-pub fn package_spec_list(matches: &ArgMatches) -> String {
-    let packages = matches.get_many::<String>("PACKAGE").into_iter().flatten();
+pub struct PackageSpecList {
+    pub list: Vec<PackageSpec>,
+}
+
+impl PackageSpecList {
+    pub fn new(matches: &ArgMatches) -> Self {
+        let packages = matches
+            .get_many::<String>("PACKAGE").into_iter().flatten();
+        Self {
+            list: packages
+                .map(PackageSpec::new)
+                .collect::<Vec<_>>(),
+        }
+    }
+}
 
-    packages
-        .map(PackageSpec::new)
-        .map(|p| format!("{p}"))
-        .collect::<Vec<_>>()
-        .join(",")
+impl Display for PackageSpecList {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if self.list.len() == 0 {
+            write!(f, "")
+        } else {
+            write!(f, "[{}]", self.list.iter().map(|p| format!("{p}")).collect::<Vec<_>>().join(","))
+        }
+    }
 }
diff --git a/src/bin/ion/commands/pkg/why.rs b/src/bin/ion/commands/pkg/why.rs
@@ -1,9 +1,4 @@
-use crate::commands::pkg::package_spec_list;
-use clap::parser::ArgMatches;
-use clap::{arg, Command, ValueHint};
-use ion::config::Config;
-use ion::errors::CliResult;
-use ion::utils::{assert_julia_version, Julia};
+use crate::commands::*;
 
 pub fn cli() -> Command {
     Command::new("why")
@@ -19,7 +14,7 @@ pub fn cli() -> Command {
 
 pub fn exec(config: &mut Config, matches: &ArgMatches) -> CliResult {
     assert_julia_version(config, ">=1.9.0-beta")?;
-    format!("using Pkg; Pkg.why([{}])", package_spec_list(matches))
+    format!("using Pkg; Pkg.why({})", PackageSpecList::new(matches))
         .julia_exec(config, matches.get_flag("global"))?;
     Ok(())
 }