diff options
Diffstat (limited to 'lib/chef/provider')
| -rw-r--r-- | lib/chef/provider/git.rb | 10 | ||||
| -rw-r--r-- | lib/chef/provider/package.rb | 28 | ||||
| -rw-r--r-- | lib/chef/provider/package/rubygems.rb | 16 | ||||
| -rw-r--r-- | lib/chef/provider/package/windows.rb | 6 | ||||
| -rw-r--r-- | lib/chef/provider/service/freebsd.rb | 30 | ||||
| -rw-r--r-- | lib/chef/provider/subversion.rb | 18 | ||||
| -rw-r--r-- | lib/chef/provider/template/content.rb | 8 | ||||
| -rw-r--r-- | lib/chef/provider/user/mac.rb | 32 |
8 files changed, 61 insertions, 87 deletions
diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb index 568a56d8fb..1c0b9f562e 100644 --- a/lib/chef/provider/git.rb +++ b/lib/chef/provider/git.rb @@ -281,12 +281,10 @@ class Chef def target_revision @target_revision ||= - begin - if sha_hash?(new_resource.revision) - @target_revision = new_resource.revision - else - @target_revision = remote_resolve_reference - end + if sha_hash?(new_resource.revision) + @target_revision = new_resource.revision + else + @target_revision = remote_resolve_reference end end diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb index 9c2ee4bb3f..65d2254258 100644 --- a/lib/chef/provider/package.rb +++ b/lib/chef/provider/package.rb @@ -598,12 +598,10 @@ class Chef # @return [Array] new_resource.source as an array def source_array @source_array ||= - begin - if new_resource.source.nil? - package_name_array.map { nil } - else - [ new_resource.source ].flatten - end + if new_resource.source.nil? + package_name_array.map { nil } + else + [ new_resource.source ].flatten end end @@ -612,16 +610,14 @@ class Chef # @return [Array] Array of sources with package_names converted to sources def resolved_source_array @resolved_source_array ||= - begin - source_array.each_with_index.map do |source, i| - package_name = package_name_array[i] - # we require at least one '/' in the package_name to avoid [XXX_]package 'foo' breaking due to a random 'foo' file in cwd - if use_package_name_for_source? && source.nil? && package_name.match(/#{::File::SEPARATOR}/) && ::File.exist?(package_name) - logger.trace("No package source specified, but #{package_name} exists on filesystem, using #{package_name} as source.") - package_name - else - source - end + source_array.each_with_index.map do |source, i| + package_name = package_name_array[i] + # we require at least one '/' in the package_name to avoid [XXX_]package 'foo' breaking due to a random 'foo' file in cwd + if use_package_name_for_source? && source.nil? && package_name.match(/#{::File::SEPARATOR}/) && ::File.exist?(package_name) + logger.trace("No package source specified, but #{package_name} exists on filesystem, using #{package_name} as source.") + package_name + else + source end end end diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb index e427cc0d24..be143d80dd 100644 --- a/lib/chef/provider/package/rubygems.rb +++ b/lib/chef/provider/package/rubygems.rb @@ -479,9 +479,7 @@ class Chef end def all_installed_versions - @all_installed_versions ||= begin - @gem_env.installed_versions(Gem::Dependency.new(gem_dependency.name, ">= 0")) - end + @all_installed_versions ||= @gem_env.installed_versions(Gem::Dependency.new(gem_dependency.name, ">= 0")) end ## @@ -521,13 +519,11 @@ class Chef end def candidate_version - @candidate_version ||= begin - if source_is_remote? - @gem_env.candidate_version_from_remote(gem_dependency, *gem_sources).to_s - else - @gem_env.candidate_version_from_file(gem_dependency, new_resource.source).to_s - end - end + @candidate_version ||= if source_is_remote? + @gem_env.candidate_version_from_remote(gem_dependency, *gem_sources).to_s + else + @gem_env.candidate_version_from_file(gem_dependency, new_resource.source).to_s + end end def version_requirement_satisfied?(current_version, new_version) diff --git a/lib/chef/provider/package/windows.rb b/lib/chef/provider/package/windows.rb index c722d8222c..4350eb6d12 100644 --- a/lib/chef/provider/package/windows.rb +++ b/lib/chef/provider/package/windows.rb @@ -70,8 +70,7 @@ class Chef end def package_provider - @package_provider ||= begin - case installer_type + @package_provider ||= case installer_type when :msi logger.trace("#{new_resource} is MSI") require_relative "windows/msi" @@ -80,8 +79,7 @@ class Chef logger.trace("#{new_resource} is EXE with type '#{installer_type}'") require_relative "windows/exe" Chef::Provider::Package::Windows::Exe.new(resource_for_provider, installer_type, uninstall_registry_entries) - end - end + end end def installer_type diff --git a/lib/chef/provider/service/freebsd.rb b/lib/chef/provider/service/freebsd.rb index 648dc40bf6..9c1cdba39f 100644 --- a/lib/chef/provider/service/freebsd.rb +++ b/lib/chef/provider/service/freebsd.rb @@ -130,27 +130,21 @@ class Chef # The variable name used in /etc/rc.conf for enabling this service def service_enable_variable_name @service_enable_variable_name ||= - begin - # Look for name="foo" in the shell script @init_command. Use this for determining the variable name in /etc/rc.conf - # corresponding to this service - # For example: to enable the service mysql-server with the init command /usr/local/etc/rc.d/mysql-server, you need - # to set mysql_enable="YES" in /etc/rc.conf$ - if init_command - ::File.open(init_command) do |rcscript| - rcscript.each_line do |line| - if line =~ /^name="?(\w+)"?/ - return $1 + "_enable" - end + if init_command + ::File.open(init_command) do |rcscript| + rcscript.each_line do |line| + if line =~ /^name="?(\w+)"?/ + return $1 + "_enable" end end - # some scripts support multiple instances through symlinks such as openvpn. - # We should get the service name from rcvar. - logger.trace("name=\"service\" not found at #{init_command}. falling back to rcvar") - shell_out!("#{init_command} rcvar").stdout[/(\w+_enable)=/, 1] - else - # for why-run mode when the rcd_script is not there yet - new_resource.service_name end + # some scripts support multiple instances through symlinks such as openvpn. + # We should get the service name from rcvar. + logger.trace("name=\"service\" not found at #{init_command}. falling back to rcvar") + shell_out!("#{init_command} rcvar").stdout[/(\w+_enable)=/, 1] + else + # for why-run mode when the rcd_script is not there yet + new_resource.service_name end end diff --git a/lib/chef/provider/subversion.rb b/lib/chef/provider/subversion.rb index 2cc4cb7ab3..7f49e2139f 100644 --- a/lib/chef/provider/subversion.rb +++ b/lib/chef/provider/subversion.rb @@ -121,16 +121,14 @@ class Chef # up the revision id by asking the server # If the specified revision is an integer, trust it. def revision_int - @revision_int ||= begin - if /^\d+$/.match?(new_resource.revision) - new_resource.revision - else - command = scm(:info, new_resource.repository, new_resource.svn_info_args, authentication, "-r#{new_resource.revision}") - svn_info = shell_out!(command, run_options(cwd: cwd, returns: [0, 1])).stdout - - extract_revision_info(svn_info) - end - end + @revision_int ||= if /^\d+$/.match?(new_resource.revision) + new_resource.revision + else + command = scm(:info, new_resource.repository, new_resource.svn_info_args, authentication, "-r#{new_resource.revision}") + svn_info = shell_out!(command, run_options(cwd: cwd, returns: [0, 1])).stdout + + extract_revision_info(svn_info) + end end alias :revision_slug :revision_int diff --git a/lib/chef/provider/template/content.rb b/lib/chef/provider/template/content.rb index a0977b5523..fc8f30a7dc 100644 --- a/lib/chef/provider/template/content.rb +++ b/lib/chef/provider/template/content.rb @@ -29,9 +29,7 @@ class Chef include Chef::Mixin::Template def template_location - @template_file_cache_location ||= begin - template_finder.find(new_resource.source, local: new_resource.local, cookbook: new_resource.cookbook) - end + @template_file_cache_location ||= template_finder.find(new_resource.source, local: new_resource.local, cookbook: new_resource.cookbook) end private @@ -84,9 +82,7 @@ class Chef end def template_finder - @template_finder ||= begin - TemplateFinder.new(run_context, new_resource.cookbook_name, run_context.node) - end + @template_finder ||= TemplateFinder.new(run_context, new_resource.cookbook_name, run_context.node) end end end diff --git a/lib/chef/provider/user/mac.rb b/lib/chef/provider/user/mac.rb index 573d28644b..94b0ce0b21 100644 --- a/lib/chef/provider/user/mac.rb +++ b/lib/chef/provider/user/mac.rb @@ -393,23 +393,21 @@ class Chef # associated group resource. If a group exists we'll modify it, otherwise # create it. def user_group_info - @user_group_info ||= begin - if new_resource.gid.is_a?(String) - begin - g = Etc.getgrnam(new_resource.gid) - [g.name, g.gid.to_s, :modify] - rescue - [new_resource.gid, nil, :create] - end - else - begin - g = Etc.getgrgid(new_resource.gid) - [g.name, g.gid.to_s, :modify] - rescue - [g.username, nil, :create] - end - end - end + @user_group_info ||= if new_resource.gid.is_a?(String) + begin + g = Etc.getgrnam(new_resource.gid) + [g.name, g.gid.to_s, :modify] + rescue + [new_resource.gid, nil, :create] + end + else + begin + g = Etc.getgrgid(new_resource.gid) + [g.name, g.gid.to_s, :modify] + rescue + [g.username, nil, :create] + end + end end def secure_token_enabled? |