From 1fdc72cd7d4cf195a8b03489f8eaf9c3619440ac Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <krislamo@uga.edu>
Date: Fri, 22 May 2020 11:41:50 -0400
Subject: [PATCH] Update with the new location of the ruby role

See rvm/rvm1-ansible#179
---
 .gitignore                                                  | 2 +-
 playbook.yml                                                | 4 ++--
 requirements.yml                                            | 2 +-
 roles/{rvm_io.ruby.patch => rvm.ruby.patch}/README.md       | 4 ++--
 roles/rvm.ruby.patch/defaults/main.yml                      | 2 ++
 roles/{rvm_io.ruby.patch => rvm.ruby.patch}/files/rvm.sh    | 0
 roles/rvm.ruby.patch/handlers/main.yml                      | 2 ++
 roles/{rvm_io.ruby.patch => rvm.ruby.patch}/meta/main.yml   | 0
 roles/{rvm_io.ruby.patch => rvm.ruby.patch}/tasks/main.yml  | 2 +-
 roles/{rvm_io.ruby.patch => rvm.ruby.patch}/tests/inventory | 0
 roles/{rvm_io.ruby.patch => rvm.ruby.patch}/tests/test.yml  | 2 +-
 roles/rvm.ruby.patch/vars/main.yml                          | 2 ++
 roles/rvm_io.ruby.patch/defaults/main.yml                   | 2 --
 roles/rvm_io.ruby.patch/handlers/main.yml                   | 2 --
 roles/rvm_io.ruby.patch/vars/main.yml                       | 2 --
 15 files changed, 14 insertions(+), 14 deletions(-)
 rename roles/{rvm_io.ruby.patch => rvm.ruby.patch}/README.md (87%)
 create mode 100644 roles/rvm.ruby.patch/defaults/main.yml
 rename roles/{rvm_io.ruby.patch => rvm.ruby.patch}/files/rvm.sh (100%)
 create mode 100644 roles/rvm.ruby.patch/handlers/main.yml
 rename roles/{rvm_io.ruby.patch => rvm.ruby.patch}/meta/main.yml (100%)
 rename roles/{rvm_io.ruby.patch => rvm.ruby.patch}/tasks/main.yml (75%)
 rename roles/{rvm_io.ruby.patch => rvm.ruby.patch}/tests/inventory (100%)
 rename roles/{rvm_io.ruby.patch => rvm.ruby.patch}/tests/test.yml (69%)
 create mode 100644 roles/rvm.ruby.patch/vars/main.yml
 delete mode 100644 roles/rvm_io.ruby.patch/defaults/main.yml
 delete mode 100644 roles/rvm_io.ruby.patch/handlers/main.yml
 delete mode 100644 roles/rvm_io.ruby.patch/vars/main.yml

diff --git a/.gitignore b/.gitignore
index 294d9ad..a988404 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 production_inventory
 production_config.yml
 .DS_Store
