From 2c9acfb12d3980d47ab64be0aacd1f0bc7d08f6a Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 6 Apr 2018 09:19:36 +0200
Subject: [PATCH] nodejs: extract yarn tasks in a file

---
 nodejs/defaults/main.yml |  2 +-
 nodejs/tasks/main.yml    | 42 ++++++----------------------------------
 nodejs/tasks/yarn.yml    | 32 ++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 37 deletions(-)
 create mode 100644 nodejs/tasks/yarn.yml

diff --git a/nodejs/defaults/main.yml b/nodejs/defaults/main.yml
index 47bc12b4..bae84bfa 100644
--- a/nodejs/defaults/main.yml
+++ b/nodejs/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 nodejs_apt_version: 'node_8.x'
-node_yarn: False
+nodejs_install_yarn: False
diff --git a/nodejs/tasks/main.yml b/nodejs/tasks/main.yml
index 5a6ae40f..bad66d95 100644
--- a/nodejs/tasks/main.yml
+++ b/nodejs/tasks/main.yml
@@ -8,16 +8,16 @@
     - system
     - packages
 
-- name: Node GPG key is installed
+- name: NodeJS GPG key is installed
   apt_key:
-    #url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
+    # url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
     data: "{{ lookup('file', 'nodesource.gpg.key') }}"
   tags:
     - system
     - packages
     - nodejs
 
-- name: Node sources list ({{ nodejs_apt_version }}) is available
+- name: NodeJS sources list ({{ nodejs_apt_version }}) is available
   apt_repository:
     repo: "deb https://deb.nodesource.com/{{ nodejs_apt_version }} {{ ansible_distribution_release }} main"
     filename: nodesource
@@ -28,7 +28,7 @@
     - packages
     - nodejs
 
-- name: Node is installed
+- name: NodeJS is installed
   apt:
     name: nodejs
     state: present
@@ -36,35 +36,5 @@
     - packages
     - nodejs
 
-
-
-- name: yarn GPG key is installed
-  apt_key:
-    #url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
-    data: "{{ lookup('file', 'yarnpkg.gpg.key') }}"
-  tags:
-    - system
-    - packages
-    - yarn
-  when: node_yarn
-
-- name: yarn sources list is available
-  apt_repository:
-    repo: "deb https://dl.yarnpkg.com/debian/ stable main"
-    filename: yarn
-    update_cache: yes
-    state: present
-  tags:
-    - system
-    - packages
-    - yarn
-  when: node_yarn
-
-- name: yarn is installed
-  apt:
-    name: yarn
-    state: present
-  tags:
-    - packages
-    - yarn
-  when: node_yarn
+- include: yarn.yml
+  when: nodejs_install_yarn
diff --git a/nodejs/tasks/yarn.yml b/nodejs/tasks/yarn.yml
new file mode 100644
index 00000000..47af5c50
--- /dev/null
+++ b/nodejs/tasks/yarn.yml
@@ -0,0 +1,32 @@
+---
+
+- name: yarn GPG key is installed
+  apt_key:
+    # url: https://dl.yarnpkg.com/debian/pubkey.gpg
+    data: "{{ lookup('file', 'yarnpkg.gpg.key') }}"
+  tags:
+    - system
+    - packages
+    - nodejs
+    - yarn
+
+- name: yarn sources list is available
+  apt_repository:
+    repo: "deb https://dl.yarnpkg.com/debian/ stable main"
+    filename: yarn
+    update_cache: yes
+    state: present
+  tags:
+    - system
+    - packages
+    - nodejs
+    - yarn
+
+- name: yarn is installed
+  apt:
+    name: yarn
+    state: present
+  tags:
+    - packages
+    - nodejs
+    - yarn