Merge pull request #436 from puppetlabs/maint_modsync_384f4c1

(maint) - modulesync 384f4c1

Author: willmeek

.gitignore

@@ -1,24 +1,23 @@
-#This file is generated by ModuleSync, do not edit.
-pkg/
-Gemfile.lock
-Gemfile.local
-vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-log/
-junit/
-.vagrant/
+#This file is generated by ModuleSync, do not edit.Z
+*.iml
+.*.sw[op]
+.DS_Store
 .bundle/
-coverage/
-log/
 .idea/
 .metadata
-*.iml
-.*.sw[op]
+.vagrant/
 .yardoc
 .yardwarns
-.DS_Store
+Gemfile.local
+Gemfile.lock
+bin/
+coverage/
+doc/
+junit/
+log/
+pkg/
+spec/fixtures/manifests/
+spec/fixtures/modules/
 tmp/
 vendor/
-doc/
 

.rubocop.yml

@@ -95,4 +95,4 @@ Style/AsciiComments:
 Style/IfUnlessModifier:
   Enabled: false
 Style/SymbolProc:
-  Enabled: false
+  Enabled: false

Gemfile

@@ -28,10 +28,19 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 # Used for gem conditionals
-supports_windows = false
 ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
 
+# 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 "puppet-module-posix-default-r#{minor_version}",    :require => false, :platforms => "ruby"
   gem "puppet-module-win-default-r#{minor_version}",      :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
@@ -62,7 +71,6 @@ gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
 gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
 gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
 
-
 # Evaluate Gemfile.local if it exists
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)