Update Ruby role to latest version.

Author: geerlingguy

provisioning/requirements.yml

@@ -72,7 +72,7 @@
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
-  version: 2.4.2
+  version: 2.4.3
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr

provisioning/roles/geerlingguy.ruby/.gitignore

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

provisioning/roles/geerlingguy.ruby/.travis.yml

@@ -4,88 +4,64 @@ services: docker
 env:
   # Package install on all OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     ruby_version: 2.0.0
     ruby_path_prefix: /usr
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     ruby_version: 2.3.1
     ruby_path_prefix: /usr
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
     playbook: test.yml
     ruby_version: 1.9.3
     ruby_path_prefix: /usr
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     ruby_version: 2.1.5
     ruby_path_prefix: /usr
 
   # Source install on latest OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
     ruby_version: 2.3.0
     ruby_path_prefix: /usr/local
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
     ruby_version: 2.3.0
     ruby_path_prefix: /usr/local
 
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
-
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Make sure ruby is installed and at the correct version.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which ruby'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x ${ruby_path_prefix}/bin/ruby'
+  - 'docker exec --tty ${container_id} env TERM=xterm which ruby'
+  - 'docker exec --tty ${container_id} env TERM=xterm test -x ${ruby_path_prefix}/bin/ruby'
 
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ruby --version'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ${ruby_path_prefix}/bin/ruby --version | grep -qF ${ruby_version}'
+  - 'docker exec --tty ${container_id} env TERM=xterm ruby --version'
+  - 'docker exec --tty ${container_id} env TERM=xterm ${ruby_path_prefix}/bin/ruby --version | grep -qF ${ruby_version}'
 
   # Make sure bundler is installed.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ls -lah /usr/local/bin'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which bundle'
+  - 'docker exec --tty ${container_id} env TERM=xterm ls -lah /usr/local/bin'
+  - 'docker exec --tty ${container_id} env TERM=xterm which bundle'
 
   # Make sure user installed gems are available.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "which sass"'
+  - |
+    if [ "${distro}" != "ubuntu1404" ]; then
+      docker exec --tty ${container_id} env TERM=xterm bash --login -c "which sass"
+    fi
 
 after_failure:
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which ruby'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ruby --version'
+  - 'docker exec --tty ${container_id} env TERM=xterm which ruby'
+  - 'docker exec --tty ${container_id} env TERM=xterm ruby --version'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

provisioning/roles/geerlingguy.ruby/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.ruby/README.md

@@ -60,4 +60,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).

provisioning/roles/geerlingguy.ruby/defaults/main.yml

@@ -13,8 +13,8 @@ ruby_install_gems_user: "{{ ansible_user }}"
 # If set to TRUE, ruby will be installed from source, using the version set with
 # the 'ruby_version' variable instead of using a package.
 ruby_install_from_source: false
-ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.0.tar.gz
-ruby_version: 2.3.0
+ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.1.tar.gz
+ruby_version: 2.4.1
 
 # Default should usually work, but this will be overridden on Ubuntu 14.04.
 ruby_rubygems_package_name: rubygems

provisioning/roles/geerlingguy.ruby/tasks/main.yml

@@ -1,14 +1,18 @@
 ---
 # Include OS-specific installation tasks.
 - include: setup-RedHat.yml
-  when: (ruby_install_from_source == false) and (ansible_os_family == 'RedHat')
+  when:
+    - ruby_install_from_source == False
+    - ansible_os_family == 'RedHat'
 
 - include: setup-Debian.yml
-  when: (ruby_install_from_source == false) and (ansible_os_family == 'Debian')
+  when:
+    - ruby_install_from_source == False
+    - ansible_os_family == 'Debian'
 
 # Install ruby from source when ruby_install_from_source is true.
 - include: install-from-source.yml
-  when: ruby_install_from_source == true
+  when: ruby_install_from_source == True
 
 - name: Add user installed RubyGems bin directory to global $PATH.
   copy:
@@ -22,7 +26,9 @@
   when: ruby_install_bundler
 
 - name: Install configured gems.
-  gem: "name={{ item }} state=present"
+  gem:
+    name: "{{ item }}"
+    state: present
   become: yes
   become_user: "{{ ruby_install_gems_user }}"
   with_items: "{{ ruby_install_gems }}"

provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml

@@ -7,8 +7,10 @@
     ruby_rubygems_package_name: rubygems-integration
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
 
-- name: Install ruby and rubygems.
+- name: Install ruby, rubygems, and build-essential.
   apt: "name={{ item }} state=present"
   with_items:
     - ruby-full
+    - ruby-dev
     - "{{ ruby_rubygems_package_name }}"
+    - build-essential

provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml

@@ -1,6 +1,8 @@
 ---
-- name: Install ruby and rubygems.
+- name: Install ruby, rubygems, and development tools.
   yum: "name={{ item }} state=present"
   with_items:
     - ruby
+    - ruby-devel
     - "{{ ruby_rubygems_package_name }}"
+    - '@development'

provisioning/roles/geerlingguy.ruby/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)`