chef 0.10.8 → 0.10.10.beta.1

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

@@ -80,7 +80,9 @@ CONFIG
         end
 
         def start_chef
-          s = "/usr/bin/chef-client -j /etc/chef/first-boot.json"
+          # If the user doesn't have a client path configure, let bash use the PATH for what it was designed for
+          client_path = @chef_config[:chef_client_path] || 'chef-client'
+          s = "#{client_path} -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

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

@@ -84,7 +84,7 @@ class Chef
         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}")
+          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

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

@@ -32,7 +32,7 @@ class Chef
       end
 
       def edit_node
-        abort "You specified the --no-editor option, nothing to edit" if config[:no_editor]
+        abort "You specified the --disable_editing option, nothing to edit" if config[:disable_editing]
         assert_editor_set!
 
         updated_node_data = edit_data(view)

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

@@ -48,7 +48,7 @@ class Chef
         end
 
         # finally search ~/.chef/plugins/knife/*.rb
-        user_specific_files.concat Dir.glob(File.join(env['HOME'], '.chef', 'plugins', 'knife', '*.rb'))
+        user_specific_files.concat Dir.glob(File.join(env['HOME'], '.chef', 'plugins', 'knife', '*.rb')) if env['HOME']
 
         user_specific_files
       end

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

@@ -19,6 +19,7 @@
 #
 
 require 'forwardable'
+require 'chef/platform'
 require 'chef/knife/core/generic_presenter'
 
 class Chef
@@ -98,7 +99,7 @@ class Chef
       # determined by the value of `config[:color]`. When output is not to a
       # terminal, colored output is never used
       def color?
-        Chef::Config[:color] && stdout.tty? && (RUBY_PLATFORM !~ /mswin|mingw32|windows/)
+        Chef::Config[:color] && stdout.tty? && !Chef::Platform.windows?
       end
 
       def ask(*args, &block)
@@ -146,7 +147,7 @@ class Chef
       def edit_data(data, parse_output=true)
         output = Chef::JSONCompat.to_json_pretty(data)
 
-        if (!config[:no_editor])
+        if (!config[:disable_editing])
           filename = "knife-edit-"
           0.upto(20) { filename += rand(9).to_s }
           filename << ".js"

data/lib/chef/knife/help_topics.rb

@@ -1,4 +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"]
+HELP_TOPICS = ["knife-bootstrap", "knife-client", "knife-configure", "knife-cookbook-site", "knife-cookbook", "knife-data-bag", "knife-environment", "knife-exec", "knife-index", "knife-node", "knife-role", "knife-search", "knife-ssh", "knife-status", "knife-tag", "knife", "shef"]

data/lib/chef/knife/node_run_list_add.rb

@@ -27,7 +27,7 @@ class Chef
         require 'chef/json_compat'
       end
 
-      banner "knife node run_list add [NODE] [ENTRY] (options)"
+      banner "knife node run_list add [NODE] [ENTRY[,ENTRY]] (options)"
 
       option :after,
         :short => "-a ITEM",
@@ -36,9 +36,17 @@ class Chef
 
       def run
         node = Chef::Node.load(@name_args[0])
-        entry = @name_args[1]
+        if @name_args.size > 2
+          # Check for nested lists and create a single plain one
+          entries = @name_args[1..-1].map do |entry|
+            entry.split(',').map { |e| e.strip }
+          end.flatten
+        else
+          # Convert to array and remove the extra spaces
+          entries = @name_args[1].split(',').map { |e| e.strip }
+        end
 
-        add_to_run_list(node, entry, config[:after])
+        add_to_run_list(node, entries, config[:after])
 
         node.save
 
@@ -47,18 +55,18 @@ class Chef
         output(format_for_display(node))
       end
 
-      def add_to_run_list(node, new_value, after=nil)
+      def add_to_run_list(node, entries, after=nil)
         if after
           nlist = []
           node.run_list.each do |entry|
             nlist << entry
             if entry == after
-              nlist << new_value
+              entries.each { |e| nlist << e }
             end
           end
           node.run_list.reset!(nlist)
         else
-          node.run_list << new_value
+          entries.each { |e| node.run_list << e }
         end
       end
 

data/lib/chef/knife/node_run_list_remove.rb