-roles/rvm_io.ruby
+roles/rvm.ruby
 .vagrant
 scratch/*
 playbook.retry
diff --git a/playbook.yml b/playbook.yml
index bf89acf..df03510 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -6,8 +6,8 @@
     - config.yml
 
   roles:
-    - { role: rvm_io.ruby, tags: ruby, become: yes }
-    - { role: rvm_io.ruby.patch, tags: ruby, become: yes }
+    - { role: rvm.ruby, tags: ruby, become: yes }
+    - { role: rvm.ruby.patch, tags: ruby, become: yes }
     - { role: easyredmine, become: no }
 
   tasks:
diff --git a/requirements.yml b/requirements.yml
index 5f5d151..8cda8fe 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,2 +1,2 @@
 
-- src: rvm_io.ruby
+- src: rvm.ruby
diff --git a/roles/rvm_io.ruby.patch/README.md b/roles/rvm.ruby.patch/README.md
similarity index 87%
rename from roles/rvm_io.ruby.patch/README.md
rename to roles/rvm.ruby.patch/README.md
index 5413b37..16005fe 100644
--- a/roles/rvm_io.ruby.patch/README.md
+++ b/roles/rvm.ruby.patch/README.md
@@ -1,4 +1,4 @@
-rvm_io.ruby.patch
+rvm.ruby.patch
 =========
 
 Patches to [rvm1-ansible](https://github.com/rvm/rvm1-ansible) role.
@@ -13,7 +13,7 @@ Including an example of how to use your role (for instance, with variables passe
 ```
     - hosts: servers
       roles:
-         - { role: rvm_io.ruby.patch }
+         - { role: rvm.ruby.patch }
 ```
 
 License
diff --git a/roles/rvm.ruby.patch/defaults/main.yml b/roles/rvm.ruby.patch/defaults/main.yml
new file mode 100644
index 0000000..1a70d4e
--- /dev/null
+++ b/roles/rvm.ruby.patch/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for rvm.ruby.patch
diff --git a/roles/rvm_io.ruby.patch/files/rvm.sh b/roles/rvm.ruby.patch/files/rvm.sh
similarity index 100%
rename from roles/rvm_io.ruby.patch/files/rvm.sh
rename to roles/rvm.ruby.patch/files/rvm.sh
diff --git a/roles/rvm.ruby.patch/handlers/main.yml b/roles/rvm.ruby.patch/handlers/main.yml
new file mode 100644
index 0000000..b91386f
--- /dev/null
+++ b/roles/rvm.ruby.patch/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for rvm.ruby.patch
diff --git a/roles/rvm_io.ruby.patch/meta/main.yml b/roles/rvm.ruby.patch/meta/main.yml
similarity index 100%
rename from roles/rvm_io.ruby.patch/meta/main.yml
rename to roles/rvm.ruby.patch/meta/main.yml
diff --git a/roles/rvm_io.ruby.patch/tasks/main.yml b/roles/rvm.ruby.patch/tasks/main.yml
similarity index 75%
rename from roles/rvm_io.ruby.patch/tasks/main.yml
rename to roles/rvm.ruby.patch/tasks/main.yml
index ae1e1d6..2e5cb54 100644
--- a/roles/rvm_io.ruby.patch/tasks/main.yml
+++ b/roles/rvm.ruby.patch/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# tasks file for rvm_io.ruby.patch
+# tasks file for rvm.ruby.patch
 
 - copy:
     src: rvm.sh
diff --git a/roles/rvm_io.ruby.patch/tests/inventory b/roles/rvm.ruby.patch/tests/inventory
similarity index 100%
rename from roles/rvm_io.ruby.patch/tests/inventory
rename to roles/rvm.ruby.patch/tests/inventory
diff --git a/roles/rvm_io.ruby.patch/tests/test.yml b/roles/rvm.ruby.patch/tests/test.yml
similarity index 69%
rename from roles/rvm_io.ruby.patch/tests/test.yml
rename to roles/rvm.ruby.patch/tests/test.yml
index 5164132..e640cea 100644
--- a/roles/rvm_io.ruby.patch/tests/test.yml
+++ b/roles/rvm.ruby.patch/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - rvm_io.ruby.patch
\ No newline at end of file
+    - rvm.ruby.patch
diff --git a/roles/rvm.ruby.patch/vars/main.yml b/roles/rvm.ruby.patch/vars/main.yml
new file mode 100644
index 0000000..eaa115c
--- /dev/null
+++ b/roles/rvm.ruby.patch/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for rvm.ruby.patch
diff --git a/roles/rvm_io.ruby.patch/defaults/main.yml b/roles/rvm_io.ruby.patch/defaults/main.yml
deleted file mode 100644
index 5ae59a0..0000000
--- a/roles/rvm_io.ruby.patch/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for rvm_io.ruby.patch
\ No newline at end of file
diff --git a/roles/rvm_io.ruby.patch/handlers/main.yml b/roles/rvm_io.ruby.patch/handlers/main.yml
deleted file mode 100644
index e21626d..0000000
--- a/roles/rvm_io.ruby.patch/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for rvm_io.ruby.patch
\ No newline at end of file
diff --git a/roles/rvm_io.ruby.patch/vars/main.yml b/roles/rvm_io.ruby.patch/vars/main.yml
deleted file mode 100644
index e9ac7a7..0000000
--- a/roles/rvm_io.ruby.patch/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for rvm_io.ruby.patch
\ No newline at end of file