chef 10.12.0 → 10.14.0.beta.1

data/lib/chef/handler.rb

@@ -86,10 +86,14 @@ class Chef
     # Run the report handlers. This will usually be called by a notification
     # from Chef::Client
     def self.run_report_handlers(run_status)
+      events = run_status.events
+      events.handlers_start(report_handlers.size)
       Chef::Log.info("Running report handlers")
       report_handlers.each do |handler|
         handler.run_report_safely(run_status)
+        events.handler_executed(handler)
       end
+      events.handlers_completed
       Chef::Log.info("Report handlers complete")
     end
 
@@ -107,10 +111,14 @@ class Chef
     # Run the exception handlers. Usually will be called by a notification
     # from Chef::Client when the run fails.
     def self.run_exception_handlers(run_status)
+      events = run_status.events
+      events.handlers_start(exception_handlers.size)
       Chef::Log.error("Running exception handlers")
       exception_handlers.each do |handler|
         handler.run_report_safely(run_status)
+        events.handler_executed(handler)
       end
+      events.handlers_completed
       Chef::Log.error("Exception handlers complete")
     end
 

data/lib/chef/handler/error_report.rb

@@ -24,7 +24,7 @@ class Chef
     class ErrorReport < ::Chef::Handler
 
       def report
-        Chef::FileCache.store("failed-run-data.json", Chef::JSONCompat.to_json_pretty(data))
+        Chef::FileCache.store("failed-run-data.json", Chef::JSONCompat.to_json_pretty(data), 0640)
         Chef::Log.fatal("Saving node information to #{Chef::FileCache.load("failed-run-data.json", false)}")
       end
 

data/lib/chef/knife/bootstrap.rb

@@ -30,6 +30,7 @@ class Chef
         require 'highline'
         require 'net/ssh'
         require 'net/ssh/multi'
+        require 'chef/knife/ssh'
         Chef::Knife::Ssh.load_deps
       end
 
@@ -105,7 +106,7 @@ class Chef
         :description => "Comma separated list of roles/recipes to apply",
         :proc => lambda { |o| o.split(/[\s,]+/) },
         :default => []
-      
+
       option :first_boot_attributes,
         :short => "-j JSON_ATTRIBS",
         :long => "--json-attributes",
@@ -119,6 +120,14 @@ class Chef
         :boolean => true,
         :default => true
 
+      Chef::Config[:knife][:hints] ||= Hash.new
+      option :hint,
+        :long => "--hint HINT_NAME[=HINT_FILE]",
+        :description => "Specify Ohai Hint to be set on the bootstrap target.  Use multiple --hint options to specify multiple hints.",
+        :proc => Proc.new { |h|
+        name, path = h.split("=")
+           Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new  }
+
       def load_template(template=nil)
         # Are we bootstrapping using an already shipped template?
         if config[:template_file]

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

