Merge pull request #204 from seanmil/glob_modulepath_support

Add glob support for modulepath

Author: ahayworth

lib/octocatalog-diff/catalog-util/fileresources.rb

@@ -59,7 +59,7 @@ def self.module_path(dir)
           result = []
           Regexp.last_match(1).split(/:/).map(&:strip).each do |path|
             next if path.start_with?('$')
-            result << File.expand_path(path, dir)
+            result.concat(Dir.glob(File.expand_path(path, dir)))
           end
           result
         else

spec/octocatalog-diff/tests/catalog-util/fileresources_spec.rb

@@ -83,9 +83,22 @@ def catalog_from_fixture(path)
     it 'should return proper entries from environment.conf modulepath' do
       allow(File).to receive(:file?).with('/a/environment.conf').and_return(true)
       allow(File).to receive(:read).with('/a/environment.conf').and_return('modulepath=modules:site:$basemoduledir')
+      allow(Dir).to receive(:glob).with('/a/modules').and_return(['/a/modules'])
+      allow(Dir).to receive(:glob).with('/a/site').and_return(['/a/site'])
       result = OctocatalogDiff::CatalogUtil::FileResources.module_path('/a')
       expect(result).to eq(['/a/modules', '/a/site'])
     end
+
+    it 'should expand globs in modulepath, if present' do
+      allow(File).to receive(:file?).with('/a/environment.conf').and_return(true)
+      allow(File).to receive(:read).with('/a/environment.conf')
+        .and_return('modulepath=modules:extra_mods/*/modules:$basemoduledir')
+      allow(Dir).to receive(:glob).with('/a/modules').and_return(['/a/modules'])
+      allow(Dir).to receive(:glob).with('/a/extra_mods/*/modules')
+        .and_return(['/a/extra_mods/a/modules', '/a/extra_mods/b/modules'])
+      result = OctocatalogDiff::CatalogUtil::FileResources.module_path('/a')
+      expect(result).to eq(['/a/modules', '/a/extra_mods/a/modules', '/a/extra_mods/b/modules'])
+    end
   end
 
   context 'with mixed files and directories' do