Commit f669a4a1 authored by Ernesto Rodriguez Ortiz's avatar Ernesto Rodriguez Ortiz
Browse files

Use the option -d book when generating the documentation.

parent c388d167
...@@ -52,7 +52,6 @@ def install(): ...@@ -52,7 +52,6 @@ def install():
@task @task
@roles('docker') @roles('docker')
def run(): def run():
""" """
Execute the complete Behat tests suite. Execute the complete Behat tests suite.
:param role Default 'role' where to run the task :param role Default 'role' where to run the task
......
...@@ -21,11 +21,8 @@ from fabric.api import task, roles, env ...@@ -21,11 +21,8 @@ from fabric.api import task, roles, env
from fabric.contrib.console import confirm from fabric.contrib.console import confirm
from fabric.colors import red, green from fabric.colors import red, green
# Import datetime
from datetime import datetime from datetime import datetime
import os.path
import helpers as h import helpers as h
import core as c import core as c
...@@ -74,10 +71,10 @@ def aliases(): ...@@ -74,10 +71,10 @@ def aliases():
with h.fab_cd(role, drush_aliases): with h.fab_cd(role, drush_aliases):
# Create aliases # Create aliases
if h.fab_exists(role, '{}/aliases.drushrc.php'.format(drush_aliases)): if h.fab_exists(role, '{}/aliases.drushrc.php'.format(drush_aliases)):
h.fab_run(role, 'rm aliases.drushrc.php') h.fab_run(role, 'rm {}/aliases.drushrc.php'.format(drush_aliases))
h.fab_run(role, 'ln -s {}/conf/aliases.drushrc.php .'.format(workspace)) h.fab_run(role, 'ln -s {}/conf/aliases.drushrc.php .'.format(workspace))
print green('Drush aliases have been copied to {} directory.'.format(drush_aliases)) print(green('Drush aliases have been copied to {} directory.'.format(drush_aliases)))
@task @task
...@@ -127,7 +124,7 @@ def site_install(): ...@@ -127,7 +124,7 @@ def site_install():
site_admin_pass, site_admin_pass,
site_subdir)) site_subdir))
print green('Site installed successfully!') print(green('Site installed successfully!'))
# Import db_dump if it exists. # Import db_dump if it exists.
if 'db_dump' in env and env.db_dump is not False: if 'db_dump' in env and env.db_dump is not False:
...@@ -147,7 +144,7 @@ def archive_dump(role='docker'): ...@@ -147,7 +144,7 @@ def archive_dump(role='docker'):
with h.fab_cd(role, env.docker_site_root): with h.fab_cd(role, env.docker_site_root):
platform = '{}-{}.tar.gz'.format(env.project_name, datetime.now().strftime('%Y%m%d_%H%M%S')) platform = '{}-{}.tar.gz'.format(env.project_name, datetime.now().strftime('%Y%m%d_%H%M%S'))
h.fab_run(role, 'rm -f {}/build/*.tar.gz'.format(env.docker_workspace)) h.fab_run(role, 'rm -f {}/build/*.tar.gz'.format(env.docker_workspace))
print green('All tar.gz archives found in {}/build have been deleted.'.format(env.docker_workspace)) print(green('All tar.gz archives found in {}/build have been deleted.'.format(env.docker_workspace)))
h.fab_run( h.fab_run(
role, role,
...@@ -166,11 +163,11 @@ def gen_doc(role='docker'): ...@@ -166,11 +163,11 @@ def gen_doc(role='docker'):
""" """
if h.fab_exists(role, '{}/README.adoc'.format(env.docker_workspace)): if h.fab_exists(role, '{}/README.adoc'.format(env.docker_workspace)):
h.fab_run(role, 'asciidoctor -b html5 -o {}/README.html {}/README.adoc'.format(env.docker_workspace, h.fab_run(role, 'asciidoctor -d book -b html5 -o {}/README.html {}/README.adoc'.
env.docker_workspace)) format(env.docker_workspace, env.docker_workspace))
print(green('README.html generated in {}'.format(env.docker_workspace))) print(green('README.html generated in {}'.format(env.docker_workspace)))
if h.fab_exists(role, '{}/CHANGELOG.adoc'.format(env.docker_workspace)): if h.fab_exists(role, '{}/CHANGELOG.adoc'.format(env.docker_workspace)):
h.fab_run(role, 'asciidoctor -b html5 -o {}/CHANGELOG.html {}/CHANGELOG.adoc'.format(env.docker_workspace, h.fab_run(role, 'asciidoctor -d book -b html5 -o {}/CHANGELOG.html {}/CHANGELOG.adoc'.
env.docker_workspace)) format(env.docker_workspace, env.docker_workspace))
print(green('CHANGELOG.html generated in {}'.format(env.docker_workspace))) print(green('CHANGELOG.html generated in {}'.format(env.docker_workspace)))
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment