From 2615824a7cd50b820d9da907b7ae690a0f28aa29 Mon Sep 17 00:00:00 2001 From: Kees Klerk Date: Mon, 14 Dec 2015 14:02:58 +0100 Subject: [PATCH 1/3] Check if bundler is in wrapper path, excluding global gemset. --- .travis.yml | 5 +++++ tasks/rubies.yml | 15 +++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3822119..e8c3da7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,3 +45,8 @@ script: | grep -q '2' && (echo 'Really deleted ruby test: pass' && exit 0) || (echo 'Really deleted ruby test: fail' && exit 1) + - > + ls ~/.rvm/wrappers/default/ + | grep -q 'bundler' + && (echo 'Bundler symlinked on system path test: pass' && exit 0) + || (echo 'Bundler symlinked on system path test: fail' && exit 1) diff --git a/tasks/rubies.yml b/tasks/rubies.yml index 2dfc4f7..bc558f0 100644 --- a/tasks/rubies.yml +++ b/tasks/rubies.yml @@ -24,13 +24,20 @@ when: detect_default_ruby_version.stdout == '' or rvm1_default_ruby_version not in detect_default_ruby_version.stdout +- name: Detect installed ruby patch number + shell: > + {{ rvm1_rvm }} list strings | grep {{ item }} | tail -n 1 + with_items: rvm1_rubies + changed_when: False + register: ruby_patch + - name: Install bundler if not installed shell: > - {{ rvm1_install_path }}/wrappers/{{ item }}@global/gem list - | if ! grep "^bundler " ; then {{ rvm1_install_path }}/wrappers/{{ item }}@global/gem install bundler ; fi + ls {{ rvm1_install_path }}/wrappers/{{ item.stdout }} + | if ! grep "^bundler " ; then {{ rvm1_install_path }}/wrappers/{{ item.stdout }}/gem install bundler ; fi args: - creates: '{{ rvm1_install_path }}/wrappers/{{ item }}@global/bundler' - with_items: rvm1_rubies + creates: '{{ rvm1_install_path }}/wrappers/{{ item.stdout }}/bundler' + with_items: ruby_patch.results register: bundler_install changed_when: '"Successfully installed bundler" in bundler_install.stdout' From 44c3d1d2a906088813de8997f8094f44a7d0adb3 Mon Sep 17 00:00:00 2001 From: Kees Klerk Date: Mon, 14 Dec 2015 14:06:39 +0100 Subject: [PATCH 2/3] Remove whitespace, trigger build. --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index b28ee20..4c7794f 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -2,7 +2,7 @@ galaxy_info: author: Nick Janetakis description: The official rvm role to install and manage your ruby versions. - company: + company: license: license (MIT) min_ansible_version: 1.5 From ceeb68344eb30aba52bd66059d783805f9d8f008 Mon Sep 17 00:00:00 2001 From: Kees Klerk Date: Mon, 14 Dec 2015 14:12:40 +0100 Subject: [PATCH 3/3] Remove sudo. --- tests/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test.yml b/tests/test.yml index 4aed9bb..8924185 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -2,7 +2,6 @@ - hosts: localhost remote_user: travis - sudo: true vars: rvm1_rubies: