summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel DeLeo <dan@opscode.com>2011-04-04 09:40:33 -0700
committerDaniel DeLeo <dan@opscode.com>2011-04-04 09:40:33 -0700
commit0e666879a88517684085e4e89ca32368337e88af (patch)
tree9ef0ddf5319b0f13ff513a6d7cc3958e799e86cb
parent16b73c9430bf19bbca7ea57909a849fcf046985a (diff)
downloadchef-0e666879a88517684085e4e89ca32368337e88af.tar.gz
fix missing deps in cookbook metadata command
-rw-r--r--chef/lib/chef/knife/cookbook_metadata.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/chef/lib/chef/knife/cookbook_metadata.rb b/chef/lib/chef/knife/cookbook_metadata.rb
index 54077e0f0b..2331ad99e7 100644
--- a/chef/lib/chef/knife/cookbook_metadata.rb
+++ b/chef/lib/chef/knife/cookbook_metadata.rb
@@ -24,6 +24,7 @@ class Chef
class CookbookMetadata < Knife
deps do
+ require 'chef/cookbook_loader'
require 'chef/cookbook/metadata'
end
@@ -49,12 +50,16 @@ class Chef
generate_metadata(cname.to_s)
end
else
- generate_metadata(@name_args[0])
+ cookbook_name = @name_args[0]
+ if cookbook_name.nil? || cookbook_name.empty?
+ ui.error "You must specify the cookbook to generate metadata for, or use the --all option."
+ exit 1
+ end
+ generate_metadata(cookbook_name)
end
end
def generate_metadata(cookbook)
- ui.info("Generating Metadata")
Array(config[:cookbook_path]).reverse.each do |path|
file = File.expand_path(File.join(path, cookbook, 'metadata.rb'))
if File.exists?(file)
@@ -66,7 +71,7 @@ class Chef
end
def generate_metadata_from_file(cookbook, file)
- Chef::Log.debug("Generating metadata for #{cookbook} from #{file}")
+ ui.info("Generating metadata for #{cookbook} from #{file}")
md = Chef::Cookbook::Metadata.new
md.name(cookbook)
md.from_file(file)