From 7889a85d37bced0aeb5055e3c93fd57a111e35a7 Mon Sep 17 00:00:00 2001
From: David Schmitt <david@dasz.at>
Date: Mon, 25 Jan 2016 16:57:50 +0000
Subject: [PATCH] (FM-4049) Update to current msync configs [2c99161]

---
 .gitignore                |  2 +-
 .rspec                    |  2 ++
 .sync.yml                 | 12 ++++--------
 .travis.yml               | 19 +++++++------------
 Gemfile                   | 27 ++++++++++-----------------
 Rakefile                  |  3 ++-
 spec/spec_helper.rb       | 10 +++++-----
 spec/spec_helper_local.rb |  3 +++
 8 files changed, 34 insertions(+), 44 deletions(-)
 create mode 100644 .rspec
 create mode 100644 spec/spec_helper_local.rb

diff --git a/.gitignore b/.gitignore
index 874db461f..319027749 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,6 @@ spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+log/
 .idea/
 *.iml
-log/
diff --git a/.rspec b/.rspec
new file mode 100644
index 000000000..16f9cdb01
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--color
+--format documentation
diff --git a/.sync.yml b/.sync.yml
index ac8379073..80e321eb0 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,9 +1,5 @@
 ---
-.travis.yml:
-  extras:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-spec/spec_helper.rb:
-  unmanaged: true
+Gemfile:
+  optional:
+    ':development, :unit_tests':
+      - gem: rspec-puppet-facts
diff --git a/.travis.yml b/.travis.yml
index c667d4d2c..e6314a470 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,19 @@
 ---
 sudo: false
 language: ruby
+cache: bundler
 bundler_args: --without system_tests
-script: "bundle exec rake validate lint spec SPEC_OPTS='--format documentation'"
+script: "bundle exec rake validate lint spec"
 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"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index ee382e2e0..6b89aaee0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,22 +11,17 @@ def location_for(place, fake_version = nil)
 end
 
 group :development, :unit_tests do
-  # rspec-core 3.1.7 is the last version to support ruby 1.8
-  if RUBY_VERSION < '1.9'
-    gem 'rspec-core', '3.1.7'
-  else
-    # newer version required to avoid BKR-537
-    gem 'rspec-core', '>= 3.4'
-  end
-
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'simplecov',               :require => false
-  gem 'json',                    :require => false
-  gem 'metadata-json-lint',      :require => false
-  gem 'rspec-puppet-facts',      :require => false
+  gem 'json',                      :require => false
+  gem 'metadata-json-lint',        :require => false
+  gem 'puppet_facts',              :require => false
+  gem 'puppet-blacksmith',         :require => false
+  gem 'puppetlabs_spec_helper',    :require => false
+  gem 'rspec-puppet', '>= 2.3.2',  :require => false
+  gem 'simplecov',                 :require => false
+  gem 'rspec-puppet-facts',        :require => false
 end
-
 group :system_tests do
+  gem 'beaker-puppet_install_helper',  :require => false
   if beaker_version = ENV['BEAKER_VERSION']
     gem 'beaker', *location_for(beaker_version)
   end
@@ -35,12 +30,10 @@ group :system_tests do
   else
     gem 'beaker-rspec',  :require => false
   end
+  gem 'master_manipulator',            :require => false
   gem 'serverspec',                    :require => false
-  gem 'beaker-puppet_install_helper',  :require => false
 end
 
-
-
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
 else
diff --git a/Rakefile b/Rakefile
index 181157e6e..35ce31140 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,6 @@
-require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet_blacksmith/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
+require 'puppetlabs_spec_helper/rake_tasks'
 
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6277b13b6..a7f5b4ecb 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,7 +1,7 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
-require 'rspec-puppet-facts'
-include RspecPuppetFacts
 
-# The default set of platforms to test again.
-ENV['UNIT_TEST_PLATFORMS'] = 'centos-6-x86_64 ubuntu-1404-x86_64'
-PLATFORMS = ENV['UNIT_TEST_PLATFORMS'].split(' ')
+# put local configuration and setup into spec_helper_local
+begin
+  require 'spec_helper_local'
+rescue LoadError
+end
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
new file mode 100644
index 000000000..9a86ccd1b
--- /dev/null
+++ b/spec/spec_helper_local.rb
@@ -0,0 +1,3 @@
+require 'rspec-puppet-facts'
+include RspecPuppetFacts
+