Merge branch 's1as3r/master'

dotbot/plugins/shell.py

@@ -42,10 +42,11 @@ class Shell(dotbot.Plugin):
             else:
                 cmd = item
                 msg = None
-            if msg is None:
-                self._log.lowinfo(cmd)
-            elif quiet:
+            if quiet:
+                if msg is not None:
                     self._log.lowinfo("%s" % msg)
+            elif msg is None:
+                self._log.lowinfo(cmd)
             else:
                 self._log.lowinfo("%s [%s]" % (msg, cmd))
             stdout = options.get("stdout", stdout)

test/tests/shell-quiet.bash

@@ -20,9 +20,9 @@ test_expect_success 'run 2' '
 EOF
 '
 
-# when no description, expect to see command
+# when no description, expect no output
 test_expect_success 'run 3' '
-(run_dotbot | grep "echo banana") <<EOF
+(run_dotbot | (! grep "echo banana")) <<EOF
 - shell:
   - command: echo banana
     quiet: true