Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-10 15:14:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix two tiresome cache issues with simple fixes

Browse source 
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
This commit is contained in:
Clinton Wolfe 2019-06-20 00:57:58 -04:00
parent 1a47026419
commit abc5e84b87
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/fetchers/git.rb
View file

@ -41,7 +41,7 @@ module Fetchers
@ref = opts[:ref]
@remote_url = expand_local_path(remote_url)
@repo_directory = nil
@relative_path = opts[:relative_path]
@relative_path = opts[:relative_path] if opts[:relative_path] && !opts[:relative_path].empty?
end
def expand_local_path(url_or_file_path)
@ -59,7 +59,7 @@ module Fetchers
end
def fetch(destination_path)
@repo_directory = destination_path
@repo_directory = destination_path # Might be the cache, or vendoring, or something else
FileUtils.mkdir_p(destination_path) unless Dir.exist?(destination_path)
if cloned?
@ -71,7 +71,14 @@ module Fetchers
Inspec::Log.debug("Checkout of #{resolved_ref} successful. " \
"Moving #{@relative_path} to #{destination_path}")
unless File.exist?("#{working_dir}/#{@relative_path}")
raise ArgumentError.new("Cannot find relative path '#{@relative_path}' within profile in git repo specified by '#{@remote_url}'")
# Cleanup the destination path - otherwise we'll have an empty dir
# in the cache, which is enough to confuse the cache reader
# This is acourtesy, assuming we're writing to the cache; if we're
# vendoring to somthing more complex, don't bother.
FileUtils.rmdir(destination_path) if Dir.empty?(destination_path)
raise ArgumentError.new("Cannot find relative path '#{@relative_path}' " \
"within profile in git repo specified by '#{@remote_url}'")
end
FileUtils.cp_r("#{working_dir}/#{@relative_path}", destination_path)
else