Merge Upstream. Set default version to latest LTS (6.10.0)

Conflicts:
	node/binary.sls

Author: luislobo

README.md

@@ -2,6 +2,16 @@
 
 This formula installs [node.js](https://nodejs.org/en/).
 
+## Installing from PPA
+
+An example pillar for installing from Debian based PPA repository:
+
+    node:
+      version: 6.9.4
+      install_from_ppa: True
+      ppa:
+        repository_url: https://deb.nodesource.com/node_6.x
+
 ## Installing from source
 
 An example pillar file looks as follows:

node/binary.sls

@@ -1,6 +1,6 @@
 {% set node = pillar.get('node', {}) -%}
-{% set version = node.get('version', '5.4.0') -%}
-{% set checksum = node.get('checksum', 'sha256=f037e2734f52b9de63e6d4a4e80756477b843e6f106e0be05591a16b71ec2bd0') -%}
+{% set version = node.get('version', '6.10.0') -%}
+{% set checksum = node.get('checksum', 'f037e2734f52b9de63e6d4a4e80756477b843e6f106e0be05591a16b71ec2bd0') -%}
 {% if grains.get('osarch', {}) == 'armhf' -%}
 {% set arch = 'armv7l' -%}
 {% else -%}
@@ -16,17 +16,40 @@
 {% set tar_options = 'z' -%}
 {% endif -%}
 
+Get binary package:
+  file.managed:
+    - name: /usr/local/src/{{ pkgname }}.tar.{{ format }}
+    - source: https://nodejs.org/dist/v{{ version }}/{{ pkgname }}.tar.{{ format }}
+    - source_hash: sha256={{ checksum }}
+
 Extract binary package:
   archive.extracted:
     - name: /usr/local/src/
-    - source: https://nodejs.org/dist/v{{ version }}/{{ pkgname }}.tar.{{ format }}
     - source_hash: {{ checksum }}
+    - source: /usr/local/src/{{ pkgname }}.tar.gz
     - archive_format: tar
     - tar_options: {{ tar_options }}
     - if_missing: /usr/local/src/{{ pkgname }}
+    - require:
+      - file: Get binary package
+
+Remove existing include directory:
+  file.absent:
+    - name: /usr/local/include/node
+    - unless: cmp /usr/local/bin/node /usr/local/src/{{ pkgname }}/bin/node
+    - require:
+      - archive: Extract binary package
+
+Remove existing npm:
+  file.absent:
+    - name: /usr/local/lib/node_modules/npm
+    - onchanges:
+      - file: Remove existing include directory
 
 Copy lib:
   cmd.run:
     - cwd: /usr/local/src/{{ pkgname }}/
     - name: cp -r bin/ include/ lib/ share/ /usr/local/
-    - unless: cmp /usr/local/bin/node /usr/local/src/{{ pkgname }}/bin/node
+    - unless:
+      - cmp /usr/local/bin/node /usr/local/src/{{ pkgname }}/bin/node
+      - npm --version

node/map.jinja

@@ -1,18 +1,18 @@
 {% set pillar_get = salt['pillar.get'] -%}
 
 {% if pillar_get('node:install_from_source') %}
-{% set default_npm_prefix = '/usr/local' %}
+  {% set default_npm_prefix = '/usr/local' %}
 {% else %}
-{% set default_npm_prefix = '/usr' %}
+  {% set default_npm_prefix = '/usr' %}
 {% endif %}
 {% set npm_prefix = pillar_get('npm:prefix', default_npm_prefix) %}
 {% set npm_bin = '{0}/bin/npm'.format(npm_prefix) %}
 {% set npm_src_requirement = 'file: {0}'.format(npm_bin) %}
 
 {% if npm_prefix == '/usr' %}
-{% set npmrc_prefix = '' %}
+  {% set npmrc_prefix = '' %}
 {% else %}
-{% set npmrc_prefix = npm_prefix %}
+  {% set npmrc_prefix = npm_prefix %}
 {% endif %}
 {% set npmrc = '{0}/etc/npmrc'.format(npmrc_prefix) %}
 
@@ -35,8 +35,17 @@
     },
 }, grain='os', merge=pillar_get('node:lookup')) %}
 
-{% if pillar_get('node:install_from_source') or (grains['os'] == 'Debian' and grains['osrelease']|float < 8 and not pillar_get('node:install_from_ppa')) %}
-{% set npm_requirement = npm_src_requirement %}
+{% if pillar_get('node:install_from_source') or (grains['os_family'] == 'Debian' and grains['osrelease']|float < 8 and not pillar_get('node:install_from_ppa')) %}
+  {% set npm_requirement = npm_src_requirement %}
 {% else %}
