Use raw_command and raw_args. Refactor the name to 'over_ssh'.

Signed-off-by: Aalekh Patel <aalekh.gwpeck.7998@icloud.com>

Author: aalekhpatel07

src/command.rs

@@ -53,7 +53,7 @@ macro_rules! delegate {
 /// Primarily a way to allow `std::process::Command` to be turned directly into an `openssh::Command`.
 pub trait OverSsh {
     /// Given a session, return a command that can be executed over that session.
-    fn with_session<'session>(&self, session: &'session Session) -> Result<crate::Command<'session>, Error>;
+    fn over_session<'session>(&self, session: &'session Session) -> crate::Command<'session>;
 }
 
 impl OverSsh for std::process::Command {
@@ -69,35 +69,19 @@ impl OverSsh for std::process::Command {
     ///     .arg("-l")
     ///     .arg("-a")
     ///     .arg("-h")
-    ///     .with_session(&session)
+    ///     .over_session(&session)
     ///     .output()
     ///     .await?;
+    /// 
     /// assert!(String::from_utf8(ls.stdout).unwrap().contains("total"));
     /// 
     /// 
     /// ```
-    fn with_session<'session>(&self, session: &'session Session) -> Result<Command<'session>, Error> {
-        let program = 
-            self
-            .get_program()
-            .to_str()
-            .ok_or_else(|| Error::InvalidUtf8String(self.get_program().to_os_string()))?;
-
-        let args = 
-            self.
-            get_args()
-            .into_iter()
-            .map(
-                |s| 
-                s
-                .to_str()
-                .ok_or_else(|| Error::InvalidUtf8String(s.to_os_string()))
-            )
-            .collect::<Result<Vec<_>, Error>>()?;
+    fn over_session<'session>(&self, session: &'session Session) -> Command<'session> {
 
-        let mut command = session.command(program);
-        command.args(args);
-        Ok(command)
+        let mut command = session.raw_command(self.get_program());
+        command.raw_args(self.get_args());
+        command
     }
 }
 

src/error.rs

@@ -34,11 +34,6 @@ pub enum Error {
     #[error("the remote command could not be executed")]
     Remote(#[source] io::Error),
 
-    /// Invalid UTF-8 string when trying to
-    /// convert a `std::ffi::OsString` to a `String`.
-    #[error("invalid string")]
-    InvalidUtf8String(std::ffi::OsString),
-
     /// The connection to the remote host was severed.
     ///
     /// Note that for the process impl, this is a best-effort error, and it _may_ instead

tests/openssh.rs

@@ -300,8 +300,7 @@ async fn with_session() {
         let mut command = 
             std::process::Command::new("echo")
             .arg("foo")
-            .with_session(&session)
-            .expect("Expected valid utf-8 command.");
+            .over_session(&session);
 
         let child = command.output().await.unwrap();
         assert_eq!(child.stdout, b"foo\n");
@@ -321,40 +320,6 @@ async fn with_session() {
 }
 
 
-#[tokio::test]
-#[cfg_attr(not(ci), ignore)]
-async fn with_session_err() {
-    
-    for session in connects().await {
-        let bad_string = OsStr::from_bytes(b"foo\xFF");
-        let command = 
-            std::process::Command::new("echo")
-            .arg(bad_string)
-            .with_session(&session);
-        
-        let expected_error = openssh::Error::InvalidUtf8String(bad_string.to_owned());
-        assert!(command.is_err());
-        let err = command.unwrap_err();
-        assert_eq!(err.to_string(), expected_error.to_string());
-
-        // let child = command.output().await.unwrap();
-        // assert_eq!(child.stdout, b"foo\n");
-
-        // let child = session
-        //     .command("echo")
-        //     .arg("foo")
-        //     .raw_arg(">")
-        //     .arg("/dev/stderr")
-        //     .output()
-        //     .await
-        //     .unwrap();
-        // assert!(child.stdout.is_empty());
-
-        session.close().await.unwrap();
-    }
-}
-
-
 #[tokio::test]
 #[cfg_attr(not(ci), ignore)]
 async fn shell() {