Skip to content

Add glob support for modulepath #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 31, 2019
Merged

Add glob support for modulepath #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e95d6f5
Add glob support for modulepath
seanmil Jan 24, 2019
d03cc80
Merge branch 'master' into glob_modulepath_support
ahayworth Oct 30, 2019
b833c70
Merge branch 'master' into glob_modulepath_support
ahayworth Oct 30, 2019
25dfd50
Merge branch 'master' into glob_modulepath_support
ahayworth Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/octocatalog-diff/catalog-util/fileresources.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions spec/octocatalog-diff/tests/catalog-util/fileresources_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down