bumped version

README.md

@@ -1,5 +1,5 @@
 nvm
-========
+===
 
 Install nvm and Node.js.
 
@@ -14,22 +14,26 @@ Role Variables
 * `nvm.user` Remote user. Defaults to ansible `remote_user`.
 * `nvm.version` nvm version tag, or `HEAD`. Defaults to `v0.4.0`
 * `nvm.node_version` Node.js version. Defaults to `'0.10.'`
+* `nvm.packages` list of package node. Defaults to `'[]'`
 
 Dependencies
 ------------
 
 No depedencies.
 
 Example Playbook
--------------------------
+----------------
 
     - hosts: servers
       roles:
         - role: nvm
           nvm:
             user: deploy
-            version: v0.4.0
+            version: v0.17.3
             node_version: '0.10'
+            packages:
+              - bower
+              - karma
 
 License
 -------

defaults/main.yml

@@ -1,5 +1,7 @@
 ---
 nvm:
-  user: '{{ ansible_user_id }}'
-  version: v0.4.0
+  user: 'vagrant'
+  version: v0.20.0
   node_version: '0.10'
+  profile_file: '~/.profile'
+  packages: []

tasks/main.yml

@@ -1,41 +1,66 @@
 ---
 - name: Install dependencies
-  apt: pkg={{ item }} update_cache=yes cache_valid_time=3600
+  apt: pkg={{ item }} state=present
   with_items:
     - git
     - curl
     - build-essential
     - libssl-dev
   tags: nvm
 
+- name: Check for nvm
+  sudo: yes
+  sudo_user: "{{ nvm.user }}"
+  stat: path=~/.nvm
+  register: nvm_path
+
 - name: Install nvm
   sudo: yes
   sudo_user: "{{ nvm.user }}"
-  git: repo=https://github.com/creationix/nvm.git dest=~/.nvm version={{ nvm.version }}
+  git: repo=https://github.com/creationix/nvm.git dest=~/.nvm version={{ nvm.version }} accept_hostkey=True
   tags: nvm
+  when: not nvm_path.stat.exists
 
-- name: Source nvm in ~/.profile
+- name: Source nvm
   sudo: yes
   sudo_user: "{{ nvm.user }}"
   lineinfile: >
-    dest=~/.profile
+    dest={{ nvm.profile_file }}
     line="source ~/.nvm/nvm.sh"
   tags: nvm
 
-- name: Install {{ nvm.node_version }}
-  command: sudo -iu {{ nvm.user }} nvm install {{ nvm.node_version }}
-  register: nvm_install_result
-  changed_when: "'is already installed.' not in nvm_install_result.stdout"
-  tags: nvm
+- name: Check for current node version
+  sudo: yes
+  sudo_user: "{{ nvm.user }}"
+  command: node -v
+  register: nvm_node_version
+  ignore_errors: yes
+  changed_when: false
 
-- name: Check if {{ nvm.node_version }} is the default node version
-  shell: sudo -iu {{ nvm.user }} nvm ls | grep -e 'default -> {{ nvm.node_version }}'
-  register: nvm_check_default
-  changed_when: False
-  ignore_errors: True
+- name: Install node
+  sudo: yes
+  sudo_user: "{{ nvm.user }}"
+  command: nvm install {{ nvm.node_version }}
   tags: nvm
+  when: nvm_node_version.stdout.find(nvm.node_version) == -1
 
-- name: Set default node version to {{ nvm.node_version }}
-  command: sudo -iu {{ nvm.user }} nvm alias default {{ nvm.node_version }}
-  when: nvm_check_default|failed
+- name: Set default node version to installed node
+  sudo: yes
+  sudo_user: "{{ nvm.user }}"
+  command: nvm alias default {{ nvm.node_version }}
   tags: nvm
+  when: nvm_node_version.stdout.find(nvm.node_version) == -1
+
+- name: Search npm binary
+  sudo: yes
+  sudo_user: "{{ nvm.user }}"
+  command: which npm
+  register: npm_executable
+  ignore_errors: yes
+  changed_when: false
+
+- name: Install general package
+  sudo: yes
+  sudo_user: "{{ nvm.user }}"
+  npm: name={{ item }} global=yes executable={{ npm_executable.stdout }}
+  with_items: nvm.packages

test.yml

@@ -6,6 +6,6 @@
   roles:
     - role: ansible-nvm
       nvm:
-        version: v0.4.0
+        version: v0.17.3
         node_version: '0.10'
         user: vagrant