(FM-4918) update modsync / Restrict Rake ~> 10.1

.gitignore

@@ -1,7 +1,6 @@
 pkg/
 Gemfile.lock
 Gemfile.local
-vendor/
 spec/fixtures/
 log/
 junit/

.sync.yml

@@ -13,14 +13,16 @@ Gemfile:
   required:
     ':development':
       - gem: rake
+        version: '~>10.1'
       - gem: rspec
-        version: '~>3.0.0'
+        version: '~>3.0'
       - gem: puppet-lint
       - gem: puppetlabs_spec_helper
         version: '~>0.10.3'
       - gem: puppet_facts
       - gem: mocha
         version: '~>0.10.5'
+      - gem: pry
       - gem: simplecov
       - gem: yard
     ':system_tests':

.travis.yml

@@ -18,8 +18,5 @@ matrix:
     env: PUPPET_GEM_VERSION="3.7.0"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="3.7.0"
-  allow_failures:
-    - rvm: 2.1.5
-      env: PUPPET_GEM_VERSION="~> 4.0"
 notifications:
   email: false

Gemfile

@@ -25,13 +25,24 @@ def location_for(place_or_version, fake_version = nil)
   end
 end
 
+# The following gems are not included by default as they require DevKit on Windows.
+# You should probably include them in a Gemfile.local or a ~/.gemfile
+#gem 'pry' #this may already be included in the gemfile
+#gem 'pry-stack_explorer', :require => false
+#if RUBY_VERSION =~ /^2/
+#  gem 'pry-byebug'
+#else
+#  gem 'pry-debugger'
+#end
+
 group :development do
-  gem 'rake',                                :require => false
-  gem 'rspec', '~>3.0.0',                    :require => false
+  gem 'rake', '~>10.1',                      :require => false
+  gem 'rspec', '~>3.0',                      :require => false
   gem 'puppet-lint',                         :require => false
   gem 'puppetlabs_spec_helper', '~>0.10.3',  :require => false
   gem 'puppet_facts',                        :require => false
   gem 'mocha', '~>0.10.5',                   :require => false
+  gem 'pry',                                 :require => false
   gem 'simplecov',                           :require => false
   gem 'yard',                                :require => false
 end
@@ -110,8 +121,14 @@ if explicitly_require_windows_gems
   gem "windows-pr",  "1.2.3",           :require => false
 end
 
+# Evaluate Gemfile.local if it exists
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end
 
+# Evaluate ~/.gemfile if it exists
+if File.exists?(File.join(Dir.home, '.gemfile'))
+  eval(File.read(File.join(Dir.home, '.gemfile')), binding)
+end
+
 # vim:ft=ruby

appveyor.yml

@@ -26,7 +26,6 @@ matrix:
   fast_finish: true
 install:
 - SET PATH=C:\Ruby%RUBY_VER%\bin;%PATH%
-- gem install bundler --quiet --no-ri --no-rdoc
 - bundle install --jobs 4 --retry 2 --without system_tests
 - type Gemfile.lock
 build: off

spec/defines/config_spec.rb

@@ -3,7 +3,7 @@
 
 RSpec.describe 'sqlserver::config', :type => :define do
   let(:title) { 'MSSQLSERVER' }
-  let(:facts) { {:osfamily => 'windows', :platform => :windows, :puppet_vardir => 'C:/ProgramData/PuppetLabs/puppet/var'} }
+  let(:facts) { {:osfamily => 'windows', :platform => 'windows', :puppet_vardir => 'C:/ProgramData/PuppetLabs/puppet/var'} }
 
   describe 'compile' do
     let(:params) { {

spec/spec_helper.rb

@@ -7,6 +7,9 @@
 RSpec.configure do |c|
   c.module_path = File.join(fixture_path, 'modules')
   c.manifest_dir = File.join(fixture_path, 'manifests')
+  c.expect_with :rspec do |e|
+    e.syntax = [:should, :expect]
+  end
 end
 
 SimpleCov.start do