chef 0.10.2 → 0.10.4.rc.1

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

@@ -1,14 +1,17 @@
 bash -c '
+<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+
 if [ ! -f /usr/bin/chef-client ]; then
-  rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
-  wget -O /etc/yum.repos.d/aegis.repo http://rpm.aegisco.com/aegisco/el5/aegisco.repo
+  wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>http://download.fedora.redhat.com/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] %>-O /etc/yum.repos.d/aegis.repo http://rpm.aegisco.com/aegisco/el5/aegisco.repo
 
   yum install -y ruby-1.8.7.334-2.el5 ruby-devel-1.8.7.334-2.el5 gcc gcc-c++ automake autoconf make
 
   cd /tmp
-  wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
-  tar zxf rubygems-1.3.7.tgz
-  cd rubygems-1.3.7
+  wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz
+  tar zxf rubygems-1.6.2.tgz
+  cd rubygems-1.6.2
   ruby setup.rb --no-format-executable
 fi
 

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

@@ -1,4 +1,6 @@
 bash -c '
+<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+
 yum install -y ruby ruby-devel gcc gcc-c++ automake autoconf rubygems make
 
 gem update --system

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

@@ -1,32 +1,39 @@
 bash -c '
+<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+
 if [ ! -f /usr/bin/chef-client ]; then
-  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 lucid main" > /etc/apt/sources.list.d/opscode.list
-  wget -O- http://apt.opscode.com/packages@opscode.com.gpg.key | apt-key add -
+  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 -
 fi
 apt-get update
 apt-get install -y chef
 
