chef 0.10.8 → 0.10.10.beta.1

data/lib/chef/handler/json_file.rb

@@ -41,7 +41,13 @@ class Chef
         build_report_dir
         savetime = Time.now.strftime("%Y%m%d%H%M%S")
         File.open(File.join(config[:path], "chef-run-report-#{savetime}.json"), "w") do |file|
-          file.puts Chef::JSONCompat.to_json_pretty(data)
+          
+          #ensure start time and end time are output in the json properly in the event activesupport happens to be on the system
+          run_data = data
+          run_data[:start_time] = run_data[:start_time].to_s
+          run_data[:end_time] = run_data[:end_time].to_s          
+
+          file.puts Chef::JSONCompat.to_json_pretty(run_data)
         end
       end
 

data/lib/chef/knife.rb

@@ -21,6 +21,7 @@ require 'forwardable'
 require 'chef/version'
 require 'mixlib/cli'
 require 'chef/mixin/convert_to_class_name'
+require 'chef/mixin/path_sanity'
 require 'chef/knife/core/subcommand_loader'
 require 'chef/knife/core/ui'
 require 'chef/rest'
@@ -32,6 +33,7 @@ class Chef
     Chef::REST::RESTRequest.user_agent = "Chef Knife#{Chef::REST::RESTRequest::UA_COMMON}"
 
     include Mixlib::CLI
+    include Chef::Mixin::PathSanity
     extend Chef::Mixin::ConvertToClassName
     extend Forwardable
 
@@ -160,7 +162,7 @@ class Chef
       load_commands
       subcommand_class = subcommand_class_from(args)
       subcommand_class.options = options.merge!(subcommand_class.options)
-      subcommand_class.load_deps unless want_help?(args)
+      subcommand_class.load_deps
       instance = subcommand_class.new(args)
       instance.configure_chef
       instance.run_with_pretty_exceptions
@@ -210,9 +212,7 @@ class Chef
     # Error out and print usage. probably becuase the arguments given by the
     # user could not be resolved to a subcommand.
     def self.subcommand_not_found!(args)
-      unless want_help?(args)
-        ui.fatal("Cannot find sub command for: '#{args.join(' ')}'")
-      end
+      ui.fatal("Cannot find sub command for: '#{args.join(' ')}'")
 
       if category_commands = guess_category(args)
         list_commands(category_commands)
@@ -226,13 +226,6 @@ class Chef
       exit 10
     end
 
-    # :nodoc:
-    # TODO: duplicated with chef/application/knife
-    # all logic should be removed from that and Chef::Knife should own it.
-    def self.want_help?(args)
-      (args.any? { |arg| arg =~ /^(:?(:?\-\-)?help|\-h)$/})
-    end
-
     @@chef_config_dir = nil
 
     # search upward from current_dir until .chef directory is found
@@ -241,9 +234,9 @@ class Chef
         @@chef_config_dir = false
         full_path = Dir.pwd.split(File::SEPARATOR)
         (full_path.length - 1).downto(0) do |i|
-          canidate_directory = File.join(full_path[0..i] + [".chef" ])
-          if File.exist?(canidate_directory) && File.directory?(canidate_directory)
-            @@chef_config_dir = canidate_directory
+          candidate_directory = File.join(full_path[0..i] + [".chef" ])
+          if File.exist?(candidate_directory) && File.directory?(candidate_directory)
+            @@chef_config_dir = candidate_directory
             break
           end
         end
@@ -304,11 +297,11 @@ class Chef
         read_config_file(config[:config_file])
       else
         # ...but do log a message if no config was found.
-        Chef::Config[:color] = config[:color] && !config[:no_color]
+        Chef::Config[:color] = config[:color]
         ui.warn("No knife configuration file found")
       end
 
-      Chef::Config[:color] = config[:color] && !config[:no_color]
+      Chef::Config[:color] = config[:color]
 
       case config[:verbosity]
       when 0
@@ -388,6 +381,7 @@ class Chef
       unless self.respond_to?(:run)
         ui.error "You need to add a #run method to your knife command before you can use it"
       end
