Merge pull request #77 from bastelfreak/puppet4

Author: hunner

.fixtures.yml

@@ -2,6 +2,5 @@ fixtures:
   repositories:
     stdlib:
       repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
-      ref: '4.6.0'
   symlinks:
     ruby: "#{source_dir}"

.travis.yml

@@ -9,22 +9,6 @@ rvm:
 
 env:
   matrix:
-    - PUPPET_GEM_VERSION="~> 3.1.0"
-    - PUPPET_GEM_VERSION="~> 3.2.0"
-    - PUPPET_GEM_VERSION="~> 3.3.0"
-    - PUPPET_GEM_VERSION="~> 3.4.0"
-    - PUPPET_GEM_VERSION="~> 3.5.0"
-    - PUPPET_GEM_VERSION="~> 3.6.0"
-    - PUPPET_GEM_VERSION="~> 3.7.0"
-    - PUPPET_GEM_VERSION="~> 3.8.0"
-    - PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
-    - PUPPET_GEM_VERSION="~> 4.0.0"
-    - PUPPET_GEM_VERSION="~> 4.1.0"
-    - PUPPET_GEM_VERSION="~> 4.2.0"
-    - PUPPET_GEM_VERSION="~> 4.3.0"
-    - PUPPET_GEM_VERSION="~> 4.4.0"
-    - PUPPET_GEM_VERSION="~> 4.5.0"
-    - PUPPET_GEM_VERSION="~> 4.6.0"
     - PUPPET_GEM_VERSION="~> 4.7.0"
     - PUPPET_GEM_VERSION="~> 4.8.0"
     - PUPPET_GEM_VERSION="~> 4"

manifests/dev.pp

@@ -35,22 +35,17 @@
 # include ruby::dev
 #
 class ruby::dev (
-  $ensure             = 'installed',
-  $ruby_dev_packages  = undef,
-  $rake_ensure        = $ruby::params::rake_ensure,
-  $rake_package       = $ruby::params::rake_package,
-  $rake_provider      = $ruby::params::rake_provider,
-  $bundler_ensure     = $ruby::params::bundler_ensure,
-  $bundler_package    = $ruby::params::bundler_package,
-  $bundler_provider   = $ruby::params::bundler_provider,
+  Enum['installed', 'present', 'absent', 'latest'] $ensure  = 'installed',
+  $ruby_dev_packages                                        = undef,
+  $rake_ensure                                              = $ruby::params::rake_ensure,
+  $rake_package                                             = $ruby::params::rake_package,
+  $rake_provider                                            = $ruby::params::rake_provider,
+  $bundler_ensure                                           = $ruby::params::bundler_ensure,
+  $bundler_package                                          = $ruby::params::bundler_package,
+  Enum['gem', 'apt'] $bundler_provider                      = $ruby::params::bundler_provider,
 ) inherits ruby::params {
   require ::ruby
 
-  # as the package ensure covers _multiple_ packages
-  # specifying a version may cause issues.
-  validate_re($ensure,['^installed$', '^present$', '^absent$', '^latest$'])
-  validate_re($bundler_provider,['^gem$','^apt$'])
-
   case $::osfamily {
     default: {
       fail("Detected osfamily is <${::osfamily}> and supported values are 'Debian', 'RedHat' and 'Amazon'")

manifests/gemrc.pp

@@ -33,32 +33,19 @@
 #    }
 
 class ruby::gemrc (
-  $sources                    = undef,
-  $verbose                    = undef,
-  $update_sources             = undef,
-  $backtrace                  = undef,
-  $gempath                    = undef,
-  $gem_command                = undef,
-  $gemrc                      = $::ruby::params::gemrc,
-  $owner                      = 'root',
-  $group                      = 'root',
-  $mode                       = '0644',
-  $disable_default_gem_server = undef
+  $sources                                              = undef,
+  Optional[Variant[Boolean, Enum[':really']]] $verbose  = undef,
+  Optional[Boolean] $update_sources                     = undef,
+  Optional[Boolean] $backtrace                          = undef,
+  Optional[Array[String]] $gempath                      = undef,
+  Optional[Hash] $gem_command                           = undef,
+  Stdlib::Absolutepath $gemrc                           = $::ruby::params::gemrc,
+  String $owner                                         = 'root',
+  String $group                                         = 'root',
+  Pattern[/[0-7]{4}/] $mode                             = '0644',
+  Optional[Boolean] $disable_default_gem_server         = undef
 ) inherits ruby::params {
 
-  if $verbose != undef and $verbose != ':really' {
-    validate_bool($verbose)
-  }
-  if $update_sources {
-    validate_bool($update_sources)
-  }
-  if $backtrace {
-    validate_bool($backtrace)
-  }
-  if $disable_default_gem_server {
-    validate_bool($disable_default_gem_server)
-  }
-
   $ensure = pick ($sources
       , $verbose
       , $update_sources

metadata.json

@@ -69,9 +69,11 @@
     }
   ],
   "requirements": [
-    {"name":"puppet", "version_requirement": ">= 3.0.0 < 5.0.0" }
+    {"name":"puppet", "version_requirement": ">= 4.7.0 < 5.0.0" }
   ],
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"}
+    {
+      "name":"puppetlabs/stdlib","version_requirement":">= 4.13.1 < 6.0.0"
+    }
   ]
 }