Fixes #1335: Update Drupal Console Role so it works correctly with rc17 and beyond.

Author: geerlingguy

provisioning/requirements.yml

@@ -20,7 +20,7 @@
 - src: geerlingguy.drupal
   version: 2.2.1
 - src: geerlingguy.drupal-console
-  version: 1.0.7
+  version: 1.1.0
 - src: geerlingguy.drush
   version: 2.0.1
 - src: geerlingguy.elasticsearch

provisioning/roles/geerlingguy.drupal-console/.gitignore

@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh

provisioning/roles/geerlingguy.drupal-console/.travis.yml

@@ -1,41 +1,26 @@
 ---
-sudo: required
-language: python
-python: "2.7"
+services: docker
 
 env:
-  - SITE=test.yml
-  - SITE=test-self-update.yml
-
-before_install:
-  - sudo apt-get update -qq
-
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
-
-  # Install required dependencies.
-  - ansible-galaxy install geerlingguy.php
+  - distro: ubuntu1604
+    playbook: test.yml
+  - distro: ubuntu1604
+    playbook: test-self-update.yml
 
 script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
-  - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
-  # Check if Drupal Console is installed and working.
-  - drupal
+  # Ensure Drupal Console is installed and working.
+  - 'docker exec --tty ${container_id} env TERM=xterm drupal list || true'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

provisioning/roles/geerlingguy.drupal-console/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

provisioning/roles/geerlingguy.drupal-console/README.md

@@ -6,7 +6,7 @@ Installs [Drupal Console](http://drupalconsole.com/) on any Linux or UNIX system
 
 ## Requirements
 
-`php` (version 5.4+) should be installed and working.
+`php` (version 5.6+) should be installed and working.
 
 ## Role Variables
 
@@ -32,7 +32,7 @@ The path to the Drupal Console configuration file.
 
     - hosts: servers
       roles:
-        - { role: geerlingguy.drupal-console }
+        - role: geerlingguy.drupal-console
 
 After the playbook runs, `drupal` will be placed in `/usr/local/bin/drupal` (this location is configurable), and will be accessible via normal system accounts.
 
@@ -42,4 +42,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2015 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2015 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).

provisioning/roles/geerlingguy.drupal-console/meta/main.yml

@@ -7,7 +7,7 @@ galaxy_info:
   description: Drupal Console
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.4
+  min_ansible_version: 1.8
   platforms:
   - name: EL
     versions:

provisioning/roles/geerlingguy.drupal-console/tasks/main.yml

@@ -9,11 +9,6 @@
     path: "{{ drupal_console_path }}"
     mode: 0755
 
-- name: Run Drupal Console init.
-  shell: >
-    php {{ drupal_console_path }} init
-    creates={{ drupal_console_config }}
-
 - name: Update Drupal Console to latest version (if configured).
   shell: >
     php {{ drupal_console_path }} self-update

provisioning/roles/geerlingguy.drupal-console/tests/README.md

@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

provisioning/roles/geerlingguy.drupal-console/tests/inventory

@@ -0,0 +1,2 @@
+---
+- src: geerlingguy.php