chef 10.14.0.beta.2 → 10.14.0.beta.3

data/lib/chef/config.rb

@@ -53,7 +53,8 @@ class Chef
 
       if RUBY_PLATFORM =~ /mswin|mingw|windows/
         # turns /etc/chef/client.rb into C:/chef/client.rb
-        path = File.join(ENV['SYSTEMDRIVE'], path.split('/')[2..-1])
+        system_drive = ENV['SYSTEMDRIVE'] ? ENV['SYSTEMDRIVE'] : ""
+        path = File.join(system_drive, path.split('/')[2..-1])
         # ensure all forward slashes are backslashes
         path.gsub!(File::SEPARATOR, (File::ALT_SEPARATOR || '\\'))
       end
@@ -195,6 +196,7 @@ class Chef
     splay nil
     why_run false
     color false
+    client_fork false
 
     # Set these to enable SSL authentication / mutual-authentication
     # with the server

data/lib/chef/cookbook_uploader.rb

@@ -29,14 +29,15 @@ class Chef
       end
     end
 
-    attr_reader :cookbook
+    attr_reader :cookbooks
     attr_reader :path
     attr_reader :opts
     attr_reader :rest
 
     # Creates a new CookbookUploader.
     # ===Arguments:
-    # * cookbook::: A Chef::CookbookVersion describing the cookbook to be uploaded
+    # * cookbooks::: A Chef::CookbookVersion or array of them describing the
+    #                cookbook(s) to be uploaded
     # * path::: A String or Array of Strings representing the base paths to the
     #           cookbook repositories.
     # * opts::: (optional) An options Hash
@@ -48,19 +49,24 @@ class Chef
     # * :rest   A Chef::REST object that you have configured the way you like it.
     #           If you don't provide this, one will be created using the values
     #           in Chef::Config.
-    def initialize(cookbook, path, opts={})
-      @cookbook, @path, @opts = cookbook, path, opts
+    def initialize(cookbooks, path, opts={})
+      @path, @opts = path, opts
+      @cookbooks = Array(cookbooks)
       @rest = opts[:rest] || Chef::REST.new(Chef::Config[:chef_server_url])
     end
 
-    def upload_cookbook
+    def upload_cookbooks
       Thread.abort_on_exception = true
-      Chef::Log.info("Saving #{cookbook.name}")
 
       # Syntax Check
-      validate_cookbook
+      validate_cookbooks
       # generate checksums of cookbook files and create a sandbox
-      checksum_files = cookbook.checksums
+      checksum_files = {}
+      cookbooks.each do |cb|
+        Chef::Log.info("Saving #{cb.name}")
+        checksum_files.merge!(cb.checksums)
+      end
+
       checksums = checksum_files.inject({}){|memo,elt| memo[elt.first]=nil ; memo}
       new_sandbox = rest.post_rest("sandboxes", { :checksums => checksums })
 
@@ -102,8 +108,10 @@ class Chef
       end
 
       # files are uploaded, so save the manifest
-      save_url = opts[:force] ? cookbook.force_save_url : cookbook.save_url
-      rest.put_rest(save_url, cookbook)
+      cookbooks.each do |cb|
+        save_url = opts[:force] ? cb.force_save_url : cb.save_url
+        rest.put_rest(save_url, cb)
+      end
 
       Chef::Log.info("Upload complete!")
     end
@@ -140,14 +148,16 @@ class Chef
       end
     end
 
-    def validate_cookbook
-      syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cookbook.name, @user_cookbook_path)
-      Chef::Log.info("Validating ruby files")
-      exit(1) unless syntax_checker.validate_ruby_files
-      Chef::Log.info("Validating templates")
-      exit(1) unless syntax_checker.validate_templates
-      Chef::Log.info("Syntax OK")
-      true
+    def validate_cookbooks
+      cookbooks.each do |cb|
+        syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cb.name, @user_cookbook_path)
+        Chef::Log.info("Validating ruby files")
+        exit(1) unless syntax_checker.validate_ruby_files
+        Chef::Log.info("Validating templates")
+        exit(1) unless syntax_checker.validate_templates
+        Chef::Log.info("Syntax OK")
+        true
+      end
     end
 
   end

