diff options
| -rw-r--r-- | lib/chef/chef_fs/command_line.rb | 2 | ||||
| -rw-r--r-- | lib/chef/cookbook/metadata.rb | 4 | ||||
| -rw-r--r-- | lib/chef/file_access_control/unix.rb | 6 | ||||
| -rw-r--r-- | lib/chef/http/basic_client.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/mount/mount.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/service/macosx.rb | 2 | ||||
| -rw-r--r-- | lib/chef/util/dsc/resource_store.rb | 2 | ||||
| -rw-r--r-- | lib/chef/win32/security.rb | 4 |
9 files changed, 13 insertions, 13 deletions
diff --git a/lib/chef/chef_fs/command_line.rb b/lib/chef/chef_fs/command_line.rb index 2d887f4780..1b6884514a 100644 --- a/lib/chef/chef_fs/command_line.rb +++ b/lib/chef/chef_fs/command_line.rb @@ -229,7 +229,7 @@ class Chef end end - if old_value == :none || (old_value == nil && !old_entry.exists?) + if old_value == :none || (old_value.nil? && !old_entry.exists?) return [ [ :added, old_entry, new_entry, old_value, new_value ] ] elsif new_value == :none return [ [ :deleted, old_entry, new_entry, old_value, new_value ] ] diff --git a/lib/chef/cookbook/metadata.rb b/lib/chef/cookbook/metadata.rb index 02f9831d70..65307c455b 100644 --- a/lib/chef/cookbook/metadata.rb +++ b/lib/chef/cookbook/metadata.rb @@ -862,12 +862,12 @@ INVALID return if !options[:choice].is_a?(Array) || options[:choice].empty? if options[:default].is_a?(String) && options[:default] != "" - raise ArgumentError, "Default must be one of your choice values!" if options[:choice].index(options[:default]) == nil + raise ArgumentError, "Default must be one of your choice values!" if options[:choice].index(options[:default]).nil? end if options[:default].is_a?(Array) && !options[:default].empty? options[:default].each do |val| - raise ArgumentError, "Default values must be a subset of your choice values!" if options[:choice].index(val) == nil + raise ArgumentError, "Default values must be a subset of your choice values!" if options[:choice].index(val).nil? end end end diff --git a/lib/chef/file_access_control/unix.rb b/lib/chef/file_access_control/unix.rb index 7d1c211b53..0dfbff8422 100644 --- a/lib/chef/file_access_control/unix.rb +++ b/lib/chef/file_access_control/unix.rb @@ -117,7 +117,7 @@ class Chef end def gid_from_resource(resource) - return nil if resource == nil || resource.group.nil? + return nil if resource.nil? || resource.group.nil? if resource.group.kind_of?(String) diminished_radix_complement( Etc.getgrnam(resource.group).gid ) elsif resource.group.kind_of?(Integer) @@ -168,7 +168,7 @@ class Chef end def mode_from_resource(res) - return nil if res == nil || res.mode.nil? + return nil if res.nil? || res.mode.nil? (res.mode.respond_to?(:oct) ? res.mode.oct : res.mode.to_i) & 007777 end @@ -264,7 +264,7 @@ class Chef end def uid_from_resource(resource) - return nil if resource == nil || resource.owner.nil? + return nil if resource.nil? || resource.owner.nil? if resource.owner.kind_of?(String) diminished_radix_complement( Etc.getpwnam(resource.owner).uid ) elsif resource.owner.kind_of?(Integer) diff --git a/lib/chef/http/basic_client.rb b/lib/chef/http/basic_client.rb index 460744ea2a..9a000136e6 100644 --- a/lib/chef/http/basic_client.rb +++ b/lib/chef/http/basic_client.rb @@ -111,7 +111,7 @@ class Chef # match no_proxy with a fuzzy matcher, rather than letting Net::HTTP # do it. http_client = http_client_builder.new(host, port, nil) - http_client.proxy_port = nil if http_client.proxy_address == nil + http_client.proxy_port = nil if http_client.proxy_address.nil? if url.scheme == HTTPS configure_ssl(http_client) diff --git a/lib/chef/provider/mount/mount.rb b/lib/chef/provider/mount/mount.rb index 49e825e39f..e00f3290fa 100644 --- a/lib/chef/provider/mount/mount.rb +++ b/lib/chef/provider/mount/mount.rb @@ -210,7 +210,7 @@ class Chef end def device_real - if @real_device == nil + if @real_device.nil? if @new_resource.device_type == :device @real_device = @new_resource.device else diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb index 048807dd05..4b87fbb84f 100644 --- a/lib/chef/provider/package.rb +++ b/lib/chef/provider/package.rb @@ -196,7 +196,7 @@ class Chef end action :reconfig do - if @current_resource.version == nil + if @current_resource.version.nil? Chef::Log.debug("#{@new_resource} is NOT installed - nothing to do") return end diff --git a/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb index 648cd9748b..8663e7eabf 100644 --- a/lib/chef/provider/service/macosx.rb +++ b/lib/chef/provider/service/macosx.rb @@ -181,7 +181,7 @@ class Chef end def set_service_status - return if @plist == nil || @service_label.to_s.empty? + return if @plist.nil? || @service_label.to_s.empty? cmd = "launchctl list #{@service_label}" res = shell_out_as_user(cmd) diff --git a/lib/chef/util/dsc/resource_store.rb b/lib/chef/util/dsc/resource_store.rb index be8d0b301b..43b7d1bdf9 100644 --- a/lib/chef/util/dsc/resource_store.rb +++ b/lib/chef/util/dsc/resource_store.rb @@ -74,7 +74,7 @@ class Chef found = rs.find_all do |r| name_matches = r["Name"].casecmp(name) == 0 if name_matches - module_name == nil || (r["Module"] && r["Module"]["Name"].casecmp(module_name) == 0) + module_name.nil? || (r["Module"] && r["Module"]["Name"].casecmp(module_name) == 0) else false end diff --git a/lib/chef/win32/security.rb b/lib/chef/win32/security.rb index 7fc3215786..8bf2bfa762 100644 --- a/lib/chef/win32/security.rb +++ b/lib/chef/win32/security.rb @@ -551,7 +551,7 @@ class Chef def set_security_descriptor_dacl(security_descriptor, acl, defaulted = false, present = nil) security_descriptor = security_descriptor.pointer if security_descriptor.respond_to?(:pointer) acl = acl.pointer if acl.respond_to?(:pointer) - present = !security_descriptor.null? if present == nil + present = !security_descriptor.null? if present.nil? unless SetSecurityDescriptorDacl(security_descriptor, present, acl, defaulted) Chef::ReservedNames::Win32::Error.raise! @@ -579,7 +579,7 @@ class Chef def self.set_security_descriptor_sacl(security_descriptor, acl, defaulted = false, present = nil) security_descriptor = security_descriptor.pointer if security_descriptor.respond_to?(:pointer) acl = acl.pointer if acl.respond_to?(:pointer) - present = !security_descriptor.null? if present == nil + present = !security_descriptor.null? if present.nil? unless SetSecurityDescriptorSacl(security_descriptor, present, acl, defaulted) Chef::ReservedNames::Win32::Error.raise! |