@@ -27,13 +27,13 @@ class Chef
         require 'chef/json_compat'
       end
 
-      banner "knife node run_list remove [NODE] [ENTRY] (options)"
+      banner "knife node run_list remove [NODE] [ENTRIES] (options)"
 
       def run
         node = Chef::Node.load(@name_args[0])
-        entry = @name_args[1]
+        entries = @name_args[1].split(',')
 
-        node.run_list.remove(entry)
+        entries.each { |e| node.run_list.remove(e) }
 
         node.save
 

data/lib/chef/knife/ssh.rb

@@ -45,7 +45,7 @@ class Chef
         :short => "-a ATTR",
         :long => "--attribute ATTR",
         :description => "The attribute to use for opening the connection - default is fqdn",
-        :default => "fqdn"
+        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_attribute] = key }
 
       option :manual,
         :short => "-m",
@@ -71,16 +71,22 @@ 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_gatewa] = key }
+
       option :identity_file,
         :short => "-i IDENTITY_FILE",
         :long => "--identity-file IDENTITY_FILE",
         :description => "The SSH identity file used for authentication"
 
-      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 session
         config[:on_error] ||= :skip
@@ -124,17 +130,27 @@ class Chef
       end
 
       def session_from_list(list)
+        config[:ssh_gateway] ||= Chef::Config[:knife][:ssh_gateway]
+        if config[:ssh_gateway]
+          gw_host, gw_user = config[:ssh_gateway].split('@').reverse
+          gw_host, gw_port = gw_host.split(':')
+          gw_opts = gw_port ? { :port => gw_port } : {}
+
+          session.via(gw_host, gw_user || config[:ssh_user], gw_opts)
+        end
+
         list.each do |item|
           Chef::Log.debug("Adding #{item}")
 
           hostspec = config[:ssh_user] ? "#{config[:ssh_user]}@#{item}" : item
           session_opts = {}
           session_opts[:keys] = File.expand_path(config[:identity_file]) if config[:identity_file]
+          session_opts[:keys_only] = true 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]
+          if !config[:host_key_verify]
             session_opts[:paranoid] = false
             session_opts[:user_known_hosts_file] = "/dev/null"
           end
@@ -309,9 +325,8 @@ class Chef
       end
 
       def configure_attribute
-        config[:attribute] = (config[:attribute] ||
-                              Chef::Config[:knife][:ssh_attribute] ||
-                              "fqdn").strip
+        config[:attribute] = (Chef::Config[:knife][:ssh_attribute] ||
+                              config[:attribute]).strip
       end
 
       def csshx
@@ -322,15 +337,19 @@ class Chef
         exec(csshx_cmd)
       end
 
+      def get_stripped_unfrozen_value(value)
+        return nil if value.nil?
+        value.strip
+      end
+
       def configure_user