data/lib/chef/cookbook_version.rb

@@ -544,7 +544,7 @@ class Chef
     # called from DSL
     def load_recipe(recipe_name, run_context)
       unless recipe_filenames_by_name.has_key?(recipe_name)
-        raise ArgumentError, "Cannot find a recipe matching #{recipe_name} in cookbook #{name}"
+        raise Chef::Exceptions::RecipeNotFound, "could not find recipe #{recipe_name} for cookbook #{name}"
       end
 
       Chef::Log.debug("Found recipe #{recipe_name} in cookbook #{name}")
@@ -552,7 +552,7 @@ class Chef
       recipe_filename = recipe_filenames_by_name[recipe_name]
 
       unless recipe_filename
-        raise Chef::Exceptions::RecipeNotFound, "could not find recipe #{recipe_name} for cookbook #{name}"
+        raise Chef::Exceptions::RecipeNotFound, "could not find #{recipe_name} files for cookbook #{name}"
       end
 
       recipe.from_file(recipe_filename)

data/lib/chef/event_dispatch/base.rb

@@ -206,6 +206,10 @@ class Chef
       def recipe_file_load_failed(path, exception)
       end
 
+      # Called when a recipe cannot be resolved
+      def recipe_not_found(exception)
+      end
+
       # Called when recipes have been loaded.
       def recipe_load_complete
       end

data/lib/chef/exceptions.rb

@@ -53,6 +53,7 @@ class Chef
     # Cookbook loader used to raise an argument error when cookbook not found.
     # for back compat, need to raise an error that inherits from ArgumentError
     class CookbookNotFoundInRepo < ArgumentError; end
+    class RecipeNotFound < ArgumentError; end
     class AttributeNotFound < RuntimeError; end
     class InvalidCommandOption < RuntimeError; end
     class CommandTimeout < RuntimeError; end

data/lib/chef/formatters/base.rb

@@ -129,32 +129,32 @@ class Chef
 
       def registration_failed(node_name, exception, config)
         #A Formatters::ErrorDescription object
-        description = ErrorMapper.registration_failed_helper(node_name, exception, config)
+        description = ErrorMapper.registration_failed(node_name, exception, config)
         display_error(description)
       end
 
       def node_load_failed(node_name, exception, config)
-        description = ErrorMapper.node_load_failed_helper(node_name, exception, config)
+        description = ErrorMapper.node_load_failed(node_name, exception, config)
         display_error(description)
       end
 
       def run_list_expand_failed(node, exception)
-        description = ErrorMapper.run_list_expand_failed_helper(node, exception)
+        description = ErrorMapper.run_list_expand_failed(node, exception)
         display_error(description)
       end
 
       def cookbook_resolution_failed(expanded_run_list, exception)
-        description = ErrorMapper.cookbook_resolution_failed_helper(expanded_run_list, exception)
+        description = ErrorMapper.cookbook_resolution_failed(expanded_run_list, exception)
         display_error(description)
       end
 
       def cookbook_sync_failed(cookbooks, exception)
-        description = ErrorMapper.cookbook_sync_failed_helper(cookbooks, exception)
+        description = ErrorMapper.cookbook_sync_failed(cookbooks, exception)
         display_error(description)
       end
 
       def resource_failed(resource, action, exception)
-        description = ErrorMapper.resource_failed_helper(resource, action, exception)
+        description = ErrorMapper.resource_failed(resource, action, exception)
         display_error(description)
       end
 
@@ -171,9 +171,13 @@ class Chef
       # exception when loaded. Default behavior is to use CompileErrorInspector
       # to print contextual info about the failure.
       def file_load_failed(path, exception)
