Changing she-bang and moving CLI into cli.py

Author: linsomniac

docs/playbooks/basics.md

@@ -6,7 +6,7 @@ A playbook is a Python source file, let's take a look at a simple playbook that
 simple new project scaffold:
 
 ```python
-#!/usr/bin/env python3
+#!/usr/bin/env -S python3 -m uplaybook.cli
 
 #  The Python docstring: The first line is used as the short description of the playbook
 #  and displayed when the user types "up" to get a list of playbooks.  The full docstring

docs/running.md

@@ -61,11 +61,9 @@ Or to get a list of tasks in a module, specify `up --up-docs module`
 ## "Command" (she-bang) Playbooks
 
 uPlaybook can be run as a "script" on Unix-like OSes by adding a "she-bang" line
-`#!/usr/bin/env up`, however this will prevent the detection of file-type.  A vim
-"modeline" can be used to fix this:
+`#!/usr/bin/env -S python3 -m uplaybook.cli`.
 
-    #!/usr/bin/env up
-    # vim: filetype=python
+    #!/usr/bin/env -S python3 -m uplaybook.cli
     [rest of playbook here]
 
 If you `chmod 755` the playbook file, you can then directly run the playbook file as a

docs/tutorial.md

@@ -418,4 +418,20 @@ options:
 
 
 ## She-bang
-## Include Playbooks
+
+uPlaybook can be run as a "script" on Unix-like OSes by adding a "she-bang" line
+`#!/usr/bin/env -S python3 -m uplaybook.cli`.
+
+    #!/usr/bin/env -S python3 -m uplaybook.cli
+    [rest of playbook here]
+
+If you `chmod 755` the playbook file, you can then directly run the playbook file as a
+command.  For example if your playbook is in a file called "myplaybook", you can now run
+`myplaybook` instead of `up myplaybook`.  This would primarily be used for file-based
+playbooks, not directory-based, as for directory playbooks you'd need to do
+`path/to/directory/playbook`; that will work it just isn't conventional.
+
+## Include Other Playbooks
+
+
+<!-- vim: set tw=90: -->

examples/new-uplaybook/playbook

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env -S python3 -m uplaybook.cli
 
 """
 Create a new uplaybook.

examples/new-uplaybook/playbook.j2

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env -S python3 -m uplaybook.cli
 
 """
 Short description of playbook here.

pyproject.toml

@@ -21,4 +21,4 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-up = "uplaybook.internals:cli"
+up = "uplaybook.cli:cli"

tests/runtests

@@ -4,13 +4,12 @@
 
 if [ -d .git ]; then
   PYTHONPATH=$(pwd)
-  UP2='python3 -c "from uplaybook.internals import cli; cli()" --up-full-traceback'
   TESTDIR=$(pwd)/tests
 else
   PYTHONPATH=$(pwd)/..
-  UP2='python3 -c "from uplaybook.internals import cli; cli()" --up-full-traceback'
   TESTDIR=$(pwd)
 fi
+UP2='python3 -c "from uplaybook.cli import cli; cli()" --up-full-traceback'
 export UP2
 export PYTHONPATH
 export TESTDIR

tests/test_basics/args.pb

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env -S python3 -m uplaybook.cli
 
 from uplaybook import fs, core
 

tests/test_basics/basics.pb

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env -S python3 -m uplaybook.cli
 
 from uplaybook import fs, core
 

tests/test_basics/include.pb

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env -S python3 -m uplaybook.cli
 
 from uplaybook import fs, core
 import jinja2