summaryrefslogtreecommitdiff
path: root/lib/chef
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef')
-rw-r--r--lib/chef/knife/core/gem_glob_loader.rb2
-rw-r--r--lib/chef/knife/core/subcommand_loader.rb2
-rw-r--r--lib/chef/log.rb2
-rw-r--r--lib/chef/provider/yum_repository.rb2
-rw-r--r--lib/chef/provider/zypper_repository.rb2
-rw-r--r--lib/chef/resource/cron/cron_d.rb2
-rw-r--r--lib/chef/resource/cron_access.rb4
-rw-r--r--lib/chef/resource/ssh_known_hosts_entry.rb2
-rw-r--r--lib/chef/resource/sudo.rb2
-rw-r--r--lib/chef/resource/user_ulimit.rb2
-rw-r--r--lib/chef/version.rb2
11 files changed, 12 insertions, 12 deletions
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/lib/chef/version.rb b/lib/chef/version.rb
index 5dd22ffb70..88a131c503 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -22,7 +22,7 @@
require_relative "version_string"
class Chef
- CHEF_ROOT = File.expand_path('..', __dir__)
+ CHEF_ROOT = File.expand_path("..", __dir__)
VERSION = Chef::VersionString.new("16.2.83")
end
View Lorry Controller Status