Reformat tasks to make them more consistent

README.md

@@ -79,8 +79,7 @@ rvm1_temp_download_path: '/usr/local/src'
 # Where should rvm be installed to?
 rvm1_install_path: '/usr/local/rvm'
 
-# Which url or local path contains the rvm-installer script?
+# Which url contains the rvm-installer script?
-# If you use a url, it must include http:// or https:// at the start.
 rvm1_rvm_latest_installer: 'https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer'
 
 # Which url or value contains the stable version number of rvm?
@@ -92,7 +91,7 @@ rvm1_rvm_latest_installer: 'https://raw.githubusercontent.com/wayneeseguin/rvm/m
 rvm1_rvm_stable_version_number: 'https://raw.githubusercontent.com/wayneeseguin/rvm/master/VERSION'
 
 # Force upgrade the rvm-installer to the latest version.
-rvm1_rvm_force_upgrade_installer: false
+rvm1_rvm_force_upgrade_installer: False
 
 # The amount in seconds to cache apt-update.
 apt_cache_valid_time: 86400

defaults/main.yml

@@ -2,7 +2,7 @@
 rvm1_rubies:
   - 'ruby-2.1.2'
 
-rvm1_delete_ruby:
+rvm1_delete_ruby: []
 
 rvm1_user: '{{ ansible_ssh_user }}'
 rvm1_group: 'rvm'
@@ -12,6 +12,6 @@ rvm1_install_path: '/usr/local/rvm'
 
 rvm1_rvm_latest_installer: 'https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer'
 rvm1_rvm_stable_version_number: 'https://raw.githubusercontent.com/wayneeseguin/rvm/master/VERSION'
-rvm1_rvm_force_upgrade_installer: false
+rvm1_rvm_force_upgrade_installer: False
 
 apt_cache_valid_time: 86400

tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: ensure httplib2 is installed
+
-  apt: pkg=python-httplib2 state=latest update_cache=true cache_valid_time={{ apt_cache_valid_time }}
+- name: Install httplib2 to use the uri module
+  apt:
+    pkg: 'python-httplib2'
+    state: 'latest'
+    update_cache: True
+    cache_valid_time: '{{ apt_cache_valid_time }}'
   sudo: True
   sudo_user: root
 

tasks/rubies.yml

@@ -1,37 +1,44 @@
 ---
-- name: detect if rubies are installed
+
+- name: Detect if rubies are installed
   command: '{{ rvm1 }} {{ item }} do true'
-  changed_when: false
+  changed_when: False
-  failed_when: false
+  failed_when: False
   register: detect_rubies
   with_items: rvm1_rubies
   when: rvm1_rubies
 
-- name: ensure rubies are installed
+- name: Install rubies
   command: '{{ rvm1 }} install {{ item.item }}'
   when: rvm1_rubies and item.rc != 0
   with_items: detect_rubies.results
 
-- name: detect default ruby version
+- name: Detect default ruby version
   command: '{{ rvm1 }} alias list default'
-  changed_when: false
+  changed_when: False
   register: detect_default_ruby_version
 
-- name: ensure default ruby is selected
+- name: Select default ruby
   command: '{{ rvm1 }} alias create default {{ rvm1_default_ruby_version }}'
-  when: detect_default_ruby_version.stdout == '' or rvm1_default_ruby_version not in detect_default_ruby_version.stdout
+  when: detect_default_ruby_version.stdout == '' or
+        rvm1_default_ruby_version not in detect_default_ruby_version.stdout
 
-- name: ensure rvm install path is writable by the set owner:group
+- name: Set rvm install path permissions
-  file: path='{{ rvm1_install_path }}' state=directory recurse=yes owner='{{ rvm1_user }}' group='{{ rvm1_group }}'
+  file:
+    path: '{{ rvm1_install_path }}'
+    state: 'directory'
+    recurse: True
+    owner: '{{ rvm1_user }}'
+    group: '{{ rvm1_group }}'
 