+      enforce_path_sanity
       run
     rescue Exception => e
       raise if config[:verbosity] == 2

data/lib/chef/knife/bootstrap.rb

@@ -53,6 +53,12 @@ class Chef
         :default => "22",
         :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
 
+      option :ssh_gateway,
+        :short => "-G GATEWAY",
+        :long => "--ssh-gateway GATEWAY",
+        :description => "The ssh gateway",
+        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_gateway] = key }
+
       option :identity_file,
         :short => "-i IDENTITY_FILE",
         :long => "--identity-file IDENTITY_FILE",
@@ -81,7 +87,7 @@ class Chef
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
         :description => "Bootstrap a distro using a template",
-        :default => "ubuntu10.04-gems"
+        :default => "chef-full"
 
       option :use_sudo,
         :long => "--sudo",
@@ -100,11 +106,11 @@ class Chef
         :proc => lambda { |o| o.split(/[\s,]+/) },
         :default => []
 
-      option :no_host_key_verify,
-        :long => "--no-host-key-verify",
-        :description => "Disable host key verification",
+      option :host_key_verify,
+        :long => "--[no-]host-key-verify",
+        :description => "Verify host key, enabled by default.",
         :boolean => true,
-        :default => false
+        :default => true
 
       def load_template(template=nil)
         # Are we bootstrapping using an already shipped template?
@@ -113,8 +119,8 @@ class Chef
         else
           bootstrap_files = []
           bootstrap_files << File.join(File.dirname(__FILE__), 'bootstrap', "#{config[:distro]}.erb")
-          bootstrap_files << File.join(@@chef_config_dir, "bootstrap", "#{config[:distro]}.erb")
-          bootstrap_files << File.join(ENV['HOME'], '.chef', 'bootstrap', "#{config[:distro]}.erb")
+          bootstrap_files << File.join(Knife.chef_config_dir, "bootstrap", "#{config[:distro]}.erb") if Knife.chef_config_dir
+          bootstrap_files << File.join(ENV['HOME'], '.chef', 'bootstrap', "#{config[:distro]}.erb") if ENV['HOME']
           bootstrap_files << Gem.find_files(File.join("chef","knife","bootstrap","#{config[:distro]}.erb"))
           bootstrap_files.flatten!
         end
@@ -178,9 +184,10 @@ class Chef
         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[:ssh_gateway] = Chef::Config[:knife][:ssh_gateway] || config[:ssh_gateway]
         ssh.config[:identity_file] = config[:identity_file]
         ssh.config[:manual] = true
-        ssh.config[:no_host_key_verify] = config[:no_host_key_verify]
+        ssh.config[:host_key_verify] = config[:host_key_verify]
         ssh.config[:on_error] = :raise
         ssh
       end

data/lib/chef/knife/bootstrap/centos5-gems.erb

@@ -2,7 +2,7 @@ bash -c '
 <%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
 
 if [ ! -f /usr/bin/chef-client ]; then
-  wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
+  wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>http://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm
   rpm -Uvh epel-release-5-4.noarch.rpm
   wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>http://rpm.aegisco.com/aegisco/rhel/aegisco-rhel.rpm
   rpm -Uvh aegisco-rhel.rpm

data/lib/chef/knife/bootstrap/chef-full.erb

@@ -0,0 +1,59 @@
+bash -c '
+<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+
+exists() {
+  if command -v $1 &>/dev/null
+  then
+    return 0
+  else
+    return 1
+  fi
+}
+
+install_sh="http://opscode.com/chef/install.sh"
+version_string="<%= "-v #{knife_config[:bootstrap_version]}" if knife_config[:bootstrap_version] %>"
+
+if ! exists /usr/bin/chef-client; then
+  if exists wget; then
+    bash <(wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %> ${install_sh} -O -) ${version_string}
+  else
+    if exists curl; then
+      bash <(curl -L <%= "--proxy=on " if knife_config[:bootstrap_proxy] %> ${install_sh}) ${version_string}
+    fi
+  fi
+fi
+
+mkdir -p /etc/chef
+
+(
+cat <<'EOP'
+<%= validation_key %>
+EOP
+) > /tmp/validation.pem
+awk NF /tmp/validation.pem > /etc/chef/validation.pem
+rm /tmp/validation.pem
+
+
+<% if @chef_config[:encrypted_data_bag_secret] -%>
+(
+cat <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+) > /tmp/encrypted_data_bag_secret
+awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
+rm /tmp/encrypted_data_bag_secret
+<% end -%>
+
+(
+cat <<'EOP'
+<%= config_content %>
+EOP
+) > /etc/chef/client.rb
+
+(
+cat <<'EOP'
+<%= { "run_list" => @run_list }.to_json %>
+EOP
+) > /etc/chef/first-boot.json
+
+<%= start_chef %>'

