summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2013-06-18 23:33:52 -0600
committerJohn Keiser <jkeiser@opscode.com>2013-06-18 23:39:36 -0600
commit273deeec186a556e74730704ff9ed269f0b87da3 (patch)
tree801c52c613e01cfac747740f9ac045567f928da6
parent1603b53dbf72e8a2dc4bb9ab3c2b0b7320d24852 (diff)
downloadchef-zero-273deeec186a556e74730704ff9ed269f0b87da3.tar.gz
Support attribute() and grouping() in cookbook metadata
-rw-r--r--lib/chef_zero/cookbook_data.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef_zero/cookbook_data.rb b/lib/chef_zero/cookbook_data.rb
index 10c2002..df033a5 100644
--- a/lib/chef_zero/cookbook_data.rb
+++ b/lib/chef_zero/cookbook_data.rb
@@ -36,7 +36,7 @@ module ChefZero
file = filename(directory, 'metadata.rb') || "(#{name}/metadata.rb)"
metadata.instance_eval(read_file(directory, 'metadata.rb'), file)
rescue
- ChefZero::Log.error("Error loading cookbook #{name}: #{$!}\n#{$!.backtrace}")
+ ChefZero::Log.error("Error loading cookbook #{name}: #{$!}\n #{$!.backtrace.join("\n ")}")
end
elsif has_child(directory, 'metadata.json')
metadata.from_json(read_file(directory, 'metadata.json'))
@@ -68,8 +68,8 @@ module ChefZero
def initialize(cookbook)
self.name(cookbook.name)
self.recipes(cookbook.fully_qualified_recipe_names)
- %w(dependencies supports recommendations suggestions conflicting providing replacing recipes).each do |cookbook_arg|
- self[cookbook_arg.to_sym] = Hashie::Mash.new
+ %w(attributes grouping dependencies supports recommendations suggestions conflicting providing replacing recipes).each do |hash_arg|
+ self[hash_arg.to_sym] = Hashie::Mash.new
end
end