From 6ba0163d3a0b240bc25756cc9b56f437c9bebff2 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenn.rolland@netcat.io>
Date: Fri, 27 Nov 2015 17:43:18 +0100
Subject: [PATCH] Rename users variable to vimrc_users.

---
 defaults/main.yml          |  7 +++++++
 tasks/pathogen-plugins.yml | 28 ++++++++++++++--------------
 tasks/pathogen.yml         |  6 +++---
 tasks/vimrc.yml            |  4 ++--
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 9e63507..988e71d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,3 +5,10 @@ vimrc_boundary_begin: "\\\" BEGIN {{vimrc_boundary}} -- DO NOT MODIFY"
 vimrc_boundary_end: "\\\" END {{vimrc_boundary}}"
 vimrc_boundary_begin_regexp: "^{{vimrc_boundary_begin}}"
 vimrc_boundary_end_regexp: "^{{vimrc_boundary_end}}"
+
+vimrc_users: []
+
+# FIXME: find a solution for system vimrc
+vimrc_sys: 
+  - "syntax on"
+
diff --git a/tasks/pathogen-plugins.yml b/tasks/pathogen-plugins.yml
index 01bad9a..06c30ac 100644
--- a/tasks/pathogen-plugins.yml
+++ b/tasks/pathogen-plugins.yml
@@ -7,7 +7,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Install Nerdtree plugin
   git: 
@@ -17,7 +17,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 
 - name: Install AutoComplPop plugin
@@ -28,7 +28,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Install vim-fugitive plugin
   git:
@@ -38,7 +38,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 #- name: Install CtrlP
 #  git:
@@ -57,7 +57,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Install syntastic plugin
   git:
@@ -67,7 +67,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 
 - name: Install tabular plugin
@@ -78,7 +78,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Install vim-bundler plugin
   git:
@@ -88,7 +88,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Install vim-javascript plugin
   git:
@@ -98,7 +98,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Install vim-puppet plugin
   git:
@@ -108,7 +108,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Install vim-rails plugin
   git:
@@ -118,7 +118,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Install vim-sensible plugin
   git:
@@ -128,7 +128,7 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Install YouCompleteMe dependencies
   apt: 
@@ -148,12 +148,12 @@
     accept_hostkey=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Build YouCompleteMe plugin
   shell: cd ~/.vim/bundle/YouCompleteMe ; ./install.sh
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
   when: youcompleteme_git.changed
 
diff --git a/tasks/pathogen.yml b/tasks/pathogen.yml
index 11dbe4e..ed4fb95 100644
--- a/tasks/pathogen.yml
+++ b/tasks/pathogen.yml
@@ -3,14 +3,14 @@
   command: mkdir -p ~/.vim/autoload ~/.vim/bundle
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - name: Install Pathogen
   command: >
     curl -LSso ~/.vim/autoload/pathogen.vim https://raw.github.com/tpope/vim-pathogen/master/autoload/pathogen.vim
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - lineinfile: >
     dest=~/.vimrc
@@ -19,4 +19,4 @@
     insertbefore="{{vimrc_boundary_end_regexp}}"
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
diff --git a/tasks/vimrc.yml b/tasks/vimrc.yml
index 0352469..585d9a1 100644
--- a/tasks/vimrc.yml
+++ b/tasks/vimrc.yml
@@ -6,7 +6,7 @@
     create=yes
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users
 
 - lineinfile: >
     dest=~/.vimrc
@@ -15,4 +15,4 @@
     line="{{vimrc_boundary_end}}"
   become: true
   become_user: "{{item}}"
-  with_items: users
+  with_items: vimrc_users