From 1e4484ae6b3ff1310dd6a7eca38413c8e98c1f13 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 7 Jul 2020 17:58:19 -0700 Subject: Allow iso8601 gem version 0.13 This release just drops Ruby 2.4 support and resolves Rubocop warnings. Signed-off-by: Tim Smith --- Gemfile.lock | 34 ++++++++++++------------- chef-universal-mingw32.gemspec | 2 +- omnibus/Gemfile.lock | 58 +++++++++++++++++++++--------------------- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c1b7ece64f..e5aaeb283f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: d8d6cc3aa61b8ba9611be452f43618f5a6138ade + revision: 605f02c66120e999c00895fe3d53769472759aa5 branch: master specs: - chefstyle (1.1.2) - rubocop (= 0.86.0) + chefstyle (1.2.0) + rubocop (= 0.88.0) GIT remote: https://github.com/chef/ohai.git @@ -74,7 +74,7 @@ PATH ffi-yajl (~> 2.2) highline (>= 1.6.9, < 2) iniparse (~> 1.4) - iso8601 (~> 0.12.1) + iso8601 (>= 0.12.1, < 0.14) license-acceptance (~> 1.0, >= 1.0.5) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) @@ -161,7 +161,7 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) debug_inspector (0.0.3) - diff-lcs (1.3) + diff-lcs (1.4.4) ecma-re-validator (0.2.1) regexp_parser (~> 1.2) ed25519 (1.2.4) @@ -193,7 +193,7 @@ GEM htmlentities (4.3.4) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.20.10) + inspec-core (4.21.3) addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0) @@ -218,12 +218,12 @@ GEM train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) - inspec-core-bin (4.20.10) - inspec-core (= 4.20.10) + inspec-core-bin (4.21.3) + inspec-core (= 4.21.3) ipaddress (0.8.3) - iso8601 (0.12.3) - json (2.3.0) - json_schemer (0.2.11) + iso8601 (0.13.0) + json (2.3.1) + json_schemer (0.2.12) ecma-re-validator (~> 0.2) hana (~> 1.3) regexp_parser (~> 1.5) @@ -252,7 +252,7 @@ GEM mixlib-shellout (3.0.9-universal-mingw32) win32-process (~> 0.8.2) wmi-lite (~> 1.0) - multi_json (1.14.1) + multi_json (1.15.0) multipart-post (2.1.1) necromancer (0.5.1) net-scp (3.0.0) @@ -313,16 +313,16 @@ GEM rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.86.0) + rubocop (0.88.0) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.0.3, < 1.0) + rubocop-ast (>= 0.1.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.0.3) + rubocop-ast (0.1.0) parser (>= 2.7.0.1) ruby-prof (1.2.0) ruby-progressbar (1.10.1) @@ -348,7 +348,7 @@ GEM tins (1.25.0) sync tomlrb (1.2.9) - train-core (3.3.1) + train-core (3.3.6) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec index 9d77b2526e..49228f6c9e 100644 --- a/chef-universal-mingw32.gemspec +++ b/chef-universal-mingw32.gemspec @@ -14,7 +14,7 @@ gemspec.add_dependency "win32-process", "~> 0.8.2" gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0" gemspec.add_dependency "wmi-lite", "~> 1.0" gemspec.add_dependency "win32-taskscheduler", "~> 2.0" -gemspec.add_dependency "iso8601", "~> 0.12.1" +gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out gemspec.add_dependency "win32-certstore", "~> 0.3" gemspec.extensions << "ext/win32-eventlog/Rakefile" gemspec.files += Dir.glob("{distro,ext}/**/*") diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index e8108cf800..d22a6db8e1 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: d75718522deb9faeb3c21b50c60e94daf70ce9b6 + revision: fdca423b097bfdabc765320aa15f7b392501b7ed branch: master specs: - omnibus (7.0.13) + omnibus (7.0.18) aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) chef-sugar (>= 3.3) @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 2cf96c6c07de7d05ded6b45a0531feb10ae7cd9e + revision: 6909d445b211528dc3c56b66813bca78dc22d213 branch: master specs: omnibus-software (4.0.0) @@ -32,16 +32,16 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.335.0) - aws-sdk-core (3.102.1) + aws-partitions (1.341.0) + aws-sdk-core (3.103.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.35.0) + aws-sdk-kms (1.36.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.71.1) + aws-sdk-s3 (1.74.0) aws-sdk-core (~> 3, >= 3.102.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -64,19 +64,19 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (16.2.50) + chef (16.2.73) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.2.50) - chef-utils (= 16.2.50) + chef-config (= 16.2.73) + chef-utils (= 16.2.73) chef-vault chef-zero (>= 14.0.11) - diff-lcs (~> 1.2, >= 1.2.4) + diff-lcs (>= 1.2.4, < 1.4.0) ed25519 (~> 1.2) erubis (~> 2.7) ffi (>= 1.9.25) - ffi-libarchive + ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) iniparse (~> 1.4) @@ -98,19 +98,19 @@ GEM train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (16.2.50-universal-mingw32) + chef (16.2.73-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.2.50) - chef-utils (= 16.2.50) + chef-config (= 16.2.73) + chef-utils (= 16.2.73) chef-vault chef-zero (>= 14.0.11) - diff-lcs (~> 1.2, >= 1.2.4) + diff-lcs (>= 1.2.4, < 1.4.0) ed25519 (~> 1.2) erubis (~> 2.7) ffi (>= 1.9.25) - ffi-libarchive + ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) iniparse (~> 1.4) @@ -145,15 +145,15 @@ GEM win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) chef-cleanroom (1.0.2) - chef-config (16.2.50) + chef-config (16.2.73) addressable - chef-utils (= 16.2.50) + chef-utils (= 16.2.73) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) chef-sugar (5.1.9) - chef-utils (16.2.50) + chef-utils (16.2.73) chef-vault (4.0.1) chef-zero (15.0.0) ffi-yajl (~> 2.2) @@ -164,7 +164,7 @@ GEM citrus (3.0.2) cleanroom (1.0.0) concurrent-ruby (1.1.6) - diff-lcs (1.4) + diff-lcs (1.3) ed25519 (1.2.4) equatable (0.6.1) erubi (1.9.0) @@ -191,9 +191,9 @@ GEM iniparse (1.5.0) iostruct (0.0.4) ipaddress (0.8.3) - iso8601 (0.12.2) + iso8601 (0.12.3) jmespath (1.4.0) - json (2.3.0) + json (2.3.1) kitchen-vagrant (1.6.1) test-kitchen (>= 1.4, < 3) libyajl2 (1.2.0) @@ -207,9 +207,9 @@ GEM mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) little-plugger (1.1.4) - logging (2.2.2) + logging (2.3.0) little-plugger (~> 1.1) - multi_json (~> 1.10) + multi_json (~> 1.14) minitar (0.9) mixlib-archive (1.0.5) mixlib-log @@ -230,7 +230,7 @@ GEM wmi-lite (~> 1.0) mixlib-versioning (1.2.12) molinillo (0.6.6) - multi_json (1.14.1) + multi_json (1.15.0) multipart-post (2.1.1) necromancer (0.5.1) net-scp (3.0.0) @@ -247,7 +247,7 @@ GEM octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (16.2.1) + ohai (16.2.3) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) @@ -295,7 +295,7 @@ GEM structured_warnings (0.4.0) syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (2.5.2) + test-kitchen (2.5.3) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) license-acceptance (~> 1.0, >= 1.0.11) @@ -312,7 +312,7 @@ GEM toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.3.1) + train-core (3.3.6) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) -- cgit v1.2.1 From bc42dacb13565f44de7b2ce71b5a0032d07c696c Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Wed, 15 Jul 2020 11:58:26 -0700 Subject: Chefstyle 1.2.0 fixes Signed-off-by: Tim Smith --- chef-bin/chef-bin.gemspec | 1 - chef-config/chef-config.gemspec | 1 - chef-utils/chef-utils.gemspec | 1 - lib/chef/provider/mount/solaris.rb | 1 - lib/chef/provider/package/zypper.rb | 1 - spec/functional/resource/aix_service_spec.rb | 1 - spec/functional/resource/aixinit_service_spec.rb | 1 - spec/functional/resource/apt_package_spec.rb | 1 - spec/functional/resource/cron_spec.rb | 1 - spec/functional/resource/insserv_spec.rb | 1 - spec/unit/mixin/securable_spec.rb | 1 - 11 files changed, 11 deletions(-) diff --git a/chef-bin/chef-bin.gemspec b/chef-bin/chef-bin.gemspec index 66d14f3f52..4ca7da4f6b 100644 --- a/chef-bin/chef-bin.gemspec +++ b/chef-bin/chef-bin.gemspec @@ -1,4 +1,3 @@ -# coding: utf-8 lib = File.expand_path("../lib", __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "chef-bin/version" diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec index 2e978236ee..a273b70d44 100644 --- a/chef-config/chef-config.gemspec +++ b/chef-config/chef-config.gemspec @@ -1,4 +1,3 @@ -# coding: utf-8 lib = File.expand_path("../lib", __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "chef-config/version" diff --git a/chef-utils/chef-utils.gemspec b/chef-utils/chef-utils.gemspec index dbe0ef751e..3f135de6ba 100644 --- a/chef-utils/chef-utils.gemspec +++ b/chef-utils/chef-utils.gemspec @@ -1,4 +1,3 @@ -# coding: utf-8 lib = File.expand_path("../lib", __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "chef-utils/version" diff --git a/lib/chef/provider/mount/solaris.rb b/lib/chef/provider/mount/solaris.rb index 203efa2cd4..245e04f40e 100644 --- a/lib/chef/provider/mount/solaris.rb +++ b/lib/chef/provider/mount/solaris.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Author:: Hugo Fichter # Author:: Lamont Granquist () # Author:: Joshua Timberman () diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb index 403e73ea47..40a03b9f88 100644 --- a/lib/chef/provider/package/zypper.rb +++ b/lib/chef/provider/package/zypper.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Authors:: Adam Jacob () # Ionuț Arțăriși () diff --git a/spec/functional/resource/aix_service_spec.rb b/spec/functional/resource/aix_service_spec.rb index 0bc3dd2aad..455b9344f9 100755 --- a/spec/functional/resource/aix_service_spec.rb +++ b/spec/functional/resource/aix_service_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Kaustubh Deorukhkar () # Copyright:: Copyright (c) Chef Software Inc. diff --git a/spec/functional/resource/aixinit_service_spec.rb b/spec/functional/resource/aixinit_service_spec.rb index ed99472df3..a5dea072c4 100755 --- a/spec/functional/resource/aixinit_service_spec.rb +++ b/spec/functional/resource/aixinit_service_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Kaustubh Deorukhkar () # Copyright:: Copyright (c) Chef Software Inc. diff --git a/spec/functional/resource/apt_package_spec.rb b/spec/functional/resource/apt_package_spec.rb index 431c106cb0..228882a2e7 100644 --- a/spec/functional/resource/apt_package_spec.rb +++ b/spec/functional/resource/apt_package_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Daniel DeLeo () # Copyright:: Copyright (c) Chef Software Inc. diff --git a/spec/functional/resource/cron_spec.rb b/spec/functional/resource/cron_spec.rb index 29f2eb4eea..0e9e690d66 100644 --- a/spec/functional/resource/cron_spec.rb +++ b/spec/functional/resource/cron_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Kaustubh Deorukhkar () # Copyright:: Copyright (c) Chef Software Inc. diff --git a/spec/functional/resource/insserv_spec.rb b/spec/functional/resource/insserv_spec.rb index caacd4c0ed..2c1770cb7f 100644 --- a/spec/functional/resource/insserv_spec.rb +++ b/spec/functional/resource/insserv_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Dheeraj Dubey () # Copyright:: Copyright (c) Chef Software Inc. diff --git a/spec/unit/mixin/securable_spec.rb b/spec/unit/mixin/securable_spec.rb index 538241551a..4863693dba 100644 --- a/spec/unit/mixin/securable_spec.rb +++ b/spec/unit/mixin/securable_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Mark Mzyk () # Copyright:: Copyright (c) Chef Software Inc. -- cgit v1.2.1