diff options
author | Russ Teabeault and Jeff Smith <rteabeault@rallydev.com> | 2014-01-17 12:46:56 -0700 |
---|---|---|
committer | Seth Vargo <sethvargo@gmail.com> | 2014-01-21 19:06:51 -0500 |
commit | a89a9d089f51807d0c471824ddb3c1ebd1aab895 (patch) | |
tree | 33c89a24ad6dc5c618b374da558642164bf7f5fb | |
parent | 0d5e08883fa9608c328cf57c12a77b492ddf8500 (diff) | |
download | chef-zero-a89a9d089f51807d0c471824ddb3c1ebd1aab895.tar.gz |
Read JSON, not a file path
-rw-r--r-- | lib/chef_zero/cookbook_data.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef_zero/cookbook_data.rb b/lib/chef_zero/cookbook_data.rb index df033a5..89d5282 100644 --- a/lib/chef_zero/cookbook_data.rb +++ b/lib/chef_zero/cookbook_data.rb @@ -73,8 +73,8 @@ module ChefZero end end - def from_json(filepath) - self.merge!(JSON.parse(File.read(filepath))) + def from_json(json) + self.merge!(JSON.parse(json)) end private |