data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb

@@ -2,6 +2,7 @@ bash -c '
 <%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
 
 if [ ! -f /usr/bin/chef-client ]; then
+  apt-get install -y wget
   echo "chef	chef/chef_server_url	string	<%= @chef_config[:chef_server_url] %>" | debconf-set-selections
   [ -f /etc/apt/sources.list.d/opscode.list ] || echo "deb http://apt.opscode.com <%= chef_version.to_f == 0.10 ? "lucid-0.10" : "lucid" %> main" > /etc/apt/sources.list.d/opscode.list
   wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>-O- http://apt.opscode.com/packages@opscode.com.gpg.key | apt-key add -

data/lib/chef/knife/configure.rb

@@ -83,7 +83,7 @@ EOH
           client_create.config[:admin] = true
           client_create.config[:file] = new_client_key
           client_create.config[:yes] = true
-          client_create.config[:no_editor] = true
+          client_create.config[:disable_editing] = true
           client_create.run
         else
           ui.msg("*****")
@@ -105,7 +105,7 @@ EOH
       end
 
       def ask_user_for_config_path
-        config[:config_file] ||= ask_question("Where should I put the config file? ", :default => '~/.chef/knife.rb')
+        config[:config_file] ||= ask_question("Where should I put the config file? ", :default => "#{Chef::Config[:user_home]}/.chef/knife.rb")
         # have to use expand path to expand the tilde character to the user's home
         config[:config_file] = File.expand_path(config[:config_file])
         if File.exists?(config[:config_file])

data/lib/chef/knife/cookbook_site_download.rb

@@ -21,7 +21,9 @@ class Chef
   class Knife
     class CookbookSiteDownload < Knife
 
-      attr_reader :version
+      deps do
+        require 'fileutils'
+      end
 
       banner "knife cookbook site download COOKBOOK [VERSION] (options)"
       category "cookbook site"
@@ -36,35 +38,72 @@ class Chef
         :description => "Force download deprecated version"
 
       def run
-        current = noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}")
-        if current["deprecated"] == true
-          replacement = File.basename(current["replacement"])
-          ui.warn("DEPRECATION: This cookbook has been deprecated. It has been replaced by #{replacement}.")
+        if current_cookbook_deprecated?
+          message = 'DEPRECATION: This cookbook has been deprecated. '
+          message << "It has been replaced by #{replacement_cookbook}."
+          ui.warn message
+
           unless config[:force]
-            ui.warn("Use --force to force download deprecated cookbook.")
+            ui.warn 'Use --force to force download deprecated cookbook.'
             return
           end
         end
-        cookbook_data = if @name_args.length == 1
-                          noauth_rest.get_rest(current["latest_version"])
-                        else
-                          noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
-                        end
-
-        @version = cookbook_data['version']
-        unless config[:file]
-          config[:file] = File.join(Dir.pwd, "#{@name_args[0]}-#{cookbook_data['version']}.tar.gz")
+
+        download_cookbook
+      end
+
+      def version
+        @version = desired_cookbook_data['version']
+      end
+
+      private
+      def cookbooks_api_url
+        'http://cookbooks.opscode.com/api/v1/cookbooks'
+      end
+
+      def current_cookbook_data
+        @current_cookbook_data ||= begin
+          noauth_rest.get_rest "#{cookbooks_api_url}/#{@name_args[0]}"
         end
