chore: gems update

ajgon · Dec 8, 2020 · 8d2aef7 · 8d2aef7
1 parent 37b9465
commit 8d2aef7
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 33 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -10,6 +10,7 @@ Layout/EmptyLinesAroundAttributeAccessor:
 
 Layout/LineLength:
   Max: 120
+  Enabled: true
 
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
@@ -23,15 +24,27 @@ Lint/ConstantDefinitionInBlock:
 Lint/DeprecatedOpenSSLConstant:
   Enabled: true
 
+Lint/DuplicateBranch:
+  Enabled: true
+
 Lint/DuplicateElsifCondition:
   Enabled: true
 
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+
 Lint/DuplicateRequire:
   Enabled: true
 
 Lint/DuplicateRescueException:
   Enabled: true
 
+Lint/EmptyBlock:
+  Enabled: true
+
+Lint/EmptyClass:
+  Enabled: true
+
 Lint/EmptyConditionalBody:
   Enabled: true
 
@@ -43,6 +56,7 @@ Lint/FloatComparison:
 
 Lint/HashCompareByIdentity:
   Enabled: true
+
 Lint/IdentityComparison:
   Enabled: true
 
@@ -52,6 +66,9 @@ Lint/MissingSuper:
 Lint/MixedRegexpCaptureTypes:
   Enabled: true
 
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+
 Lint/OutOfRangeRegexpRef:
   Enabled: true
 
@@ -67,12 +84,21 @@ Lint/SelfAssignment:
 Lint/StructNewOverride:
   Enabled: true
 
+Lint/ToEnumArguments:
+  Enabled: true
+
 Lint/TopLevelReturnWithArgument:
   Enabled: true
 
 Lint/TrailingCommaInAttributeDeclaration:
   Enabled: true
 
+Lint/UnexpectedBlockArity:
+  Enabled: true
+
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+
 Lint/UnreachableLoop:
   Enabled: true
 
@@ -84,19 +110,33 @@ Lint/UselessTimes:
 
 Metrics/AbcSize:
   Max: 30
+  Enabled: true
 
 Metrics/BlockLength:
   Enabled: false
 
 Metrics/PerceivedComplexity:
   Max: 10
+  Enabled: true
 
 Performance/AncestorsInclude:
   Enabled: true
 
 Performance/BigDecimalWithNumericArgument:
   Enabled: true
 
+Performance/BlockGivenWithExplicitBlock:
+  Enabled: true
+
+Performance/CollectionLiteralInLoop:
+  Enabled: true
+
+Performance/ConstantRegexp:
+  Enabled: true
+
+Performance/MethodObjectAsBlock:
+  Enabled: true
+
 Performance/RedundantSortBlock:
   Enabled: true
 
@@ -121,6 +161,9 @@ Performance/Sum:
 Style/AccessorGrouping:
   Enabled: true
 
+Style/ArgumentsForwarding:
+  Enabled: true
+
 Style/ArrayCoercion:
   Enabled: true
 
@@ -133,9 +176,15 @@ Style/CaseLikeIf:
 Style/ClassEqualityComparison:
   Enabled: true
 
+Style/CollectionCompact:
+  Enabled: true
+
 Style/CombinableLoops:
   Enabled: true
 
+Style/DocumentDynamicEvalDefinition:
+  Enabled: true
+
 Style/Documentation:
   Enabled: false
 
@@ -166,9 +215,18 @@ Style/HashTransformValues:
 Style/KeywordParametersOrder:
   Enabled: true
 
+Style/NegatedIfElseCondition:
+  Enabled: true
+
+Style/NilLambda:
+  Enabled: true
+
 Style/OptionalBooleanParameter:
   Enabled: true
 
+Style/RedundantArgument:
+  Enabled: true
+
 Style/RedundantAssignment:
   Enabled: true
 
@@ -199,9 +257,13 @@ Style/SoleNestedConditional:
 Style/StringConcatenation:
   Enabled: true
 
+Style/SwapValues:
+  Enabled: true
+
 AllCops:
   TargetRubyVersion: 2.6
   DisplayCopNames: true
