summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-08-13 08:50:13 -0700
committerGitHub <noreply@github.com>2020-08-13 08:50:13 -0700
commit6419a5a9160d13e51e7e638cfb71d02051d262c0 (patch)
tree0c07857ce2544de5cc120e0a5cae9073215f9839
parent5cdffd971171b2d550b583ee48149435dc3d0ba1 (diff)
parent904a32331073b5840eb2742d5178d7ca58d91f97 (diff)
downloadmixlib-config-6419a5a9160d13e51e7e638cfb71d02051d262c0.tar.gz
Merge pull request #83 from chef/requires
Optimize requires for non-omnibus installs
-rw-r--r--lib/mixlib/config.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mixlib/config.rb b/lib/mixlib/config.rb
index d57a44a..1508f5b 100644
--- a/lib/mixlib/config.rb
+++ b/lib/mixlib/config.rb
@@ -69,7 +69,7 @@ module Mixlib
# === Parameters
# filename<String>:: A filename to read from
def from_yaml(filename)
- require "yaml"
+ require "yaml" unless defined?(YAML)
from_hash(YAML.load(IO.read(filename)))
end
@@ -78,12 +78,12 @@ module Mixlib
# === Parameters
# filename<String>:: A filename to read from
def from_json(filename)
- require "json"
+ require "json" unless defined?(JSON)
from_hash(JSON.parse(IO.read(filename)))
end
def from_toml(filename)
- require "tomlrb"
+ require "tomlrb" unless defined?(Tomlrb)
from_hash(Tomlrb.parse(IO.read(filename), symbolize_keys: true))
end