-        ui.info("Downloading #{@name_args[0]} from the cookbooks site at version #{cookbook_data['version']} to #{config[:file]}")
+      end
+
+      def current_cookbook_deprecated?
+        current_cookbook_data['deprecated'] == true
+      end
+
+      def desired_cookbook_data
+        @desired_cookbook_data ||= begin
+          uri = if @name_args.length == 1
+            current_cookbook_data['latest_version']
+          else
+            specific_cookbook_version_url
+          end
+
+          noauth_rest.get_rest uri
+        end
+      end
+
+      def download_cookbook
+        ui.info "Downloading #{@name_args[0]} from the cookbooks site at version #{version} to #{download_location}"
         noauth_rest.sign_on_redirect = false
-        tf = noauth_rest.get_rest(cookbook_data["file"], true)
+        tf = noauth_rest.get_rest desired_cookbook_data["file"], true
+
+        ::FileUtils.cp tf.path, download_location
+        ui.info "Cookbook saved: #{download_location}"
+      end
+
+      def download_location
+        config[:file] ||= File.join Dir.pwd, "#{@name_args[0]}-#{version}.tar.gz"
+        config[:file]
+      end
 
-        FileUtils.cp(tf.path, config[:file])
-        ui.info("Cookbook saved: #{config[:file]}")
+      def replacement_cookbook
+        replacement = File.basename(current_cookbook_data['replacement'])
       end
 
+      def specific_cookbook_version_url
+        "#{cookbooks_api_url}/#{@name_args[0]}/versions/#{@name_args[1].gsub('.', '_')}"
+      end
     end
   end
 end
-
-

data/lib/chef/knife/cookbook_site_install.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef/knife'
+require 'shellwords'
 
 class Chef
   class Knife
@@ -34,9 +35,10 @@ class Chef
 
       option :no_deps,
        :short => "-D",
-       :long => "--no-dependencies",
+       :long => "--skip-dependencies",
        :boolean => true,
-       :description => "Do not install dependencies automatically"
+       :default => false,
+       :description => "Skips automatic dependency installation."
 
       option :cookbook_path,
         :short => "-o PATH:PATH",
@@ -65,7 +67,7 @@ class Chef
         @cookbook_name = parse_name_args!
         # Check to ensure we have a valid source of cookbooks before continuing
         #
-        @install_path = config[:cookbook_path].first
+        @install_path = File.expand_path(config[:cookbook_path].first)
         ui.info "Installing #@cookbook_name to #{@install_path}"
 
         @repo = CookbookSCMRepo.new(@install_path, ui, config)
@@ -78,12 +80,12 @@ class Chef
 
         downloader = download_cookbook_to(upstream_file)
         clear_existing_files(File.join(@install_path, @cookbook_name))
-        extract_cookbook(upstream_file, @install_path)
+        extract_cookbook(upstream_file, downloader.version)
 
         # 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)
+        File.unlink(upstream_file)
 
         if @repo.finalize_updates_to(@cookbook_name, downloader.version)
           @repo.reset_to_default_state
@@ -108,14 +110,15 @@ class Chef
 
       def parse_name_args!
         if name_args.empty?
-          ui.error("please specify a cookbook to download and install")
+          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
+        elsif name_args.size >= 2
+          unless name_args.last.match(/^(\d+)(\.\d+){1,2}$/) and name_args.size == 2
+            ui.error("Installing multiple cookbooks at once is not supported.")
+            exit 1
+          end
         end
+        name_args.first
       end
 
       def download_cookbook_to(download_path)
@@ -128,21 +131,13 @@ class Chef
 
       def extract_cookbook(upstream_file, version)
         ui.info("Uncompressing #{@cookbook_name} version #{version}.")