-        config[:ssh_user] = (config[:ssh_user] ||
+        config[:ssh_user] = get_stripped_unfrozen_value(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?
+        config[:identity_file] = get_stripped_unfrozen_value(config[:identity_file] || 
+                             Chef::Config[:knife][:ssh_identity_file])
       end
 
       def run

data/lib/chef/mash.rb

@@ -65,6 +65,20 @@ class Mash < Hash
     end
   end
 
+  # @param orig<Object> Mash being copied
+  #
+  # @return [Object] A new copied Mash
+  def initialize_copy(orig)
+    super
+    # Handle nested values
+    each do |k,v|
+      if v.kind_of?(Mash) || v.is_a?(Array)
+        self[k] = v.dup
+      end
+    end
+    self
+  end
+
   # @param key<Object> The default value for the mash. Defaults to nil.
   #
   # @details [Alternatives]

data/lib/chef/mixin/command.rb

@@ -27,6 +27,7 @@ class Chef
     module Command
       extend self
 
+      # NOTE: run_command is deprecated in favor of using Chef::Shellout which now comes from the mixlib-shellout gem. NOTE #
 
       if RUBY_PLATFORM =~ /mswin|mingw32|windows/
         require 'chef/mixin/command/windows'

data/lib/chef/mixin/command/unix.rb

@@ -28,6 +28,9 @@ class Chef
         #
         # Thanks Ara!
         def popen4(cmd, args={}, &b)
+          # Ruby 1.8 suffers from intermittent segfaults believed to be due to GC while IO.select
+          # See CHEF-2916 / CHEF-1305
+          GC.disable
 
           # Waitlast - this is magic.
           #
@@ -207,6 +210,8 @@ class Chef
           else
             [cid, pw.last, pr.first, pe.first]
           end
+        ensure
+          GC.enable
         end
 
       end

data/lib/chef/mixin/convert_to_class_name.rb

@@ -23,6 +23,8 @@ class Chef
       extend self
 
       def convert_to_class_name(str)
+        str = str.dup
+        str.gsub!(/[^A-Za-z0-9_]/,'_')
         rname = nil
         regexp = %r{^(.+?)(_(.+))?$}
         

data/lib/chef/mixin/deep_merge.rb

@@ -22,21 +22,30 @@ class Chef
     # == Chef::Mixin::DeepMerge
     # Implements a deep merging algorithm for nested data structures.
     # ==== Notice:
-    #   This code is imported from deep_merge by Steve Midgley. deep_merge is
-    #   available under the MIT license from
+    #   This code was originally imported from deep_merge by Steve Midgley.
+    #   deep_merge is available under the MIT license from
     #   http://trac.misuse.org/science/wiki/DeepMerge
     module DeepMerge
-      def self.merge(first, second)
+      extend self
+
+      def merge(first, second)
         first  = Mash.new(first)  unless first.kind_of?(Mash)
         second = Mash.new(second) unless second.kind_of?(Mash)
 
-        DeepMerge.deep_merge!(second, first, {:knockout_prefix => "!merge:", :preserve_unmergeables => false})
+        DeepMerge.deep_merge(second, first, {:preserve_unmergeables => false})
+      end
+
+      # Inherited roles use the knockout_prefix array subtraction functionality
+      # This is likely to go away in Chef >= 0.11
+      def role_merge(first, second)
+        first  = Mash.new(first)  unless first.kind_of?(Mash)
+        second = Mash.new(second) unless second.kind_of?(Mash)
+
+        DeepMerge.deep_merge(second, first, {:knockout_prefix => "!merge", :preserve_unmergeables => false})
       end
     
       class InvalidParameter < StandardError; end
       
-      DEFAULT_FIELD_KNOCKOUT_PREFIX = '--' unless defined?(DEFAULT_FIELD_KNOCKOUT_PREFIX)
-     
       # Deep Merge core documentation.
       # deep_merge! method permits merging of arbitrary child elements. The two top level
       # elements must be hashes. These hashes can contain unlimited (to stack limit) levels
@@ -54,11 +63,13 @@ class Chef
       # 
       # Options:
       #   Options are specified in the last parameter passed, which should be in hash format:
-      #   hash.deep_merge!({:x => [1,2]}, {:knockout_prefix => '--'})
+      #   hash.deep_merge!({:x => [1,2]}, {:knockout_prefix => '!merge'})
       #   :preserve_unmergeables  DEFAULT: false
       #      Set to true to skip any unmergeable elements from source
       #   :knockout_prefix        DEFAULT: nil
       #      Set to string value to signify prefix which deletes elements from existing element
+      #      A colon is appended when indicating a specific value, eg:
+      #      :knockout_prefix => "dontmerge", is referenced as "dontmerge:foobar" in an array
       #   :sort_merged_arrays     DEFAULT: false
       #      Set to true to sort all arrays that are merged together
       #   :unpack_arrays          DEFAULT: nil
@@ -69,13 +80,13 @@ class Chef
       # Selected Options Details:
       # :knockout_prefix => The purpose of this is to provide a way to remove elements 
       #   from existing Hash by specifying them in a special way in incoming hash
-      #    source = {:x => ['--1', '2']}
+      #    source = {:x => ['!merge:1', '2']}
       #    dest   = {:x => ['1', '3']}
       #    dest.ko_deep_merge!(source)
       #    Results: {:x => ['2','3']}
       #   Additionally, if the knockout_prefix is passed alone as a string, it will cause
       #   the entire element to be removed:
-      #    source = {:x => '--'}
+      #    source = {:x => '!merge'}
       #    dest   = {:x => [1,2,3]}
       #    dest.ko_deep_merge!(source)
       #    Results: {:x => ""}
@@ -90,7 +101,7 @@ class Chef
       # 
       # There are many tests for this library - and you can learn more about the features
       # and usages of deep_merge! by just browsing the test examples
-      def self.deep_merge!(source, dest, options = {})
+      def deep_merge!(source, dest, options = {})
         # turn on this line for stdout debugging text
         merge_debug = options[:merge_debug] || false
         overwrite_unmergeable = !options[:preserve_unmergeables]
@@ -108,7 +119,7 @@ class Chef
         if dest.nil? && overwrite_unmergeable
           dest = source; return dest
         end
-     
+
         puts "#{di}Source class: #{source.class.inspect} :: Dest class: #{dest.class.inspect}" if merge_debug
         if source.kind_of?(Hash)
           puts "#{di}Hashes: #{source.inspect} :: #{dest.inspect}" if merge_debug
@@ -146,8 +157,11 @@ class Chef
             end
           end
           # if there's a naked knockout_prefix in source, that means we are to truncate dest
-          if source.index(knockout_prefix)
-            dest = clear_or_nil(dest); source.delete(knockout_prefix)
+          ko_variants = [ knockout_prefix, "#{knockout_prefix}:" ]
+          ko_variants.each do |ko|
+            if source.index(ko)
+              dest = clear_or_nil(dest); source.delete(ko)
+            end
           end
           if dest.kind_of?(Array)
             if knockout_prefix
@@ -155,7 +169,7 @@ class Chef
               # remove knockout prefix items from both source and dest
               source.delete_if do |ko_item|
                 retval = false
-                item = ko_item.respond_to?(:gsub) ? ko_item.gsub(%r{^#{knockout_prefix}}, "") : ko_item
+                item = ko_item.respond_to?(:gsub) ? ko_item.gsub(%r{^#{knockout_prefix}:}, "") : ko_item
                 if item != ko_item
                   print "#{ko_item} - " if merge_debug
                   dest.delete(item)
@@ -182,16 +196,20 @@ class Chef
       end # deep_merge!
      
       # allows deep_merge! to uniformly handle overwriting of unmergeable entities
-      def self.overwrite_unmergeables(source, dest, options)
+      def overwrite_unmergeables(source, dest, options)
         merge_debug = options[:merge_debug] || false
         overwrite_unmergeable = !options[:preserve_unmergeables]
         knockout_prefix = options[:knockout_prefix] || false
         di = options[:debug_indent] || ''
         if knockout_prefix && overwrite_unmergeable
           if source.kind_of?(String) # remove knockout string from source before overwriting dest
-            src_tmp = source.gsub(%r{^#{knockout_prefix}},"")
+            if source == knockout_prefix
+              src_tmp = ""
+            else
+              src_tmp = source.gsub(%r{^#{knockout_prefix}:},"")
+            end
           elsif source.kind_of?(Array) # remove all knockout elements before overwriting dest
-            src_tmp = source.delete_if {|ko_item| ko_item.kind_of?(String) && ko_item.match(%r{^#{knockout_prefix}}) }
+            src_tmp = source.delete_if {|ko_item| ko_item.kind_of?(String) && ko_item.match(%r{^#{knockout_prefix}:}) }
           else
             src_tmp = source
           end
@@ -207,8 +225,12 @@ class Chef
         end
         dest
       end
+
+      def deep_merge(source, dest, options = {})
+        deep_merge!(source.dup, dest.dup, options)
+      end
      
-      def self.clear_or_nil(obj)
+      def clear_or_nil(obj)
         if obj.respond_to?(:clear)
           obj.clear
         else

data/lib/chef/mixin/enforce_ownership_and_permissions.rb

@@ -0,0 +1,39 @@
+#
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2011 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/file_access_control'
+
+class Chef
+  module Mixin
+    module EnforceOwnershipAndPermissions
+
+      # will set the proper user, group and
+      # permissions using a platform specific
+      # version of Chef::FileAccessControl
+      def enforce_ownership_and_permissions(path=nil)
+        if path.nil? and new_resource.respond_to?(:path)
+          path = new_resource.path
+        end
+        access_controls = Chef::FileAccessControl.new(new_resource, path)
+        access_controls.set_all
+        new_resource.updated_by_last_action(access_controls.modified?)
+      end
+
+    end
+  end
+end