diff options
author | Tim Smith <tsmith84@gmail.com> | 2020-07-07 15:54:52 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-07-07 17:32:22 -0700 |
commit | 6c4c32340ac0fcebb53768cb78f5760e55c35514 (patch) | |
tree | 70de57d90bacbe6be118c9b6ead9efc1e650098e | |
parent | ed460911a49716817ded2986e81a5116dfbb795e (diff) | |
download | chef-6c4c32340ac0fcebb53768cb78f5760e55c35514.tar.gz |
Fix quotes for Chefstyle
Signed-off-by: Tim Smith <tsmith@chef.io>
31 files changed, 40 insertions, 40 deletions
@@ -9,12 +9,12 @@ gem "chef", path: "." gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" -gem "chef-utils", path: File.expand_path('chef-utils', __dir__) if File.exist?(File.expand_path('chef-utils', __dir__)) -gem "chef-config", path: File.expand_path('chef-config', __dir__) if File.exist?(File.expand_path('chef-config', __dir__)) +gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__)) +gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__)) -if File.exist?(File.expand_path('chef-bin', __dir__)) +if File.exist?(File.expand_path("chef-bin", __dir__)) # bundling in a git checkout - gem "chef-bin", path: File.expand_path('chef-bin', __dir__) + gem "chef-bin", path: File.expand_path("chef-bin", __dir__) else # bundling in omnibus gem "chef-bin" # rubocop:disable Bundler/DuplicatedGem @@ -18,7 +18,7 @@ # # we need this to resolve files required by lib/chef/dist -$LOAD_PATH.unshift(File.expand_path('chef-config/lib', __dir__)) +$LOAD_PATH.unshift(File.expand_path("chef-config/lib", __dir__)) begin require_relative "tasks/rspec" diff --git a/chef-bin/chef-bin.gemspec b/chef-bin/chef-bin.gemspec index 0b87227be8..1e7c45d8e9 100644 --- a/chef-bin/chef-bin.gemspec +++ b/chef-bin/chef-bin.gemspec @@ -1,5 +1,5 @@ # coding: utf-8 -lib = File.expand_path('lib', __dir__) +lib = File.expand_path("lib", __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "chef-bin/version" diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index 3aa4f15786..15bf9be9cb 100644 --- a/chef-bin/lib/chef-bin/version.rb +++ b/chef-bin/lib/chef-bin/version.rb @@ -20,7 +20,7 @@ # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! module ChefBin - CHEFBIN_ROOT = File.expand_path('..', __dir__) + CHEFBIN_ROOT = File.expand_path("..", __dir__) VERSION = "16.2.86".freeze end diff --git a/chef-config/Gemfile b/chef-config/Gemfile index 312045d7c7..c3d90e5e6c 100644 --- a/chef-config/Gemfile +++ b/chef-config/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "chef-utils", path: File.expand_path('../chef-utils', __dir__) if File.exist?(File.expand_path('../chef-utils', __dir__)) +gem "chef-utils", path: File.expand_path("../chef-utils", __dir__) if File.exist?(File.expand_path("../chef-utils", __dir__)) # Specify your gem's dependencies in chef-config.gemspec gemspec diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec index 80aa6da7ed..6229acdade 100644 --- a/chef-config/chef-config.gemspec +++ b/chef-config/chef-config.gemspec @@ -1,5 +1,5 @@ # coding: utf-8 -lib = File.expand_path('lib', __dir__) +lib = File.expand_path("lib", __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "chef-config/version" diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec index 3aced09d1b..9aa286ee82 100644 --- a/chef-universal-mingw32.gemspec +++ b/chef-universal-mingw32.gemspec @@ -1,4 +1,4 @@ -gemspec = eval(IO.read(File.expand_path('chef.gemspec', __dir__))) +gemspec = eval(IO.read(File.expand_path("chef.gemspec", __dir__))) gemspec.platform = Gem::Platform.new(%w{universal mingw32}) diff --git a/chef-utils/chef-utils.gemspec b/chef-utils/chef-utils.gemspec index 0e91ed49aa..cbd745e991 100644 --- a/chef-utils/chef-utils.gemspec +++ b/chef-utils/chef-utils.gemspec @@ -1,5 +1,5 @@ # coding: utf-8 -lib = File.expand_path('lib', __dir__) +lib = File.expand_path("lib", __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "chef-utils/version" diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 35506123ab..c55084200a 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -14,6 +14,6 @@ # limitations under the License. module ChefUtils - CHEFUTILS_ROOT = File.expand_path("../..", __FILE__) + CHEFUTILS_ROOT = File.expand_path('..', __dir__) VERSION = "16.2.86".freeze end diff --git a/lib/chef/knife/core/gem_glob_loader.rb b/lib/chef/knife/core/gem_glob_loader.rb index e31d826081..b29df38c86 100644 --- a/lib/chef/knife/core/gem_glob_loader.rb +++ b/lib/chef/knife/core/gem_glob_loader.rb @@ -47,7 +47,7 @@ class Chef def find_subcommands_via_dirglob # The "require paths" of the core knife subcommands bundled with chef - files = Dir[File.join(Chef::Util::PathHelper.escape_glob_dir(File.expand_path('../../knife', __dir__)), "*.rb")] + files = Dir[File.join(Chef::Util::PathHelper.escape_glob_dir(File.expand_path("../../knife", __dir__)), "*.rb")] subcommand_files = {} files.each do |knife_file| rel_path = knife_file[/#{CHEF_ROOT}#{Regexp.escape(File::SEPARATOR)}(.*)\.rb/, 1] diff --git a/lib/chef/knife/core/subcommand_loader.rb b/lib/chef/knife/core/subcommand_loader.rb index e416d4a0c2..b0f8381d64 100644 --- a/lib/chef/knife/core/subcommand_loader.rb +++ b/lib/chef/knife/core/subcommand_loader.rb @@ -125,7 +125,7 @@ class Chef # def find_subcommands_via_dirglob # The "require paths" of the core knife subcommands bundled with chef - files = Dir[File.join(Chef::Util::PathHelper.escape_glob_dir(File.expand_path('../../knife', __dir__)), "*.rb")] + files = Dir[File.join(Chef::Util::PathHelper.escape_glob_dir(File.expand_path("../../knife", __dir__)), "*.rb")] subcommand_files = {} files.each do |knife_file| rel_path = knife_file[/#{CHEF_ROOT}#{Regexp.escape(File::SEPARATOR)}(.*)\.rb/, 1] diff --git a/lib/chef/log.rb b/lib/chef/log.rb index 63454e91a6..6254b71342 100644 --- a/lib/chef/log.rb +++ b/lib/chef/log.rb @@ -47,7 +47,7 @@ class Chef def self.caller_location # Pick the first caller that is *not* part of the Chef gem, that's the # thing the user wrote. Or failing that, the most recent caller. - chef_gem_path = File.expand_path('..', __dir__) + chef_gem_path = File.expand_path("..", __dir__) caller(0..20).find { |c| !c.start_with?(chef_gem_path) } || caller(0..1)[0] end diff --git a/lib/chef/provider/yum_repository.rb b/lib/chef/provider/yum_repository.rb index 787ce301f9..956d5ae64c 100644 --- a/lib/chef/provider/yum_repository.rb +++ b/lib/chef/provider/yum_repository.rb @@ -37,7 +37,7 @@ class Chef if template_available?(new_resource.source) source new_resource.source else - source ::File.expand_path('support/yum_repo.erb', __dir__) + source ::File.expand_path("support/yum_repo.erb", __dir__) local true end sensitive new_resource.sensitive diff --git a/lib/chef/provider/zypper_repository.rb b/lib/chef/provider/zypper_repository.rb index 5173118ba6..d2d4d68d76 100644 --- a/lib/chef/provider/zypper_repository.rb +++ b/lib/chef/provider/zypper_repository.rb @@ -41,7 +41,7 @@ class Chef if template_available?(new_resource.source) source new_resource.source else - source ::File.expand_path('support/zypper_repo.erb', __dir__) + source ::File.expand_path("support/zypper_repo.erb", __dir__) local true end sensitive new_resource.sensitive diff --git a/lib/chef/resource/cron/cron_d.rb b/lib/chef/resource/cron/cron_d.rb index 9749fa1976..882544a8bc 100644 --- a/lib/chef/resource/cron/cron_d.rb +++ b/lib/chef/resource/cron/cron_d.rb @@ -158,7 +158,7 @@ class Chef # @todo this is Chef 12 era cleanup. Someday we should remove it all template "/etc/cron.d/#{sanitized_name}" do - source ::File.expand_path('../support/cron.d.erb', __dir__) + source ::File.expand_path("../support/cron.d.erb", __dir__) local true mode new_resource.mode variables( diff --git a/lib/chef/resource/cron_access.rb b/lib/chef/resource/cron_access.rb index 1b991ae35c..3ea777ce9c 100644 --- a/lib/chef/resource/cron_access.rb +++ b/lib/chef/resource/cron_access.rb @@ -70,7 +70,7 @@ class Chef with_run_context :root do edit_resource(:template, allow_path) do |new_resource| - source ::File.expand_path('support/cron_access.erb', __dir__) + source ::File.expand_path("support/cron_access.erb", __dir__) local true mode "0600" variables["users"] ||= [] @@ -87,7 +87,7 @@ class Chef with_run_context :root do edit_resource(:template, deny_path) do |new_resource| - source ::File.expand_path('support/cron_access.erb', __dir__) + source ::File.expand_path("support/cron_access.erb", __dir__) local true mode "0600" variables["users"] ||= [] diff --git a/lib/chef/resource/ssh_known_hosts_entry.rb b/lib/chef/resource/ssh_known_hosts_entry.rb index c4384d80f0..533cb42279 100644 --- a/lib/chef/resource/ssh_known_hosts_entry.rb +++ b/lib/chef/resource/ssh_known_hosts_entry.rb @@ -106,7 +106,7 @@ class Chef r = with_run_context :root do find_resource(:template, "update ssh known hosts file #{new_resource.file_location}") do - source ::File.expand_path('support/ssh_known_hosts.erb', __dir__) + source ::File.expand_path("support/ssh_known_hosts.erb", __dir__) local true path new_resource.file_location owner new_resource.owner diff --git a/lib/chef/resource/sudo.rb b/lib/chef/resource/sudo.rb index d3419d1aef..bd1c7de60e 100644 --- a/lib/chef/resource/sudo.rb +++ b/lib/chef/resource/sudo.rb @@ -199,7 +199,7 @@ class Chef end else template file_path do - source ::File.expand_path('support/sudoer.erb', __dir__) + source ::File.expand_path("support/sudoer.erb", __dir__) local true mode "0440" variables sudoer: (new_resource.groups + new_resource.users).join(","), diff --git a/lib/chef/resource/user_ulimit.rb b/lib/chef/resource/user_ulimit.rb index 1cab5ee5f0..d138eeabf3 100644 --- a/lib/chef/resource/user_ulimit.rb +++ b/lib/chef/resource/user_ulimit.rb @@ -80,7 +80,7 @@ class Chef action :create do template "/etc/security/limits.d/#{new_resource.filename}" do - source ::File.expand_path('support/ulimit.erb', __dir__) + source ::File.expand_path("support/ulimit.erb", __dir__) local true mode "0644" variables( diff --git a/omnibus/config/projects/angrychef.rb b/omnibus/config/projects/angrychef.rb index c5d110408d..57f2c023fe 100644 --- a/omnibus/config/projects/angrychef.rb +++ b/omnibus/config/projects/angrychef.rb @@ -20,7 +20,7 @@ # `config/project/chef.rb`. # current_file = __FILE__ -chef_project_contents = IO.read(File.expand_path('chef.rb', __dir__)) +chef_project_contents = IO.read(File.expand_path("chef.rb", __dir__)) instance_eval chef_project_contents name "angrychef" diff --git a/spec/integration/recipes/accumulator_spec.rb b/spec/integration/recipes/accumulator_spec.rb index dc3724707e..329137440c 100644 --- a/spec/integration/recipes/accumulator_spec.rb +++ b/spec/integration/recipes/accumulator_spec.rb @@ -6,7 +6,7 @@ describe "Accumulators" do include IntegrationSupport include Chef::Mixin::ShellOut - let(:chef_dir) { File.expand_path('../../../bin', __dir__) } + let(:chef_dir) { File.expand_path("../../../bin", __dir__) } # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the # following constraints are satisfied: diff --git a/spec/integration/recipes/lwrp_inline_resources_spec.rb b/spec/integration/recipes/lwrp_inline_resources_spec.rb index 7de6f78656..dff2c886be 100644 --- a/spec/integration/recipes/lwrp_inline_resources_spec.rb +++ b/spec/integration/recipes/lwrp_inline_resources_spec.rb @@ -6,7 +6,7 @@ describe "LWRPs with inline resources" do include IntegrationSupport include Chef::Mixin::ShellOut - let(:chef_dir) { File.expand_path('../../../bin', __dir__) } + let(:chef_dir) { File.expand_path("../../../bin", __dir__) } # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the # following constraints are satisfied: diff --git a/spec/integration/recipes/lwrp_spec.rb b/spec/integration/recipes/lwrp_spec.rb index 247ed9125d..b7a0589675 100644 --- a/spec/integration/recipes/lwrp_spec.rb +++ b/spec/integration/recipes/lwrp_spec.rb @@ -6,7 +6,7 @@ describe "LWRPs" do include IntegrationSupport include Chef::Mixin::ShellOut - let(:chef_dir) { File.expand_path('../../../bin', __dir__) } + let(:chef_dir) { File.expand_path("../../../bin", __dir__) } # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the # following constraints are satisfied: diff --git a/spec/integration/recipes/notifies_spec.rb b/spec/integration/recipes/notifies_spec.rb index 299fcd1912..a31ba6370b 100644 --- a/spec/integration/recipes/notifies_spec.rb +++ b/spec/integration/recipes/notifies_spec.rb @@ -22,7 +22,7 @@ describe "notifications" do include IntegrationSupport include Chef::Mixin::ShellOut - let(:chef_dir) { File.expand_path('../../../bin', __dir__) } + let(:chef_dir) { File.expand_path("../../../bin", __dir__) } let(:chef_client) { "bundle exec chef-client --minimal-ohai" } when_the_repository "notifies a nameless resource" do diff --git a/spec/integration/recipes/notifying_block_spec.rb b/spec/integration/recipes/notifying_block_spec.rb index 292fce4aac..7a2c5631c1 100644 --- a/spec/integration/recipes/notifying_block_spec.rb +++ b/spec/integration/recipes/notifying_block_spec.rb @@ -23,7 +23,7 @@ describe "notifying_block" do include IntegrationSupport include Chef::Mixin::ShellOut - let(:chef_dir) { File.expand_path('../../../bin', __dir__) } + let(:chef_dir) { File.expand_path("../../../bin", __dir__) } let(:chef_client) { "bundle exec chef-client --minimal-ohai" } when_the_repository "notifying_block test one" do diff --git a/spec/integration/recipes/unified_mode_spec.rb b/spec/integration/recipes/unified_mode_spec.rb index 45efd7a08b..b2c3620fdb 100644 --- a/spec/integration/recipes/unified_mode_spec.rb +++ b/spec/integration/recipes/unified_mode_spec.rb @@ -6,7 +6,7 @@ describe "Unified Mode" do include IntegrationSupport include Chef::Mixin::ShellOut - let(:chef_dir) { File.expand_path('../../../bin', __dir__) } + let(:chef_dir) { File.expand_path("../../../bin", __dir__) } let(:chef_client) { "bundle exec chef-client --minimal-ohai" } diff --git a/spec/integration/recipes/use_partial_spec.rb b/spec/integration/recipes/use_partial_spec.rb index 9287a1ad1c..c9f1e8e509 100644 --- a/spec/integration/recipes/use_partial_spec.rb +++ b/spec/integration/recipes/use_partial_spec.rb @@ -22,7 +22,7 @@ describe "notifying_block" do include IntegrationSupport include Chef::Mixin::ShellOut - let(:chef_dir) { File.expand_path('../../../bin', __dir__) } + let(:chef_dir) { File.expand_path("../../../bin", __dir__) } let(:chef_client) { "bundle exec chef-client --minimal-ohai" } when_the_repository "has a cookbook with partial resources" do diff --git a/spec/scripts/ssl-serve.rb b/spec/scripts/ssl-serve.rb index 40b77d4d1a..b03fe4af42 100644 --- a/spec/scripts/ssl-serve.rb +++ b/spec/scripts/ssl-serve.rb @@ -12,7 +12,7 @@ require "webrick/https" $ssl = true -CHEF_SPEC_DATA = File.expand_path('../data', __dir__) +CHEF_SPEC_DATA = File.expand_path("../data", __dir__) cert_text = File.read(File.expand_path("ssl/chef-rspec.cert", CHEF_SPEC_DATA)) cert = OpenSSL::X509::Certificate.new(cert_text) key_text = File.read(File.expand_path("ssl/chef-rspec.key", CHEF_SPEC_DATA)) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a05a90e7a5..5dba5ea0be 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -24,10 +24,10 @@ module Shell IRB = nil unless defined? IRB end -$LOAD_PATH.unshift File.expand_path('..', __dir__) +$LOAD_PATH.unshift File.expand_path("..", __dir__) -$LOAD_PATH.unshift File.expand_path('../chef-config/lib', __dir__) -$LOAD_PATH.unshift File.expand_path('../chef-utils/lib', __dir__) +$LOAD_PATH.unshift File.expand_path("../chef-config/lib", __dir__) +$LOAD_PATH.unshift File.expand_path("../chef-utils/lib", __dir__) require "rubygems" require "rspec/mocks" diff --git a/spec/unit/lwrp_spec.rb b/spec/unit/lwrp_spec.rb index 093503d1c4..a933d23afe 100644 --- a/spec/unit/lwrp_spec.rb +++ b/spec/unit/lwrp_spec.rb @@ -140,7 +140,7 @@ describe "LWRP" do before do @tmpdir = Dir.mktmpdir("lwrp_test") @lwrp_path = File.join(@tmpdir, "foo.rb") - content = IO.read(File.expand_path('../data/lwrp/resources/foo.rb', __dir__)) + content = IO.read(File.expand_path("../data/lwrp/resources/foo.rb", __dir__)) IO.write(@lwrp_path, content) Chef::Resource::LWRPBase.build_from_file("lwrp", @lwrp_path, nil) @original_resource = Chef::ResourceResolver.resolve(:lwrp_foo) @@ -152,7 +152,7 @@ describe "LWRP" do context "And the LWRP is asked to load again, this time with different code" do before do - content = IO.read(File.expand_path('../data/lwrp_override/resources/foo.rb', __dir__)) + content = IO.read(File.expand_path("../data/lwrp_override/resources/foo.rb", __dir__)) IO.write(@lwrp_path, content) Chef::Resource::LWRPBase.build_from_file("lwrp", @lwrp_path, nil) end @@ -390,11 +390,11 @@ describe "LWRP" do end before(:each) do - Dir[File.expand_path(File.expand_path('../data/lwrp/resources/*', __dir__))].each do |file| + Dir[File.expand_path(File.expand_path("../data/lwrp/resources/*", __dir__))].each do |file| Chef::Resource::LWRPBase.build_from_file(lwrp_cookbook_name, file, run_context) end - Dir[File.expand_path(File.expand_path('../data/lwrp/providers/*', __dir__))].each do |file| + Dir[File.expand_path(File.expand_path("../data/lwrp/providers/*", __dir__))].each do |file| Chef::Provider::LWRPBase.build_from_file(lwrp_cookbook_name, file, run_context) end end diff --git a/spec/unit/run_context/cookbook_compiler_spec.rb b/spec/unit/run_context/cookbook_compiler_spec.rb index 1a33e0f230..4d744edc3a 100644 --- a/spec/unit/run_context/cookbook_compiler_spec.rb +++ b/spec/unit/run_context/cookbook_compiler_spec.rb @@ -175,7 +175,7 @@ describe Chef::RunContext::CookbookCompiler do describe "event dispatch" do let(:recipe) { "dependency1::default" } let(:recipe_path) do - File.expand_path('../../data/run_context/cookbooks/dependency1/recipes/default.rb', __dir__) + File.expand_path("../../data/run_context/cookbooks/dependency1/recipes/default.rb", __dir__) end before do node.run_list(recipe) |