summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Teabeault and Jeff Smith <rteabeault@rallydev.com>2014-01-17 12:46:56 -0700
committerSeth Vargo <sethvargo@gmail.com>2014-01-17 15:34:47 -0500
commit76e82b235b54bbbfd58af27b559e055295089492 (patch)
tree596250ed18ab170ce4571cacbba6a98285d2c743
parent3fb9c28ab2c83bd4bb820f4d7eea109a409b21b5 (diff)
downloadchef-zero-76e82b235b54bbbfd58af27b559e055295089492.tar.gz
Read JSON, not a file path
-rw-r--r--lib/chef_zero/cookbook_data.rb4
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