Add --verbose option

bake/bakefile.py

@@ -492,7 +492,7 @@ def _transform_line(line, *, indent_styles=INDENT_STYLES):
 
         return line
 
-    def gen_source(self, *, sources):
+    def gen_source(self, *, sources, verbose=False):
 
         source_container = []
 
@@ -519,6 +519,9 @@ def gen_source(self, *, sources):
 
             source_container += [self.bashfile.funcs_source, self.bashfile.root_source]
 
+        if verbose and Bakefile._is_safe_to_inject(shebang):
+            yield "set -x"
+
         main_source = "\n".join(source_container)
 
         for sourceline in main_source.split("\n"):
@@ -529,7 +532,7 @@ def gen_source(self, *, sources):
         yield "\n"
 
     def execute(
-        self, *, blocking=False, debug=False, interactive=False, silent=False, **kwargs
+        self, *, blocking=False, debug=False, interactive=False, silent=False, verbose=False, **kwargs
     ):
 
         args = " ".join([shlex_quote(a) for a in self.bf.args])
@@ -539,7 +542,7 @@ def execute(
         )
 
         script = (
-            f"t=$(mktemp) && bake --source {self.name} "
+            f"t=$(mktemp) && bake {'--verbose' if verbose else ''} --source {self.name} "
             "> ${t} && chmod +x ${t} && ${t} "
             + f"{args} "
             + f"{sed_magic} "

bake/cli.py

@@ -116,6 +116,7 @@ def echo_json(obj):
 )
 @click.option("--debug", default=False, is_flag=True, hidden=True)
 @click.option("--source", default=False, nargs=1, hidden=True)
+@click.option("--verbose", default=False, is_flag=True)
 @click.option(
     "--allow",
     default=False,
@@ -200,6 +201,7 @@ def entrypoint(
     yes,
     help,
     source,
+    verbose,
 ):
     """bake — the strangely familiar task–runner."""
 
@@ -249,7 +251,7 @@ def entrypoint(
     if source:
 
         task = bf.tasks[source]
-        source = task.gen_source(sources=[task.bf.root_source, task.source])
+        source = task.gen_source(sources=[task.bf.root_source, task.source], verbose=verbose)
 
         for source_line in source:
             click.echo(source_line)
@@ -391,6 +393,7 @@ def execute_task(task, *, silent=False):
                     debug=debug,
                     silent=silent,
                     interactive=force_interactive or interactive,
+                    verbose=verbose,
                 )
 
                 if not _continue:

tests/basics.bats

@@ -72,3 +72,9 @@ export BAKEFILE=basics.Bakefile
     run bake deps/fail --no-deps
     [ "${status}" -eq 0 ]
 }
+
+@test "bake --verbose" {
+    run pipenv run bake --verbose echo foo
+    [ "${lines[0]}" = " + Executing echo:" ]
+    [ "${lines[1]}" = " |  + echo foo" ]
+}