-- name: detect if ruby version can be deleted
+- name: Detect if ruby version can be deleted
   command: '{{ rvm1 }} {{ rvm1_delete_ruby }} do true'
-  changed_when: false
+  changed_when: False
-  failed_when: false
+  failed_when: False
   register: detect_delete_ruby
   when: rvm1_delete_ruby
 
-- name: ensure ruby version is deleted
+- name: Delete ruby version
   command: '{{ rvm1 }} remove {{ rvm1_delete_ruby }}'
-  changed_when: false
+  changed_when: False
   when: rvm1_delete_ruby and detect_delete_ruby.rc == 0

tasks/rvm.yml

@@ -1,47 +1,50 @@
 ---
-- name: detect rvm binary
+
+- name: Detect rvm binary
   stat: path='{{ rvm1 }}'
   register: rvm_binary
 
-- name: detect rvm installer
+- name: Detect rvm installer
   stat: path='{{ rvm1_temp_download_path }}/rvm-installer.sh'
   register: rvm_installer
 
-- name: detect current rvm version
+- name: Detect current rvm version
   command: '{{ rvm1 }} version'
-  changed_when: false
+  changed_when: False
   register: rvm_current_version
   when: rvm_binary.stat.exists
 
-- name: detect stable rvm version from url
+- name: Detect stable rvm version
-  uri: url='{{ rvm1_rvm_stable_version_number }}' return_content=yes
+  uri:
+    url: '{{ rvm1_rvm_stable_version_number }}'
+    return_content: True
   register: rvm_stable_version_number
   when: '"://" in rvm1_rvm_stable_version_number'
 
-- name: ensure rvm installer is copied from url
+- name: Install rvm installer
   get_url:
     url: '{{ rvm1_rvm_latest_installer }}'
     dest: '{{ rvm1_temp_download_path }}/rvm-installer.sh'
-  when: '"://" in rvm1_rvm_latest_installer and not rvm_installer.stat.exists or rvm1_rvm_force_upgrade_installer'
+  when: not rvm_installer.stat.exists or rvm1_rvm_force_upgrade_installer
 
-- name: ensure rvm installer is copied from local file
+- name: Configure rvm installer
-  copy: src='{{ rvm1_rvm_latest_installer }}' dest='{{ rvm1_temp_download_path }}/rvm-installer.sh'
-  when: not '://' in rvm1_rvm_latest_installer and not rvm_installer.stat.exists or rvm1_rvm_force_upgrade_installer
-
-- name: ensure rvm installer is configured
   file:
-    path: "{{ rvm1_temp_download_path }}/rvm-installer.sh"
+    path: '{{ rvm1_temp_download_path }}/rvm-installer.sh'
     mode: 0755
   when: not rvm_binary.stat.exists or rvm1_rvm_force_upgrade_installer
 
-- name: ensure rvm stable is installed
+- name: Install rvm stable
-  command: '{{ rvm1_temp_download_path }}/rvm-installer.sh --path {{ rvm1_install_path }} --auto-dotfiles stable'
+  command: >
+    {{ rvm1_temp_download_path }}/rvm-installer.sh
+    --path {{ rvm1_install_path }}
+    --auto-dotfiles stable
   when: not rvm_binary.stat.exists
 
-- name: ensure rvm is upgraded
+- name: Update rvm
   shell: '{{ rvm1 }} get stable && {{ rvm1 }} reload'
-  when: rvm_binary.stat.exists and rvm_stable_version_number.content | default(rvm1_rvm_stable_version_number) | replace('\n', '') > rvm_current_version.stdout.split()[1]
+  when: rvm_binary.stat.exists and
+        rvm_stable_version_number.content | default(rvm1_rvm_stable_version_number) | replace('\n', '') > rvm_current_version.stdout.split()[1]
 
-- name: ensure rvm installs ruby dependencies
+- name: Configure rvm
   command: '{{ rvm1 }} autolibs 3'
   when: not rvm_binary.stat.exists