From 48b87f7744e3ca8f24fe5ec8a265fd942e8fb4d2 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sun, 4 Jun 2017 16:57:53 -0700 Subject: [PATCH] Updated gems --- Gemfile | 17 ++++++++-------- Gemfile.lock | 57 +++++++++++++++++++++++++++------------------------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index 7ed29a0..d0bf059 100644 --- a/Gemfile +++ b/Gemfile @@ -5,40 +5,39 @@ source 'https://rubygems.org' if ENV.key?('PUPPET_VERSION') puppetversion = ENV['PUPPET_VERSION'].to_s else - puppetversion = ['~> 4.0'] + puppetversion = ['>= 4.9', '< 5'] end # rubocop:enable ConditionalAssignment group :production do gem 'os', '~> 1.0' gem 'puppet', puppetversion - gem 'r10k', '~> 2.3' + gem 'r10k', '~> 2.5' gem 'rugged', '~> 0.24' gem 'xmlrpc', '~> 0.3.0' end group :development, :unit_tests do gem 'json', '>= 2.0.2' - gem 'json_pure', '>= 2.0.2' - gem 'metadata-json-lint', '~> 1.0' - gem 'puppetlabs_spec_helper', '~> 1.1' + gem 'metadata-json-lint', '~> 1.2' + gem 'puppetlabs_spec_helper', '~> 2.1' gem 'rspec-puppet', '~> 2.5' - gem 'rubocop', '~> 0.48' + gem 'rubocop', '~> 0.49' gem 'tty-command', '~> 0.4' gem 'tty-file', '~> 0.3' gem 'tty-prompt', '~> 0.12' gem 'yamllint', '~> 0.0.9' # puppet-lint and plugins - gem 'puppet-lint', '~> 1.1' + gem 'puppet-lint', '~> 2.2' gem 'puppet-lint-absolute_classname-check', '~> 0.2' gem 'puppet-lint-absolute_template_path', '~> 1.0' gem 'puppet-lint-empty_string-check', '~> 0.2' gem 'puppet-lint-leading_zero-check', '~> 0.1' gem 'puppet-lint-resource_reference_syntax', '~> 1.0' gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 0.1' - gem 'puppet-lint-trailing_newline-check', '~> 1.0' + gem 'puppet-lint-trailing_newline-check', '~> 1.1' gem 'puppet-lint-undef_in_function-check', '~> 0.2' gem 'puppet-lint-unquoted_string-check', '~> 0.3' - gem 'puppet-lint-variable_contains_upcase', '~> 1.1' + gem 'puppet-lint-variable_contains_upcase', '~> 1.2' end diff --git a/Gemfile.lock b/Gemfile.lock index b551703..3c7bff9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,43 +19,48 @@ GEM gettext (3.2.2) locale (>= 2.0.5) text (>= 1.3.0) - gettext-setup (0.24) + gettext-setup (0.25) fast_gettext (~> 1.1.0) gettext (>= 3.0.2) locale hiera (3.3.1) json (2.1.0) - json_pure (2.1.0) + json_pure (1.8.6) locale (2.1.2) log4r (1.1.10) metaclass (0.0.4) - metadata-json-lint (1.1.0) + metadata-json-lint (1.2.2) json semantic_puppet (>= 0.1.2, < 2.0.0) spdx-licenses (~> 1.0) - minitar (0.5.4) + minitar (0.6.1) mocha (1.2.1) metaclass (~> 0.0.1) multi_json (1.12.1) multipart-post (2.0.0) necromancer (0.4.0) os (1.0.0) + parallel (1.11.2) parser (2.4.0.0) ast (~> 2.2) pastel (0.7.1) equatable (~> 0.5.0) tty-color (~> 0.4.0) powerpack (0.1.1) - puppet (4.5.3) + puppet (4.10.1) facter (> 2.0, < 4) + gettext-setup (>= 0.10, < 1) hiera (>= 2.0, < 4) - json_pure - puppet (4.5.3-universal-darwin) + json_pure (~> 1.8) + locale (~> 2.1) + puppet (4.10.1-universal-darwin) CFPropertyList (~> 2.2.6) facter (> 2.0, < 4) + gettext-setup (>= 0.10, < 1) hiera (>= 2.0, < 4) - json_pure - puppet-lint (1.1.0) + json_pure (~> 1.8) + locale (~> 2.1) + puppet-lint (2.2.1) puppet-lint-absolute_classname-check (0.2.4) puppet-lint (>= 1.0, < 3.0) puppet-lint-absolute_template_path (1.0.1) @@ -84,18 +89,16 @@ GEM gettext-setup (~> 0.11) minitar semantic_puppet (~> 0.1.0) - puppetlabs_spec_helper (1.1.1) - mocha - puppet-lint - puppet-syntax - rake - rspec-puppet - r10k (2.5.4) + puppetlabs_spec_helper (2.1.3) + mocha (~> 1.0) + puppet-lint (~> 2.0) + puppet-syntax (~> 2.0) + rspec-puppet (~> 2.0) + r10k (2.5.5) colored (= 1.2) cri (~> 2.6.1) gettext-setup (~> 0.5) log4r (= 1.1.10) - minitar (= 0.5.4) multi_json (~> 1.10) puppet_forge (~> 2.2) semantic_puppet (~> 0.1.0) @@ -117,7 +120,8 @@ GEM rspec-puppet (2.5.0) rspec rspec-support (3.6.0) - rubocop (0.48.1) + rubocop (0.49.1) + parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -156,25 +160,24 @@ PLATFORMS DEPENDENCIES json (>= 2.0.2) - json_pure (>= 2.0.2) - metadata-json-lint (~> 1.0) + metadata-json-lint (~> 1.2) os (~> 1.0) - puppet (~> 4.0) - puppet-lint (~> 1.1) + puppet (>= 4.9, < 5) + puppet-lint (~> 2.2) puppet-lint-absolute_classname-check (~> 0.2) puppet-lint-absolute_template_path (~> 1.0) puppet-lint-empty_string-check (~> 0.2) puppet-lint-leading_zero-check (~> 0.1) puppet-lint-resource_reference_syntax (~> 1.0) puppet-lint-spaceship_operator_without_tag-check (~> 0.1) - puppet-lint-trailing_newline-check (~> 1.0) + puppet-lint-trailing_newline-check (~> 1.1) puppet-lint-undef_in_function-check (~> 0.2) puppet-lint-unquoted_string-check (~> 0.3) - puppet-lint-variable_contains_upcase (~> 1.1) - puppetlabs_spec_helper (~> 1.1) - r10k (~> 2.3) + puppet-lint-variable_contains_upcase (~> 1.2) + puppetlabs_spec_helper (~> 2.1) + r10k (~> 2.5) rspec-puppet (~> 2.5) - rubocop (~> 0.48) + rubocop (~> 0.49) rugged (~> 0.24) tty-command (~> 0.4) tty-file (~> 0.3)