Merge pull request #27 from matonb/master

Fix lint issues

.travis.yml

@@ -16,5 +16,6 @@ env:
   - PUPPET_GEM_VERSION="~> 4.8.0" STRICT_VARIABLES=yes
   - PUPPET_GEM_VERSION="~> 4.9.0" STRICT_VARIABLES=yes
   - PUPPET_GEM_VERSION="~> 4.10.0" STRICT_VARIABLES=yes
+  - PUPPET_GEM_VERSION="~> 5.0.0" STRICT_VARIABLES=yes
 matrix:
   exclude:

Gemfile

@@ -1,14 +1,18 @@
 source "https://rubygems.org"
 
+puppetversion = ENV['PUPPET_VERSION'].nil? ? '~> 4.5' : ENV['PUPPET_VERSION'].to_s
+puppetver = Gem::Version.new(%r/([\d.]+)/.match(puppetversion)[1])
+
 group :test do
   gem "rake"
-  gem "puppet", ENV['PUPPET_GEM_VERSION'] || '~> 4.5'
+  gem "puppet", puppetversion
   gem "rspec", '~> 3.4.0'
   gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
   gem "puppetlabs_spec_helper", '~> 2.1'
   gem "metadata-json-lint"
   gem "rspec-puppet-facts"
   gem 'rubocop', '0.40.0'
+  gem 'semantic_puppet' unless puppetver >= Gem::Version.new('5.0')
   gem 'simplecov', '>= 0.11.0'
   gem 'simplecov-console'
   gem 'puppet-lint', '>= 2.0.0'

Rakefile

@@ -3,7 +3,6 @@ require 'bundler/setup'
 
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet/version'
-require 'puppet/vendor/semantic/lib/semantic' unless Puppet.version.to_f < 3.6
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppet-syntax/tasks/puppet-syntax'
 require 'metadata-json-lint/rake_task'

manifests/join/password.pp

@@ -11,9 +11,9 @@
   $_ou        = $::realmd::ou
 
   if $_ou != undef {
-    $_realm_args = [$_domain, "--unattended", "--computer-ou=${_ou}", "--user=${_user}"]
+    $_realm_args = [$_domain, '--unattended', "--computer-ou=${_ou}", "--user=${_user}"]
   } else {
-    $_realm_args = [$_domain, "--unattended", "--user=${_user}"]
+    $_realm_args = [$_domain, '--unattended', "--user=${_user}"]
   }
 
   $_args = join($_realm_args, ' ')