summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schmitt <david@dasz.at>2016-01-25 14:19:19 +0000
committerDavid Schmitt <david@dasz.at>2016-01-27 14:48:13 +0000
commit7ff944daa0b124dc7f423e7eda351119780eda18 (patch)
treede16abca42952b1e96c9157c3ccb9e2d096f028b
parent2a510169d6eb8be7155064e2b9569227e65f7d3c (diff)
downloadpuppet-stdlib-7ff944daa0b124dc7f423e7eda351119780eda18.tar.gz
puppet-stdlib-7ff944daa0b124dc7f423e7eda351119780eda18.tar.bz2
(FM-4049) Update to current msync configs [2c99161]
-rw-r--r--.gitignore20
-rw-r--r--.rspec4
-rw-r--r--.travis.yml12
-rw-r--r--CONTRIBUTING.md6
4 files changed, 18 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore
index 37c4f59..3190277 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,10 @@
-/pkg/
-/Gemfile.lock
-/vendor/
-/spec/fixtures/manifests/*
-/spec/fixtures/modules/*
-!/spec/fixtures/modules/stdlib
-!/spec/fixtures/modules/stdlib/*
-/.vagrant/
-/.bundle/
-/coverage/
-/.idea/
+pkg/
+Gemfile.lock
+vendor/
+spec/fixtures/
+.vagrant/
+.bundle/
+coverage/
+log/
+.idea/
*.iml
diff --git a/.rspec b/.rspec
index 7ab5f55..16f9cdb 100644
--- a/.rspec
+++ b/.rspec
@@ -1,4 +1,2 @@
--color
---format
-progress
---backtrace
+--format documentation
diff --git a/.travis.yml b/.travis.yml
index 6fad7a4..160b371 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,15 +7,13 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
matrix:
fast_finish: true
include:
- - rvm: 1.8.7
+ - rvm: 2.1.6
+ env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+ - rvm: 2.1.5
+ env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+ - rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- - rvm: 2.1.5
- env: PUPPET_GEM_VERSION="~> 3.0"
- - rvm: 2.1.5
- env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- - rvm: 2.1.6
- env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
notifications:
email: false
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f1cbde4..bfeaa70 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -159,7 +159,7 @@ If you already have those gems installed, make sure they are up-to-date:
With all dependencies in place and up-to-date we can now run the tests:
```shell
-% rake spec
+% bundle exec rake spec
```
This will execute all the [rspec tests](http://rspec-puppet.com/) tests
@@ -178,8 +178,8 @@ installed on your system.
You can run them by issuing the following command
```shell
-% rake spec_clean
-% rspec spec/acceptance
+% bundle exec rake spec_clean
+% bundle exec rspec spec/acceptance
```
This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),