Merge pull request sous-chefs#1133 from chef-cookbooks/cookstyle_bot/…

…cookstyle_6_18_8

Signed-off-by: Tim Smith <[email protected]>

libraries/docker_container.rb

@@ -125,7 +125,7 @@ def coerce_links(v)
       when DockerBase::UnorderedArray, nil
         v
       else
-        return nil if v.empty?
+        return if v.empty?
         # Parse docker input of /source:/container_name/dest into source:dest
         DockerBase::UnorderedArray.new(Array(v)).map! do |link|
           if link =~ %r{^/(?<source>.+):/#{name}/(?<dest>.+)}
@@ -732,7 +732,7 @@ def validate_container_create
       end
 
       def parsed_hostname
-        return nil if new_resource.network_mode == 'host'
+        return if new_resource.network_mode == 'host'
         new_resource.hostname
       end
 
@@ -746,7 +746,7 @@ def state
       end
 
       def ulimits_to_hash
-        return nil if new_resource.ulimits.nil?
+        return if new_resource.ulimits.nil?
         new_resource.ulimits.map do |u|
           name = u.split('=')[0]
           soft = u.split('=')[1].split(':')[0]

libraries/helpers_service.rb

@@ -51,7 +51,7 @@ def installed_docker_version
       end
 
       def connect_host
-        return nil unless host
+        return unless host
         sorted = coerce_host(host).sort do |a, b|
           c_a = 1 if a =~ /^unix:/
           c_a = 2 if a =~ /^fd:/
@@ -76,7 +76,7 @@ def connect_host
 
       def connect_socket
         return "/var/run/#{docker_name}.sock" unless host
-        return nil if host.grep(%r{unix://|fd://}).empty?
+        return if host.grep(%r{unix://|fd://}).empty?
         sorted = coerce_host(host).sort do |a, b|
           c_a = 1 if a =~ /^unix:/
           c_a = 2 if a =~ /^fd:/