modulesync

4 files changed, 4 insertions, 3 deletions

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index d8f5c59..e09d52f 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,5 +1,5 @@
 --fail-on-warnings
 --relative
---no-80chars
+--no-140chars
 --no-documentation
 --no-class_inherits_from_params_class-check
diff --git a/.travis.yml b/.travis.yml
index 5b64f69..25f723f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ matrix:
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.7
-    env: PUPPET_GEM_VERSION="~> 4.0"
+    env: PUPPET_GEM_VERSION="~> 4.5.0"
 notifications:
   email: false
 deploy:
diff --git a/Gemfile b/Gemfile
index 1c22776..c2dabee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,7 @@ group :development, :unit_tests do
   gem 'rspec-puppet-facts',                                :require => false
   gem 'ruby-augeas',                                       :require => false
   gem 'puppet-blacksmith',                                 :require => false if RUBY_VERSION !~ /^1\./
+  gem 'json_pure', '< 2.0.2',                              :require => false
 end
 
 group :system_tests do
diff --git a/Rakefile b/Rakefile
index ab65ceb..aa7b8a1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,7 @@ require 'puppet-lint/tasks/puppet-lint'
 Rake::Task[:lint].clear
 PuppetLint::RakeTask.new :lint do |config|
   config.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
-  config.disable_checks = ['80chars']
+  config.disable_checks = ['140chars']
   config.fail_on_warnings = true
 end