add the command_args! macro

magiclen · Jun 12, 2020 · 3b2ab50 · 3b2ab50
1 parent 33cab7b
commit 3b2ab50
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/execute-command-macro/Cargo.toml b/execute-command-macro/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "execute-command-macro"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Magic Len <[email protected]>"]
 edition = "2018"
 repository = "https://github.com/magiclen/execute"
 homepage = "https://magiclen.org/execute"
 keywords = ["execute", "command"]
 categories = ["parser-implementations"]
-description= "Create `Command` instances using the `command!` macro."
+description= "Create `Command` instances using the `command!` macro or the `command_args!` marco."
 readme = "README.md"
 license = "MIT"
 

diff --git a/execute-command-macro/README.md b/execute-command-macro/README.md
@@ -3,7 +3,7 @@ Execute Command Macro
 
 [![Build Status](https://travis-ci.org/magiclen/execute.svg?branch=master)](https://travis-ci.org/magiclen/execute)
 
-Create `Command` instances using the `command!` macro.
+Create `Command` instances using the `command!` macro or the `command_args!` macro.
 
 Also see [`execute`](https://crates.io/crates/execute).
 
@@ -15,6 +15,12 @@ Also see [`execute`](https://crates.io/crates/execute).
 let command = command!("program arg1 arg2 'arg 3' -opt1 -opt2");
 ```
 
+```rust
+#[macro_use] extern crate execute_command_macro;
+
+let command = command_args!("program", "arg1", "arg2", "-opt1", "-opt2");
+```
+
 ## Crates.io
 
 https://crates.io/crates/execute

diff --git a/execute-command-macro/src/lib.rs b/execute-command-macro/src/lib.rs
@@ -1,7 +1,7 @@
 /*!
 # Execute Command Macro
 
-Create `Command` instances using the `command!` macro.
+Create `Command` instances using the `command!` macro or the `command_args!` macro.
 
 Also see [`execute`](https://crates.io/crates/execute).
 
@@ -12,6 +12,12 @@ Also see [`execute`](https://crates.io/crates/execute).
 
 let command = command!("program arg1 arg2 'arg 3' -opt1 -opt2");
 ```
+
+```rust
+#[macro_use] extern crate execute_command_macro;
+
+let command = command_args!("program", "arg1", "arg2", "-opt1", "-opt2");
+```
 */
 
 #[macro_use]
@@ -28,3 +34,26 @@ extern crate execute_command_macro_impl;
 /// ```
 #[proc_macro_hack]
 pub use execute_command_macro_impl::command;
+
+/// Create a `Command` instance by inputting args separately.
+///
+/// ```rust
+/// #[macro_use] extern crate execute_command_macro;
+///
+/// let command = command_args!("program", "arg1", "arg2", "-opt1", "-opt2");
+/// ```
+#[macro_export]
+macro_rules! command_args {
+    ($program:expr $(,)*) => {
+        std::process::Command::new($program)
+    };
+    ($program:expr, $arg:expr $(, $args:expr)* $(,)*) => {
+        {
+            let mut command = std::process::Command::new($program);
+
+            command.arg(&$arg)$(.arg(&$args))*;
+
+            command
+        }
+    };
+}
diff --git a/execute-command-macro/tests/tests.rs b/execute-command-macro/tests/tests.rs
@@ -4,10 +4,10 @@
 extern crate execute_command_macro;
 
 #[test]
-fn command(){
+fn command() {
     let mut command = command!("sh -c \"echo '123 456' | cut -d ' ' -f 1\"");
 
     let output = command.output().unwrap();
 
     assert_eq!(b"123\n", output.stdout.as_slice());
-}
+}