-<% unless Chef::Config[:validation_client_name] == "chef-validator" -%>
-[  `grep -qx "validation_client_name \"<%= Chef::Config[:validation_client_name] %>\"" /etc/chef/client.rb` ] || echo "validation_client_name \"<%= Chef::Config[:validation_client_name] %>\"" >> /etc/chef/client.rb
-<% end -%>
-
 (
 cat <<'EOP'
-<%= IO.read(Chef::Config[:validation_key]) %>
+<%= validation_key %>
 EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
 
+<% unless @chef_config[:validation_client_name] == "chef-validator" -%>
+[  `grep -qx "validation_client_name \"<%= @chef_config[:validation_client_name] %>\"" /etc/chef/client.rb` ] || echo "validation_client_name \"<%= @chef_config[:validation_client_name] %>\"" >> /etc/chef/client.rb
+<% end -%>
+
 <% if @config[:chef_node_name] %>
 [ `grep -qx "node_name \"<%= @config[:chef_node_name] %>\"" /etc/chef/client.rb` ] || echo "node_name \"<%= @config[:chef_node_name] %>\"" >> /etc/chef/client.rb
 <% end -%>
 
+<% if knife_config[:bootstrap_proxy] %>
+echo 'http_proxy  "knife_config[:bootstrap_proxy]"' >> /etc/chef/client.rb
+echo 'https_proxy "knife_config[:bootstrap_proxy]"' >> /etc/chef/client.rb
+<% end -%>
+
 (
 cat <<'EOP'
 <%= { "run_list" => @run_list }.to_json %>
 EOP
 ) > /etc/chef/first-boot.json
 
-/usr/bin/chef-client -j /etc/chef/first-boot.json'
+<%= start_chef %>'

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

@@ -1,14 +1,17 @@
 bash -c '
+<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+
 if [ ! -f /usr/bin/chef-client ]; then
   apt-get update
   apt-get install -y ruby ruby1.8-dev build-essential wget libruby-extras libruby1.8-extras
   cd /tmp
-  wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
-  tar zxf rubygems-1.3.7.tgz
-  cd rubygems-1.3.7
+  wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz
+  tar zxf rubygems-1.6.2.tgz
+  cd rubygems-1.6.2
   ruby setup.rb --no-format-executable
 fi
 
+gem update --no-rdoc --no-ri
 gem install ohai --no-rdoc --no-ri --verbose
 gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
 

data/lib/chef/knife/client_bulk_delete.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -29,12 +29,34 @@ class Chef
 
       banner "knife client bulk delete REGEX (options)"
 
-      def run 
-        if @name_args.length < 1
+      def run
+        if name_args.length < 1
           ui.fatal("You must supply a regular expression to match the results against")
           exit 42
-        else
-          bulk_delete(Chef::ApiClient, "client", nil, nil, @name_args[0])
+        end
+        all_clients = Chef::ApiClient.list(true)
+
+        matcher = /#{name_args[0]}/
+        clients_to_delete = {}
+        all_clients.each do |name, client|
+          next unless name =~ matcher
+          clients_to_delete[client.name] = client
+        end
+
+        if clients_to_delete.empty?
+          ui.info "No clients match the expression /#{name_args[0]}/"
+          exit 0
+        end
+
+        ui.msg("The following clients will be deleted:")
+        ui.msg("")
+        ui.msg(ui.list(clients_to_delete.keys.sort, :columns_down))
+        ui.msg("")
+        ui.confirm("Are you sure you want to delete these clients")
+
+        clients_to_delete.sort.each do |name, client|
+          client.destroy
+          ui.msg("Deleted client #{name}")
         end
       end
     end

data/lib/chef/knife/cookbook_site_install.rb

@@ -36,7 +36,7 @@ class Chef
        :short => "-D",
        :long => "--no-dependencies",
        :boolean => true,
-       :description => "Grab dependencies automatically"
+       :description => "Do not install dependencies automatically"
 
       option :cookbook_path,
         :short => "-o PATH:PATH",
@@ -44,7 +44,7 @@ class Chef
         :description => "A colon-separated path to look for cookbooks in",
         :proc => lambda { |o| o.split(":") }
 
-      option :branch_default,
+      option :default_branch,
         :short => "-B BRANCH",
         :long => "--branch BRANCH",
         :description => "Default branch to work with",

data/lib/chef/knife/cookbook_upload.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Christopher Walters (<cw@opscode.com>)
+# Author:: Nuo Yan (<yan.nuo@gmail.com>)
 # Copyright:: Copyright (c) 2009, 2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -61,11 +62,20 @@ class Chef
         :description => "Set ENVIRONMENT's version dependency match the version you're uploading.",
         :default => nil
 
+      option :depends,
+        :short => "-d",
+        :long => "--include-dependencies",
+        :description => "Also upload cookbook dependencies"
+
       def run
         config[:cookbook_path] ||= Chef::Config[:cookbook_path]
 
         assert_environment_valid!
+        warn_about_cookbook_shadowing
         version_constraints_to_update = {}
+        # Get a list of cookbooks and their versions from the server
+        # for checking existence of dependending cookbooks.
+        @server_side_cookbooks = Chef::CookbookVersion.list
 
         if config[:all]
           justify_width = cookbook_repo.cookbook_names.map {|name| name.size}.max.to_i + 2
@@ -84,6 +94,11 @@ class Chef
           @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
+                end
+              end
               cookbook.freeze_version if config[:freeze]
               upload(cookbook, justify_width)
               version_constraints_to_update[cookbook_name] = cookbook.version
@@ -117,6 +132,22 @@ class Chef
         @environment ||= config[:environment] ? Environment.load(config[:environment]) : nil
       end
 
+      def warn_about_cookbook_shadowing
+        unless cookbook_repo.merged_cookbooks.empty?
+          ui.warn "* " * 40
+          ui.warn(<<-WARNING)
+The cookbooks: #{cookbook_repo.merged_cookbooks.join(', ')} exist in multiple places in your cookbook_path.
+A composite version of these cookbooks has been compiled for uploading.
+
+#{ui.color('IMPORTANT:', :red, :bold)} In a future version of Chef, this behavior will be removed and you will no longer
+be able to have the same version of a cookbook in multiple places in your cookbook_path.
+WARNING
+          ui.warn "The affected cookbooks are located:"
+          ui.output ui.format_for_display(cookbook_repo.merged_cookbook_paths)
+          ui.warn "* " * 40
+        end
+      end
+
       private
 
       def assert_environment_valid!
@@ -135,6 +166,7 @@ class Chef
         ui.info("Uploading #{cookbook.name.to_s.ljust(justify_width + 10)} [#{cookbook.version}]")
 
         check_for_broken_links(cookbook)
+        check_dependencies(cookbook)
         Chef::CookbookUploader.new(cookbook, config[:cookbook_path], :force => config[:force]).upload_cookbook
       rescue Net::HTTPServerException => e
         case e.response.code
@@ -164,6 +196,45 @@ class Chef
         end
       end
 
+      def check_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
+          end
+        end
+      end
+
+      def check_server_side_cookbooks(cookbook_name, version)
+        if @server_side_cookbooks[cookbook_name].nil?
+          false
+        else
+          @server_side_cookbooks[cookbook_name]["versions"].each do |versions_hash|
+            return true if Chef::VersionConstraint.new(version).include?(versions_hash["version"])
+          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
+        end
+        false
+      end
+
     end
   end
 end

data/lib/chef/knife/core/bootstrap_context.rb

@@ -38,8 +38,7 @@ class Chef
           if @config[:prerelease]
             "--prerelease"
           else
-            version = knife_config[:bootstrap_version] || Chef::VERSION
-            "--version #{version}"
+            "--version #{chef_version}"
           end
         end
 
@@ -63,17 +62,28 @@ CONFIG
           else
             client_rb << "# Using default node name (fqdn)\n"
           end
+
+          if knife_config[:bootstrap_proxy]
+            client_rb << %Q{http_proxy        "#{knife_config[:bootstrap_proxy]}"\n}
+            client_rb << %Q{https_proxy       "#{knife_config[:bootstrap_proxy]}"\n}
+          end
           client_rb
         end
 
         def start_chef
-          "/usr/bin/chef-client -j /etc/chef/first-boot.json -E #{bootstrap_environment}"
+          s = "/usr/bin/chef-client -j /etc/chef/first-boot.json"
+          s << " -E #{bootstrap_environment}" if chef_version.to_f != 0.9 # only use the -E option on Chef 0.10+
+          s
         end
 
         def knife_config
           @chef_config.key?(:knife) ? @chef_config[:knife] : {}
         end
 
+        def chef_version
+          knife_config[:bootstrap_version] || Chef::VERSION
+        end
+
       end
     end
   end

data/lib/chef/knife/core/cookbook_scm_repo.rb

@@ -34,6 +34,7 @@ class Chef
         @repo_path = repo_path
         @ui = ui
         @default_branch = 'master'
+        apply_opts(opts)
       end
 
       def sanity_check
@@ -113,7 +114,7 @@ class Chef
       end
 
       def branch_exists?(branch_name)
-        git("branch --no-color").stdout.lines.any? {|l| l.include?(branch_name) }
+        git("branch --no-color").stdout.lines.any? {|l| l =~ /\s#{Regexp.escape(branch_name)}(?:\s|$)/ }
       end
 
       private
@@ -133,8 +134,6 @@ class Chef
           case option.to_s
           when 'default_branch'
             @default_branch = value
-          else
-            raise ArgumentError, "invalid option `#{option}' passed to CookbookRepo.new()"
           end
         end
       end

data/lib/chef/knife/core/node_presenter.rb

@@ -60,14 +60,17 @@ class Chef
         def summarize(data)
           if data.kind_of?(Chef::Node)
             node = data
+            # special case ec2 with their split horizon whatsis.
+            ip = (node[:ec2] && node[:ec2][:public_ipv4]) || node[:ipaddress]
+
             summarized=<<-SUMMARY
 #{ui.color('Node Name:', :bold)}   #{ui.color(node.name, :bold)}
 #{key('Environment:')} #{node.chef_environment}
 #{key('FQDN:')}        #{node[:fqdn]}
-#{key('IP:')}          #{node[:ipaddress]}
+#{key('IP:')}          #{ip}
 #{key('Run List:')}    #{node.run_list}
 #{key('Roles:')}       #{Array(node[:roles]).join(', ')}
-#{key('Recipes')}      #{Array(node[:recipes]).join(', ')}
+#{key('Recipes:')}     #{Array(node[:recipes]).join(', ')}
 #{key('Platform:')}    #{node[:platform]} #{node[:platform_version]}
 SUMMARY
             if config[:medium_output] || config[:long_output]

data/lib/chef/knife/help.rb

@@ -55,23 +55,25 @@ MOAR_HELP
           @topic = find_manpages_for_query(@query)
         end
 
-        manpage_path = available_manpages_by_basename[@topic]
+        manpage_path = find_manpage_path(@topic)
         exec "man #{manpage_path}"
       end
 
       def help_topics
-        available_manpages_by_basename.keys.map {|c| c.sub(/^knife\-/, '')}.sort
+        # The list of help topics is generated by a rake task from the available man pages
+        # This constant is provided in help_topics.rb which is automatically required/loaded by the knife subcommand loader.
+        HELP_TOPICS
       end
 
       def print_help_topics
         ui.info "Available help topics are: "
-        help_topics.each do |topic|
+        help_topics.collect {|t| t.gsub(/knife-/, '') }.sort.each do |topic|
           ui.msg "  #{topic}"
         end
       end
 
       def find_manpages_for_query(query)
-        possibilities = available_manpages_by_basename.keys.select do |manpage|
+        possibilities = help_topics.select do |manpage|
           ::File.fnmatch("knife-#{query}*", manpage) || ::File.fnmatch("#{query}*", manpage)
         end
         if possibilities.empty?
@@ -87,16 +89,15 @@ MOAR_HELP
         end
       end
 
-      def available_manpages_by_basename
-        @available_manpages_by_basename ||= begin
-          available_manpages = Dir[File.expand_path("../distro/common/man/man1/*1", CHEF_ROOT)]
-          available_manpages.inject({}) do |map, manpath|
-            map[::File.basename(manpath, '.1')] = manpath
-            map
-          end
+      def find_manpage_path(topic)
+        if ::File.exists?(::File.expand_path("../distro/common/man/man1/#{topic}.1", CHEF_ROOT))
+          # If we've provided the man page in the gem, give that
+          return ::File.expand_path("../distro/common/man/man1/#{topic}.1", CHEF_ROOT)
+        else
+          # Otherwise, we'll just be using MANPATH
+          topic
         end
       end
-
     end
   end
 end

data/lib/chef/knife/help_topics.rb

@@ -0,0 +1,4 @@
+# Do not edit this file by hand
+# This file is autogenerated by the docs:list rake task from the available manpages
+
+HELP_TOPICS = ["knife-ssh", "knife-environment", "knife-bootstrap", "knife-cookbook", "knife-exec", "knife-tag", "knife-status", "knife", "knife-data-bag", "knife-index", "knife-configure", "knife-search", "knife-node", "knife-client", "shef", "knife-role", "knife-cookbook-site"]

data/lib/chef/knife/ssh.rb

@@ -149,9 +149,8 @@ class Chef
           data.split(/\n/).each { |d| print_data(host, d) }
         else
           padding = @longest - host.length
-          print ui.color(host, :cyan)
-          padding.downto(0) { print " " }
-          puts data
+          str = ui.color(host, :cyan) + (" " * (padding + 1)) + data
+          ui.msg(str)
         end
       end
 
@@ -241,6 +240,7 @@ class Chef
         window = 0
         session.servers_for.each do |server|
           tf.print("screen -t \"#{server.host}\" #{window} ssh ")
+          tf.print("-i #{config[:identity_file]} ") if config[:identity_file]
           server.user ? tf.puts("#{server.user}@#{server.host}") : tf.puts(server.host)
           window += 1
         end
@@ -250,8 +250,9 @@ class Chef
 
       def tmux
         ssh_dest = lambda do |server|
+          identity = "-i #{config[:identity_file]} " if config[:identity_file]
           prefix = server.user ? "#{server.user}@" : ""
-          "'ssh #{prefix}#{server.host}'"
+          "'ssh #{identity}#{prefix}#{server.host}'"
         end
 
         new_window_cmds = lambda do
@@ -300,11 +301,31 @@ class Chef
         end
       end
 
+      def configure_attribute
+        config[:attribute] = (config[:attribute] ||
+                              Chef::Config[:knife][:ssh_attribute] ||
+                              "fqdn").strip
+      end
+
+      def configure_user
+        config[:ssh_user] = (config[:ssh_user] ||
+                             Chef::Config[:knife][:ssh_user])
+        config[:ssh_user].strip! unless config[:ssh_user].nil?
+      end
+
+      def configure_identity_file
+        config[:identity_file] = (config[:identity_file] || Chef::Config[:knife][:ssh_identity_file])
+        config[:identity_file].strip! unless config[:identity_file].nil?
+      end
+
       def run
         extend Chef::Mixin::Command
 
         @longest = 0
 
+        configure_attribute
+        configure_user
+        configure_identity_file
         configure_session
 
         case @name_args[1]