chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

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_metadata.rb

@@ -46,6 +46,7 @@ class Chef
 
         if config[:all]
           cl = Chef::CookbookLoader.new(config[:cookbook_path])
+          cl.load_cookbooks
           cl.each do |cname, cookbook|
             generate_metadata(cname.to_s)
           end

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,7 +25,7 @@ class Chef
     class CookbookTest < Knife
 
       deps do
-        require 'chef/checksum_cache'
+        require 'chef/cookbook_loader'
         require 'chef/cookbook/syntax_check'
       end
 
@@ -47,7 +47,9 @@ class Chef
 
         checked_a_cookbook = false
         if config[:all]
-          cookbook_loader.each do |key, cookbook|
+          cl = cookbook_loader
+          cl.load_cookbooks
+          cl.each do |key, cookbook|
             checked_a_cookbook = true
             test_cookbook(key)
           end

data/lib/chef/knife/cookbook_upload.rb

@@ -19,6 +19,7 @@
 #
 
 require 'chef/knife'
+require 'chef/cookbook_uploader'
 
 class Chef
   class Knife
@@ -86,7 +87,6 @@ class Chef
         end
 
         assert_environment_valid!
-        warn_about_cookbook_shadowing
         version_constraints_to_update = {}
         upload_failures = 0
         upload_ok = 0
@@ -96,7 +96,7 @@ class Chef
         @server_side_cookbooks = Chef::CookbookVersion.list_all_versions
         justify_width = @server_side_cookbooks.map {|name| name.size}.max.to_i + 2
         if config[:all]
-
+          cookbook_repo.load_cookbooks
           cbs = []
           cookbook_repo.each do |cookbook_name, cookbook|
             cbs << cookbook
@@ -154,7 +154,7 @@ class Chef
       def cookbooks_to_upload
         @cookbooks_to_upload ||=
           if config[:all]
-            cookbook_repo
+            cookbook_repo.load_cookbooks
           else
             upload_set = {}
             @name_args.each do |cookbook_name|
@@ -255,7 +255,7 @@ WARNING
         # 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)
-            ui.error "Cookbook #{cookbook.name} depends on cookbook #{cookbook_name} version #{version},"
+            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

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,12 +51,18 @@ 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
           client_rb = <<-CONFIG
-log_level        :info
+log_level        :auto
 log_location     STDOUT
 chef_server_url  "#{@chef_config[:chef_server_url]}"
 validation_client_name "#{@chef_config[:validation_client_name]}"
@@ -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
@@ -121,7 +137,19 @@ class Chef
         end
 
         def format_for_display(data)
-          if config[:attribute]
+          if formatting_subset_of_data?
+            format_data_subset_for_display(data)
+          elsif config[:id_only]
+            name_or_id_for(data)
+          elsif config[:environment] && data.respond_to?(:chef_environment)
+            {"chef_environment" => data.chef_environment}
+          else
+            data
+          end
+        end
+
+        def format_data_subset_for_display(data)
+          subset = if config[:attribute]
             result = {}
             Array(config[:attribute]).each do |nested_value_spec|
               nested_value = extract_nested_value(data, nested_value_spec)
@@ -129,22 +157,23 @@ class Chef
             end
             result
           elsif config[:run_list]
-            data = data.run_list.run_list
-            { "run_list" => data }
-          elsif config[:environment]
-            if data.respond_to?(:chef_environment)
-              {"chef_environment" => data.chef_environment}
-            else
-              # this is a place holder for now. Feel free to modify (i.e. add other cases). [nuo]
-              data
-            end
-          elsif config[:id_only]
-            data.respond_to?(:name) ? data.name : data["id"]
+            run_list = data.run_list.run_list
+            { "run_list" => run_list }
           else
-            data
+            raise ArgumentError, "format_data_subset_for_display requires attribute, run_list, or id_only config option to be set"
           end
+          {name_or_id_for(data) => subset }
         end
 
+        def name_or_id_for(data)
+          data.respond_to?(:name) ? data.name : data["id"]
+        end
+
+        def formatting_subset_of_data?
+          config[:attribute] || config[:run_list]
+        end
+
+
         def extract_nested_value(data, nested_value_spec)
           nested_value_spec.split(".").each do |attr|
             if data.nil?

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

@@ -18,7 +18,6 @@
 
 require 'chef/json_compat'
 require 'chef/node'
-require 'tempfile'
 
 class Chef
   class Knife
@@ -36,24 +35,11 @@ class Chef
         abort "You specified the --disable_editing option, nothing to edit" if config[:disable_editing]
         assert_editor_set!
 
-        updated_node_data = @ui.edit_data(view)
+        updated_node_data = edit_data(view)
         apply_updates(updated_node_data)
         @updated_node
       end
 
-      def updated?
-        pristine_copy = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(node), :create_additions => false)
-        updated_copy  = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(@updated_node), :create_additions => false)
-        unless pristine_copy == updated_copy
-          updated_properties = %w{name normal chef_environment run_list default override automatic}.reject do |key|
-             pristine_copy[key] == updated_copy[key]
-          end
-        end
-        ( pristine_copy != updated_copy ) && updated_properties
-      end
-
-      private
-
       def view
         result = {}
         result["name"] = node.name
