WIP #60 rename to option --dry-run on run subcommand

src/main.rs

@@ -46,25 +46,25 @@ const USAGE: &'static str = "
 Factotum.
 
 Usage:
-  factotum run <factfile> [--start=<start_task>] [--env=<env>]
-  factotum dry-run <factfile> [--start=<start_task>] [--env=[env]]
+  factotum run <factfile> [--start=<start_task>] [--env=<env>] [--dry-run]
   factotum validate <factfile>
   factotum (-h | --help)
 
 Options:
   -h --help             Show this screen.
   --start=<start_task>  Begin at specified task.
   --env=<env>           Supply JSON to define mustache variables in Factfile.
+  --dry-run             Pretend to execute a Factfile, showing the commands that would be executed. Can be used with other options.
 ";
 
 #[derive(Debug, RustcDecodable)]
 struct Args {
     flag_start: Option<String>,
     flag_env: Option<String>,
+    flag_dry_run: bool,
     arg_factfile: String,
     cmd_run: bool,
-    cmd_validate: bool,
-    cmd_dry_run: bool
+    cmd_validate: bool
 }
 
 // macro to simplify printing to stderr
@@ -374,9 +374,11 @@ fn factotum() -> i32 {
                     };
 
     if args.cmd_run {
-        parse_file_and_execute(&args.arg_factfile, args.flag_env, args.flag_start)
-    } else if args.cmd_dry_run {
-         parse_file_and_simulate(&args.arg_factfile, args.flag_env, args.flag_start)
+        if !args.flag_dry_run {
+            parse_file_and_execute(&args.arg_factfile, args.flag_env, args.flag_start)
+        } else {
+            parse_file_and_simulate(&args.arg_factfile, args.flag_env, args.flag_start)
+        }
     } else if args.cmd_validate {
         match validate(&args.arg_factfile, args.flag_env) {
             Ok(msg) => {