From 697a512898a0f153640656f9127cfb18fc420d36 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Mon, 4 Jul 2016 16:10:23 -0400 Subject: [PATCH 1/2] Allow puppet-lint v1 so community plugins work --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 42c0e5f..7c7a1cf 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'metadata-json-lint' gem 'puppetlabs_spec_helper', '>= 1.1.1' gem 'facter', '>= 1.7.0' gem 'rspec-puppet' -gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git' +gem 'puppet-lint', '>= 1.0', '< 3.0' gem 'puppet-lint-absolute_classname-check' gem 'puppet-lint-alias-check' gem 'puppet-lint-empty_string-check' From 097563fff1c7b503aadb01d795900f96ce172001 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Mon, 4 Jul 2016 16:22:34 -0400 Subject: [PATCH 2/2] Pin json to v1 for Ruby versions < 2 json v2 requires at least ruby v2.0.0 --- Gemfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 7c7a1cf..6134a7f 100644 --- a/Gemfile +++ b/Gemfile @@ -31,3 +31,6 @@ if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9' gem 'rake', '~> 10.0' end +if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0' + gem 'json', '~> 1.0' +end