chef 11.4.4 → 11.6.0.hotfix.1

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

@@ -11,13 +11,13 @@ fi
 
 mkdir -p /etc/chef
 
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 chmod 0600 /etc/chef/validation.pem
 
-<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+<% if encrypted_data_bag_secret -%>
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
 <%= encrypted_data_bag_secret %>
 EOP
 chmod 0600 /etc/chef/encrypted_data_bag_secret

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

@@ -28,13 +28,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
 
 mkdir -p /etc/chef
 
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 chmod 0600 /etc/chef/validation.pem
 
-<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+<% if encrypted_data_bag_secret -%>
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
 <%= encrypted_data_bag_secret %>
 EOP
 chmod 0600 /etc/chef/encrypted_data_bag_secret

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

@@ -10,7 +10,7 @@ exists() {
   fi
 }
 
-install_sh="http://opscode.com/chef/install.sh"
+install_sh="https://www.opscode.com/chef/install.sh"
 version_string="-v <%= chef_version %>"
 
 if ! exists /usr/bin/chef-client; then
@@ -26,13 +26,13 @@ fi
 
 mkdir -p /etc/chef
 
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 chmod 0600 /etc/chef/validation.pem
 
-<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+<% if encrypted_data_bag_secret -%>
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
 <%= encrypted_data_bag_secret %>
 EOP
 chmod 0600 /etc/chef/encrypted_data_bag_secret

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

@@ -10,13 +10,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
 
 mkdir -p /etc/chef
 
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 chmod 0600 /etc/chef/validation.pem
 
-<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+<% if encrypted_data_bag_secret -%>
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
 <%= encrypted_data_bag_secret %>
 EOP
 chmod 0600 /etc/chef/encrypted_data_bag_secret

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

@@ -10,13 +10,13 @@ fi
 apt-get update
 apt-get install -y chef
 
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 chmod 0600 /etc/chef/validation.pem
 
-<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+<% if encrypted_data_bag_secret -%>
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
 <%= encrypted_data_bag_secret %>
 EOP
 chmod 0600 /etc/chef/encrypted_data_bag_secret

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

@@ -14,13 +14,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
 
 mkdir -p /etc/chef
 
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 chmod 0600 /etc/chef/validation.pem
 
-<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+<% if encrypted_data_bag_secret -%>
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
 <%= encrypted_data_bag_secret %>
 EOP
 chmod 0600 /etc/chef/encrypted_data_bag_secret

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

@@ -12,13 +12,13 @@ gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
 
 mkdir -p /etc/chef
 
-awk NF > /etc/chef/validation.pem <<'EOP'
+cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 chmod 0600 /etc/chef/validation.pem
 
-<% if @chef_config[:encrypted_data_bag_secret] -%>
-awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP'
+<% if encrypted_data_bag_secret -%>
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
 <%= encrypted_data_bag_secret %>
 EOP
 chmod 0600 /etc/chef/encrypted_data_bag_secret

data/lib/chef/knife/client_show.rb

@@ -22,6 +22,8 @@ class Chef
   class Knife
     class ClientShow < Knife
 
+      include Knife::Core::MultiAttributeReturnOption
+
       deps do
         require 'chef/api_client'
         require 'chef/json_compat'
@@ -29,11 +31,6 @@ class Chef
 
       banner "knife client show CLIENT (options)"
 
-      option :attribute,
-        :short => "-a ATTR",
-        :long => "--attribute ATTR",
-        :description => "Show only one attribute"
-
       def run
         @client_name = @name_args[0]
 

data/lib/chef/knife/configure.rb

@@ -133,17 +133,17 @@ EOH
 
       def ask_user_for_config
         server_name = guess_servername
