Implement leo remove functionality

leo/commands/remove.rs

@@ -14,37 +14,35 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{
+use crate::{cli::*, cli_types::*, errors::CLIError};
-    cli::*,
+use leo_package::LeoPackage;
-    cli_types::*,
-    commands::BuildCommand,
-    errors::{CLIError, RunError},
-};
-use leo_package::{
-    root::Manifest,
-    source::{MAIN_FILENAME, SOURCE_DIRECTORY_NAME},
-};
 
 use clap::ArgMatches;
-use std::{convert::TryFrom, env::current_dir};
+use std::env::current_dir;
 
 #[derive(Debug)]
 pub struct RemoveCommand;
 
 impl CLI for RemoveCommand {
-    type Options = ();
+    type Options = Option<String>;
     type Output = ();
 
-    const ABOUT: AboutType = "Uninstall a package from the current package (*)";
+    const ABOUT: AboutType = "Uninstall a package from the current package";
-    const ARGUMENTS: &'static [ArgumentType] = &[];
+    const ARGUMENTS: &'static [ArgumentType] = &[
+        // (name, description, required, index)
+        ("NAME", "Removes the package from the current directory", true, 1u64),
+    ];
     const FLAGS: &'static [FlagType] = &[];
     const NAME: NameType = "remove";
     const OPTIONS: &'static [OptionType] = &[];
     const SUBCOMMANDS: &'static [SubCommandType] = &[];
 
     #[cfg_attr(tarpaulin, skip)]
-    fn parse(_arguments: &ArgMatches) -> Result<Self::Options, CLIError> {
+    fn parse(arguments: &ArgMatches) -> Result<Self::Options, CLIError> {
-        Ok(())
+        Ok(match arguments.value_of("NAME") {
+            Some(name) => Some(name.to_string()),
+            None => unreachable!(),
+        })
     }
 
     #[cfg_attr(tarpaulin, skip)]
@@ -55,24 +53,11 @@ impl CLI for RemoveCommand {
 
         let path = current_dir()?;
 
-        match BuildCommand::output(options)? {
+        if let Some(package_name) = options {
-            Some((_program, _checksum_differs)) => {
+            LeoPackage::remove_imported_package(&package_name, &path)?;
-                // Get the package name
+            tracing::info!("Successfully removed package \"{}\"\n", package_name);
-                let _package_name = Manifest::try_from(&path)?.get_package_name();
-
-                tracing::info!("Unimplemented - `leo remove`");
-
-                Ok(())
-            }
-            None => {
-                let mut main_file_path = path.clone();
-                main_file_path.push(SOURCE_DIRECTORY_NAME);
-                main_file_path.push(MAIN_FILENAME);
-
-                Err(CLIError::RunError(RunError::MainFileDoesNotExist(
-                    main_file_path.into_os_string(),
-                )))
-            }
         }
+
+        Ok(())
     }
 }

package/src/errors/imports/directory.rs

@@ -30,6 +30,9 @@ pub enum ImportsDirectoryError {
     #[error("file {:?} type getting: {}", _0, _1)]
     GettingFileType(OsString, io::Error),
 
+    #[error("package {:?} does not exist as an import", _0)]
+    ImportDoesNotExist(OsString),
+
     #[error("invalid file {:?} extension: {:?}", _0, _1)]
     InvalidFileExtension(OsString, OsString),
 

package/src/imports/directory.rs

@@ -56,10 +56,12 @@ impl ImportsDirectory {
 
         path.push(PathBuf::from(package_name));
 
-        if path.is_dir() && path.exists() {
+        if !path.exists() || !path.is_dir() {
-            fs::remove_dir_all(&path).map_err(ImportsDirectoryError::Removing)?;
+            return Err(ImportsDirectoryError::ImportDoesNotExist(package_name.into()));
         }
 
+        fs::remove_dir_all(&path).map_err(ImportsDirectoryError::Removing)?;
+
         Ok(())
     }
 }