chef 0.10.0.beta.3 → 0.10.0.beta.4

data/lib/chef/application/knife.rb

@@ -32,17 +32,13 @@ class Chef::Application::Knife < Chef::Application
     :description => "The configuration file to use",
     :proc => lambda { |path| File.expand_path(path, Dir.pwd) }
 
-  option :log_level,
-    :short        => "-l LEVEL",
-    :long         => "--log_level LEVEL",
-    :description  => "Set the log level (debug, info, warn, error, fatal)",
-    :proc         => lambda { |l| l.to_sym }
-
-  option :log_location,
-    :short        => "-L LOGLOCATION",
-    :long         => "--logfile LOGLOCATION",
-    :description  => "Set the log file location, defaults to STDOUT",
-    :proc         => nil
+  verbosity_level = 0
+  option :verbosity,
+    :short => '-V',
+    :long  => '--verbose',
+    :description => "More verbose output. Use twice for max verbosity",
+    :proc  => Proc.new { verbosity_level += 1},
+    :default => 0
 
   option :environment,
     :short        => "-E ENVIRONMENT",
@@ -94,7 +90,6 @@ class Chef::Application::Knife < Chef::Application
     :description => "Accept default values for all questions"
 
   option :print_after,
-    :short => "-p",
     :long => "--print-after",
     :description => "Show the data after a destructive operation"
 

data/lib/chef/knife.rb

@@ -151,7 +151,7 @@ class Chef
       load_commands
       subcommand_class = subcommand_class_from(args)
       subcommand_class.options = options.merge!(subcommand_class.options)
-      subcommand_class.load_deps
+      subcommand_class.load_deps unless want_help?(args)
       instance = subcommand_class.new(args)
       instance.configure_chef
       instance.run
@@ -282,8 +282,15 @@ class Chef
         self.msg("No knife configuration file found")
       end
 
-      Chef::Config[:log_level]         = config[:log_level]       if config[:log_level]
-      Chef::Config[:log_location]      = config[:log_location]    if config[:log_location]
+      case config[:verbosity]
+      when 0
+        Chef::Config[:log_level] = :error
+      when 1
+        Chef::Config[:log_level] = :info
+      else
+        Chef::Config[:log_level] = :debug
+      end
+
       Chef::Config[:node_name]         = config[:node_name]       if config[:node_name]
       Chef::Config[:client_key]        = config[:client_key]      if config[:client_key]
       Chef::Config[:chef_server_url]   = config[:chef_server_url] if config[:chef_server_url]

data/lib/chef/knife/bootstrap.rb

@@ -26,6 +26,9 @@ class Chef
         require 'chef/json_compat'
         require 'tempfile'
         require 'erubis'
+        require 'highline'
+        require 'net/ssh'
+        require 'net/ssh/multi'
       end
 
       banner "knife bootstrap FQDN [RUN LIST...] (options)"
@@ -41,6 +44,13 @@ class Chef
         :long => "--ssh-password PASSWORD",
         :description => "The ssh password"
 
+      option :ssh_port,
+        :short => "-p PORT",
+        :long => "--ssh-port PORT",
+        :description => "The ssh port",
+        :default => "22",
+        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
+
       option :identity_file,
         :short => "-i IDENTITY_FILE",
         :long => "--identity-file IDENTITY_FILE",
@@ -118,8 +128,6 @@ class Chef
       end
 
       def run
-        require 'highline'
-        require 'net/ssh'
 
         validate_name_args!
         @node_name = Array(@name_args).first
@@ -156,6 +164,7 @@ class Chef
         ssh.name_args = [ server_name, ssh_command ]
         ssh.config[:ssh_user] = config[:ssh_user]
         ssh.config[:ssh_password] = config[:ssh_password]