-        @chef_server            = config[:chef_server_url] || ask_question("Please enter the chef server URL: ", :default => "http://#{server_name}:4000")
+        @chef_server            = config[:chef_server_url] || ask_question("Please enter the chef server URL: ", :default => "https://#{server_name}:443")
         if config[:initial]
           @new_client_name        = config[:node_name] || ask_question("Please enter a name for the new user: ", :default => Etc.getlogin)
           @admin_client_name      = config[:admin_client_name] || ask_question("Please enter the existing admin name: ", :default => 'admin')
-          @admin_client_key       = config[:admin_client_key] || ask_question("Please enter the location of the existing admin's private key: ", :default => '/etc/chef/admin.pem')
+          @admin_client_key       = config[:admin_client_key] || ask_question("Please enter the location of the existing admin's private key: ", :default => '/etc/chef-server/admin.pem')
           @admin_client_key       = File.expand_path(@admin_client_key)
         else
           @new_client_name        = config[:node_name] || ask_question("Please enter an existing username or clientname for the API: ", :default => Etc.getlogin)
         end
         @validation_client_name = config[:validation_client_name] || ask_question("Please enter the validation clientname: ", :default => 'chef-validator')
-        @validation_key         = config[:validation_key] || ask_question("Please enter the location of the validation key: ", :default => '/etc/chef/validation.pem')
+        @validation_key         = config[:validation_key] || ask_question("Please enter the location of the validation key: ", :default => '/etc/chef-server/chef-validator.pem')
         @validation_key         = File.expand_path(@validation_key)
         @chef_repo              = config[:repository] || ask_question("Please enter the path to a chef repository (or leave blank): ")
 

data/lib/chef/knife/cookbook_create.rb

@@ -185,13 +185,14 @@ EOH
         unless File.exists?(File.join(dir,cookbook_name,'CHANGELOG.md'))
           open(File.join(dir, cookbook_name, 'CHANGELOG.md'),'w') do |file|
             file.puts <<-EOH
-# CHANGELOG for #{cookbook_name}
+#{cookbook_name} CHANGELOG
+#{'='*"#{cookbook_name} CHANGELOG".length}
 
-This file is used to list changes made in each version of #{cookbook_name}.
+This file is used to list changes made in each version of the #{cookbook_name} cookbook.
 
-## 0.1.0:
-
-* Initial release of #{cookbook_name}
+0.1.0
+-----
+- [your_name] - Initial release of #{cookbook_name}
 
 - - -
 Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.

data/lib/chef/knife/cookbook_download.rb

@@ -61,6 +61,10 @@ class Chef
           exit 1
         elsif @version.nil?
           @version = determine_version
+          if @version.nil?
+            ui.fatal("No such cookbook found")
+            exit 1
+          end
         end
 
         ui.info("Downloading #{@cookbook_name} cookbook version #{@version}")
@@ -95,10 +99,13 @@ class Chef
       end
 
       def determine_version
-        if available_versions.size == 1
+
+        if available_versions.nil?
+          nil
+        elsif available_versions.size == 1
           @version = available_versions.first
         elsif config[:latest]
-          @version = available_versions.map { |v| Chef::Version.new(v) }.sort.last
+          @version = available_versions.last
         else
           ask_which_version
         end
@@ -106,10 +113,11 @@ class Chef
 
       def available_versions
         @available_versions ||= begin
-          versions = Chef::CookbookVersion.available_versions(@cookbook_name).map do |version|
-            Chef::Version.new(version)
+          versions = Chef::CookbookVersion.available_versions(@cookbook_name)
+          unless versions.nil?
+            versions.map! { |version| Chef::Version.new(version) }
+            versions.sort!
           end
-          versions.sort!
           versions
         end
         @available_versions

data/lib/chef/knife/cookbook_site_share.rb

@@ -23,6 +23,7 @@ class Chef
     class CookbookSiteShare < Knife
 
       deps do
+        require 'chef/cookbook_loader'
         require 'chef/cookbook_uploader'
         require 'chef/cookbook_site_streaming_uploader'
       end

data/lib/chef/knife/cookbook_test.rb

