From e496de727fafbbfbe2cf72c9f1528a719ec0e50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 16 Aug 2016 16:23:49 +0200 Subject: modulesync --- .puppet-lint.rc | 2 +- .travis.yml | 2 ++ Gemfile | 1 + Rakefile | 2 +- 4 files changed, 5 insertions(+), 2 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 d816b71..7cf4712 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ addons: apt: packages: - libaugeas-dev + sources: + - augeas cache: bundler bundler_args: --without system_tests script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'"] 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 -- cgit v1.2.3