Merge pull request #25 from glennsarti/ticket/maint/MODULES-3536-mods…

…ync-update

(MODULES-3536) modsync update

.gitignore

@@ -7,13 +7,13 @@ junit/
 .vagrant/
 .bundle/
 coverage/
-/.idea/
-/.vscode/
+.idea/
 .metadata
 *.iml
 .*.sw[op]
 .DS_Store
 .rspec
+tmp/
 
 *.orig
 *.bak
@@ -34,6 +34,6 @@ rdoc
 spec/reports
 test/version_tmp
 tmp
-.idea
+/.idea/
+/.vscode/
 .config
-

Gemfile

@@ -93,22 +93,22 @@ if explicitly_require_windows_gems
   # This also means Puppet Gem less than 3.5.0 - this has been tested back
   # to 3.0.0. Any further back is likely not supported.
   if puppet_gem_location == :gem
-    gem "ffi", "1.9.0",                 :require => false
-    gem "win32-eventlog", "0.5.3",      :require => false
-    gem "win32-process", "0.6.5",       :require => false
-    gem "win32-security", "~> 0.1.2",   :require => false
-    gem "win32-service", "0.7.2",       :require => false
-    gem "minitar", "0.5.4",             :require => false
+    gem "ffi", "1.9.0",                          :require => false
+    gem "win32-eventlog", "0.5.3","<= 0.6.5",    :require => false
+    gem "win32-process", "0.6.5","<= 0.7.5",     :require => false
+    gem "win32-security", "~> 0.1.2","<= 0.2.5", :require => false
+    gem "win32-service", "0.7.2","<= 0.8.7",     :require => false
+    gem "minitar", "0.5.4",                      :require => false
   else
-    gem "ffi", "~> 1.9.0",              :require => false
-    gem "win32-eventlog", "~> 0.5",     :require => false
-    gem "win32-process", "~> 0.6",      :require => false
-    gem "win32-security", "~> 0.1",     :require => false
-    gem "win32-service", "~> 0.7",      :require => false
-    gem "minitar", "~> 0.5.4",          :require => false
+    gem "ffi", "~> 1.9.0",                       :require => false
+    gem "win32-eventlog", "~> 0.5","<= 0.6.5",   :require => false
+    gem "win32-process", "~> 0.6","<= 0.7.5",    :require => false
+    gem "win32-security", "~> 0.1","<= 0.2.5",   :require => false
+    gem "win32-service", "~> 0.7","<= 0.8.7",    :require => false
+    gem "minitar", "~> 0.5.4",                   :require => false
   end
 
-  gem "win32-dir", "~> 0.3",            :require => false
+  gem "win32-dir", "~> 0.3","<= 0.4.9", :require => false
   gem "win32console", "1.3.2",          :require => false if RUBY_VERSION =~ /^1\./
 
   # Puppet less than 3.7.0 requires these.
@@ -123,6 +123,16 @@ if explicitly_require_windows_gems
   gem "win32-taskscheduler", "0.2.2",   :require => false
   gem "windows-api", "0.4.3",           :require => false
   gem "windows-pr",  "1.2.3",           :require => false
+else
+  if Gem::Platform.local.os == 'mingw32'
+    # If we're using a Puppet gem on windows, which handles its own win32-xxx gem dependencies (Pup 3.5.0 and above), set maximum versions
+    # Required due to PUP-6445
+    gem "win32-dir", "<= 0.4.9",        :require => false
+    gem "win32-eventlog", "<= 0.6.5",   :require => false
+    gem "win32-process", "<= 0.7.5",    :require => false
+    gem "win32-security", "<= 0.2.5",   :require => false
+    gem "win32-service", "<= 0.8.7",    :require => false
+  end
 end
 
 # Evaluate Gemfile.local if it exists

Rakefile

@@ -7,6 +7,12 @@ rescue LoadError
   #Do nothing, only installed with system_tests group 
 end
 
+# These lint exclusions are in puppetlabs_spec_helper but needs a version above 0.10.3 
+# Line length test is 80 chars in puppet-lint 1.1.0
+PuppetLint.configuration.send('disable_80chars')
+# Line length test is 140 chars in puppet-lint 2.x
+PuppetLint.configuration.send('disable_140chars')
+
 task :default => [:test]
 
 desc 'Run RSpec'