-{% set npm_requirement = 'pkg: {0}'.format(node['npm_pkg']) %}
+  {% set npm_requirement = 'pkg: {0}'.format(node['npm_pkg']) %}
 {% endif %}
+
+  {% set from_src_requirements = salt['grains.filter_by']({
+  'Debian': {
+    'pkgs': ['git', 'curl', 'gcc', 'pkg-config', 'build-essential', 'checkinstall', 'libssl-dev', 'g++']
+  },
+  'RedHat': {
+    'pkgs': ['git', 'curl', 'gcc','openssl-devel','pkgconfig', 'gcc-c++', 'make', 'automake']
+  },
+}, grain='os_family', merge=pillar_get('from_src_requirements:lookup'), default='Debian') %}

node/pkg.sls

@@ -1,14 +1,14 @@
 {%- from "node/map.jinja" import node, npm_bin with context %}
 
-{%- if grains['os'] in ['Ubuntu', 'Debian'] and salt['pillar.get']('node:install_from_ppa') %}
+{%- if grains['os_family'] in ['Ubuntu', 'Debian'] and salt['pillar.get']('node:install_from_ppa') %}
 nodejs.ppa:
   pkg.installed:
     - name: apt-transport-https
     - require_in:
       - pkgrepo: nodejs.ppa
   pkgrepo.managed:
     - humanname: NodeSource Node.js Repository
-    - name: deb {{ salt['pillar.get']('node:ppa:repository_url', 'https://deb.nodesource.com/node_0.12') }} {{ grains['oscodename'] }} main
+    - name: deb {{ salt['pillar.get']('node:ppa:repository_url', 'https://deb.nodesource.com/node_6.x') }} {{ grains['oscodename'] }} main
     - dist: {{ grains['oscodename'] }}
     - file: /etc/apt/sources.list.d/nodesource.list
     - keyid: "68576280"

node/source.sls

@@ -1,3 +1,5 @@
+{% from "node/map.jinja" import from_src_requirements with context %}
+
 {% set node = pillar.get('node', {}) -%}
 {% set version = node.get('version', '5.1.0') -%}
 {% set checksum = node.get('checksum', '25b2d3b7dd57fe47a483539fea240a3c6bbbdab4d89a45a812134cf1380ecb94') -%}
@@ -12,15 +14,19 @@
 
 Ensure required packages are present:
   pkg.installed:
-    - names:
-      - libssl-dev
-      - git
-      - pkg-config
-      - build-essential
-      - curl
+    - names: {{ from_src_requirements.pkgs|json }}
+
+{% if grains['os_family'] in ['RedHat', 'CentOS'] %}
+Alternative checkinstall requirement:
+  pkg.installed:
+    - pkgs:
+      - ruby-devel
       - gcc
-      - g++
-      - checkinstall
+
+fpm:
+  gem.installed:
+    - user: root
+{% endif %}
 
 Download node sources:
   file.managed:
@@ -48,11 +54,42 @@ make-node:
     - cwd: /usr/src/node-v{{ version }}
     - name: make --jobs={{ make_jobs }}
 
+{% if grains['os_family'] in ['RedHat', 'CentOS'] %}
+make-install-node:
+  cmd.run:
+    - cwd: /usr/src/node-v{{ version }}
+    - name: make install DESTDIR=/usr/src/node-v{{ version }}/tmp
+    - onchanges:
+      - cmd: make-node
+
+fpm-node:
+  cmd.run:
+    - cwd: /usr/src/node-v{{ version }}
+    - name: fpm -s dir -t rpm -C /usr/src/node-v{{ version }}/tmp --name=node --version "{{ version }}" --iteration 1 --description "Node package v{{ version }} (fpm)" --force
+    - onchanges:
+      - cmd: make-install-node
+
+install-node:
+  pkg.installed:
+    - sources:
+      - node: /usr/src/node-v{{ version }}/node-{{ version }}-1.x86_64.rpm
+    - onchanges:
+      - cmd: fpm-node
+{% else %}
+
 install-node:
   cmd.run:
     - cwd: /usr/src/node-v{{ version }}
     - name: checkinstall --install=yes --pkgname=node --pkgversion "{{ version }}" --default
     - onchanges:
       - cmd: make-node
 
-{% endif %}
+{% endif %}
+
+{% else %}
+
+Version Control:
+  test.succeed_without_changes:
+    - name: Node version {{ nodeVersion }} already installed
+
+{% endif %}

pillar.example

@@ -13,7 +13,7 @@ node:
 
 # Install from PPA:
 node:
-  version: 5.4.0
+  version: 6.9.4
   install_from_ppa: True
   ppa:
-    repository_url: https://deb.nodesource.com/node_5.x
+    repository_url: https://deb.nodesource.com/node_6.x