diff --git a/.gitignore b/.gitignore index 4cab865a6..6e985a867 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ omnibus/.cache omnibus/pkg test/**/*.lock examples/**/*.lock +examples/meta-profile/vendor/ habitat/VERSION habitat/results /.ruby-gemset diff --git a/lib/inspec/dependencies/lockfile.rb b/lib/inspec/dependencies/lockfile.rb index 8643e732f..153304cfd 100644 --- a/lib/inspec/dependencies/lockfile.rb +++ b/lib/inspec/dependencies/lockfile.rb @@ -15,14 +15,19 @@ module Inspec new(lockfile_content) end - def self.from_file(path) - parsed_content = YAML.load(File.read(path)) + def self.from_content(content) + parsed_content = YAML.load(content) version = parsed_content['lockfile_version'] fail "No lockfile_version set in #{path}!" if version.nil? validate_lockfile_version!(version.to_i) new(parsed_content) end + def self.from_file(path) + content = File.read(path) + from_content(content) + end + def self.validate_lockfile_version!(version) if version < MINIMUM_SUPPORTED_VERSION fail <