From 18bfb70ecbdbaee7f98dfe7fb7a620752d19489b Mon Sep 17 00:00:00 2001 From: tphoney Date: Wed, 13 Dec 2017 10:49:41 +0000 Subject: [PATCH] (maint) - modulesync 384f4c1 --- .gitignore | 31 +++++++++++++++---------------- .rubocop.yml | 2 -- .rubocop_todo.yml | 20 -------------------- Gemfile | 12 ++++++++++-- 4 files changed, 25 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index f6e8b46..e5e6f9e 100644 --- a/.gitignore +++ b/.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/ diff --git a/.rubocop.yml b/.rubocop.yml index d973ebd..515ef63 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -96,5 +96,3 @@ Style/IfUnlessModifier: Enabled: false Style/SymbolProc: Enabled: false -RSpec/NamedSubject: - Enabled: false \ No newline at end of file diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index cab617e..e69de29 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,20 +0,0 @@ -# This configuration was generated by -# `rubocop --auto-gen-config` -# on 2017-12-06 17:50:51 +0000 using RuboCop version 0.51.0. -# The point is for the user to remove these configuration records -# one by one as the offenses are removed from the code base. -# Note that changes in the inspected code, or installation of new -# versions of RuboCop, may require this file to be generated again. - -# Offense count: 43 -# Causes errors -Lint/BooleanSymbol: - Exclude: - - 'lib/puppet/provider/firewall/ip6tables.rb' - - 'lib/puppet/provider/firewall/iptables.rb' - - 'lib/puppet/type/firewall.rb' - -# Offense count: 2 -Lint/RescueWithoutErrorClass: - Exclude: - - 'lib/puppet/util/firewall.rb' diff --git a/Gemfile b/Gemfile index a9f0161..84b23f2 100644 --- a/Gemfile +++ b/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) -- 2.45.2