Skip to content

Commit

Permalink
Remove dependency from zzet.common role
Browse files Browse the repository at this point in the history
  • Loading branch information
zzet committed Apr 1, 2014
1 parent 1a9284a commit 5e76c74
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Defaults is:

rbenv_root: "{% if rbenv.env == 'system' %}/usr/local/rbenv{% else %}~/.rbenv{% endif %}"

users: []
rbenv_users: []

Description:

Expand All @@ -76,7 +76,7 @@ Example:
Dependencies
------------

zzet.common
none

License
-------
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ rbenv_plugins:

rbenv_root: "{% if rbenv.env == 'system' %}/usr/local/rbenv{% else %}~/.rbenv{% endif %}"

users: []
rbenv_users: []
3 changes: 1 addition & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ galaxy_info:
- development
- system

dependencies:
- zzet.common
dependencies: []
20 changes: 10 additions & 10 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

- name: checkout rbenv_repo for selected users
git: repo={{ rbenv_repo }} dest={{ rbenv_root }} version={{ rbenv.version }}
with_items: users
with_items: rbenv_users
sudo: true
sudo_user: "{{ item.name }}"
when: not "system" == "{{ rbenv.env }}"
Expand All @@ -45,7 +45,7 @@

- name: create plugins directory for selected users
file: state=directory path={{ rbenv_root }}/plugins
with_items: users
with_items: rbenv_users
sudo: true
sudo_user: "{{ item.name }}"
when: not "system" == "{{ rbenv.env }}"
Expand All @@ -56,7 +56,7 @@
- name: install plugins for selected users
git: repo={{ item[1].repo }} dest={{ rbenv_root }}/plugins/{{ item[1].name }} version={{ item[1].version }}
with_nested:
- users
- rbenv_users
- rbenv_plugins
sudo: true
sudo_user: "{{ item[0].name }}"
Expand All @@ -73,7 +73,7 @@

- name: set default-gems
copy: src=default-gems dest={{ item.home }}/.rbenv/default-gems
with_items: users
with_items: rbenv_users
sudo: true
sudo_user: "{{ item.name }}"
when: not "system" == "{{ rbenv.env }}"
Expand All @@ -83,7 +83,7 @@

- name: set gemrc
copy: src=gemrc dest={{ item.home }}/.gemrc
with_items: users
with_items: rbenv_users
sudo: true
sudo_user: "{{ item.name }}"
when: not "system" == "{{ rbenv.env }}"
Expand All @@ -93,7 +93,7 @@

- name: set vars
copy: src=vars dest={{ item.home }}/.rbenv/vars
with_items: users
with_items: rbenv_users
sudo: true
sudo_user: "{{ item.name }}"
when: not "system" == "{{ rbenv.env }}"
Expand Down Expand Up @@ -124,7 +124,7 @@
shell: bash -lc "rbenv versions | grep {{ rbenv.ruby_version }}"
sudo: true
sudo_user: "{{ item.name }}"
with_items: users
with_items: rbenv_users
when: not "system" == "{{ rbenv.env }}"
register: ruby_installed
ignore_errors: yes
Expand All @@ -136,7 +136,7 @@
sudo: true
with_together:
- ruby_installed.results
- users
- rbenv_users
when: (not "system" == "{{ rbenv.env }}") and (item[0].rc != 0)
ignore_errors: true
tags:
Expand All @@ -148,7 +148,7 @@
sudo_user: "{{ item[1].name }}"
with_together:
- ruby_installed.results
- users
- rbenv_users
when: (not "system" == "{{ rbenv.env }}") and (item[0].rc != 0)
ignore_errors: true
tags:
Expand All @@ -160,7 +160,7 @@
sudo_user: "{{ item[1].name }}"
with_together:
- ruby_installed.results
- users
- rbenv_users
when: (not "system" == "{{ rbenv.env }}") and (item[0].rc != 0)
ignore_errors: true
tags:
Expand Down

1 comment on commit 5e76c74

@zzet
Copy link
Owner Author

@zzet zzet commented on 5e76c74 Apr 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @westonplatter, your tweet was about this changes?

Please sign in to comment.