@@ -66,7 +52,12 @@ class Chef
           result["override"]  = node.override_attrs
           result["automatic"] = node.automatic_attrs
         end
-        result
+        Chef::JSONCompat.to_json_pretty(result)
+      end
+
+      def edit_data(text)
+        edited_data = tempfile_for(text) {|filename| system("#{config[:editor]} #{filename}")}
+        Chef::JSONCompat.from_json(edited_data)
       end
 
       def apply_updates(updated_data)
@@ -93,6 +84,19 @@ class Chef
         end
       end
 
+      def updated?
+        pristine_copy = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(node), :create_additions => false)
+        updated_copy  = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(@updated_node), :create_additions => false)
+        unless pristine_copy == updated_copy
+          updated_properties = %w{name normal chef_environment run_list default override automatic}.reject do |key|
+             pristine_copy[key] == updated_copy[key]
+          end
+        end
+        ( pristine_copy != updated_copy ) && updated_properties
+      end
+
+      private
+
       def abort(message)
         ui.error(message)
         exit 1
@@ -104,6 +108,22 @@ class Chef
         end
       end
 
+      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') << '.json'
+        filename = File.join(Dir.tmpdir, basename)
+        File.open(filename, "w+") do |f|
+          f.sync = true
+          f.puts data
+        end
+
+        yield filename
+
+        IO.read(filename)
+      ensure
+        File.unlink(filename)
+      end
     end
   end
 end

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

@@ -86,7 +86,7 @@ class Chef
         # Converts a Chef::Node object to a string suitable for output to a
         # terminal. If config[:medium_output] or config[:long_output] are set
         # the volume of output is adjusted accordingly. Uses colors if enabled
-        # in the ui object.
+        # in the the ui object.
         def summarize(data)
           if data.kind_of?(Chef::Node)
             node = data

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/text_formatter.rb

@@ -41,58 +41,44 @@ class Chef
           @formatted_data ||= text_format(data)
         end
 
-        def text_format(data, indent=0)
+        def text_format(data)
           buffer = ''
 
           if data.respond_to?(:keys)
-            justify_width = data.keys.map {|k| k.to_s.size }.max.to_i + 2
+            justify_width = data.keys.map {|k| k.to_s.size }.max.to_i + 1
             data.sort.each do |key, value|
-              justified_key = ui.color("#{key}:".ljust(justify_width), :cyan)
-              if should_enumerate?(value)
-                buffer << indent_line(justified_key, indent)
-                buffer << text_format(value, indent + 1)
+              # key: ['value'] should be printed as key: value
+              if value.kind_of?(Array) && value.size == 1 && is_singleton(value[0])
+                value = value[0]
+              end
+              if is_singleton(value)
+                # Strings are printed as key: value.
+                justified_key = ui.color("#{key}:".ljust(justify_width), :cyan)
+                buffer << "#{justified_key} #{value}\n"
               else
-                buffer << indent_key_value(justified_key, value, justify_width, indent)
+                # Arrays and hashes get indented on their own lines.
+                buffer << ui.color("#{key}:\n", :cyan)
+                lines = text_format(value).split("\n")
+                lines.each { |line| buffer << "  #{line}\n" }
               end
             end
           elsif data.kind_of?(Array)
-            data.each do |item|
-              if should_enumerate?(data)
-                buffer << text_format(item, indent + 1)
-              else
-                buffer << indent_line(item, indent)
-              end
+            data.each_index do |index|
+              item = data[index]
+              buffer << text_format(data[index])
+              # Separate items with newlines if it's an array of hashes or an
+              # array of arrays
+              buffer << "\n" if !is_singleton(data[index]) && index != data.size-1
             end
           else
-            buffer << indent_line(stringify_value(data), indent)
+            buffer << "#{data}\n"
           end
           buffer
         end
 
-        # Ruby 1.8 Strings include enumberable, which is not what we want. So
-        # we have this heuristic to detect hashes and arrays instead.
-        def should_enumerate?(value)
-          ((value.respond_to?(:keys) && !value.empty? ) || ( value.kind_of?(Array) && (value.size > 1 || should_enumerate?(value.first) )))
-        end
-
-        def indent_line(string, indent)
-          ("  " * indent) << "#{string}\n"
-        end
-
-        def indent_key_value(key, value, justify_width, indent)
-          lines = value.to_s.split("\n")
-          if lines.size > 1
-            total_indent = (2 * indent) + justify_width + 1
-            indent_line("#{key} #{lines.shift}", indent) << lines.map {|l| (" " * total_indent) + l << "\n" }.join("")
-          else
-            indent_line("#{key} #{stringify_value(value)}", indent)
-          end
-        end
-
-        def stringify_value(data)
-          data.kind_of?(String) ? data : data.to_s
+        def is_singleton(value)
+          !(value.kind_of?(Array) || value.respond_to?(:keys))
         end
-
       end
     end
   end