Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-09-20 14:31:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

bugfix: work around embedded only_if conditionals

Browse source 
Signed-off-by: Dominik Richter <dominik@vulcanosec.com>
This commit is contained in:
Dominik Richter 2015-06-21 22:52:40 +02:00
parent 8294641b1e
commit 1b9997b204
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/vulcano/rule.rb
View file

@ -92,11 +92,11 @@ module Vulcano::DSL
}
end
def self.load_spec_file_for_profile profile_id, file, rule_registry
def self.load_spec_file_for_profile profile_id, file, rule_registry, only_ifs
raw = File::read(file)
# TODO: error-handling
ctx = Vulcano::ProfileContext.new(profile_id, rule_registry)
ctx = Vulcano::ProfileContext.new(profile_id, rule_registry, only_ifs)
ctx.instance_eval(raw, file, 1)
end
@ -105,14 +105,16 @@ module Vulcano::DSL
files = get_spec_files_for_profile profile_id
# load all rules from spec files
rule_registry = {}
# TODO: handling of only_ifs
only_ifs = []
files.each do |file|
load_spec_file_for_profile(profile_id, file, rule_registry)
load_spec_file_for_profile(profile_id, file, rule_registry, only_ifs)
end
# interpret the block and create a set of rules from it
block_registry = {}
if block_given?
ctx = Vulcano::ProfileContext.new(profile_id, block_registry)
ctx = Vulcano::ProfileContext.new(profile_id, block_registry, only_ifs)
ctx.instance_eval(&block)
end
@ -164,9 +166,14 @@ module Vulcano
class ProfileContext
include Vulcano::DSL
def initialize profile_id, profile_registry
def initialize profile_id, profile_registry, only_ifs
@profile_id = profile_id
@rules = profile_registry
@only_ifs = only_ifs
end
def only_if *a, &b
@only_ifs.push([a,b])
end
def __unregister_rule id