Skip to content

Commit 1db3564

Browse files
committed
Update common files
1 parent c1328b6 commit 1db3564

File tree

5 files changed

+38
-35
lines changed

5 files changed

+38
-35
lines changed

Diff for: .rubocop.yml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ AllCops:
1818
- 'pkg/**/*'
1919
- 'spec/fixtures/**/*'
2020
- 'vendor/**/*'
21-
RunRailsCops: false
2221
DisplayCopNames: true
2322

2423
Metrics/LineLength:

Diff for: .ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.7
1+
2.1.9

Diff for: .travis.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@ matrix:
88
fast_finish: true
99
include:
1010
- rvm: 1.9.3
11-
env: PUPPET_GEM_VERSION="~> 3.7.0" FUTURE_PARSER="no"
12-
- rvm: 1.9.3
13-
env: PUPPET_GEM_VERSION="~> 3.7.0" FUTURE_PARSER="yes"
14-
- rvm: 1.9.3
15-
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="no"
11+
env: PUPPET_GEM_VERSION="~> 3.0"
1612
- rvm: 1.9.3
1713
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
18-
- rvm: 2.1.7
19-
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="no"
2014
- rvm: 2.1.7
2115
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
16+
- rvm: 2.1.7
17+
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="no"
2218
notifications:
2319
email: false

Diff for: Gemfile

+26-19
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,32 @@
11
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
22

33
group :unit_tests do
4-
gem 'rubocop', '0.34.2', :require => false
5-
gem 'puppetlabs_spec_helper', :require => false
6-
gem 'rspec-puppet-facts', :require => false
7-
gem 'metadata-json-lint', :require => false
8-
gem 'json', :require => false
9-
gem 'puppet-lint-trailing_newline-check', :require => false
10-
gem 'puppet-lint-variable_contains_upcase', :require => false
11-
gem 'puppet-lint-absolute_template_path', :require => false
12-
gem 'puppet-lint-strict_indent-check', :require => false
13-
gem 'puppet-lint-unquoted_string-check', :require => false
14-
gem 'puppet-lint-empty_string-check', :require => false
15-
gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false
16-
gem 'puppet-lint-absolute_classname-check', :require => false
17-
gem 'puppet-lint-undef_in_function-check', :require => false
18-
gem 'puppet-lint-leading_zero-check', :require => false
19-
gem 'puppet-lint-file_ensure-check', :require => false
20-
gem 'puppet-lint-trailing_comma-check', :require => false
21-
gem 'puppet-lint-version_comparison-check', :require => false
22-
gem 'puppet-lint-appends-check', :require => false
4+
gem 'rubocop', :require => false
5+
gem 'puppetlabs_spec_helper', :require => false
6+
gem 'rspec-puppet-facts', :require => false
7+
gem 'metadata-json-lint', :require => false
8+
gem 'json', :require => false
9+
gem 'puppet-lint-absolute_classname-check', :require => false
10+
gem 'puppet-lint-absolute_template_path', :require => false
11+
gem 'puppet-lint-alias-check', :require => false
12+
gem 'puppet-lint-appends-check', :require => false
13+
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
14+
gem 'puppet-lint-empty_string-check', :require => false
15+
gem 'puppet-lint-file_ensure-check', :require => false
16+
gem 'puppet-lint-file_source_rights-check', :require => false
17+
gem 'puppet-lint-leading_zero-check', :require => false
18+
gem 'puppet-lint-numericvariable', :require => false
19+
gem 'puppet-lint-resource_outside_class-check', :require => false
20+
gem 'puppet-lint-resource_reference_syntax', :require => false
21+
gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false
22+
gem 'puppet-lint-strict_indent-check', :require => false
23+
gem 'puppet-lint-trailing_comma-check', :require => false
24+
gem 'puppet-lint-trailing_newline-check', :require => false
25+
gem 'puppet-lint-undef_in_function-check', :require => false
26+
gem 'puppet-lint-unquoted_string-check', :require => false
27+
gem 'puppet-lint-usascii_format-check', :require => false
28+
gem 'puppet-lint-variable_contains_upcase', :require => false
29+
gem 'puppet-lint-version_comparison-check', :require => false
2330
end
2431

2532
group :development do

Diff for: Rakefile

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
ENV['FUTURE_PARSER'] ||= 'yes'
2-
31
require 'rubygems' if RUBY_VERSION < '1.9.0'
42
# require 'rubocop/rake_task'
53
require 'puppetlabs_spec_helper/rake_tasks'
@@ -16,11 +14,14 @@ exclude_paths = [
1614
'vendor/**/*'
1715
]
1816

19-
PuppetLint.configuration.fail_on_warnings = true
20-
PuppetLint.configuration.relative = true
21-
PuppetLint.configuration.send('disable_80chars')
22-
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
23-
PuppetLint.configuration.ignore_paths = exclude_paths
17+
# Puppet-Lint 1.1.0
18+
Rake::Task[:lint].clear
19+
PuppetLint::RakeTask.new :lint do |config|
20+
config.ignore_paths = exclude_paths
21+
config.disable_checks = %w(class_inherits_from_params_class 80chars)
22+
config.fail_on_warnings = true
23+
# config.relative = true
24+
end
2425
PuppetSyntax.exclude_paths = exclude_paths
2526

2627
Rake::Task[:default].prerequisites.clear

0 commit comments

Comments
 (0)