summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Yardley <wyardley@users.noreply.github.com>2017-09-15 23:21:42 (GMT)
committerGitHub <noreply@github.com>2017-09-15 23:21:42 (GMT)
commit8838461cdd277de83879bf74095e736f91c2ecf7 (patch)
tree8b55aa1232dd1b3b2b13d9d785b5d031e6bdb107
parent8cfdff1ebeb9ec134edda7c4e06c1a45d7968423 (diff)
parent30d2010aa06805839170cf2d8b0bca814f251120 (diff)
downloadpuppet-prometheus_reporter-8838461cdd277de83879bf74095e736f91c2ecf7.zip
puppet-prometheus_reporter-8838461cdd277de83879bf74095e736f91c2ecf7.tar.gz
puppet-prometheus_reporter-8838461cdd277de83879bf74095e736f91c2ecf7.tar.bz2
Merge pull request #15 from voxpupuli/modulesync
modulesync 1.1.0
-rw-r--r--.msync.yml2
-rw-r--r--.rubocop.yml77
-rw-r--r--.travis.yml12
-rw-r--r--Gemfile13
-rw-r--r--Rakefile7
-rw-r--r--spec/acceptance/nodesets/docker/ubuntu-14.04.yml2
-rw-r--r--spec/acceptance/nodesets/docker/ubuntu-16.04.yml2
7 files changed, 53 insertions, 62 deletions
diff --git a/.msync.yml b/.msync.yml
index 4abde22..0a4a57d 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.21.3'
+modulesync_config_version: '1.1.0'
diff --git a/.rubocop.yml b/.rubocop.yml
index d92e4e4..b1a9521 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -51,7 +51,7 @@ Lint/AmbiguousOperator:
Lint/AssignmentInCondition:
Enabled: True
-Style/SpaceBeforeComment:
+Layout/SpaceBeforeComment:
Enabled: True
Style/AndOr:
@@ -119,7 +119,7 @@ Lint/UselessAssignment:
Lint/Void:
Enabled: True
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
Enabled: True
Style/AccessorMethodName:
@@ -128,13 +128,13 @@ Style/AccessorMethodName:
Style/Alias:
Enabled: True
-Style/AlignArray:
+Layout/AlignArray:
Enabled: True
-Style/AlignHash:
+Layout/AlignHash:
Enabled: True
-Style/AlignParameters:
+Layout/AlignParameters:
Enabled: True
Metrics/BlockNesting:
@@ -152,7 +152,7 @@ Style/BracesAroundHashParameters:
Style/CaseEquality:
Enabled: True
-Style/CaseIndentation:
+Layout/CaseIndentation:
Enabled: True
Style/CharacterLiteral:
@@ -186,64 +186,64 @@ Style/WordArray:
Style/UnneededPercentQ:
Enabled: True
-Style/Tab:
+Layout/Tab:
Enabled: True
-Style/SpaceBeforeSemicolon:
+Layout/SpaceBeforeSemicolon:
Enabled: True
-Style/TrailingBlankLines:
+Layout/TrailingBlankLines:
Enabled: True
-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
Enabled: True
-Style/SpaceInsideBrackets:
+Layout/SpaceInsideBrackets:
Enabled: True
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
Enabled: True
-Style/SpaceInsideParens:
+Layout/SpaceInsideParens:
Enabled: True
-Style/LeadingCommentSpace:
+Layout/LeadingCommentSpace:
Enabled: True
-Style/SpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
Enabled: True
-Style/SpaceAfterColon:
+Layout/SpaceAfterColon:
Enabled: True
-Style/SpaceAfterComma:
+Layout/SpaceAfterComma:
Enabled: True
-Style/SpaceAfterMethodName:
+Layout/SpaceAfterMethodName:
Enabled: True
-Style/SpaceAfterNot:
+Layout/SpaceAfterNot:
Enabled: True
-Style/SpaceAfterSemicolon:
+Layout/SpaceAfterSemicolon:
Enabled: True
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
Enabled: True
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
Enabled: True
-Style/SpaceBeforeBlockBraces:
+Layout/SpaceBeforeBlockBraces:
Enabled: True
-Style/SpaceBeforeComma:
+Layout/SpaceBeforeComma:
Enabled: True
Style/CollectionMethods:
Enabled: True
-Style/CommentIndentation:
+Layout/CommentIndentation:
Enabled: True
Style/ColonMethodCall:
@@ -268,7 +268,7 @@ Style/DefWithParentheses:
Style/PreferredHashMethods:
Enabled: True
-Style/DotPosition:
+Layout/DotPosition:
EnforcedStyle: trailing
Style/DoubleNegation:
@@ -277,25 +277,25 @@ Style/DoubleNegation:
Style/EachWithObject:
Enabled: True
-Style/EmptyLineBetweenDefs:
+Layout/EmptyLineBetweenDefs:
Enabled: True
-Style/IndentArray:
+Layout/IndentArray:
Enabled: True
-Style/IndentHash:
+Layout/IndentHash:
Enabled: True
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
Enabled: True
-Style/IndentationWidth:
+Layout/IndentationWidth:
Enabled: True
-Style/EmptyLines:
+Layout/EmptyLines:
Enabled: True
-Style/EmptyLinesAroundAccessModifier:
+Layout/EmptyLinesAroundAccessModifier:
Enabled: True
Style/EmptyLiteral:
@@ -314,7 +314,7 @@ Style/MethodDefParentheses:
Style/LineEndConcatenation:
Enabled: True
-Style/TrailingWhitespace:
+Layout/TrailingWhitespace:
Enabled: True
Style/StringLiterals:
@@ -466,9 +466,6 @@ Metrics/ParameterLists:
Lint/RequireParentheses:
Enabled: True
-Style/SpaceBeforeFirstArg:
- Enabled: True
-
Style/ModuleFunction:
Enabled: True
@@ -484,7 +481,7 @@ Style/Encoding:
Style/BlockDelimiters:
Enabled: True
-Style/MultilineBlockLayout:
+Layout/MultilineBlockLayout:
Enabled: True
# 'Complexity' is very relative
@@ -498,7 +495,7 @@ Metrics/PerceivedComplexity:
Lint/UselessAssignment:
Enabled: True
-Style/ClosingParenthesisIndentation:
+Layout/ClosingParenthesisIndentation:
Enabled: True
# RSpec
@@ -527,7 +524,7 @@ RSpec/NestedGroups:
Enabled: False
# this is broken on ruby1.9
-Style/IndentHeredoc:
+Layout/IndentHeredoc:
Enabled: False
# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
diff --git a/.travis.yml b/.travis.yml
index 5293b04..11e405d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,21 +18,15 @@ matrix:
- rvm: 2.1.9
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=test
- - rvm: 2.2.7
- bundler_args: --without system_tests development
- env: PUPPET_VERSION="~> 4.0" CHECK=test
- - rvm: 2.3.4
- bundler_args: --without system_tests development
- env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.4.1
bundler_args: --without system_tests development
- env: PUPPET_VERSION="~> 4.0" CHECK=test
+ env: PUPPET_VERSION="~> 5.0" CHECK=test
- rvm: 2.4.1
bundler_args: --without system_tests development
- env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
+ env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
- rvm: 2.4.1
bundler_args: --without system_tests development
- env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
+ env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
branches:
only:
- master
diff --git a/Gemfile b/Gemfile
index 0914f7c..9d5df20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,11 +11,10 @@ def location_for(place, fake_version = nil)
end
group :test do
- gem 'puppetlabs_spec_helper', '~> 2.1.1', :require => false
+ gem 'puppetlabs_spec_helper', '~> 2.2.0', :require => false
gem 'rspec-puppet', '~> 2.5', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'rspec-puppet-utils', :require => false
- gem 'puppet-lint-absolute_classname-check', :require => false
gem 'puppet-lint-leading_zero-check', :require => false
gem 'puppet-lint-trailing_comma-check', :require => false
gem 'puppet-lint-version_comparison-check', :require => false
@@ -24,10 +23,10 @@ group :test do
gem 'puppet-lint-variable_contains_upcase', :require => false
gem 'metadata-json-lint', :require => false
gem 'puppet-blacksmith', :require => false
- gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
+ gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
gem 'puppet-strings', '~> 1.0', :require => false
gem 'redcarpet', :require => false
- gem 'rubocop', '~> 0.48.0', :require => false if RUBY_VERSION >= '2.3.0'
+ gem 'rubocop', '~> 0.49.1', :require => false if RUBY_VERSION >= '2.3.0'
gem 'rubocop-rspec', '~> 1.15.0', :require => false if RUBY_VERSION >= '2.3.0'
gem 'mocha', '>= 1.2.1', :require => false
gem 'coveralls', :require => false
@@ -42,7 +41,7 @@ group :development do
gem 'travis', :require => false
gem 'travis-lint', :require => false
gem 'guard-rake', :require => false
- gem 'overcommit', '~> 0.39.1', :require => false
+ gem 'overcommit', '>= 0.39.1', :require => false
end
group :system_tests do
@@ -63,10 +62,10 @@ end
if facterversion = ENV['FACTER_GEM_VERSION']
gem 'facter', facterversion.to_s, :require => false, :groups => [:test]
else
- gem 'facter', :require => false, :groups => [:test]
+gem 'facter', :require => false, :groups => [:test]
end
-ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
+ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 5.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
gem 'puppet', puppetversion, :require => false, :groups => [:test]
# vim: syntax=ruby
diff --git a/Rakefile b/Rakefile
index 82c8960..ab9411b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -35,9 +35,10 @@ begin
require 'github_changelog_generator/task'
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
version = (Blacksmith::Modulefile.new).version
- config.future_release = "v#{version}"
- config.header = "# Change log\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not impact the functionality of the module."
- config.exclude_labels = %w{duplicate question invalid wontfix modulesync}
+ config.future_release = "v#{version}" if version =~ /^\d+\.\d+.\d+$/
+ config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module."
+ config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
+ config.user = 'voxpupuli'
end
rescue LoadError
end
diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
index 54d5e5a..ae45304 100644
--- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
+++ b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
@@ -12,7 +12,7 @@ HOSTS:
docker_image_commands:
- 'rm /usr/sbin/policy-rc.d'
- 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
- - 'apt-get install -y net-tools wget'
+ - 'apt-get install -y net-tools wget apt-transport-https'
- 'locale-gen en_US.UTF-8'
CONFIG:
trace_limit: 200
diff --git a/spec/acceptance/nodesets/docker/ubuntu-16.04.yml b/spec/acceptance/nodesets/docker/ubuntu-16.04.yml
index bac2d5b..2d173c5 100644
--- a/spec/acceptance/nodesets/docker/ubuntu-16.04.yml
+++ b/spec/acceptance/nodesets/docker/ubuntu-16.04.yml
@@ -10,7 +10,7 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- - 'apt-get install -y net-tools wget locales'
+ - 'apt-get install -y net-tools wget locales apt-transport-https'
- 'locale-gen en_US.UTF-8'
CONFIG:
trace_limit: 200