aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2019-03-06 19:30:15 +0100
committerGitHub <noreply@github.com>2019-03-06 19:30:15 +0100
commit0d7d8fdc0aa2adb2b6ce06052668c0e1bf57da77 (patch)
tree59f8cc57a86974806f2e4f02bc43c07106f72ef7
parent17b7fae31d17b2d5aaf57b17c5f66a093ca7a9bc (diff)
parent408d3b985567f54fc9f7024cfdb0e4fd0a82d6e3 (diff)
downloadpuppet-ferm-0d7d8fdc0aa2adb2b6ce06052668c0e1bf57da77.tar.gz
puppet-ferm-0d7d8fdc0aa2adb2b6ce06052668c0e1bf57da77.tar.bz2
Merge pull request #38 from voxpupuli/modulesync
modulesync 2.5.1
-rw-r--r--.github/CONTRIBUTING.md6
-rw-r--r--.travis.yml4
-rw-r--r--Dockerfile2
-rw-r--r--Gemfile1
-rw-r--r--Rakefile1
5 files changed, 9 insertions, 5 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 4a51969..5d04747 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -51,19 +51,19 @@ You can install all needed gems for spec tests into the modules directory by
running:
```sh
-bundle install --path .vendor/ --without development --without system_tests --without release
+bundle install --path .vendor/ --without development system_tests release
```
If you also want to run acceptance tests:
```sh
-bundle install --path .vendor/ --without development --with system_tests --without release
+bundle install --path .vendor/ --with system_tests --without development release
```
Our all in one solution if you don't know if you need to install or update gems:
```sh
-bundle install --path .vendor/ --without development --with system_tests --without release; bundle update; bundle clean
+bundle install --path .vendor/ --with system_tests --without development release; bundle update; bundle clean
```
## Syntax and style
diff --git a/.travis.yml b/.travis.yml
index 77f89e5..a987212 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,9 @@ dist: xenial
language: ruby
cache: bundler
before_install:
- - sh ./.travis/setup.sh
+ - gem update --system
+ - gem update bundler
+ - bundle --version
script:
- 'bundle exec rake $CHECK'
matrix:
diff --git a/Dockerfile b/Dockerfile
index 27a33cf..67048bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.5.1
+FROM ruby:2.5.3
WORKDIR /opt/puppet
diff --git a/Gemfile b/Gemfile
index 9524f1a..6a74c57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,7 @@ group :test do
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
gem 'puppet-lint-variable_contains_upcase', :require => false
+ gem 'puppet-lint-absolute_classname-check', :require => false
gem 'metadata-json-lint', :require => false
gem 'redcarpet', :require => false
gem 'rubocop', '~> 0.49.1', :require => false
diff --git a/Rakefile b/Rakefile
index 13ef17c..a6cf0ac 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,6 +11,7 @@ end
PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
PuppetLint.configuration.fail_on_warnings = true
+PuppetLint.configuration.absolute_classname_reverse = true
PuppetLint.configuration.send('relative')
PuppetLint.configuration.send('disable_140chars')
PuppetLint.configuration.send('disable_class_inherits_from_params_class')