diff --git a/Gemfile b/Gemfile index 9161e3cc..f5b005b8 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,10 @@ else gem 'rake', :require => false end +if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0' + gem 'json', '~> 1.0' +end + if facterversion = ENV['FACTER_GEM_VERSION'] gem 'facter', facterversion, :require => false else diff --git a/Rakefile b/Rakefile index 1f6c81f0..28d00a1e 100644 --- a/Rakefile +++ b/Rakefile @@ -12,6 +12,7 @@ end PuppetLint.configuration.fail_on_warnings PuppetLint.configuration.send('relative') PuppetLint.configuration.send('disable_80chars') +PuppetLint.configuration.send('disable_140chars') PuppetLint.configuration.send('disable_class_inherits_from_params_class') PuppetLint.configuration.send('disable_class_parameter_defaults') PuppetLint.configuration.send('disable_documentation') @@ -36,4 +37,4 @@ task :test => [ :syntax, :lint, :spec, -] \ No newline at end of file +] diff --git a/manifests/pip.pp b/manifests/pip.pp index b50d7efb..70560a6d 100644 --- a/manifests/pip.pp +++ b/manifests/pip.pp @@ -85,7 +85,7 @@ $python_provider = getparam(Class['python'], 'provider') $python_version = getparam(Class['python'], 'version') - + # Get SCL exec prefix # NB: this will not work if you are running puppet from scl enabled shell $exec_prefix = $python_provider ? { @@ -93,7 +93,7 @@ 'rhscl' => "scl enable ${python_version} -- ", default => '', } - + # Parameter validation if ! $virtualenv { fail('python::pip: virtualenv parameter must not be empty')