Remove "-option" suffix from --ssh-option and --rsync-option

This way it's much easier to type.

Author: mlafeldt

CHANGELOG.md

@@ -3,12 +3,11 @@
 FEATURES:
 
 * Allow to specify one or more custom OpenSSH options on the command line, e.g.
-  `chef-runner --ssh-option LogLevel=debug --ssh-option "ProxyCommand ..."`. See
+  `chef-runner --ssh LogLevel=debug --ssh "ProxyCommand ..."`. See
   `ssh_config(5)` for a list of available options and their format. (Thanks to
   @berniedurfee who requested this feature.)
 * Allow to specify one or more custom Rsync options on the command line, e.g.
-  `chef-runner --rsync-option --progress`. See `rsync(1)` for a list of
-  available options.
+  `chef-runner --rsync --progress`. See `rsync(1)` for a list of available
 * Add `--color=false` option to disable colorized output.
 
 IMPROVEMENTS:
@@ -31,7 +30,7 @@ BREAKING CHANGES:
   instead. This change also simplifies run list composition when multiple
   cookbooks are involved, e.g. `chef-runner apt postgresql::client nginx`.
 * No longer run Rsync in verbose mode by default. To get back the old output,
-  you need to use `--rsync-option --verbose` now.
+  you need to use `--rsync --verbose` now.
 
 [omnibus package]: https://godoc.org/github.com/mlafeldt/chef-runner/chef/omnibus
 

README.md

@@ -137,8 +137,8 @@ Usage: chef-runner [options] [--] [<recipe>...]
   -M, --machine <name>         Name or UUID of Vagrant virtual machine
   -K, --kitchen <name>         Name of Test Kitchen instance
 
-  --ssh-option <option>        Add OpenSSH option as specified in ssh_config(5)
-  --rsync-option <option>      Add Rsync option as listed in rsync(1)
+  --ssh <option>               Add OpenSSH option as specified in ssh_config(5)
+  --rsync <option>             Add Rsync option as listed in rsync(1)
 
   -i, --install-chef <version> Install Chef (x.y.z, latest, true, false)
                                default: false
@@ -257,15 +257,15 @@ any system reachable over SSH.
 Use the `-H` option (or `--host`) to specify the name of a host that was
 configured for direct SSH access. The argument passed to `-H` has the format
 `[user@]hostname[:port]`, allowing you to optionally change SSH user and port.
-If you need to change other SSH settings, either use `--ssh-option` or add a
+If you need to change other SSH settings, either use `--ssh` or add a
 host-specific configuration section to your `~/.ssh/config`.
 
 Examples:
 
     $ chef-runner -H example.local
     $ chef-runner -H user@example.local
     $ chef-runner -H example.local:1234
-    $ chef-runner -H example.local --ssh-option LogLevel=debug --ssh-option "ProxyCommand ..."
+    $ chef-runner -H example.local --ssh LogLevel=debug --ssh "ProxyCommand ..."
 
 ### Installing Chef
 

cli/cli.go

@@ -18,8 +18,8 @@ var usage = `Usage: chef-runner [options] [--] [<recipe>...]
   -M, --machine <name>         Name or UUID of Vagrant virtual machine
   -K, --kitchen <name>         Name of Test Kitchen instance
 
-  --ssh-option <option>        Add OpenSSH option as specified in ssh_config(5)
-  --rsync-option <option>      Add Rsync option as listed in rsync(1)
+  --ssh <option>               Add OpenSSH option as specified in ssh_config(5)
+  --rsync <option>             Add Rsync option as listed in rsync(1)
 
   -i, --install-chef <version> Install Chef (x.y.z, latest, true, false)
                                default: false
@@ -82,9 +82,9 @@ func ParseFlags(args []string) (*Flags, error) {
 	f.StringVar(&flags.Kitchen, "K", "", "")
 	f.StringVar(&flags.Kitchen, "kitchen", "", "")
 
-	f.Var(&flags.SSHOptions, "ssh-option", "")
+	f.Var(&flags.SSHOptions, "ssh", "")
 
-	f.Var(&flags.RsyncOptions, "rsync-option", "")
+	f.Var(&flags.RsyncOptions, "rsync", "")
 
 	f.StringVar(&flags.ChefVersion, "i", "", "")
 	f.StringVar(&flags.ChefVersion, "install-chef", "", "")

cli/cli_test.go

@@ -44,11 +44,11 @@ func TestParseFlags(t *testing.T) {
 			flags: &Flags{Kitchen: "some-instance", Color: true},
 		},
 		{
-			args:  []string{"--ssh-option", "x=1", "--ssh-option", "y 2 3"},
+			args:  []string{"--ssh", "x=1", "--ssh", "y 2 3"},
 			flags: &Flags{SSHOptions: []string{"x=1", "y 2 3"}, Color: true},
 		},
 		{
-			args:  []string{"--rsync-option", "-x", "--rsync-option", "--y"},
+			args:  []string{"--rsync", "-x", "--rsync", "--y"},
 			flags: &Flags{RsyncOptions: []string{"-x", "--y"}, Color: true},
 		},
 		{