summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2018-01-04 10:17:07 (GMT)
committerGitHub <noreply@github.com>2018-01-04 10:17:07 (GMT)
commit417d1b6a532e6ba4a321472c57cb3d142f0ef9c7 (patch)
tree8e87f32a1f23a69e0d2aee399cc876e531b0e85b
parent93bdaa2e3318d7ea4a49b1cd8a00e28a95092545 (diff)
parentdb267db71e25ef5f2585ee540bdf844d52f13f8d (diff)
downloadpuppet-prometheus_reporter-417d1b6a532e6ba4a321472c57cb3d142f0ef9c7.zip
puppet-prometheus_reporter-417d1b6a532e6ba4a321472c57cb3d142f0ef9c7.tar.gz
puppet-prometheus_reporter-417d1b6a532e6ba4a321472c57cb3d142f0ef9c7.tar.bz2
Merge pull request #20 from voxpupuli/modulesyncupstream
modulesync 1.6.0
-rw-r--r--.msync.yml2
-rw-r--r--.rubocop.yml2
-rw-r--r--.travis.yml7
-rw-r--r--Rakefile27
4 files changed, 30 insertions, 8 deletions
diff --git a/.msync.yml b/.msync.yml
index 80959a3..08e85ce 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '1.5.0'
+modulesync_config_version: '1.6.0'
diff --git a/.rubocop.yml b/.rubocop.yml
index 3fc819b..099a11c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -46,7 +46,7 @@ Style/HashSyntax:
Style/RedundantReturn:
Enabled: True
-Style/EndOfLine:
+Layout/EndOfLine:
Enabled: False
Lint/AmbiguousOperator:
diff --git a/.travis.yml b/.travis.yml
index 7f69ff5..f213a3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,7 @@ dist: trusty
language: ruby
cache: bundler
before_install:
- - bundle -v
- - rm Gemfile.lock || true
- - gem update --system
- - gem update bundler
- - gem --version
- - bundle -v
+ - rm -f Gemfile.lock
script:
- 'bundle exec rake $CHECK'
matrix:
diff --git a/Rakefile b/Rakefile
index 14ccf58..279580a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -26,6 +26,12 @@ exclude_paths = %w(
PuppetLint.configuration.ignore_paths = exclude_paths
PuppetSyntax.exclude_paths = exclude_paths
+desc 'Auto-correct puppet-lint offenses'
+task 'lint:auto_correct' do
+ PuppetLint.configuration.fix = true
+ Rake::Task[:lint].invoke
+end
+
desc 'Run acceptance tests'
RSpec::Core::RakeTask.new(:acceptance) do |t|
t.pattern = 'spec/acceptance'
@@ -48,6 +54,27 @@ task test_with_coveralls: [:test] do
end
end
+desc "Print supported beaker sets"
+task 'beaker_sets', [:directory] do |t, args|
+ directory = args[:directory]
+
+ metadata = JSON.load(File.read('metadata.json'))
+
+ (metadata['operatingsystem_support'] || []).each do |os|
+ (os['operatingsystemrelease'] || []).each do |release|
+ if directory
+ beaker_set = "#{directory}/#{os['operatingsystem'].downcase}-#{release}"
+ else
+ beaker_set = "#{os['operatingsystem'].downcase}-#{release}-x64"
+ end
+
+ filename = "spec/acceptance/nodesets/#{beaker_set}.yml"
+
+ puts beaker_set if File.exists? filename
+ end
+ end
+end
+
begin
require 'github_changelog_generator/task'
GitHubChangelogGenerator::RakeTask.new :changelog do |config|