+
   Exclude:
     - libraries/provider_*.rb
     - libraries/resource_deploy*.rb
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -96,7 +96,7 @@ GEM
     diff-lcs (1.4.4)
     docile (1.1.5)
     ed25519 (1.2.4)
-    erubi (1.9.0)
+    erubi (1.10.0)
     erubis (2.7.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
@@ -116,7 +116,7 @@ GEM
       rufus-lru (~> 1.0)
       treetop (~> 1.4)
     fuzzyurl (0.9.0)
-    gssapi (1.3.0)
+    gssapi (1.3.1)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
@@ -129,7 +129,7 @@ GEM
     json (2.3.1)
     kitchen-docker (2.10.0)
       test-kitchen (>= 1.0.0)
-    kitchen-vagrant (1.7.0)
+    kitchen-vagrant (1.7.2)
       test-kitchen (>= 1.4, < 3)
     libyajl2 (1.2.0)
     license-acceptance (2.1.2)
@@ -149,14 +149,14 @@ GEM
     mixlib-cli (1.7.0)
     mixlib-config (2.2.18)
       tomlrb
-    mixlib-install (3.12.3)
+    mixlib-install (3.12.5)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (1.7.1)
     mixlib-shellout (2.4.4)
     mixlib-versioning (1.2.12)
-    molinillo (0.6.6)
+    molinillo (0.7.0)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     net-scp (3.0.0)
@@ -174,7 +174,7 @@ GEM
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     nori (2.6.0)
-    octokit (4.18.0)
+    octokit (4.19.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (8.26.1)
@@ -192,7 +192,7 @@ GEM
     overcommit (0.57.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
-    parallel (1.19.2)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     pastel (0.8.0)
@@ -204,7 +204,7 @@ GEM
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.8.2)
+    regexp_parser (2.0.0)
     retryable (2.0.4)
     rexml (3.2.4)
     ridley (5.1.1)
@@ -225,38 +225,38 @@ GEM
       retryable (~> 2.0)
       semverse (~> 2.0)
       varia_model (~> 0.6)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.93.1)
+    rubocop (1.5.2)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
+    rubocop-ast (1.3.0)
       parser (>= 2.7.1.5)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
+    rubocop-performance (1.9.1)
+      rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.10.1)
     ruby_parser (3.15.0)
@@ -283,7 +283,7 @@ GEM
     solve (4.0.4)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    specinfra (2.82.21)
+    specinfra (2.82.22)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -298,7 +298,7 @@ GEM
     systemu (2.6.5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-kitchen (2.7.2)
+    test-kitchen (2.8.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)
@@ -323,7 +323,7 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-cursor (~> 0.7)
-    tty-color (0.5.2)
+    tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-prompt (0.22.0)
       pastel (~> 0.8)
@@ -348,7 +348,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.2.2)
+    winrm-elevated (1.2.3)
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)

diff --git a/libraries/core_ext.rb b/libraries/core_ext.rb
@@ -6,7 +6,7 @@ def try(*methods, &block)
   end
 
   def try!(*methods, &block)
-    if methods.empty? && block_given?
+    if methods.empty? && block
       if block.arity.zero?
         instance_eval(&block)
       else

diff --git a/recipes/setup.rb b/recipes/setup.rb
@@ -146,8 +146,8 @@
     end
   else
     ruby_pkg_version = node['ruby-version'].split('.')[0..1]
-    package "ruby#{ruby_pkg_version.join('')}"
-    package "ruby#{ruby_pkg_version.join('')}-devel"
+    package "ruby#{ruby_pkg_version.join}"
+    package "ruby#{ruby_pkg_version.join}-devel"
     execute "/usr/sbin/alternatives --set ruby /usr/bin/ruby#{ruby_pkg_version.join('.')}"
 
     link '/usr/local/bin/bundle' do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -29,7 +29,7 @@ def deep_merge!(other, &block)
       @target.dup.merge!(other) do |key, old_val, new_val|
         if old_val.is_a?(Hash) && new_val.is_a?(Hash)
           DeepMergeableHash.new(old_val).deep_merge(new_val, &block)
-        elsif block_given?
+        elsif block
           yield(key, old_val, new_val)
         else
           new_val