-        error_inspector = ErrorInspectors::CompileErrorInspector.new(path, exception)
-        headline = "Error compiling #{path}"
-        describe_error(headline, error_inspector)
+        description = ErrorMapper.file_load_failed(path, exception)
+        display_error(description)
+      end
+
+      def recipe_not_found(exception)
+        description = ErrorMapper.file_load_failed(nil, exception)
+        display_error(description)
       end
 
       # Delegates to #file_loaded

data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb

@@ -33,11 +33,16 @@ class Chef
         end
 
         def add_explanation(error_description)
-          error_description.section(exception.class.name, exception.message)
-
-          traceback = filtered_bt.map {|line| "  #{line}"}.join("\n")
-          error_description.section("Cookbook Trace:", traceback)
-          error_description.section("Relevant File Content:", context)
+          case exception
+          when Chef::Exceptions::RecipeNotFound
+            error_description.section(exception.class.name, exception.message)
+          else
+            error_description.section(exception.class.name, exception.message)
+
+            traceback = filtered_bt.map {|line| "  #{line}"}.join("\n")
+            error_description.section("Cookbook Trace:", traceback)
+            error_description.section("Relevant File Content:", context)
+          end
         end
 
         def context
@@ -80,7 +85,8 @@ class Chef
         end
 
         def filtered_bt
