From 98b11b91ef482566f99c58ee2232ccddfb48fce5 Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Tue, 24 Jan 2017 14:01:26 -0800 Subject: [PATCH 1/9] Make quotes coherent in Gemfile --- Gemfile | 4 ++-- skeleton/Gemfile | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index e90a476..45af2fe 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ -source "https://rubygems.org" +source 'https://rubygems.org' -gem "puppet", ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0' +gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0' diff --git a/skeleton/Gemfile b/skeleton/Gemfile index 0b5912b..321c745 100644 --- a/skeleton/Gemfile +++ b/skeleton/Gemfile @@ -1,37 +1,37 @@ -source ENV['GEM_SOURCE'] || "https://rubygems.org" +source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem "rake" - gem "puppet", ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0' - gem "rspec", '< 3.2.0' - gem "rspec-puppet" - gem "puppetlabs_spec_helper" - gem "metadata-json-lint" - gem "rspec-puppet-facts" + gem 'rake' + gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0' + gem 'rspec', '< 3.2.0' + gem 'rspec-puppet' + gem 'puppetlabs_spec_helper' + gem 'metadata-json-lint' + gem 'rspec-puppet-facts' gem 'rubocop', '0.33.0' gem 'simplecov', '>= 0.11.0' gem 'simplecov-console' - gem "puppet-lint-absolute_classname-check" - gem "puppet-lint-leading_zero-check" - gem "puppet-lint-trailing_comma-check" - gem "puppet-lint-version_comparison-check" - gem "puppet-lint-classes_and_types_beginning_with_digits-check" - gem "puppet-lint-unquoted_string-check" + gem 'puppet-lint-absolute_classname-check' + gem 'puppet-lint-leading_zero-check' + gem 'puppet-lint-trailing_comma-check' + gem 'puppet-lint-version_comparison-check' + gem 'puppet-lint-classes_and_types_beginning_with_digits-check' + gem 'puppet-lint-unquoted_string-check' gem 'puppet-lint-resource_reference_syntax' gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0' end group :development do - gem "travis" if RUBY_VERSION >= '2.1.0' - gem "travis-lint" if RUBY_VERSION >= '2.1.0' - gem "puppet-blacksmith" - gem "guard-rake" if RUBY_VERSION >= '2.2.5' # per dependency https://rubygems.org/gems/ruby_dep + gem 'travis' if RUBY_VERSION >= '2.1.0' + gem 'travis-lint' if RUBY_VERSION >= '2.1.0' + gem 'puppet-blacksmith' + gem 'guard-rake' if RUBY_VERSION >= '2.2.5' # per dependency https://rubygems.org/gems/ruby_dep end group :system_tests do - gem "beaker" - gem "beaker-rspec" - gem "beaker-puppet_install_helper" + gem 'beaker' + gem 'beaker-rspec' + gem 'beaker-puppet_install_helper' end From 3a0a5fbdbce3370215f2fd49d4f0533d05e078c8 Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Tue, 24 Jan 2017 15:20:17 -0800 Subject: [PATCH 2/9] rspec should be able to go to latest version --- skeleton/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skeleton/Gemfile b/skeleton/Gemfile index 321c745..1eb8f7e 100644 --- a/skeleton/Gemfile +++ b/skeleton/Gemfile @@ -3,7 +3,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do gem 'rake' gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0' - gem 'rspec', '< 3.2.0' + gem 'rspec-core', '< 3.2.0' if RUBY_VERSION < '1.9' gem 'rspec-puppet' gem 'puppetlabs_spec_helper' gem 'metadata-json-lint' From 733fa7880386b5b5eb56a204ab803e6ad1773e37 Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Tue, 24 Jan 2017 15:36:53 -0800 Subject: [PATCH 3/9] PUPPET_VERSION has been renamed to PUPPET_GEM_VERSION but forgotten in CONTRIBUTING.md --- skeleton/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skeleton/CONTRIBUTING.md b/skeleton/CONTRIBUTING.md index 36d07a8..4ed29a4 100644 --- a/skeleton/CONTRIBUTING.md +++ b/skeleton/CONTRIBUTING.md @@ -30,7 +30,7 @@ By default the tests use a baseline version of Puppet. If you have Ruby 2.x or want a specific version of Puppet, you must set an environment variable such as: - export PUPPET_VERSION="~> 3.2.0" + export PUPPET_GEM_VERSION="~> 3.2.0" Install the dependencies like so... From 096be0a1b781520b34685ba0ff3bb3709f4f413f Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Tue, 24 Jan 2017 15:52:03 -0800 Subject: [PATCH 4/9] Unpin rubocop gem to be compatible with latest rake version when ruby >= 2 --- skeleton/Gemfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/skeleton/Gemfile b/skeleton/Gemfile index 1eb8f7e..3ffecc3 100644 --- a/skeleton/Gemfile +++ b/skeleton/Gemfile @@ -8,7 +8,11 @@ group :test do gem 'puppetlabs_spec_helper' gem 'metadata-json-lint' gem 'rspec-puppet-facts' - gem 'rubocop', '0.33.0' + if RUBY_VERSION < '2.0.0' + gem 'rubocop', '< 0.42.0' + else + gem 'rubocop' + end gem 'simplecov', '>= 0.11.0' gem 'simplecov-console' From 19f49f20c27b27d5f5a380bcd85bcfada59ddc65 Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Tue, 24 Jan 2017 16:12:15 -0800 Subject: [PATCH 5/9] Prevent clearning unexisting task --- skeleton/Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skeleton/Rakefile b/skeleton/Rakefile index f96b21f..0873369 100644 --- a/skeleton/Rakefile +++ b/skeleton/Rakefile @@ -27,7 +27,7 @@ exclude_paths = [ # Coverage from puppetlabs-spec-helper requires rcov which # doesn't work in anything since 1.8.7 -Rake::Task[:coverage].clear +Rake::Task[:coverage].clear if Rake::Task.task_defined?(:coverage) Rake::Task[:lint].clear From 1673539ad540dcf65c8ee0dc56d10a308558c181 Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Tue, 24 Jan 2017 17:13:22 -0800 Subject: [PATCH 6/9] Fix some robocop declaration issues coming with the latest version --- skeleton/.rubocop.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/skeleton/.rubocop.yml b/skeleton/.rubocop.yml index e4d810a..634b50f 100644 --- a/skeleton/.rubocop.yml +++ b/skeleton/.rubocop.yml @@ -72,7 +72,7 @@ Lint/AmbiguousRegexpLiteral: Enabled: false # DISABLED -Lint/Eval: +Security/Eval: Enabled: false # DISABLED @@ -211,7 +211,7 @@ Style/SpaceInsideParens: Style/LeadingCommentSpace: Enabled: false -Style/SingleSpaceBeforeFirstArg: +Style/SpaceBeforeFirstArg: Enabled: false Style/SpaceAfterColon: @@ -220,7 +220,7 @@ Style/SpaceAfterColon: Style/SpaceAfterComma: Enabled: false -Style/SpaceAfterControlKeyword: +Style/SpaceAroundKeyword: Enabled: false Style/SpaceAfterMethodName: @@ -268,9 +268,6 @@ Style/Documentation: Style/DefWithParentheses: Enabled: false -Style/DeprecatedHashMethods: - Enabled: false - Style/DotPosition: Enabled: false @@ -308,9 +305,6 @@ Style/EmptyLiteral: Metrics/LineLength: Enabled: false -Style/MethodCallParentheses: - Enabled: false - Style/MethodDefParentheses: Enabled: false @@ -323,7 +317,10 @@ Style/TrailingWhitespace: Style/StringLiterals: Enabled: false -Style/TrailingComma: +Style/TrailingCommaInLiteral: + Enabled: false + +Style/TrailingCommaInArguments: Enabled: false Style/GlobalVars: @@ -464,9 +461,6 @@ Metrics/ParameterLists: Lint/RequireParentheses: Enabled: false -Lint/SpaceBeforeFirstArg: - Enabled: false - Style/ModuleFunction: Enabled: false From 33e6ba3183010da866713d9c2eadabc8d91d80a2 Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Tue, 24 Jan 2017 17:50:57 -0800 Subject: [PATCH 7/9] Fix rubocop criticals --- skeleton/.rubocop.yml | 3 +++ skeleton/Gemfile | 26 +++++++++++--------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/skeleton/.rubocop.yml b/skeleton/.rubocop.yml index 634b50f..f3fccde 100644 --- a/skeleton/.rubocop.yml +++ b/skeleton/.rubocop.yml @@ -168,6 +168,9 @@ Style/ClassAndModuleChildren: Style/ClassCheck: Enabled: false +Metrics/BlockLength: + Enabled: false + Metrics/ClassLength: Enabled: false diff --git a/skeleton/Gemfile b/skeleton/Gemfile index 3ffecc3..39a4fdd 100644 --- a/skeleton/Gemfile +++ b/skeleton/Gemfile @@ -1,41 +1,37 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'rake' + gem 'metadata-json-lint' gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0' + gem 'puppetlabs_spec_helper' + gem 'rake' gem 'rspec-core', '< 3.2.0' if RUBY_VERSION < '1.9' gem 'rspec-puppet' - gem 'puppetlabs_spec_helper' - gem 'metadata-json-lint' gem 'rspec-puppet-facts' - if RUBY_VERSION < '2.0.0' - gem 'rubocop', '< 0.42.0' - else - gem 'rubocop' - end + gem 'rubocop', if RUBY_VERSION < '2.0.0' then '< 0.42.0' end gem 'simplecov', '>= 0.11.0' gem 'simplecov-console' gem 'puppet-lint-absolute_classname-check' + gem 'puppet-lint-classes_and_types_beginning_with_digits-check' gem 'puppet-lint-leading_zero-check' + gem 'puppet-lint-resource_reference_syntax' gem 'puppet-lint-trailing_comma-check' - gem 'puppet-lint-version_comparison-check' - gem 'puppet-lint-classes_and_types_beginning_with_digits-check' gem 'puppet-lint-unquoted_string-check' - gem 'puppet-lint-resource_reference_syntax' + gem 'puppet-lint-version_comparison-check' gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0' end group :development do - gem 'travis' if RUBY_VERSION >= '2.1.0' - gem 'travis-lint' if RUBY_VERSION >= '2.1.0' + gem 'guard-rake' if RUBY_VERSION >= '2.2.5' # per dependency https://rubygems.org/gems/ruby_dep gem 'puppet-blacksmith' - gem 'guard-rake' if RUBY_VERSION >= '2.2.5' # per dependency https://rubygems.org/gems/ruby_dep + gem 'travis' if RUBY_VERSION >= '2.1.0' + gem 'travis-lint' if RUBY_VERSION >= '2.1.0' end group :system_tests do gem 'beaker' - gem 'beaker-rspec' gem 'beaker-puppet_install_helper' + gem 'beaker-rspec' end From 3b7ad653f490ef3629edca0ac3459717d53469c9 Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Tue, 24 Jan 2017 18:06:23 -0800 Subject: [PATCH 8/9] simplecov-console 0.4.0 not compatible ruby 1.9.3 --- skeleton/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skeleton/Gemfile b/skeleton/Gemfile index 39a4fdd..09e52ad 100644 --- a/skeleton/Gemfile +++ b/skeleton/Gemfile @@ -10,7 +10,7 @@ group :test do gem 'rspec-puppet-facts' gem 'rubocop', if RUBY_VERSION < '2.0.0' then '< 0.42.0' end gem 'simplecov', '>= 0.11.0' - gem 'simplecov-console' + gem 'simplecov-console', if RUBY_VERSION < '2.0.0' then '< 0.4.0' end gem 'puppet-lint-absolute_classname-check' gem 'puppet-lint-classes_and_types_beginning_with_digits-check' From 9d16343c79299c28bdff05655564eb1c1e2360eb Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Tue, 24 Jan 2017 19:07:20 -0800 Subject: [PATCH 9/9] Fix wrong number of arguments (5 for 1..3) for puppet < 4 and ruby > 2 --- skeleton/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skeleton/Gemfile b/skeleton/Gemfile index 09e52ad..256c27c 100644 --- a/skeleton/Gemfile +++ b/skeleton/Gemfile @@ -8,7 +8,7 @@ group :test do gem 'rspec-core', '< 3.2.0' if RUBY_VERSION < '1.9' gem 'rspec-puppet' gem 'rspec-puppet-facts' - gem 'rubocop', if RUBY_VERSION < '2.0.0' then '< 0.42.0' end + gem 'rubocop', if RUBY_VERSION < '2.0.0' or Gem::Version.new((ENV['PUPPET_GEM_VERSION'] || '3.8.0').split(' ').last) < Gem::Version.new('4.0.0') then '< 0.42.0' end gem 'simplecov', '>= 0.11.0' gem 'simplecov-console', if RUBY_VERSION < '2.0.0' then '< 0.4.0' end