From d6534a311f1782704ea6fdea738053dfd9134247 Mon Sep 17 00:00:00 2001 From: Paul Montero Date: Fri, 11 Nov 2016 12:37:03 -0500 Subject: [PATCH 1/2] Make default rvm1_user as a non root user --- defaults/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 32c9960..4373dbc 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,19 +11,19 @@ rvm1_bundler_install: True # Delete a specific version of ruby (ie. ruby-2.1.0) rvm1_delete_ruby: -# Install path for rvm (defaults to system wide) -rvm1_install_path: '/usr/local/rvm' +# Install path for rvm (defaults to user based install) +rvm1_install_path: '~/.rvm' # Add or remove any install flags -# NOTE: If you are doing a USER BASED INSTALL then -# make sure you ADD the --user-install flag below -rvm1_install_flags: '--auto-dotfiles' +# NOTE: If you are doing a ROOT BASED INSTALL then +# make sure you REMOVE the --user-install flag below +rvm1_install_flags: '--auto-dotfiles --user-install' # Add additional ruby install flags rvm1_ruby_install_flags: # Set the owner for the rvm directory -rvm1_user: 'root' +rvm1_user: 'ubuntu' # URL for the latest installer script rvm1_rvm_latest_installer: 'https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer' From 4d408fc31404d549401f59ba2f8d4c1c4082e4f3 Mon Sep 17 00:00:00 2001 From: Paul Montero Date: Fri, 11 Nov 2016 12:38:44 -0500 Subject: [PATCH 2/2] Make the test with newer versions of ruby --- .travis.yml | 6 +++--- tests/test.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f69d54f..06883eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,16 +27,16 @@ script: || (echo 'Idempotence test: fail' && exit 1) - > ~/.rvm/wrappers/default/ruby -v - | grep -q '2.1.2' + | grep -q '2.3.1' && (echo 'Default ruby test: pass' && exit 0) || (echo 'Default ruby test: fail' && exit 1) - > ls ~/.rvm/rubies - | grep -q 'ruby-2.1.0' + | grep -q 'ruby-2.2.5' && (echo 'Multiple rubies test: pass' && exit 0) || (echo 'Multiple rubies test: fail' && exit 1) - > - ansible-playbook $SITE_AND_INVENTORY --connection=local --extra-vars='rvm1_delete_ruby=ruby-2.1.0' + ansible-playbook $SITE_AND_INVENTORY --connection=local --extra-vars='rvm1_delete_ruby=ruby-2.2.5' | grep -q 'ok=1.*failed=0' && (echo 'Delete ruby test: pass' && exit 0) || (echo 'Delete ruby test: fail' && exit 1) diff --git a/tests/test.yml b/tests/test.yml index 8924185..a74e05b 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -5,10 +5,10 @@ vars: rvm1_rubies: - - 'ruby-2.1.0' - - 'ruby-2.1.2' + - 'ruby-2.2.5' + - 'ruby-2.3.1' rvm1_install_path: '/home/travis/.rvm' - rvm1_install_flags: '--auto-dotfiles --user-install' + rvm1_user: travis roles: - rvm1-ansible