-        shell_out!("tar zxvf #{upstream_file}", :cwd => @install_path)
+        shell_out!("tar zxvf #{Shellwords.escape 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)
+        FileUtils.rmtree(cookbook_path) if File.directory?(cookbook_path)
       end
-
-
     end
   end
 end
-
-
-
-
-
-

data/lib/chef/knife/cookbook_upload.rb

@@ -68,49 +68,85 @@ class Chef
         :description => "Also upload cookbook dependencies"
 
       def run
+        # Sanity check before we load anything from the server
+        unless config[:all]
+          if @name_args.empty?
+            show_usage
+            ui.fatal("You must specify the --all flag or at least one cookbook name")
+            exit 1
+          end
+        end
+
         config[:cookbook_path] ||= Chef::Config[:cookbook_path]
 
+        if @name_args.empty? and ! config[:all]
+          show_usage
+          ui.fatal("You must specify the --all flag or at least one cookbook name")
+          exit 1
+        end
+
         assert_environment_valid!
         warn_about_cookbook_shadowing
         version_constraints_to_update = {}
+        upload_failures = 0
+        upload_ok = 0
+
         # Get a list of cookbooks and their versions from the server
-        # for checking existence of dependending cookbooks.
-        @server_side_cookbooks = Chef::CookbookVersion.list
+        # to check for the existence of a cookbook's dependencies.
+        @server_side_cookbooks = Chef::CookbookVersion.list_all_versions
+
+        justify_width = cookbooks_to_upload.map {|name, cookbook| name.size}.max.to_i + 2
 
-        if config[:all]
-          justify_width = cookbook_repo.cookbook_names.map {|name| name.size}.max.to_i + 2
-          cookbook_repo.each do |cookbook_name, cookbook|
-            cookbook.freeze_version if config[:freeze]
+        cookbooks_to_upload.each do |cookbook_name, cookbook|
+          cookbook.freeze_version if config[:freeze]
+          begin
             upload(cookbook, justify_width)
+            upload_ok += 1
             version_constraints_to_update[cookbook_name] = cookbook.version
+          rescue Exceptions::CookbookFrozen
+            upload_failures += 1
+            ui.warn("Not updating version constraints for #{cookbook_name} in the environment as the cookbook is frozen.") if config[:environment]
           end
-        else
-          if @name_args.empty?
-            show_usage
-            ui.error("You must specify the --all flag or at least one cookbook name")
-            exit 1
-          end
-          justify_width = @name_args.map {|name| name.size }.max.to_i + 2
-          @name_args.each do |cookbook_name|
+        end
+
+        upload_failures += config[:all] ? 0 : @name_args.length - @cookbooks_to_upload.length
+
+        if upload_failures == 0
+          ui.info "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""}."
+        elsif upload_failures > 0 && upload_ok > 0
+          ui.warn "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""} ok but #{upload_failures} " +
+            "cookbook#{upload_failures > 1 ? "s" : ""} upload failed."
+        elsif upload_failures > 0 && upload_ok == 0
+          ui.error "Failed to upload #{upload_failures} cookbook#{upload_failures > 1 ? "s" : ""}."
+          exit 1
+        end
+
+        unless version_constraints_to_update.empty?
+          update_version_constraints(version_constraints_to_update) if config[:environment]
+        end
+      end
+
+      def cookbooks_to_upload
+        @cookbooks_to_upload ||=
+          if config[:all]
+            cookbook_repo
+          else
+            upload_set = {}
+            @name_args.each do |cookbook_name|
             begin
-              cookbook = cookbook_repo[cookbook_name]
-              if config[:depends]
-                cookbook.metadata.dependencies.each do |dep, versions|
-                  @name_args.push dep
+              if ! upload_set.has_key?(cookbook_name)
+                upload_set[cookbook_name] = cookbook_repo[cookbook_name]
+                if config[:depends]
+                  upload_set[cookbook_name].metadata.dependencies.each { |dep, ver| @name_args << dep }
                 end
               end
-              cookbook.freeze_version if config[:freeze]
-              upload(cookbook, justify_width)
-              version_constraints_to_update[cookbook_name] = cookbook.version
             rescue Exceptions::CookbookNotFoundInRepo => e
               ui.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
               Log.debug(e)
             end
           end
-        end
-
-        ui.info "upload complete"
-        update_version_constraints(version_constraints_to_update) if config[:environment]
+            upload_set
+          end
       end
 
       def cookbook_repo
@@ -127,7 +163,6 @@ class Chef
         environment.save
       end
 
-
       def environment
         @environment ||= config[:environment] ? Environment.load(config[:environment]) : nil
       end
@@ -164,23 +199,21 @@ WARNING
 
       def upload(cookbook, justify_width)
         ui.info("Uploading #{cookbook.name.to_s.ljust(justify_width + 10)} [#{cookbook.version}]")
-
-        check_for_broken_links(cookbook)
-        check_dependencies(cookbook)
+        check_for_broken_links!(cookbook)
+        check_for_dependencies!(cookbook)
         Chef::CookbookUploader.new(cookbook, config[:cookbook_path], :force => config[:force]).upload_cookbook
       rescue Net::HTTPServerException => e
         case e.response.code
         when "409"
           ui.error "Version #{cookbook.version} of cookbook #{cookbook.name} is frozen. Use --force to override."
           Log.debug(e)
+          raise Exceptions::CookbookFrozen
         else
           raise
         end
       end
 
-      # if only you people wouldn't put broken symlinks in your cookbooks in
-      # the first place. ;)
-      def check_for_broken_links(cookbook)
+      def check_for_broken_links!(cookbook)
         # MUST!! dup the cookbook version object--it memoizes its
         # manifest object, but the manifest becomes invalid when you
         # regenerate the metadata
@@ -190,18 +223,17 @@ WARNING
         unless broken_files.empty?
           broken_filenames = Array(broken_files).map {|path, info| path}
           ui.error "The cookbook #{cookbook.name} has one or more broken files"
-          ui.info "This is probably caused by broken symlinks in the cookbook directory"
-          ui.info "The broken file(s) are: #{broken_filenames.join(' ')}"
+          ui.error "This is probably caused by broken symlinks in the cookbook directory"
+          ui.error "The broken file(s) are: #{broken_filenames.join(' ')}"
           exit 1
         end
       end
 
-      def check_dependencies(cookbook)
+      def check_for_dependencies!(cookbook)
         # for each dependency, check if the version is on the server, or
         # the version is in the cookbooks being uploaded. If not, exit and warn the user.
         cookbook.metadata.dependencies.each do |cookbook_name, version|
           unless check_server_side_cookbooks(cookbook_name, version) || check_uploading_cookbooks(cookbook_name, version)
-            # warn the user and exit
             ui.error "Cookbook #{cookbook.name} depends on cookbook #{cookbook_name} version #{version},"
             ui.error "which is not currently being uploaded and cannot be found on the server."
             exit 1
@@ -213,28 +245,25 @@ WARNING
         if @server_side_cookbooks[cookbook_name].nil?
           false
         else
+          versions = @server_side_cookbooks[cookbook_name]['versions'].collect {|versions| versions["version"]}
+          Log.debug "Versions of cookbook '#{cookbook_name}' returned by the server: #{versions.join(", ")}"
           @server_side_cookbooks[cookbook_name]["versions"].each do |versions_hash|
-            return true if Chef::VersionConstraint.new(version).include?(versions_hash["version"])
+            if Chef::VersionConstraint.new(version).include?(versions_hash["version"])
+              Log.debug "Matched cookbook '#{cookbook_name}' with constraint '#{version}' to cookbook version '#{versions_hash['version']}' on the server"
+              return true
+            end
           end
           false
         end
       end
 
       def check_uploading_cookbooks(cookbook_name, version)
-        if config[:all]
-          # check from all local cookbooks in the path
-          unless cookbook_repo[cookbook_name].nil?
-            return Chef::VersionConstraint.new(version).include?(cookbook_repo[cookbook_name].version)
-          end
-        else
-          # check from only those in the command argument
-          if @name_args.include?(cookbook_name)
-            return Chef::VersionConstraint.new(version).include?(cookbook_repo[cookbook_name].version)
-          end
+        if (! cookbooks_to_upload[cookbook_name].nil?) && Chef::VersionConstraint.new(version).include?(cookbooks_to_upload[cookbook_name].version)
+          Log.debug "Matched cookbook '#{cookbook_name}' with constraint '#{version}' to a local cookbook."
+          return true
         end
         false
       end
-
     end
   end
 end