@@ -25,6 +25,7 @@ class Chef
     class CookbookTest < Knife
 
       deps do
+        require 'chef/cookbook_loader'
         require 'chef/cookbook/syntax_check'
       end
 

data/lib/chef/knife/cookbook_upload.rb

@@ -19,6 +19,7 @@
 #
 
 require 'chef/knife'
+require 'chef/cookbook_uploader'
 
 class Chef
   class Knife
@@ -228,15 +229,9 @@ WARNING
           check_for_dependencies!(cb)
         end
         Chef::CookbookUploader.new(cookbooks, config[:cookbook_path], :force => config[:force]).upload_cookbooks
-      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
+      rescue Chef::Exceptions::CookbookFrozen => e
+        ui.error e
+        raise
       end
 
       def check_for_broken_links!(cookbook)

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

@@ -25,7 +25,7 @@ class Chef
       # following instance variables:
       # * @config   - a hash of knife's config values
       # * @run_list - the run list for the node to boostrap
-      # 
+      #
       class BootstrapContext
 
         def initialize(config, run_list, chef_config)
@@ -51,7 +51,13 @@ class Chef
         end
 
         def encrypted_data_bag_secret
-          IO.read(File.expand_path(@chef_config[:encrypted_data_bag_secret]))
+          @config[:secret] || begin
+            if @config[:secret_file] && File.exist?(@config[:secret_file])
+              IO.read(File.expand_path(@config[:secret_file]))
+            elsif @chef_config[:encrypted_data_bag_secret] && File.exist?(@chef_config[:encrypted_data_bag_secret])
+              IO.read(File.expand_path(@chef_config[:encrypted_data_bag_secret]))
+            end
+          end
         end
 
         def config_content
@@ -72,7 +78,7 @@ CONFIG
             client_rb << %Q{https_proxy       "#{knife_config[:bootstrap_proxy]}"\n}
           end
 
-          if @chef_config[:encrypted_data_bag_secret]
+          if encrypted_data_bag_secret
             client_rb << %Q{encrypted_data_bag_secret "/etc/chef/encrypted_data_bag_secret"\n}
           end
 
@@ -94,7 +100,7 @@ CONFIG
         def chef_version
           knife_config[:bootstrap_version] || Chef::VERSION
         end
-        
+
         def first_boot
           (@config[:first_boot_attributes] || {}).merge(:run_list => @run_list)
         end

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

@@ -22,6 +22,22 @@ class Chef
   class Knife
     module Core
 
+      # Allows includer knife commands to  return multiple attributes
+      # @brief knife node show NAME -a ATTR1 -a ATTR2
+      module MultiAttributeReturnOption
+        # :nodoc:
+        def self.included(includer)
+          includer.class_eval do
+            @attrs_to_show = []
+            option :attribute,
+              :short => "-a ATTR1 [-a ATTR2]",
+              :long => "--attribute ATTR1 [--attribute ATTR2] ",
+              :proc => lambda {|val| @attrs_to_show << val},
+              :description => "Show one or more attributes"
+          end
+        end
+      end
+
       #==Chef::Knife::Core::GenericPresenter
       # The base presenter class for displaying structured data in knife commands.
       # This is not an abstract base class, and it is suitable for displaying

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

@@ -111,7 +111,7 @@ class Chef
       def tempfile_for(data)
         # TODO: include useful info like the node name in the temp file
         # name
-        basename = "knife-edit-" << rand(1_000_000_000_000_000).to_s.rjust(15, '0') << '.js'
+        basename = "knife-edit-" << rand(1_000_000_000_000_000).to_s.rjust(15, '0') << '.json'
         filename = File.join(Dir.tmpdir, basename)
         File.open(filename, "w+") do |f|
           f.sync = true

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

@@ -21,9 +21,6 @@ class Chef
   class Knife
     class SubcommandLoader
 
