Adding dependency support for vendoring

Author: adamhjk

chef/lib/chef/knife/cookbook_site_vendor.rb

@@ -17,13 +17,20 @@
 #
 
 require'chef/knife'
+require'chef/cookbook/metadata'
 
 classChef
 classKnife
 classCookbookSiteVendor < Knife
 
 banner"Sub-Command: cookbook site vendor COOKBOOK [VERSION] (options)"
 
+option:deps,
+:short=>"-d",
+:long=>"--dependencies",
+:boolean=>true,
+:description=>"Grab dependencies automatically"
+
 defrun
 vendor_path=File.join(Chef::Config[:cookbook_path].first)
 cookbook_path=File.join(vendor_path,name_args[0])
@@ -53,29 +60,45 @@ def run
 Chef::Mixin::Command.run_command(:command=>"rm #{upstream_file}",:cwd=>vendor_path)
 Chef::Log.info("Adding changes.")
 Chef::Mixin::Command.run_command(:command=>"git add #{name_args[0]}",:cwd=>vendor_path)
+
 Chef::Log.info("Committing changes.")
+changes=true
 begin
 Chef::Mixin::Command.run_command(:command=>"git commit -a -m 'Import #{name_args[0]} version #{download.version}'",:cwd=>vendor_path)
 rescueChef::Exceptions::Exec=>e
 Chef::Log.warn("Checking out the master branch.")
-Chef::Log.warn("No changes from current vendor #{name_args[0]}, aborting!")
+Chef::Log.warn("No changes from current vendor #{name_args[0]}")
 Chef::Mixin::Command.run_command(:command=>"git checkout master",:cwd=>vendor_path)
-exit1
+changes=false
 end
-Chef::Log.info("Creating tag chef-vendor-#{name_args[0]}-#{download.version}.")
-Chef::Mixin::Command.run_command(:command=>"git tag -f chef-vendor-#{name_args[0]}-#{download.version}",:cwd=>vendor_path)
-Chef::Log.info("Checking out the master branch.")
-Chef::Mixin::Command.run_command(:command=>"git checkout master",:cwd=>vendor_path)
-Chef::Log.info("Merging changes from #{name_args[0]} version #{download.version}.")
-
-Dir.chdir(vendor_path)do
-ifsystem("git merge #{branch_name}")
-Chef::Log.info("Cookbook #{name_args[0]} version #{download.version} successfully vendored!")
-exit0
-else
-Chef::Log.error("You have merge conflicts - please resolve manually!")
-Chef::Log.error("(Hint: cd #{vendor_path}; git status)")
-exit1
+
+ifchanges
+Chef::Log.info("Creating tag chef-vendor-#{name_args[0]}-#{download.version}.")
+Chef::Mixin::Command.run_command(:command=>"git tag -f chef-vendor-#{name_args[0]}-#{download.version}",:cwd=>vendor_path)
+Chef::Log.info("Checking out the master branch.")
+Chef::Mixin::Command.run_command(:command=>"git checkout master",:cwd=>vendor_path)
+Chef::Log.info("Merging changes from #{name_args[0]} version #{download.version}.")
+
+Dir.chdir(vendor_path)do
+ifsystem("git merge #{branch_name}")
+Chef::Log.info("Cookbook #{name_args[0]} version #{download.version} successfully vendored!")
+else
+Chef::Log.error("You have merge conflicts - please resolve manually!")
+Chef::Log.error("(Hint: cd #{vendor_path}; git status)")
+exit1
+end
+end
+end
+
+ifconfig[:deps]
+md=Chef::Cookbook::Metadata.new
+md.from_file(File.join(cookbook_path,"metadata.rb"))
+md.dependencies.eachdo |cookbook,version_list|
+# Doesn't do versions.. yet
+nv=Chef::Knife::CookbookSiteVendor.new
+nv.config=config
+nv.name_args=[cookbook]
+nv.run
 end
 end
 end