@@ -28,6 +28,19 @@ awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
 <% end -%>
 
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir -p /etc/chef/ohai/hints
+<% end -%>
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+(
+cat <<'EOP'
+<%= hash.to_json %>
+EOP
+) > /etc/chef/ohai/hints/<%= name %>.json
+<% end -%>
+
 (
 cat <<'EOP'
 log_level        :info
@@ -38,7 +51,7 @@ validation_client_name "<%= @chef_config[:validation_client_name] %>"
 node_name "<%= @config[:chef_node_name] %>"
 <% else -%>
 # Using default node name (fqdn)
-<% end -%> 
+<% end -%>
 # ArchLinux follows the Filesystem Hierarchy Standard
 file_cache_path    "/var/cache/chef"
 file_backup_path   "/var/lib/chef/backup"

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

@@ -41,6 +41,19 @@ awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
 <% end -%>
 
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir -p /etc/chef/ohai/hints
+<% end -%>
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+(
+cat <<'EOP'
+<%= hash.to_json %>
+EOP
+) > /etc/chef/ohai/hints/<%= name %>.json
+<% end -%>
+
 (
 cat <<'EOP'
 <%= config_content %>

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

@@ -44,6 +44,19 @@ awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
 <% end -%>
 
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir -p /etc/chef/ohai/hints
+<% end -%>
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+(
+cat <<'EOP'
+<%= hash.to_json %>
+EOP
+) > /etc/chef/ohai/hints/<%= name %>.json
+<% end -%>
+
 (
 cat <<'EOP'
 <%= config_content %>

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

@@ -28,6 +28,19 @@ awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
 <% end -%>
 
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir -p /etc/chef/ohai/hints
+<% end -%>
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+(
+cat <<'EOP'
+<%= hash.to_json %>
+EOP
+) > /etc/chef/ohai/hints/<%= name %>.json
+<% end -%>
+
 (
 cat <<'EOP'
 <%= config_content %>

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

@@ -28,6 +28,19 @@ awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
 <% end -%>
 
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir -p /etc/chef/ohai/hints
+<% end -%>
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+(
+cat <<'EOP'
+<%= hash.to_json %>
+EOP
+) > /etc/chef/ohai/hints/<%= name %>.json
+<% end -%>
+
 <% 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 -%>

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

@@ -35,6 +35,19 @@ awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
 <% end -%>
 
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir -p /etc/chef/ohai/hints
+<% end -%>
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+(
+cat <<'EOP'
+<%= hash.to_json %>
+EOP
+) > /etc/chef/ohai/hints/<%= name %>.json
+<% end -%>
+
 (
 cat <<'EOP'
 <%= config_content %>

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

@@ -30,6 +30,19 @@ awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
 <% end -%>
 
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir -p /etc/chef/ohai/hints
+<% end -%>
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+(
+cat <<'EOP'
+<%= hash.to_json %>
+EOP
+) > /etc/chef/ohai/hints/<%= name %>.json
+<% end -%>
+
 (
 cat <<'EOP'
 <%= config_content %>

data/lib/chef/knife/cookbook_site_install.rb

@@ -52,6 +52,13 @@ class Chef
         :description => "Default branch to work with",
         :default => "master"
 
+      option :use_current_branch,
+        :short =>  "-b",
+        :long => "--use-current-branch",
+        :description => "Use the current branch",
+        :boolean => true,
+        :default => false
+
       attr_reader :cookbook_name
       attr_reader :vendor_path
 
@@ -75,8 +82,10 @@ class Chef
         upstream_file = File.join(@install_path, "#{@cookbook_name}.tar.gz")
 
         @repo.sanity_check
-        @repo.reset_to_default_state
-        @repo.prepare_to_import(@cookbook_name)
+        unless config[:use_current_branch]
+          @repo.reset_to_default_state
+          @repo.prepare_to_import(@cookbook_name)
+        end
 
         downloader = download_cookbook_to(upstream_file)
         clear_existing_files(File.join(@install_path, @cookbook_name))
@@ -88,13 +97,16 @@ class Chef
         File.unlink(upstream_file)
 
         if @repo.finalize_updates_to(@cookbook_name, downloader.version)
-          @repo.reset_to_default_state
+          unless config[:use_current_branch]
+            @repo.reset_to_default_state
+          end
           @repo.merge_updates_from(@cookbook_name, downloader.version)
         else
-          @repo.reset_to_default_state
+          unless config[:use_current_branch]
+            @repo.reset_to_default_state
+          end
         end
 
-
         unless config[:no_deps]
           md = Chef::Cookbook::Metadata.new
           md.from_file(File.join(@install_path, @cookbook_name, "metadata.rb"))

data/lib/chef/knife/cookbook_site_show.rb

@@ -25,13 +25,16 @@ class Chef
       category "cookbook site"
 
       def run
+        output(format_for_display(get_cookbook_data))
+      end
+      
+      def get_cookbook_data
         case @name_args.length
         when 1 
-          cookbook_data = noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}")
+          noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}")
         when 2
-          cookbook_data = noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
+          noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
         end
-        output(format_for_display(cookbook_data))
       end
 
       def get_cookbook_list(items=10, start=0, cookbook_collection={})

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

@@ -28,12 +28,14 @@ class Chef
 
       attr_reader :repo_path
       attr_reader :default_branch
+      attr_reader :use_current_branch
       attr_reader :ui
 
       def initialize(repo_path, ui, opts={})
         @repo_path = repo_path
         @ui = ui
         @default_branch = 'master'
+        @use_current_branch = false
         apply_opts(opts)
       end
 
@@ -47,6 +49,9 @@ class Chef
           ui.info("Use `git init` to initialize a git repo")
           exit 1
         end
+        if use_current_branch
+          @default_branch = get_current_branch()
+        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"
@@ -117,6 +122,11 @@ class Chef
         git("branch --no-color").stdout.lines.any? {|l| l =~ /\s#{Regexp.escape(branch_name)}(?:\s|$)/ }
       end
 
+      def get_current_branch()
+        ref = git("symbolic-ref HEAD").stdout
+        ref.chomp.split('/')[2]
+      end
+
       private
 
       def git_repo?(directory)
@@ -134,6 +144,8 @@ class Chef
           case option.to_s
           when 'default_branch'
             @default_branch = value
+          when 'use_current_branch'
+            @use_current_branch = value
           end
         end
       end

data/lib/chef/knife/exec.rb

@@ -27,11 +27,23 @@ class Chef::Knife::Exec < Chef::Knife
     :long => "--exec CODE",
     :description => "a string of Chef code to execute"
 
+  option :script_path,
+    :short => "-p PATH:PATH",
+    :long => "--script-path PATH:PATH",
+    :description => "A colon-separated path to look for scripts in",
+    :proc => lambda { |o| o.split(":") }
+
   deps do
     require 'chef/shef/ext'
   end
 
   def run
+    config[:script_path] ||= Array(Chef::Config[:script_path])
+
+    # Default script paths are chef-repo/.chef/scripts and ~/.chef/scripts
+    config[:script_path] << File.join(Chef::Knife.chef_config_dir, 'scripts') if Chef::Knife.chef_config_dir
+    config[:script_path] << File.join(ENV['HOME'], '.chef', 'scripts') if ENV['HOME']
+
     scripts = Array(name_args)
     context = Object.new
     Shef::Extensions.extend_context_object(context)
@@ -39,7 +51,7 @@ class Chef::Knife::Exec < Chef::Knife
       context.instance_eval(config[:exec], "-E Argument", 0)
     elsif !scripts.empty?
       scripts.each do |script|
-        file = File.expand_path(script)
+        file = find_script(script)
         context.instance_eval(IO.read(file), file, 0)
       end
     else
@@ -47,5 +59,28 @@ class Chef::Knife::Exec < Chef::Knife
       context.instance_eval(script, "STDIN", 0)
     end
   end
-  
+
+  def find_script(x)
+    # Try to find a script. First try expanding the path given.
+    script = File.expand_path(x)
+    return script if File.exists?(script)
+
+    # Failing that, try searching the script path. If we can't find
+    # anything, fail gracefully.
+    Chef::Log.debug("Searching script_path: #{config[:script_path].inspect}")
+
+    config[:script_path].each do |path|
+      path = File.expand_path(path)
+      test = File.join(path, x)
+      Chef::Log.debug("Testing: #{test}")
+      if File.exists?(test)
+        script = test
+        Chef::Log.debug("Found: #{test}")
+        return script
+      end
+    end
+    ui.error("\"#{x}\" not found in current directory or script_path, giving up.")
+    exit(1)
+  end
+ 
 end

data/lib/chef/knife/ssh.rb

@@ -26,8 +26,10 @@ class Chef
         require 'net/ssh'
         require 'net/ssh/multi'
         require 'readline'
+        require 'chef/exceptions'
         require 'chef/search/query'
         require 'chef/mixin/shell_out'
+        require 'mixlib/shellout'
       end
 
       include Chef::Mixin::ShellOut
@@ -180,6 +182,7 @@ class Chef
       end
 
       def ssh_command(command, subsession=nil)
+        exit_status = 0
         subsession ||= session
         command = fixup_sudo(command)
         subsession.open_channel do |ch|
@@ -192,9 +195,13 @@ class Chef
                 ichannel.send_data("#{get_password}\n")
               end
             end
+            ch.on_request "exit-status" do |ichannel, data|
+              exit_status = data.read_long
+            end
           end
         end
         session.loop
+        exit_status
       end
 
       def get_password
@@ -332,12 +339,23 @@ class Chef
                               "fqdn").strip
       end
 
-      def csshx
-        csshx_cmd = "csshX"
+      def cssh
+        cssh_cmd = nil
+        %w[csshX cssh].each do |cmd|
+          begin
+            # Unix and Mac only
+            cssh_cmd = shell_out!("which #{cmd}").stdout.strip
+            break
+          rescue Mixlib::ShellOut::ShellCommandFailed
+          end
+        end
+        raise Chef::Exceptions::Exec, "no command found for cssh" unless cssh_cmd
+
         session.servers_for.each do |server|
-          csshx_cmd << " #{server.user ? "#{server.user}@#{server.host}" : server.host}"
+          cssh_cmd << " #{server.user ? "#{server.user}@#{server.host}" : server.host}"
         end
-        exec(csshx_cmd)
+        Chef::Log.debug("starting cssh session with command: #{cssh_cmd}")
+        exec(cssh_cmd)
       end
 
       def get_stripped_unfrozen_value(value)
@@ -365,6 +383,7 @@ class Chef
         configure_identity_file
         configure_session
 
+        exit_status =
         case @name_args[1]
         when "interactive"
           interactive
@@ -374,13 +393,18 @@ class Chef
           tmux
         when "macterm"
           macterm
+        when "cssh"
+          cssh
         when "csshx"
-          csshx
+          Chef::Log.warn("knife ssh csshx will be deprecated in a future release")
+          Chef::Log.warn("please use knife ssh cssh instead")
+          cssh
         else
           ssh_command(@name_args[1..-1].join(" "))
         end
 
         session.close
+        exit_status
       end
 
     end