-      CHEF_FILE_IN_GEM = /chef-[\d]+\.[\d]+\.[\d]+/
-      CURRENT_CHEF_GEM = /chef-#{Regexp.escape(Chef::VERSION)}/
-
       attr_reader :chef_config_dir
       attr_reader :env
 
@@ -86,8 +83,7 @@ class Chef
       end
 
       def find_subcommands_via_rubygems
-        files = Gem.find_files 'chef/knife/*.rb'
-        files.reject! {|f| from_old_gem?(f) }
+        files = find_files_latest_gems 'chef/knife/*.rb'
         subcommand_files = {}
         files.each do |file|
           rel_path = file[/(#{Regexp.escape File.join('chef', 'knife', '')}.*)\.rb/, 1]
@@ -99,13 +95,48 @@ class Chef
 
       private
 
-      # wow, this is a sad hack :(
-      # Gem.find_files finds files in all versions of a gem, which
-      # means that if chef 0.10 and 0.9.x are installed, we'll try to
-      # require, e.g., chef/knife/ec2_server_create, which will cause
-      # a gem activation error. So remove files from older chef gems.
-      def from_old_gem?(path)
-        path =~ CHEF_FILE_IN_GEM && path !~ CURRENT_CHEF_GEM
+      def find_files_latest_gems(glob, check_load_path=true)
+        files = []
+
+        if check_load_path
+          files = $LOAD_PATH.map { |load_path|
+            Dir["#{File.expand_path glob, load_path}#{Gem.suffix_pattern}"]
+          }.flatten.select { |file| File.file? file.untaint }
+        end
+
+        gem_files = latest_gem_specs.map do |spec|
+          # Gem::Specification#matches_for_glob wasn't added until RubyGems 1.8
+          if spec.respond_to? :matches_for_glob
+            spec.matches_for_glob("#{glob}#{Gem.suffix_pattern}")
+          else
+            check_spec_for_glob(spec, glob)
+          end
+        end.flatten
+        
+        files.concat gem_files
+        files.uniq! if check_load_path
+
+        return files
+      end
+
+      def latest_gem_specs
+        @latest_gem_specs ||= if Gem::Specification.respond_to? :latest_specs
+          Gem::Specification.latest_specs
+        else
+          Gem.source_index.latest_specs
+        end
+      end
+
+      def check_spec_for_glob(spec, glob)
+        dirs = if spec.require_paths.size > 1 then
+          "{#{spec.require_paths.join(',')}}"
+        else
+          spec.require_paths.first
+        end
+      
+        glob = File.join("#{spec.full_gem_path}/#{dirs}", glob)
+ 
+        Dir[glob].map { |f| f.untaint }
       end
     end
   end

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

@@ -19,7 +19,7 @@
 #
 
 require 'forwardable'
-require 'chef/platform'
+require 'chef/platform/query_helpers'
 require 'chef/knife/core/generic_presenter'
 
 class Chef
@@ -64,14 +64,24 @@ class Chef
       # Prints a message to stdout. Aliased as +info+ for compatibility with
       # the logger API.
       def msg(message)
-        stdout.puts message
+        begin
+          stdout.puts message
+        rescue Errno::EPIPE => e
+          raise e if @config[:verbosity] >= 2
+          exit 0
+        end
       end
 
       alias :info :msg
 
       # Prints a msg to stderr. Used for warn, error, and fatal.
       def err(message)
-        stderr.puts message
+        begin
+          stderr.puts message
+        rescue Errno::EPIPE => e
+          raise e if @config[:verbosity] >= 2
+          exit 0
+        end
       end
 
       # Print a warning message
@@ -143,7 +153,12 @@ class Chef
       end
 
       def pretty_print(data)
-        stdout.puts data
+        begin
+          stdout.puts data
+        rescue Errno::EPIPE => e
+          raise e if @config[:verbosity] >= 2
+          exit 0
+        end
       end
 
       def edit_data(data, parse_output=true)