lib/inspec/dependencies/requirement.rb in inspec-4.7.3 vs lib/inspec/dependencies/requirement.rb in inspec-4.7.18
- old
+ new
@@ -19,20 +19,20 @@
cache: cache,
cwd: req_path,
}
new(dep[:name],
- dep[:version],
- config,
- opts.merge(dep))
+ dep[:version],
+ config,
+ opts.merge(dep))
end
def self.from_lock_entry(entry, config, opts = {})
req = new(entry[:name],
- entry[:version_constraints],
- config,
- entry[:resolved_source].merge(backend: config[:backend]).merge(opts))
+ entry[:version_constraints],
+ config,
+ entry[:resolved_source].merge(backend: config[:backend]).merge(opts))
locked_deps = []
Array(entry[:dependencies]).each do |dep_entry|
dep_config = config.dup
dep_config[:parent_profile] = entry[:name]
@@ -84,11 +84,11 @@
"name" => name,
"resolved_source" => resolved_source,
"version_constraints" => version_constraints,
}
- if !dependencies.empty?
+ unless dependencies.empty?
h["dependencies"] = dependencies.map(&:to_hash)
end
h
end
@@ -113,9 +113,10 @@
end
# load the profile for the requirement
def profile
return @profile unless @profile.nil?
+
opts = @opts.dup
opts[:backend] = @backend
opts[:runner_conf] = Inspec::Config.cached
if !@dependencies.nil? && !@dependencies.empty?
opts[:dependencies] = Inspec::DependencySet.from_array(@dependencies, @cwd, @cache, @backend)