diff options
| author | Thom May <thom@may.lt> | 2016-03-07 17:31:32 +0000 |
|---|---|---|
| committer | Thom May <thom@may.lt> | 2016-03-07 17:31:32 +0000 |
| commit | da65e437c257e50d0142efd4922f936a36e1ebd0 (patch) | |
| tree | 72511034435b761448dda07837224ab2fb9d2dc5 | |
| parent | 75ab6df9a1d3415fa8dfbaaa45589be535bc02d7 (diff) | |
| parent | 4ea42b788decf2e2ab099fd2b42a04b67595c7e4 (diff) | |
| download | ohai-da65e437c257e50d0142efd4922f936a36e1ebd0.tar.gz | |
Merge pull request #747 from chef/jdm/escape-dir-glob
Use escape_glob_dir instead of escape_glob
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | lib/ohai/loader.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/appveyor.yml b/appveyor.yml index 83e19722..5b4410bf 100644 --- 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 index 6680be90..0328b59e 100644 --- a/lib/ohai/loader.rb +++ b/lib/ohai/loader.rb @@ -39,7 +39,7 @@ module Ohai # 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 |