(FM-4049) Update to current msync configs [2c99161]

diff --git a/.gitignore b/.gitignore
index 37c4f59680006307f12a9eb3366ea6247f9585cf..31902774981f53470ce6b9f3cc13187f4015a53e 100644 (file)
--- 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 7ab5f55c51687b6f0519e4b55fe6be5ce20f5b4f..16f9cdb013585a86aa600f8d0c002e8a2c33b6a9 100644 (file)
--- a/.rspec
+++ b/.rspec
@@ -1,4 +1,2 @@
 --color
---format
-progress
---backtrace
+--format documentation

diff --git a/.travis.yml b/.travis.yml
index 6fad7a4ad07a9d72a2a252025062995b88479384..160b371320f923e6c5542c58b9e147510df4fa92 100644 (file)
--- 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 f1cbde4bbf76475f0e3b088000058629b8669558..bfeaa701cae5b418a5f863343e48765330df476e 100644 (file)
--- 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),