Merge pull request #32 from DavidS/rubocop-0.53.0

Update to rubocop 0.53.0

.rubocop.yml

@@ -62,10 +62,6 @@ Style/TrailingCommaInArguments:
   Description: Prefer always trailing comma on multiline argument lists. This makes
     diffs, and re-ordering nicer.
   EnforcedStyleForMultiline: comma
-Style/TrailingCommaInLiteral:
-  Description: Prefer always trailing comma on multiline literals. This makes diffs,
-    and re-ordering nicer.
-  EnforcedStyleForMultiline: comma
 Style/SymbolArray:
   Description: Using percent style obscures symbolic intent of array's contents.
   EnforcedStyle: brackets
@@ -135,3 +131,26 @@ Style/BracesAroundHashParameters:
 # see http://www.virtuouscode.com/2016/01/06/about-the-ruby-squiggly-heredoc-syntax/
 Layout/IndentHeredoc:
   Enabled: false
+
+# Updated in 0.53 (or thereabouts)
+Style/TrailingCommaInArrayLiteral:
+  Description: Prefer always trailing comma on multiline literals. This makes diffs,
+    and re-ordering nicer.
+  EnforcedStyleForMultiline: comma
+Style/TrailingCommaInHashLiteral:
+  Description: Prefer always trailing comma on multiline literals. This makes diffs,
+    and re-ordering nicer.
+  EnforcedStyleForMultiline: comma
+
+# Add allowing "is", as it is a technical term in puppet
+Naming/UncommunicativeMethodParamName:
+  Description: Checks for method parameter names that contain capital letters, end in
+    numbers, or do not meet a minimal length.
+  Enabled: true
+  MinNameLength: 3
+  AllowNamesEndingInNumbers: true
+  AllowedNames:
+  - io
+  - id
+  - is
+  ForbiddenNames: []

Rakefile

@@ -13,7 +13,7 @@ end
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-  if RUBY_PLATFORM == "java"
+  if RUBY_PLATFORM == 'java'
     t.exclude_pattern = 'spec/{acceptance/**/*.rb,integration/**/*.rb,puppet/resource_api/*_context_spec.rb,puppet/util/network_device/simple/device_spec.rb}'
     t.rspec_opts = '--tag ~agent_test'
   end

puppet-resource_api.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('../lib', __FILE__) # __dir__ not supported on ruby-1.9 # rubocop:disable Style/ExpandPathArguments
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'puppet/resource_api/version'
 

spec/puppet/resource_api/base_context_spec.rb

@@ -3,9 +3,9 @@
 RSpec.describe Puppet::ResourceApi::BaseContext do
   class TestContext < described_class
     attr_reader :last_level, :last_message
-    def send_log(l, m)
-      @last_level = l
-      @last_message = m
+    def send_log(log, msg)
+      @last_level = log
+      @last_message = msg
     end
   end
 

spec/puppet/resource_api_spec.rb

@@ -389,9 +389,9 @@
     end
     let(:provider_class) do
       Class.new do
-        def canonicalize(_context, x)
-          x[0][:test_string] = ['canon', x[0][:test_string]].compact.join unless x[0][:test_string] && x[0][:test_string].start_with?('canon')
-          x
+        def canonicalize(_context, resources)
+          resources[0][:test_string] = ['canon', resources[0][:test_string]].compact.join unless resources[0][:test_string] && resources[0][:test_string].start_with?('canon')
+          resources
         end
 
         def get(_context)