Convert FileUtils to block style

Author: ianfixes

spec/fake_lib_dir.rb

@@ -1,5 +1,11 @@
 require "arduino_ci"
 
+# This class is meant for the :around behavior of RSpec test cases so that
+# we can make temporary directories in test cases. Note that since test cases
+# are evaluated on load, any temp directories that were created will not exist
+# by the time the test runs.  So this class handles all of the particulars
+# around creating a fake library directory on time and configuring the backend
+# to properly use it.
 class FakeLibDir
 
   attr_reader :config_dir
@@ -18,16 +24,18 @@ def initialize
 
   # designed to be called by rspec's "around" function
   def in_pristine_fake_libraries_dir(example)
-    d = Dir.mktmpdir
-    begin
+    # we will make a dummy directory to contain the libraries directory,
+    # and use that directory in a dummy config which we will pass to the backend.
+    # then we can run the test case
+    Dir.mktmpdir do |d|
       # write a yaml file containing the current directory
       dummy_config = { "directories" => { "user" => d.to_s } }
       @arduino_dir = Pathname.new(d)
       @libraries_dir = @arduino_dir + "libraries"
       Dir.mkdir(@libraries_dir)
 
-      f = File.open(@config_file, "w")
-      begin
+      # with the config file, enforce a structure similar to a temp file -- delete after use
+      File.open(@config_file, "w") do |f|
         f.write dummy_config.to_yaml
         f.close
         example.run
@@ -39,15 +47,14 @@ def in_pristine_fake_libraries_dir(example)
         end
       end
     ensure
+      # the tmp dir will be cleaned up automatically, but if we did our own symlink hack then here is the place to clean it up
       if ArduinoCI::Host.needs_symlink_hack?
         stdout, stderr, exitstatus = Open3.capture3('cmd.exe', "/c rmdir /s /q #{ArduinoCI::Host.pathname_to_windows(d)}")
         unless exitstatus.success?
           puts "====== rmdir of #{d} failed"
           puts stdout
           puts stderr
         end
-      else
-        FileUtils.remove_entry(d)
       end
     end
   end