1 files changed, 43 insertions, 23 deletions

diff --git a/spec/lib/puppet_spec/files.rb b/spec/lib/puppet_spec/files.rb
index b02637e..5fef530 100644
--- a/spec/lib/puppet_spec/files.rb
+++ b/spec/lib/puppet_spec/files.rb
@@ -5,26 +5,32 @@ require 'pathname'
 
 # A support module for testing files.
 module PuppetSpec::Files
+  @global_tempfiles = []
+
   def self.cleanup
-    $global_tempfiles ||= []
-    while path = $global_tempfiles.pop do
+    until @global_tempfiles.empty?
+      path = @global_tempfiles.pop
       begin
         Dir.unstub(:entries)
-        FileUtils.rm_rf path, :secure => true
-      rescue Errno::ENOENT
-        # nothing to do
+        FileUtils.rm_rf path, secure: true
       end
     end
   end
 
-  def make_absolute(path) PuppetSpec::Files.make_absolute(path) end
+  def make_absolute(path)
+    PuppetSpec::Files.make_absolute(path)
+  end
+
   def self.make_absolute(path)
     path = File.expand_path(path)
     path[0] = 'c' if Puppet.features.microsoft_windows?
     path
   end
 
-  def tmpfile(name, dir = nil) PuppetSpec::Files.tmpfile(name, dir) end
+  def tmpfile(name, dir = nil)
+    PuppetSpec::Files.tmpfile(name, dir)
+  end
+
   def self.tmpfile(name, dir = nil)
     # Generate a temporary file, just for the name...
     source = dir ? Tempfile.new(name, dir) : Tempfile.new(name)
@@ -36,14 +42,20 @@ module PuppetSpec::Files
     path
   end
 
-  def file_containing(name, contents) PuppetSpec::Files.file_containing(name, contents) end
+  def file_containing(name, contents)
+    PuppetSpec::Files.file_containing(name, contents)
+  end
+
   def self.file_containing(name, contents)
     file = tmpfile(name)
     File.open(file, 'wb') { |f| f.write(contents) }
     file
   end
 
-  def script_containing(name, contents) PuppetSpec::Files.script_containing(name, contents) end
+  def script_containing(name, contents)
+    PuppetSpec::Files.script_containing(name, contents)
+  end
+
   def self.script_containing(name, contents)
     file = tmpfile(name)
     if Puppet.features.microsoft_windows?
@@ -53,11 +65,14 @@ module PuppetSpec::Files
       text = contents[:posix]
     end
     File.open(file, 'wb') { |f| f.write(text) }
-    Puppet::FileSystem.chmod(0755, file)
+    Puppet::FileSystem.chmod(0o755, file)
     file
   end
 
-  def tmpdir(name) PuppetSpec::Files.tmpdir(name) end
+  def tmpdir(name)
+    PuppetSpec::Files.tmpdir(name)
+  end
+
   def self.tmpdir(name)
     dir = Puppet::FileSystem.expand_path(Dir.mktmpdir(name).encode!(Encoding::UTF_8))
 
@@ -66,20 +81,26 @@ module PuppetSpec::Files
     dir
   end
 
-  def dir_containing(name, contents_hash) PuppetSpec::Files.dir_containing(name, contents_hash) end
+  def dir_containing(name, contents_hash)
+    PuppetSpec::Files.dir_containing(name, contents_hash)
+  end
+
   def self.dir_containing(name, contents_hash)
     dir_contained_in(tmpdir(name), contents_hash)
   end
 
-  def dir_contained_in(dir, contents_hash) PuppetSpec::Files.dir_contained_in(dir, contents_hash) end
+  def dir_contained_in(dir, contents_hash)
+    PuppetSpec::Files.dir_contained_in(dir, contents_hash)
+  end
+
   def self.dir_contained_in(dir, contents_hash)
-    contents_hash.each do |k,v|
+    contents_hash.each do |k, v|
       if v.is_a?(Hash)
-        Dir.mkdir(tmp = File.join(dir,k))
+        Dir.mkdir(tmp = File.join(dir, k))
         dir_contained_in(tmp, v)
       else
         file = File.join(dir, k)
-        File.open(file, 'wb') {|f| f.write(v) }
+        File.open(file, 'wb') { |f| f.write(v) }
       end
     end
     dir
@@ -87,17 +108,16 @@ module PuppetSpec::Files
 
   def self.record_tmp(tmp)
     # ...record it for cleanup,
-    $global_tempfiles ||= []
-    $global_tempfiles << tmp
+    @global_tempfiles << tmp
   end
 
   def expect_file_mode(file, mode)
-    actual_mode = "%o" % Puppet::FileSystem.stat(file).mode
+    actual_mode = '%o' % Puppet::FileSystem.stat(file).mode
     target_mode = if Puppet.features.microsoft_windows?
-      mode
-    else
-      "10" + "%04i" % mode.to_i
-    end
+                    mode
+                  else
+                    '10' + '%04i' % mode.to_i
+                  end
     expect(actual_mode).to eq(target_mode)
   end
 end