+        ssh.config[:ssh_port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
         ssh.config[:identity_file] = config[:identity_file]
         ssh.config[:manual] = true
         ssh.config[:no_host_key_verify] = config[:no_host_key_verify]

data/lib/chef/knife/cookbook_bulk_delete.rb

@@ -25,6 +25,7 @@ class Chef
 
       deps do
         require 'chef/knife/cookbook_delete'
+        require 'chef/cookbook_version'
       end
 
       option :purge, :short => '-p', :long => '--purge', :boolean => true, :description => 'Permanently remove files from backing data store'
@@ -44,12 +45,12 @@ class Chef
         cookbooks_to_delete = cookbooks_names.inject({}) { |hash, name| hash[name] = all_cookbooks[name];hash }
         output(format_list_for_display(cookbooks_to_delete))
 
-        confirm("Do you really want to delete these cookbooks? All versions will be deleted. (Y/N) ", false)
+        ui.confirm("Do you really want to delete these cookbooks? All versions will be deleted. (Y/N) ", false)
 
-        confirm("Files that are common to multiple cookbooks are shared, so purging the files may disable other cookbooks. Are you sure you want to purge files instead of just deleting the cookbooks") if config[:purge]
+        ui.confirm("Files that are common to multiple cookbooks are shared, so purging the files may disable other cookbooks. Are you sure you want to purge files instead of just deleting the cookbooks") if config[:purge]
 
         cookbooks_names.each do |cookbook_name|
-          versions = rest.get_rest("cookbooks/#{cookbook_name}").values.flatten
+          versions = rest.get_rest("cookbooks/#{cookbook_name}")[cookbook_name]["versions"].map {|v| v["version"]}.flatten
           versions.each do |version|
             object = rest.delete_rest("cookbooks/#{cookbook_name}/#{version}#{config[:purge] ? "?purge=true" : ""}")
             ui.info("Deleted cookbook  #{cookbook_name.ljust(25)} [#{version}]")

data/lib/chef/knife/cookbook_download.rb

@@ -95,7 +95,7 @@ class Chef
         if available_versions.size == 1
           @version = available_versions.first
         elsif config[:latest]
-          @version = available_versions.map { |v| Chef::Cookbook::Metadata::Version.new(v) }.sort.last
+          @version = available_versions.map { |v| Chef::Version.new(v) }.sort.last
         else
           ask_which_version
         end
@@ -104,7 +104,7 @@ class Chef
       def available_versions
         @available_versions ||= begin
           versions = Chef::CookbookVersion.available_versions(@cookbook_name).map do |version|
-            Chef::Cookbook::Metadata::Version.new(version)
+            Chef::Version.new(version)
           end
           versions.sort!
           versions

data/lib/chef/knife/cookbook_list.rb

@@ -40,7 +40,10 @@ class Chef
         num_versions = config[:all_versions] ? "num_versions=all" : "num_versions=1"
         api_endpoint = env ? "/environments/#{env}/cookbooks?#{num_versions}" : "/cookbooks?#{num_versions}"
         ui.info("Showing latest versions. Use --show-all to list all available versions.") unless config[:all_versions]
-        output(format_cookbook_list_for_display(rest.get_rest(api_endpoint)))
+        cookbook_versions = rest.get_rest(api_endpoint)
+        format_cookbook_list_for_display(cookbook_versions).each do |line|
+          ui.msg(line)
+        end
       end
     end
   end

data/lib/chef/knife/cookbook_site_download.rb

@@ -41,7 +41,7 @@ class Chef
 
         @version = cookbook_data['version']
 
-        ui.info("Downloading #{@name_args[0]} from the cookbooks site at version #{cookbook_data['version']}")
+        ui.info("Downloading #{@name_args[0]} from the cookbooks site at version #{cookbook_data['version']} to #{config[:file]}")
         rest.sign_on_redirect = false
         tf = rest.get_rest(cookbook_data["file"], true)
         unless config[:file]

data/lib/chef/knife/cookbook_site_install.rb

@@ -0,0 +1,272 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+require 'chef/mixin/shell_out'
+
+class Chef
+  class Knife
+    class CookbookRepo
+
+      DIRTY_REPO = /^[\s]+M/
+
+      include Chef::Mixin::ShellOut
+
+      attr_reader :repo_path
+      attr_reader :default_branch
+      attr_reader :ui
+
+      def initialize(repo_path, ui, opts={})
+        @repo_path = repo_path
+        @ui = ui
+        @default_branch = 'master'
+      end
+
+      def sanity_check
+        unless ::File.directory?(repo_path)
+          ui.error("The cookbook repo path #{repo_path} does not exist or is not a directory")
+          exit 1
+        end
+        unless git_repo?(repo_path)
+          ui.error "The cookbook repo #{repo_path} is not a git repository."
+          ui.info("Use `git init` to initialize a git repo")
+          exit 1
+        end
+        unless branch_exists?(default_branch)
+          ui.error "The default branch '#{default_branch}' does not exist"
+          ui.info "If this is a new git repo, make sure you have at least one commit before installing cookbooks"
+          exit 1
+        end
+        cmd = git('status --porcelain')
+        if cmd.stdout =~ DIRTY_REPO
+          ui.error "You have uncommitted changes to your cookbook repo (#{repo_path}):"
+          ui.msg cmd.stdout
+          ui.info "Commit or stash your changes before importing cookbooks"
+          exit 1
+        end
+        # TODO: any untracked files in the cookbook directory will get nuked later
+        # make this an error condition also.
+        true
+      end
+
+      def reset_to_default_state
+        ui.info("Checking out the #{default_branch} branch.")
+        git("checkout #{default_branch}")
+      end
+
+      def prepare_to_import(cookbook_name)
+        branch = "chef-vendor-#{cookbook_name}"
+        if branch_exists?(branch)
+          ui.info("Pristine copy branch (#{branch}) exists, switching to it.")
+          git("checkout #{branch}")
+        else
+          ui.info("Creating pristine copy branch #{branch}")
+          git("checkout -b #{branch}")
+        end
+      end
+
+      def finalize_updates_to(cookbook_name, version)
+        if update_count = updated?(cookbook_name)
+          ui.info "#{update_count} files updated, committing changes"
+          git("add #{cookbook_name}")
+          git("commit -m 'Import #{cookbook_name} version #{version}' -- #{cookbook_name}")
+          ui.info("Creating tag cookbook-site-imported-#{cookbook_name}-#{version}")
+          git("tag -f cookbook-site-imported-#{cookbook_name}-#{version}")
+          true
+        else
+          ui.info("No changes made to #{cookbook_name}")
+          false
+        end
+      end
+
+      def merge_updates_from(cookbook_name, version)
+        branch = "chef-vendor-#{cookbook_name}"
+        Dir.chdir(repo_path) do
+          if system("git merge #{branch}")
+            ui.info("Cookbook #{cookbook_name} version #{version} successfully installed")
+          else
+            ui.error("You have merge conflicts - please resolve manually")
+            ui.info("Merge status (cd #{repo_path}; git status):")
+            system("git status")
+            exit 3
+          end
+        end
+      end
+
+      def updated?(cookbook_name)
+        update_count = git("status --porcelain -- #{cookbook_name}").stdout.strip.lines.count
+        update_count == 0 ? nil : update_count
+      end
+
+      def branch_exists?(branch_name)
+        git("branch --no-color").stdout.lines.any? {|l| l.include?(branch_name) }
+      end
+
+      private
+
+      def git_repo?(directory)
+        if File.directory?(File.join(directory, '.git'))
+          return true
+        elsif File.dirname(directory) == directory
+          return false
+        else
+          git_repo?(File.dirname(directory))
+        end
+      end
+
+      def apply_opts(opts)
+        opts.each do |option, value|
+          case option.to_s
+          when 'default_branch'
+            @default_branch = value
+          else
+            raise ArgumentError, "invalid option `#{option}' passed to CookbookRepo.new()"
+          end
+        end
+      end
+
+      def git(command)
+        shell_out!("git #{command}", :cwd => repo_path)
+      end
+
+    end
+
+    class CookbookSiteInstall < Knife
+
+      deps do
+        require 'chef/mixin/shell_out'
+        require 'chef/cookbook/metadata'
+      end
+
+      banner "knife cookbook site vendor COOKBOOK [VERSION] (options)"
+      category "cookbook site"
+
+      option :deps,
+       :short => "-d",
+       :long => "--dependencies",
+       :boolean => true,
+       :description => "Grab dependencies automatically"
+
+      option :cookbook_path,
+        :short => "-o PATH:PATH",
+        :long => "--cookbook-path PATH:PATH",
+        :description => "A colon-separated path to look for cookbooks in",
+        :proc => lambda { |o| o.split(":") }
+
+      option :branch_default,
+        :short => "-B BRANCH",
+        :long => "--branch BRANCH",
+        :description => "Default branch to work with",
+        :default => "master"
+
+      attr_reader :cookbook_name
+      attr_reader :vendor_path
+
+      def run
+        extend Chef::Mixin::ShellOut
+
+        if config[:cookbook_path]
+          Chef::Config[:cookbook_path] = config[:cookbook_path]
+        else
+          config[:cookbook_path] = Chef::Config[:cookbook_path]
+        end
+
+        @cookbook_name = parse_name_args!
+        # Check to ensure we have a valid source of cookbooks before continuing
+        #
+        @install_path = config[:cookbook_path].first
+        ui.info "Installing #@cookbook_name to #{@install_path}"
+
+        @repo = CookbookRepo.new(@install_path, ui, config)
+        #cookbook_path = File.join(vendor_path, name_args[0])
+        upstream_file = File.join(@install_path, "#{@cookbook_name}.tar.gz")
+
+        @repo.sanity_check
+        @repo.reset_to_default_state
+        @repo.prepare_to_import(@cookbook_name)
+
+        downloader = download_cookbook_to(upstream_file)
+        clear_existing_files(File.join(@install_path, @cookbook_name))
+        extract_cookbook(upstream_file, @install_path)
+
+        # TODO: it'd be better to store these outside the cookbook repo and
+        # keep them around, e.g., in ~/Library/Caches on OS X.
+        ui.info("removing downloaded tarball")
+        shell_out!("rm #{upstream_file}", :cwd => vendor_path)
+
+        if @repo.finalize_updates_to(@cookbook_name, downloader.version)
+          @repo.reset_to_default_state
+          @repo.merge_updates_from(@cookbook_name, downloader.version)
+        else
+          @repo.reset_to_default_state
+        end
+
+
+        if config[:deps]
+          md = Chef::Cookbook::Metadata.new
+          md.from_file(File.join(cookbook_path, "metadata.rb"))
+          md.dependencies.each do |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
+
+      def parse_name_args!
+        if name_args.empty?
+          ui.error("please specify a cookbook to download and install")
+          exit 1
+        elsif name_args.size > 1
+          ui.error("Installing multiple cookbooks at once is not supported")
+          exit 1
+        else
+          name_args.first
+        end
+      end
+
+      def download_cookbook_to(download_path)
+        downloader = Chef::Knife::CookbookSiteDownload.new
+        downloader.config[:file] = download_path
+        downloader.name_args = name_args
+        downloader.run
+        downloader
+      end
+
+      def extract_cookbook(upstream_file, version)
+        ui.info("Uncompressing #{@cookbook_name} version #{version}.")
+        shell_out!("tar zxvf #{upstream_file}", :cwd => @install_path)
+      end
+
+      def clear_existing_files(cookbook_path)
+        ui.info("Removing pre-existing version.")
+        shell_out!("rm -r #{cookbook_path}", :cwd => @install_path) if File.directory?(cookbook_path)
+      end
+
+
+    end
+  end
+end
+
+
+
+
+
+

data/lib/chef/knife/ssh.rb

@@ -62,6 +62,13 @@ class Chef
         :long => "--ssh-password PASSWORD",
         :description => "The ssh password"
 
+      option :ssh_port,
+        :short => "-p PORT",
+        :long => "--ssh-port PORT",
+        :description => "The ssh port",
+        :default => "22",
+        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
+
       option :identity_file,
         :short => "-i IDENTITY_FILE",
         :long => "--identity-file IDENTITY_FILE",
@@ -115,6 +122,7 @@ class Chef
           session_opts = {}
           session_opts[:keys] = File.expand_path(config[:identity_file]) if config[:identity_file]
           session_opts[:password] = config[:ssh_password] if config[:ssh_password]
+          session_opts[:port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
           session_opts[:logger] = Chef::Log.logger if Chef::Log.level == :debug
 
           if config[:no_host_key_verify]

data/lib/chef/knife/ui.rb

@@ -147,10 +147,14 @@ class Chef
         if config[:with_uri]
           item
         else
-          item.inject({}){|result, (k,v)|
-            result[k] = v["versions"].inject([]){|res, ver| res.push(ver["version"]); res}
-            result
-          }
+          versions_by_cookbook = item.inject({}) do |collected, ( cookbook, versions )|
+            collected[cookbook] = versions["versions"].map {|v| v['version']}
+            collected
+          end
+          key_length = versions_by_cookbook.keys.map {|name| name.size }.max + 2
+          versions_by_cookbook.sort.map do |cookbook, versions|
+            "#{cookbook.ljust(key_length)} #{versions.join(',')}"
+          end
         end
       end
 

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.10.0.beta.3'
+  VERSION = '0.10.0.beta.4'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

metadata

@@ -2,7 +2,7 @@
 name: chef
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.10.0.beta.3
+  version: 0.10.0.beta.4
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -07:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -319,12 +319,12 @@ files:
 - lib/chef/knife/cookbook_metadata_from_file.rb
 - lib/chef/knife/cookbook_show.rb
 - lib/chef/knife/cookbook_site_download.rb
+- lib/chef/knife/cookbook_site_install.rb
 - lib/chef/knife/cookbook_site_list.rb
 - lib/chef/knife/cookbook_site_search.rb
 - lib/chef/knife/cookbook_site_share.rb
 - lib/chef/knife/cookbook_site_show.rb
 - lib/chef/knife/cookbook_site_unshare.rb
-- lib/chef/knife/cookbook_site_vendor.rb
 - lib/chef/knife/cookbook_test.rb
 - lib/chef/knife/cookbook_upload.rb
 - lib/chef/knife/data_bag_create.rb

data/lib/chef/knife/cookbook_site_vendor.rb

@@ -1,142 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef/knife'
-
-class Chef
-  class Knife
-    class CookbookSiteVendor < Knife
-
-      deps do
-        require 'chef/cookbook/metadata'
-      end
-
-      banner "knife cookbook site vendor COOKBOOK [VERSION] (options)"
-      category "cookbook site"
-
-      option :deps,
-       :short => "-d",
-       :long => "--dependencies",
-       :boolean => true,
-       :description => "Grab dependencies automatically"
-
-      option :cookbook_path,
-        :short => "-o PATH:PATH",
-        :long => "--cookbook-path PATH:PATH",
-        :description => "A colon-separated path to look for cookbooks in",
-        :proc => lambda { |o| o.split(":") }
-
-      option :branch_default,
-        :short => "-B BRANCH",
-        :long => "--branch BRANCH",
-        :description => "Default branch to work with",
-        :default => "master"
-
-      def run
-        if config[:cookbook_path]
-          Chef::Config[:cookbook_path] = config[:cookbook_path]
-        else
-          config[:cookbook_path] = Chef::Config[:cookbook_path]
-        end
-
-        # Check to ensure we have a valid source of cookbooks before continuing
-        unless File.directory?(config[:cookbook_path].first)
-          ui.error( File.join(config[:cookbook_path].first, " doesn't exist!.  Make sure you have cookbook_path configured correctly"))
-          exit 1
-        end
-
-        vendor_path = File.expand_path(File.join(config[:cookbook_path].first))
-        cookbook_path = File.join(vendor_path, name_args[0])
-        upstream_file = File.join(vendor_path, "#{name_args[0]}.tar.gz")
-        branch_name = "chef-vendor-#{name_args[0]}"
-
-        download = Chef::Knife::CookbookSiteDownload.new
-        download.config[:file] = upstream_file
-        download.name_args = name_args
-        download.run
-
-        ui.info("Checking out the #{config[:branch_default]} branch.")
-        Chef::Mixin::Command.run_command(:command => "git checkout #{config[:branch_default]}", :cwd => vendor_path)
-        ui.info("Checking the status of the vendor branch.")
-        status, branch_output, branch_error = Chef::Mixin::Command.output_of_command("git branch --no-color | grep #{branch_name}", :cwd => vendor_path)
-        if branch_output =~ /#{Regexp.escape(branch_name)}$/m
-          ui.info("Vendor branch found.")
-          Chef::Mixin::Command.run_command(:command => "git checkout #{branch_name}", :cwd => vendor_path)
-        else
-          ui.info("Creating vendor branch.")
-          Chef::Mixin::Command.run_command(:command => "git checkout -b #{branch_name}", :cwd => vendor_path)
-        end
-        ui.info("Removing pre-existing version.")
-        Chef::Mixin::Command.run_command(:command => "rm -r #{cookbook_path}", :cwd => vendor_path) if File.directory?(cookbook_path)
-        ui.info("Uncompressing #{name_args[0]} version #{download.version}.")
-        Chef::Mixin::Command.run_command(:command => "tar zxvf #{upstream_file}", :cwd => vendor_path)
-        Chef::Mixin::Command.run_command(:command => "rm #{upstream_file}", :cwd => vendor_path)
-        ui.info("Adding changes.")
-        Chef::Mixin::Command.run_command(:command => "git add #{name_args[0]}", :cwd => vendor_path)
-
-        ui.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)
-        rescue Chef::Exceptions::Exec => e
-          ui.warn("Checking out the #{config[:branch_default]} branch.")
-          ui.warn("No changes from current vendor #{name_args[0]}")
-          Chef::Mixin::Command.run_command(:command => "git checkout #{config[:branch_default]}", :cwd => vendor_path)
-          changes = false
-        end
-
-        if changes
-          ui.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)
-          ui.info("Checking out the #{config[:branch_default]} branch.")
-          Chef::Mixin::Command.run_command(:command => "git checkout #{config[:branch_default]}", :cwd => vendor_path)
-          ui.info("Merging changes from #{name_args[0]} version #{download.version}.")
-
-          Dir.chdir(vendor_path) do
-            if system("git merge #{branch_name}")
-              ui.info("Cookbook #{name_args[0]} version #{download.version} successfully vendored!")
-            else
-              ui.error("You have merge conflicts - please resolve manually!")
-              ui.error("(Hint: cd #{vendor_path}; git status)")
-              exit 1
-            end
-          end
-        end
-
-        if config[:deps]
-          md = Chef::Cookbook::Metadata.new
-          md.from_file(File.join(cookbook_path, "metadata.rb"))
-          md.dependencies.each do |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
-
-    end
-  end
-end
-
-
-
-
-
-