Merge pull request #179 from willdurand/puppet-5

Puppet 5 support

Author: Ma27

.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
 
-rvm:
-  - 2.1.0
+rvm: $RUBY_VERSION
 
 env:
-  - PUPPET_VERSION="~> 3.6.0"
-  - PUPPET_VERSION="~> 3.7.0"
-  - PUPPET_VERSION="~> 4.3.0"
-  - PUPPET_VERSION="~> 4.3.0" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 3.6.0" RUBY_VERSION="2.1.0"
+  - PUPPET_VERSION="~> 3.7.0" RUBY_VERSION="2.1.0"
+  - PUPPET_VERSION="~> 4.3.0" RUBY_VERSION="2.4.0"
+  - PUPPET_VERSION="~> 4.3.0" STRICT_VARIABLES=yes RUBY_VERSION="2.4.0"
+  - PUPPET_VERSION="~> 5.5.0" RUBY_VERSION="2.4.0"
 
 before_install:
   - gem update bundler

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-puppetVersion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : '~> 3.4.0'
+puppetVersion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : '~> 5.5.0'
 
 gem 'rake'
 gem 'puppet', puppetVersion

Gemfile-Nix.lock

@@ -1,68 +1,71 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    domain_name (0.5.20170223)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    facter (1.7.6)
-    hashdiff (0.3.2)
-    hiera (1.3.4)
-      json_pure
+    facter (2.5.1)
+    fast_gettext (1.1.2)
+    hashdiff (0.3.7)
+    hiera (3.4.2)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    iconv (1.0.4)
-    json_pure (2.0.3)
+    iconv (1.0.5)
+    locale (2.1.2)
     metaclass (0.0.4)
-    mime-types (2.99.3)
-    mocha (1.2.1)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mocha (1.5.0)
       metaclass (~> 0.0.1)
+    multi_json (1.13.1)
     netrc (0.11.0)
-    public_suffix (2.0.5)
-    puppet (3.4.3)
-      facter (~> 1.6)
-      hiera (~> 1.0)
-      rgen (~> 0.6.5)
-    puppet-blacksmith (3.4.0)
-      puppet (>= 2.7.16)
-      rest-client (~> 1.8.0)
-    puppet-lint (2.1.1)
-    puppet-syntax (2.3.0)
+    public_suffix (3.0.2)
+    puppet (5.5.0)
+      facter (> 2.0.1, < 4)
+      fast_gettext (~> 1.1.2)
+      hiera (>= 3.2.1, < 4)
+      locale (~> 2.1)
+      multi_json (~> 1.10)
+    puppet-blacksmith (4.1.2)
+      rest-client (~> 2.0)
+    puppet-lint (2.3.5)
+    puppet-syntax (2.4.1)
       rake
-    puppetlabs_spec_helper (2.1.0)
+    puppetlabs_spec_helper (2.7.0)
       mocha (~> 1.0)
       puppet-lint (~> 2.0)
       puppet-syntax (~> 2.0)
       rspec-puppet (~> 2.0)
-    rake (12.0.0)
-    rest-client (1.8.0)
+    rake (12.3.1)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rgen (0.6.6)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-puppet (2.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-puppet (2.6.11)
       rspec
-    rspec-support (3.5.0)
+    rspec-support (3.7.1)
     safe_yaml (1.0.4)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
-    webmock (2.3.2)
+    unf_ext (0.0.7.5)
+    webmock (3.3.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -72,7 +75,7 @@ PLATFORMS
 
 DEPENDENCIES
   iconv
-  puppet (~> 3.4.0)
+  puppet (~> 5.5.0)
   puppet-blacksmith
   puppet-lint
   puppet-syntax
@@ -82,4 +85,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.14.4
+   1.16.1

default.nix

@@ -1,10 +1,41 @@
 with import <nixpkgs> {};
 
+let
+
+  puppetEnv = stdenv.mkDerivation rec {
+    name = "willdurand-puppet-nodejs-env";
+
+    env = bundlerEnv {
+      name = "willdurand-puppet-nodejs-env-gems";
+
+      gemfile  = ./Gemfile;
+      lockfile = ./Gemfile-Nix.lock;
+      gemset   = ./gemset.nix;
+
+      inherit ruby;
+    };
+
+    buildInputs = [ makeWrapper ];
+
+    phases = [ "installPhase" ];
+    installPhase = ''
+      export PUPPET_VERSION="~> 4.9.0"
+
+      mkdir -p $out/bin
+      makeWrapper ${env}/bin/puppet $out/bin/puppet
+      makeWrapper ${env}/bin/rake $out/bin/rake
+      makeWrapper ${env}/bin/puppet-lint $out/bin/puppet-lint
+    '';
+  };
+
+in
+
 stdenv.mkDerivation rec {
   name = "willdurand-puppet-nodejs";
 
   buildInputs =
-  [
-    (import ./env.nix)
-  ];
+    [
+      ruby
+      puppetEnv
+    ];
 }