summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-07-06 10:13:25 -0700
committerGitHub <noreply@github.com>2021-07-06 10:13:25 -0700
commitdfd7b36b2905dad433ef7209561e8217e2173782 (patch)
treecebdb06bece5a6cd61a0f515d060e0e58812a56d
parent8457513756bfaed5e23b581990da023dd21aeb7b (diff)
parentf72ec2cff0da6d8c3bf2b9a7809f99c07a5a2c2e (diff)
downloadchef-dfd7b36b2905dad433ef7209561e8217e2173782.tar.gz
Merge pull request #11787 from chef/chefstyle
Chefstyle fixes for RuboCop 1.18.3
-rw-r--r--knife/spec/integration/cookbook_download_spec.rb2
-rw-r--r--lib/chef/client.rb2
-rw-r--r--lib/chef/json_compat.rb2
-rw-r--r--lib/chef/provider/lwrp_base.rb2
-rw-r--r--lib/chef/resource/lwrp_base.rb2
-rw-r--r--spec/functional/mixin/from_file_spec.rb2
-rw-r--r--spec/integration/recipes/recipe_dsl_spec.rb2
-rw-r--r--spec/integration/recipes/resource_action_spec.rb8
8 files changed, 11 insertions, 11 deletions
diff --git a/knife/spec/integration/cookbook_download_spec.rb b/knife/spec/integration/cookbook_download_spec.rb
index 589417126c..18b50ef824 100644
--- a/knife/spec/integration/cookbook_download_spec.rb
+++ b/knife/spec/integration/cookbook_download_spec.rb
@@ -66,7 +66,7 @@ describe "knife cookbook download", :workstation do
Downloading root_files
Cookbook downloaded to #{tmpdir}/x-1.0.1
EOM
- )
+ )
end
end
end
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 3a312701d2..efe6409fcd 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -751,7 +751,7 @@ class Chef
end
# Notification registration
- class<<self
+ class << self
#
# Add a listener for the 'client run started' event.
#
diff --git a/lib/chef/json_compat.rb b/lib/chef/json_compat.rb
index b5c9072f6f..2c143ab445 100644
--- a/lib/chef/json_compat.rb
+++ b/lib/chef/json_compat.rb
@@ -25,7 +25,7 @@ require "json" unless defined?(JSON)
class Chef
class JSONCompat
- class <<self
+ class << self
def parse(source, opts = {})
FFI_Yajl::Parser.parse(source, opts)
diff --git a/lib/chef/provider/lwrp_base.rb b/lib/chef/provider/lwrp_base.rb
index a95927daf3..4b9c67a568 100644
--- a/lib/chef/provider/lwrp_base.rb
+++ b/lib/chef/provider/lwrp_base.rb
@@ -45,7 +45,7 @@ class Chef
def load_current_resource; end
# class methods
- class <<self
+ class << self
include Chef::Mixin::ConvertToClassName
include Chef::Mixin::FromFile
diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb
index 1284572339..63bad384d4 100644
--- a/lib/chef/resource/lwrp_base.rb
+++ b/lib/chef/resource/lwrp_base.rb
@@ -37,7 +37,7 @@ class Chef
class LWRPBase < Resource
# Class methods
- class <<self
+ class << self
include Chef::Mixin::ConvertToClassName
include Chef::Mixin::FromFile
diff --git a/spec/functional/mixin/from_file_spec.rb b/spec/functional/mixin/from_file_spec.rb
index 17371513e7..d0cb0cc96b 100644
--- a/spec/functional/mixin/from_file_spec.rb
+++ b/spec/functional/mixin/from_file_spec.rb
@@ -33,7 +33,7 @@ describe Chef::Mixin::FromFile do
end
class ClassTestData
- class <<self
+ class << self
include Chef::Mixin::FromFile
def a(a = nil)
diff --git a/spec/integration/recipes/recipe_dsl_spec.rb b/spec/integration/recipes/recipe_dsl_spec.rb
index c692915afd..b639fb4d3f 100644
--- a/spec/integration/recipes/recipe_dsl_spec.rb
+++ b/spec/integration/recipes/recipe_dsl_spec.rb
@@ -19,7 +19,7 @@ describe "Recipe DSL methods" do
provides :base_thingy
default_action :create
- class<<self
+ class << self
attr_accessor :created_name
attr_accessor :created_resource
attr_accessor :created_provider
diff --git a/spec/integration/recipes/resource_action_spec.rb b/spec/integration/recipes/resource_action_spec.rb
index febac64283..009a78a24a 100644
--- a/spec/integration/recipes/resource_action_spec.rb
+++ b/spec/integration/recipes/resource_action_spec.rb
@@ -9,7 +9,7 @@ class NoActionJackson < Chef::Resource
@foo
end
- class <<self
+ class << self
attr_accessor :action_was
end
end
@@ -17,7 +17,7 @@ end
class WeirdActionJackson < Chef::Resource
provides :weird_action_jackson
- class <<self
+ class << self
attr_accessor :action_was
end
@@ -176,7 +176,7 @@ module ResourceActionSpec
@blarghle
end
- class <<self
+ class << self
attr_accessor :ran_action
attr_accessor :succeeded
attr_accessor :ruby_block_converged
@@ -284,7 +284,7 @@ module ResourceActionSpec
@bar = "#{value}alope" if value
@bar
end
- class <<self
+ class << self
attr_accessor :load_current_resource_ran
attr_accessor :jackalope_ran
end