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

simplify global vs embedded rule handling

Browse source 
i.e. one executes directly, the other just registers. this change makes such a distinction much easier

Signed-off-by: Dominik Richter <dominik@vulcanosec.com>
This commit is contained in:
Dominik Richter 2015-06-19 21:52:57 +02:00
parent da71e1e826
commit 7649d1459c
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/vulcano/rule.rb
View file

@ -28,18 +28,19 @@ end
module Vulcano::DSL
def rule id, &block
Vulcano::Rule.new(id, &block)
__register_rule Vulcano::Rule.new(id, &block)
end
def __register_rule r
r
end
def require_rules id, &block
files = ::Vulcano::DSL.get_spec_files_for_profile id
::Vulcano::DSL.load_spec_files_for_profile id, false, &block
end
def include_rules id, &block
files = ::Vulcano::DSL.get_spec_files_for_profile id
# files.each do |file|
# eval(File::read(file), file, 1)
# end
::Vulcano::DSL.load_spec_files_for_profile id, true, &block
end
# Register a given rule with RSpec and
@ -70,6 +71,14 @@ module Vulcano::DSL
}
end
def self.load_spec_files_for_profile id, include_all, &block
files = get_spec_files_for_profile id
# p "LOAD FILES: #{id} -- #{include_all}"
# files.each do |file|
# eval(File::read(file), file, 1)
# end
end
def self.get_spec_files_for_profile id
base_path = '/etc/vulcanosec/tests'
path = File.join( base_path, id )
@ -89,8 +98,7 @@ module Vulcano::DSL
end
module Vulcano::GlobalDSL
def rule id, &block
r = Vulcano::Rule.new(id, &block)
def __register_rule r
::Vulcano::DSL.execute_rule(r)
end
end