Merge pull request #747 from chef/jdm/escape-dir-glob

Use escape_glob_dir instead of escape_glob
chef · Mar 7, 2016 · da65e43 · da65e43
2 parents 75ab6df + 4ea42b7
commit da65e43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,6 +7,8 @@ platform:
 environment:
   matrix:
     - ruby_version: "200"
+    - ruby_version: "21"
+    - ruby_version: "22"
 
 clone_folder: c:\projects\ohai
 clone_depth: 1

diff --git a/lib/ohai/loader.rb b/lib/ohai/loader.rb
@@ -39,7 +39,7 @@ class PluginFile < Struct.new(:path, :plugin_root)
 
       # Finds all the *.rb files under the configured paths in :plugin_path
       def self.find_all_in(plugin_dir)
-        Dir[File.join(ChefConfig::PathHelper.escape_glob(plugin_dir), "**", "*.rb")].map do |file|
+        Dir[File.join(ChefConfig::PathHelper.escape_glob_dir(plugin_dir), "**", "*.rb")].map do |file|
           new(file, plugin_dir)
         end
       end