-          exception.backtrace.select {|l| l =~ /^#{Chef::Config.file_cache_path}/ }
+          r = exception.backtrace.select {|l| l =~ /^#{Chef::Config.file_cache_path}/ }
+          return r.count > 0 ? r : exception.backtrace
         end
 
       end

data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb

@@ -49,7 +49,7 @@ class Chef
         def recipe_snippet
           return nil if dynamic_resource?
           @snippet ||= begin
-            if file = resource.source_line[/^([^:]+):[\d]+/,1] and line = resource.source_line[/^#{file}:([\d]+)/,1].to_i
+            if file = resource.source_line[/^(([\w]:)?[^:]+):([\d]+)/,1] and line = resource.source_line[/^#{file}:([\d]+)/,1].to_i
               lines = IO.readlines(file)
 
               relevant_lines = ["# In #{file}\n\n"]
@@ -74,7 +74,6 @@ class Chef
                 break if nesting <= 0
               end
               relevant_lines << format_line(current_line + 1, lines[current_line + 1]) if lines[current_line + 1]
-
               relevant_lines.join("")
             end
           end

data/lib/chef/formatters/error_mapper.rb

@@ -25,7 +25,7 @@ class Chef
     module ErrorMapper
 
       # Failed to register this client with the server.
-      def self.registration_failed_helper(node_name, exception, config)
+      def self.registration_failed(node_name, exception, config)
         error_inspector = ErrorInspectors::RegistrationErrorInspector.new(node_name, exception, config)
         headline = "Chef encountered an error attempting to create the client \"#{node_name}\""
         description = ErrorDescription.new(headline)
@@ -33,7 +33,7 @@ class Chef
         return description
       end
 
-      def self.node_load_failed_helper(node_name, exception, config)
+      def self.node_load_failed(node_name, exception, config)
         error_inspector = ErrorInspectors::NodeLoadErrorInspector.new(node_name, exception, config)
         headline = "Chef encountered an error attempting to load the node data for \"#{node_name}\""
         description = ErrorDescription.new(headline)
@@ -41,7 +41,7 @@ class Chef
         return description
       end
 
-      def self.run_list_expand_failed_helper(node, exception)
+      def self.run_list_expand_failed(node, exception)
         error_inspector = ErrorInspectors::RunListExpansionErrorInspector.new(node, exception)
         headline = "Error expanding the run_list:"
         description = ErrorDescription.new(headline)
@@ -49,7 +49,7 @@ class Chef
         return description
       end
 
-      def self.cookbook_resolution_failed_helper(expanded_run_list, exception)
+      def self.cookbook_resolution_failed(expanded_run_list, exception)
         error_inspector = ErrorInspectors::CookbookResolveErrorInspector.new(expanded_run_list, exception)
         headline = "Error Resolving Cookbooks for Run List:"
         description = ErrorDescription.new(headline)
@@ -57,7 +57,7 @@ class Chef
         return description
       end
 
-      def self.cookbook_sync_failed_helper(cookbooks, exception)
+      def self.cookbook_sync_failed(cookbooks, exception)
         error_inspector = ErrorInspectors::CookbookSyncErrorInspector.new(cookbooks, exception)
         headline = "Error Syncing Cookbooks:"
         description = ErrorDescription.new(headline)
@@ -65,7 +65,7 @@ class Chef
         return description
       end
 
-      def self.resource_failed_helper(resource, action, exception)
+      def self.resource_failed(resource, action, exception)
         error_inspector = ErrorInspectors::ResourceFailureInspector.new(resource, action, exception)
         headline = "Error executing action `#{action}` on resource '#{resource}'"
         description = ErrorDescription.new(headline)
@@ -73,6 +73,13 @@ class Chef
         return description
       end
 
+      def self.file_load_failed(path, exception)
+        error_inspector = ErrorInspectors::CompileErrorInspector.new(path, exception)
+        headline = "Recipe Compile Error" + ( path ? " in #{path}" : "" )
+        description = ErrorDescription.new(headline)
+        error_inspector.add_explanation(description)
+        description
+      end
     end
   end
 end

data/lib/chef/knife/bootstrap.rb

@@ -120,13 +120,13 @@ 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  }
+          Chef::Config[:knife][:hints] ||= Hash.new
+          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?
@@ -176,7 +176,7 @@ class Chef
           knife_ssh.run
         rescue Net::SSH::AuthenticationFailed
           unless config[:ssh_password]
-            puts "Failed to authenticate #{config[:ssh_user]} - trying password auth"
+            ui.info("Failed to authenticate #{config[:ssh_user]} - trying password auth")
             knife_ssh_with_password_auth.run
           end
         end

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

@@ -51,8 +51,8 @@ EOP
 
 (
 cat <<'EOP'
-<%= { "run_list" => @run_list }.to_json %>
+<%= first_boot.to_json %>
 EOP
 ) > /etc/chef/first-boot.json
 
-<%= start_chef %>'
+<%= start_chef %>'

data/lib/chef/knife/client_create.rb

@@ -71,6 +71,7 @@ class Chef
           end
         else
           ui.error "Client '#{client['name']}' already exists"
+          exit 1
         end
       end
     end

data/lib/chef/knife/cookbook_upload.rb

@@ -94,31 +94,56 @@ class Chef
         # Get a list of cookbooks and their versions from the server
         # to check for the existence of a cookbook's dependencies.
         @server_side_cookbooks = Chef::CookbookVersion.list_all_versions
+        justify_width = @server_side_cookbooks.map {|name| name.size}.max.to_i + 2
+        if config[:all]
 
-        justify_width = cookbooks_to_upload.map {|name, cookbook| name.size}.max.to_i + 2
-
-        cookbooks_to_upload.each do |cookbook_name, cookbook|
-          cookbook.freeze_version if config[:freeze]
-          begin
-            upload(cookbook, justify_width)
-            upload_ok += 1
+          cbs = []
+          cookbook_repo.each do |cookbook_name, cookbook|
+            cbs << cookbook
+            cookbook.freeze_version if config[:freeze]
             version_constraints_to_update[cookbook_name] = cookbook.version
+          end
+          begin
+            upload(cbs, justify_width)
           rescue Exceptions::CookbookFrozen
-            upload_failures += 1
-            ui.warn("Not updating version constraints for #{cookbook_name} in the environment as the cookbook is frozen.") if config[:environment]
+            ui.warn("Not updating version constraints for some cookbooks in the environment as the cookbook is frozen.")
+          end
+          ui.info("Uploaded all cookbooks.")
+        else
+          if @name_args.empty?
+            show_usage
+            ui.error("You must specify the --all flag or at least one cookbook name")
+            exit 1
+          end
+
+          cookbooks_to_upload.each do |cookbook_name, cookbook|
+            cookbook.freeze_version if config[:freeze]
+            begin
+              upload([cookbook], justify_width)
+              upload_ok += 1
+              version_constraints_to_update[cookbook_name] = cookbook.version
+            rescue Exceptions::CookbookNotFoundInRepo => e
+              upload_failures += 1
+              ui.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
+              Log.debug(e)
+              upload_failures += 1
+            rescue Exceptions::CookbookFrozen
+              ui.warn("Not updating version constraints for #{cookbook_name} in the environment as the cookbook is frozen.")
+              upload_failures += 1
+            end
           end
-        end
 
-        upload_failures += config[:all] ? 0 : @name_args.length - @cookbooks_to_upload.length
+          upload_failures += @name_args.length - @cookbooks_to_upload.length
 
-        if upload_failures == 0
-          ui.info "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""}."
-        elsif upload_failures > 0 && upload_ok > 0
-          ui.warn "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""} ok but #{upload_failures} " +
-            "cookbook#{upload_failures > 1 ? "s" : ""} upload failed."
-        elsif upload_failures > 0 && upload_ok == 0
-          ui.error "Failed to upload #{upload_failures} cookbook#{upload_failures > 1 ? "s" : ""}."
-          exit 1
+          if upload_failures == 0
+            ui.info "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""}."
+          elsif upload_failures > 0 && upload_ok > 0
+            ui.warn "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""} ok but #{upload_failures} " +
+              "cookbook#{upload_failures > 1 ? "s" : ""} upload failed."
+          elsif upload_failures > 0 && upload_ok == 0
+            ui.error "Failed to upload #{upload_failures} cookbook#{upload_failures > 1 ? "s" : ""}."
+            exit 1
+          end
         end
 
         unless version_constraints_to_update.empty?
@@ -133,18 +158,18 @@ class Chef
           else
             upload_set = {}
             @name_args.each do |cookbook_name|
-            begin
-              if ! upload_set.has_key?(cookbook_name)
-                upload_set[cookbook_name] = cookbook_repo[cookbook_name]
-                if config[:depends]
-                  upload_set[cookbook_name].metadata.dependencies.each { |dep, ver| @name_args << dep }
+              begin
+                if ! upload_set.has_key?(cookbook_name)
+                  upload_set[cookbook_name] = cookbook_repo[cookbook_name]
+                  if config[:depends]
+                    upload_set[cookbook_name].metadata.dependencies.each { |dep, ver| @name_args << dep }
+                  end
                 end
+              rescue Exceptions::CookbookNotFoundInRepo => e
+                ui.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
+                Log.debug(e)
               end
-            rescue Exceptions::CookbookNotFoundInRepo => e
-              ui.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
-              Log.debug(e)
             end
-          end
             upload_set
           end
       end
@@ -197,11 +222,13 @@ WARNING
         end
       end
 
-      def upload(cookbook, justify_width)
-        ui.info("Uploading #{cookbook.name.to_s.ljust(justify_width + 10)} [#{cookbook.version}]")
-        check_for_broken_links!(cookbook)
-        check_for_dependencies!(cookbook)
-        Chef::CookbookUploader.new(cookbook, config[:cookbook_path], :force => config[:force]).upload_cookbook
+      def upload(cookbooks, justify_width)
+        cookbooks.each do |cb|
+          ui.info("Uploading #{cb.name.to_s.ljust(justify_width + 10)} [#{cb.version}]")
+          check_for_broken_links!(cb)
+          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"