Separate composer-package based site build to own task

Author: oxyc

default.config.yml

@@ -47,6 +47,12 @@ drupal_composer_path: "{{ config_dir }}/drupal.composer.json"
 drupal_composer_install_dir: "/var/www/drupalvm/drupal"
 drupal_composer_dependencies: []
 
+# Set this to 'true' and 'build_makefile' as well as 'build_composer' to
+# 'false' you are using Composer's create-project as a site deployment strategy.
+build_composer_project: false
+drupal_composer_project_package: ""
+drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
+
 # Set this to 'false' if you don't need to install drupal (using the drupal_*
 # settings below), but instead copy down a database (e.g. using drush sql-sync).
 install_site: true

provisioning/playbook.yml

@@ -100,6 +100,10 @@
     - include: tasks/build-composer.yml
       when: build_composer
 
+    # Build a composer project if configured.
+    - include: tasks/build-composer-project.yml
+      when: build_composer_project
+
     # Install site if configured.
     - include: tasks/install-site.yml
       when: install_site

provisioning/tasks/build-composer-project.yml

@@ -0,0 +1,15 @@
+---
+- name: Generate Drupal project with composer package.
+  command: >
+    {{ composer_path }} create-project
+    {{ drupal_composer_project_package }} {{ drupal_composer_install_dir }}
+    {{ drupal_composer_project_options|default('--prefer-dist --no-interaction') }}
+  when: not drupal_site_exists
+  become: no
+
+- name: Install dependencies with composer require.
+  command: >
+    {{ composer_path }} require {{ item }}
+    chdir={{ drupal_composer_install_dir }}
+  with_items: "{{ drupal_composer_dependencies|default([]) }}"
+  become: no

provisioning/tasks/build-composer.yml

@@ -1,30 +1,24 @@
 ---
+- name: Ensure drupal_composer_install_dir directory exists.
+  file:
+    path: "{{ drupal_composer_install_dir }}"
+    state: directory
+    mode: 0775
+  become: no
+  when: drupal_composer_path and not drupal_site_exists
+
 - name: Copy composer.json into place.
   copy:
     src: "{{ drupal_composer_path }}"
     dest: "{{ drupal_composer_install_dir }}/composer.json"
-  when: drupal_composer_path is defined and not drupal_site_exists
+  when: drupal_composer_path and not drupal_site_exists
   become: no
 
-- name: Check if composer.json exists.
-  stat: "path={{ drupal_composer_install_dir }}/composer.json"
-  register: drupal_composer_file
-
-- name: Run composer install if composer.json exists.
+- name: Run composer install.
   command: >
     composer install
     chdir={{ drupal_composer_install_dir }}
-  when: drupal_composer_file.stat.exists and not drupal_site_exists
-  become: no
-
-- name: Generate Drupal project with composer package.
-  command: >
-    {{ composer_path }} create-project
-    {{ drupal_composer_project_package }} {{ drupal_composer_install_dir }}
-    --prefer-dist
-    --stability dev
-    --no-interaction
-  when: drupal_composer_project_package and not drupal_composer_file.stat.exists and not drupal_site_exists
+  when: not drupal_site_exists
   become: no
 
 - name: Install dependencies with composer require.