Make rubocop happy

source/.rubocop.yml

@@ -1,6 +1,3 @@
-
-inherit_from: .rubocop_todo.yml
-
 AllCops:
   Exclude:
     - 'out/**/*'

source/lib/vagrant-openstack-provider/action/sync_folders.rb

@@ -71,10 +71,10 @@ def call(env)
               "chown -R #{ssh_info[:username]} '#{guestpath}'")
 
             # Generate rsync include commands
-            includes = rsync_includes.each_with_object([]) { |incl, incls|
+            includes = rsync_includes.each_with_object([]) do |incl, incls|
               incls << '--include'
               incls << incl
-            }
+            end
 
             # Rsync over to the guest path using the SSH info. add
             # .hg/ to exclude list as that isn't covered in
@@ -94,15 +94,11 @@ def call(env)
             ignore_files = ['.hgignore', '.gitignore']
             ignore_files.each do |ignore_file|
               abs_ignore_file = env[:root_path].to_s + '/' + ignore_file
-              if File.exist?(abs_ignore_file)
-                command += ['--exclude-from', abs_ignore_file]
-              end
+              command += ['--exclude-from', abs_ignore_file] if File.exist?(abs_ignore_file)
             end
 
-            r = Vagrant::Util::Subprocess.execute(*command)
-            if r.exit_code != 0
-              fail Errors::RsyncError, guestpath: guestpath, hostpath: hostpath, stderr: r.stderr
-            end
+            next if Vagrant::Util::Subprocess.execute(*command).exit_code == 0
+            ail Errors::RsyncError, guestpath: guestpath, hostpath: hostpath, stderr: r.stderr
           end
         end
 

source/lib/vagrant-openstack-provider/client/nova.rb

@@ -116,13 +116,9 @@ def check_floating_ip(_env, floating_ip)
           :accept => :json)
 
         JSON.parse(ip_details)['floating_ips'].each do |ip|
-          if ip['ip'] == floating_ip
-            if !ip['instance_id'].nil?
-              fail "Floating IP #{floating_ip} already assigned to another server"
-            else
-              return
-            end
-          end
+          next unless ip['ip'] == floating_ip
+          return if ip['instance_id'].nil?
+          fail "Floating IP #{floating_ip} already assigned to another server"
         end
         fail "Floating IP #{floating_ip} not available for this tenant"
       end