Merge pull request #65 from rolobio/quiet-swap

Quiet swap

sshm/main.py

@@ -42,12 +42,8 @@ def get_argparse_args(args=None):
             help='Remove any whitespace surrounding the output of each instance.')
     parser.add_argument('-d', '--disable-formatting', action='store_true', default=False,
             help='Disable command formatting.')
-    parser.add_argument('-q', '--quiet', action='store_true', default=False,
-            help='Hide server information on output.  This implies sorted.')
-    parser.add_argument('-u', '--ssh-quiet', action='store_true', default=False,
-            help='Pass -q to the SSH command to quiet its output.')
-    parser.add_argument('-w', '--workers', type=int, default=20,
-            help='The maximum number of simultaneous SSH connections.')
+    parser.add_argument('-u', '--quiet', action='store_true', default=False,
+            help="Hide SSHM's server information on output (this implies sorted).")
     parser.add_argument('--version', action='version', version='%(prog)s '+__version__)
     args, extra_args = parser.parse_known_args(args=args)
 
@@ -69,9 +65,6 @@ def get_argparse_args(args=None):
     if args.quiet:
         args.sorted_output = True
 
-    # Pass -q to SSH command
-    if args.ssh_quiet:
-        extra_args.insert(0, '-q')
     return (args, args.command, extra_args)
 
 

sshm/test/test_main.py

@@ -71,7 +71,7 @@ def test_get_argparse_args(self):
         self.assertEqual(extra_args, [])
 
         # You can hide server information output
-        provided = ['-q', 'example.com', 'ls']
+        provided = ['-u', 'example.com', 'ls']
         args, command, extra_args = get_argparse_args(provided)
         self.assertEqual(args.servers, ['example.com'])
         self.assertTrue(args.sorted_output)
@@ -86,13 +86,6 @@ def test_get_argparse_args(self):
         self.assertEqual(command, 'ls')
         self.assertEqual(extra_args, [])
 
-        # You can quiet SSH (passing -q to ssh) by using -u
-        provided = ['example.com', 'command', '-o Something', '-u']
-        args, command, extra_args = get_argparse_args(provided)
-        self.assertEqual(args.servers, ['example.com',])
-        self.assertEqual(command, 'command')
-        self.assertEqual(extra_args, ['-q', '-o Something'])
-
 
     def test__print_handling_newlines(self):
         """