chef 0.10.0.beta.6 → 0.10.0.beta.7

data/lib/chef/application.rb

@@ -24,6 +24,9 @@ require 'tmpdir'
 class Chef::Application
   include Mixlib::CLI
 
+  class Wakeup < Exception
+  end
+
   def initialize
     super
 

data/lib/chef/application/client.rb

@@ -26,6 +26,9 @@ require 'chef/rest'
 
 class Chef::Application::Client < Chef::Application
 
+  # Mimic self_pipe sleep from Unicorn to capture signals safely
+  SELF_PIPE = []
+
   option :config_file,
     :short => "-c CONFIG",
     :long  => "--config CONFIG",
@@ -197,6 +200,15 @@ class Chef::Application::Client < Chef::Application
 
   # Run the chef client, optionally daemonizing or looping at intervals.
   def run_application
+    unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
+      SELF_PIPE.replace IO.pipe
+
+      trap("USR1") do
+        Chef::Log.info("SIGUSR1 received, waking up")
+        SELF_PIPE[1].putc('.') # wakeup master process from select
+      end
+    end
+
     if Chef::Config[:version]
       puts "Chef version: #{::Chef::VERSION}"
     end
@@ -219,10 +231,18 @@ class Chef::Application::Client < Chef::Application
         @chef_client = nil
         if Chef::Config[:interval]
           Chef::Log.debug("Sleeping for #{Chef::Config[:interval]} seconds")
-          sleep Chef::Config[:interval]
+          unless SELF_PIPE.empty?
+            client_sleep Chef::Config[:interval]
+          else
+            # Windows
+            sleep Chef::Config[:interval]
+          end
         else
           Chef::Application.exit! "Exiting", 0
         end
+      rescue Chef::Application::Wakeup => e
+        Chef::Log.debug("Received Wakeup signal.  Starting run.")
+        next
       rescue SystemExit => e
         raise
       rescue Exception => e
@@ -230,7 +250,12 @@ class Chef::Application::Client < Chef::Application
           Chef::Log.error("#{e.class}: #{e}")
           Chef::Application.debug_stacktrace(e)
           Chef::Log.error("Sleeping for #{Chef::Config[:interval]} seconds before trying again")
-          sleep Chef::Config[:interval]
+          unless SELF_PIPE.empty?
+            client_sleep Chef::Config[:interval]
+          else
+            # Windows
+            sleep Chef::Config[:interval]
+          end
           retry
         else
           Chef::Application.debug_stacktrace(e)
@@ -241,4 +266,11 @@ class Chef::Application::Client < Chef::Application
       end
     end
   end
+
+  private 
+
+  def client_sleep(sec)
+    IO.select([ SELF_PIPE[0] ], nil, nil, sec) or return
+    SELF_PIPE[0].getc
+  end
 end

data/lib/chef/checksum.rb

@@ -106,7 +106,7 @@ class Chef
     # given by +file_location+ and saves the Checksum to the database
     def commit_sandbox_file(sandbox_file)
       @original_committed_file_location = sandbox_file
-      Chef::Log.info("commiting sandbox file: move #{sandbox_file} to #{file_location}")
+      Chef::Log.info("Commiting sandbox file: move #{sandbox_file} to #{file_location}")
       FileUtils.mkdir_p(checksum_repo_directory)
       File.rename(sandbox_file, file_location)
       cdb_save
@@ -122,7 +122,7 @@ class Chef
         raise Chef::Exceptions::IllegalChecksumRevert, "Checksum #{self.inspect} cannot be reverted because the original sandbox file location is not known"
       end
 
-      Chef::Log.warn("reverting sandbox file commit: moving #{file_location} back to #{original_committed_file_location}")
+      Chef::Log.warn("Reverting sandbox file commit: moving #{file_location} back to #{original_committed_file_location}")
       File.rename(file_location, original_committed_file_location)
       cdb_destroy
     end

data/lib/chef/checksum_cache.rb

@@ -78,7 +78,7 @@ class Chef
     end
 
     def self.cleanup_checksum_cache
-      Chef::Log.info("cleaning the checksum cache")
+      Chef::Log.debug("Cleaning the checksum cache")
       if (Chef::Config[:cache_type].to_s == "BasicFile")
         all_cached_checksums.each do |cache_key, cksum_cache_file|
           unless valid_cached_checksums.include?(cache_key)
@@ -93,7 +93,7 @@ class Chef
     end
 
     def self.remove_unused_checksum(checksum_file)
-      Chef::Log.debug("removing unused checksum cache file #{checksum_file}")
+      Chef::Log.debug("Removing unused checksum cache file #{checksum_file}")
       FileUtils.rm(checksum_file)
     end
 

data/lib/chef/client.rb

@@ -152,7 +152,7 @@ class Chef
       begin
 
         run_status.start_clock
-        Chef::Log.info("Starting Run for #{node.name}")
+        Chef::Log.info("Starting Chef Run for #{node.name}")
         run_started
 
         run_context = setup_run_context
@@ -261,7 +261,7 @@ class Chef
       @expanded_run_list_with_versions = @run_list_expansion.recipes.with_version_constraints_strings
 
       Chef::Log.info("Run List is [#{@node.run_list}]")
-      Chef::Log.info("Run List expands (with versions) to [#{@expanded_run_list_with_versions.join(', ')}]")
+      Chef::Log.info("Run List expands to [#{@expanded_run_list_with_versions.join(', ')}]")
 
       @run_status = Chef::RunStatus.new(@node)
 
@@ -317,8 +317,10 @@ class Chef
         existing_paths = env["PATH"].split(':')
         SANE_PATHS.each do |sane_path|
           unless existing_paths.include?(sane_path)
-            env["PATH"] << ':' unless env["PATH"].empty?
-            env["PATH"] << sane_path
+            env_path = env["PATH"].dup
+            env_path << ':' unless env["PATH"].empty?
+            env_path << sane_path
+            env["PATH"] = env_path
           end
         end
       end
@@ -339,7 +341,7 @@ class Chef
         # Check for cookbooks in the path given
         # Chef::Config[:cookbook_path] can be a string or an array
         # if it's an array, go through it and check each one, raise error at the last one if no files are found
-        Chef::Log.debug "loading from cookbook_path: #{Array(Chef::Config[:cookbook_path]).map { |path| File.expand_path(path) }.join(', ')}"
+        Chef::Log.debug "Loading from cookbook_path: #{Array(Chef::Config[:cookbook_path]).map { |path| File.expand_path(path) }.join(', ')}"
         Array(Chef::Config[:cookbook_path]).each_with_index do |cookbook_path, index|
           if directory_not_empty?(cookbook_path)
             break

data/lib/chef/cookbook/remote_file_vendor.rb

@@ -62,7 +62,7 @@ class Chef
         if current_checksum != found_manifest_record['checksum']
           raw_file = @rest.get_rest(found_manifest_record[:url], true)
 
-          Chef::Log.info("Storing updated #{cache_filename} in the cache.")
+          Chef::Log.debug("Storing updated #{cache_filename} in the cache.")
           Chef::FileCache.move_to(raw_file.path, cache_filename)
         else
           Chef::Log.debug("Not storing #{cache_filename}, as the cache is up to date.")

data/lib/chef/cookbook/syntax_check.rb

@@ -57,7 +57,7 @@ class Chef
       def untested_ruby_files
         ruby_files.reject do |file|
           if validated?(file)
-            Chef::Log.debug("ruby file #{file} is unchanged, skipping syntax check")
+            Chef::Log.debug("Ruby file #{file} is unchanged, skipping syntax check")
             true
           else
             false
@@ -72,7 +72,7 @@ class Chef
       def untested_template_files
         template_files.reject do |file| 
           if validated?(file)
-            Chef::Log.debug("template #{file} is unchanged, skipping syntax check")
+            Chef::Log.debug("Template #{file} is unchanged, skipping syntax check")
             true
           else
             false

data/lib/chef/cookbook_version.rb

@@ -439,6 +439,11 @@ class Chef
       @checksums
     end
 
+    def manifest_records_by_path
+      @manifest_records_by_path || generate_manifest
+      @manifest_records_by_path
+    end
+
     def full_name
       "#{name}-#{version}"
     end

data/lib/chef/data_bag_item.rb

@@ -201,7 +201,7 @@ class Chef
 
     # Remove this Data Bag Item from CouchDB
     def cdb_destroy
-      Chef::Log.debug "destroying data bag item: #{self.inspect}"
+      Chef::Log.debug "Destroying data bag item: #{self.inspect}"
       @couchdb.delete("data_bag_item", object_name, @couchdb_rev)
     end
 

data/lib/chef/environment.rb

@@ -18,7 +18,9 @@
 #
 
 require 'chef/config'
+require 'chef/mash'
 require 'chef/mixin/params_validate'
+require 'chef/mixin/from_file'
 require 'chef/couchdb'
 require 'chef/index_queue'
 require 'chef/version_constraint'
@@ -65,7 +67,8 @@ class Chef
     def initialize(couchdb=nil)
       @name = ''
       @description = ''
-      @attributes = Mash.new
+      @default_attributes = Mash.new
+      @override_attributes = Mash.new
       @cookbook_versions = Hash.new
       @couchdb_rev = nil
       @couchdb_id = nil
@@ -101,9 +104,17 @@ class Chef
       )
     end
 
-    def attributes(arg=nil)
+    def default_attributes(arg=nil)
       set_or_return(
-        :attributes,
+        :default_attributes,
+        arg,
+        :kind_of => Hash
+      )
+    end
+
+    def override_attributes(arg=nil)
+      set_or_return(
+        :override_attributes,
         arg,
         :kind_of => Hash
       )
@@ -140,7 +151,8 @@ class Chef
         "cookbook_versions" =>  @cookbook_versions,
         "json_class" => self.class.name,
         "chef_type" => "environment",
-        "attributes" => @attributes
+        "default_attributes" => @default_attributes,
+        "override_attributes" => @override_attributes
       }
       result["_rev"] = couchdb_rev if couchdb_rev
       result
@@ -153,10 +165,21 @@ class Chef
     def update_from!(o)
       description(o.description)
       cookbook_versions(o.cookbook_versions)
-      attributes(o.attributes)
+      default_attributes(o.default_attributes)
+      override_attributes(o.override_attributes)
       self
     end
 
+
+    def update_attributes_from_params(params)
+      unless params[:default_attributes].nil? || params[:default_attributes].size == 0
+        default_attributes(Chef::JSONCompat.from_json(params[:default_attributes]))
+      end
+      unless params[:override_attributes].nil? || params[:override_attributes].size == 0
+        override_attributes(Chef::JSONCompat.from_json(params[:override_attributes]))
+      end
+    end
+
     def update_from_params(params)
       # reset because everything we need will be in the params, this is necessary because certain constraints
       # may have been removed in the params and need to be removed from cookbook_versions as well.
@@ -180,9 +203,7 @@ class Chef
         end
       end
 
-      unless params[:attributes].nil? || params[:attributes].size == 0
-        attributes(Chef::JSONCompat.from_json(params[:attributes]))
-      end
+      update_attributes_from_params(params)
 
       valid = validate_required_attrs_present && valid
       cookbook_versions(bkup_cb_versions) unless valid # restore the old cookbook_versions if valid is false
@@ -228,7 +249,8 @@ class Chef
       environment.name(o["name"])
       environment.description(o["description"])
       environment.cookbook_versions(o["cookbook_versions"])
-      environment.attributes(o["attributes"])
+      environment.default_attributes(o["default_attributes"])
+      environment.override_attributes(o["override_attributes"])
       environment.couchdb_rev = o["_rev"] if o.has_key?("_rev")
       environment.couchdb_id = o["_id"] if o.has_key?("_id")
       environment

data/lib/chef/file_access_control.rb

@@ -84,8 +84,8 @@ class Chef
   
     def set_owner
       if (uid = target_uid) && (uid != stat.uid)
-        Chef::Log.debug("setting owner on #{file} to #{uid}")
         File.chown(uid, nil, file)
+        Chef::Log.info("#{log_string} owner changed to #{uid}")
         modified
       end
     end
@@ -106,8 +106,8 @@ class Chef
   
     def set_group
       if (gid = target_gid) && (gid != stat.gid)
-        Chef::Log.debug("setting group on #{file} to #{gid}")
         File.chown(nil, gid, file)
+        Chef::Log.info("#{log_string} owner changed to #{gid}")
         modified
       end
     end
@@ -119,8 +119,8 @@ class Chef
 
     def set_mode
       if (mode = target_mode) && (mode != (stat.mode & 007777))
-        Chef::Log.debug("setting mode on #{file} to #{mode.to_s(8)}")
         File.chmod(target_mode, file)
+        Chef::Log.info("#{log_string} mode changed to #{mode.to_s(8)}")
         modified
       end
     end
@@ -135,6 +135,10 @@ class Chef
     def modified
       @modified = true
     end
+
+    def log_string
+      @resource || @file
+    end
   
   end
 end

data/lib/chef/index_queue/indexable.rb

@@ -66,7 +66,7 @@ class Chef
       end
 
       def add_to_index(metadata={})
-       Chef::Log.debug("pushing item to index queue for addition: #{self.with_indexer_metadata(metadata)}")
+       Chef::Log.debug("Pushing item to index queue for addition: #{self.with_indexer_metadata(metadata)}")
        object_with_metadata = with_indexer_metadata(metadata)
        obj_id = object_with_metadata["id"]
        obj = {:action => :add, :payload => self.with_indexer_metadata(metadata)}
@@ -75,7 +75,7 @@ class Chef
       end
 
       def delete_from_index(metadata={})
-        Chef::Log.debug("pushing item to index queue for deletion: #{self.with_indexer_metadata(metadata)}")
+        Chef::Log.debug("Pushing item to index queue for deletion: #{self.with_indexer_metadata(metadata)}")
         object_with_metadata = with_indexer_metadata(metadata)
         obj_id = object_with_metadata["id"]
         obj = {:action => :delete, :payload => self.with_indexer_metadata(metadata)}

data/lib/chef/knife.rb

@@ -291,7 +291,7 @@ class Chef
         self.msg("No knife configuration file found")
       end
 
-      config[:color] = config[:color] && !config[:no_color]
+      Chef::Config[:color] = config[:color] && !config[:no_color]
 
       case config[:verbosity]
       when 0

data/lib/chef/knife/bootstrap.rb

@@ -31,7 +31,7 @@ class Chef
         require 'net/ssh/multi'
       end
 
-      banner "knife bootstrap FQDN [RUN LIST...] (options)"
+      banner "knife bootstrap FQDN (options)"
 
       option :ssh_user,
         :short => "-x USERNAME",

data/lib/chef/knife/cookbook_site_install.rb

@@ -95,7 +95,7 @@ class Chef
 
         if config[:deps]
           md = Chef::Cookbook::Metadata.new
-          md.from_file(File.join(cookbook_path, "metadata.rb"))
+          md.from_file(File.join(@install_path, @cookbook_name, "metadata.rb"))
           md.dependencies.each do |cookbook, version_list|
             # Doesn't do versions.. yet
             nv = Chef::Knife::CookbookSiteVendor.new

data/lib/chef/knife/cookbook_site_share.rb

@@ -50,10 +50,10 @@ class Chef
         cl = Chef::CookbookLoader.new(config[:cookbook_path])
         if cl.cookbook_exists?(cookbook_name)
           cookbook = cl[cookbook_name]
-          Chef::CookbookUploader.validate_cookbook(cookbook)
+          Chef::CookbookUploader.new(cookbook,config[:cookbook_path]).validate_cookbook
           tmp_cookbook_dir = Chef::CookbookSiteStreamingUploader.create_build_dir(cookbook)
           begin
-            Chef::Log.debug("temp cookbook directory is #{tmp_cookbook_dir.inspect}")
+            Chef::Log.debug("Temp cookbook directory is #{tmp_cookbook_dir.inspect}")
             ui.info("Making tarball #{cookbook_name}.tgz")
             Chef::Mixin::Command.run_command(:command => "tar -czf #{cookbook_name}.tgz #{cookbook_name}", :cwd => tmp_cookbook_dir)
           rescue => e

data/lib/chef/knife/cookbook_upload.rb

@@ -23,6 +23,9 @@ class Chef
   class Knife
     class CookbookUpload < Knife
 
+      CHECKSUM = "checksum"
+      MATCH_CHECKSUM = /[0-9a-f]{32,}/
+
       deps do
         require 'chef/exceptions'
         require 'chef/cookbook_loader'
@@ -55,7 +58,8 @@ class Chef
       option :environment,
         :short => '-E',
         :long  => '--environment ENVIRONMENT',
-        :description => "Set ENVIRONMENT's version dependency match the version you're uploading."
+        :description => "Set ENVIRONMENT's version dependency match the version you're uploading.",
+        :default => nil
 
       def run
         config[:cookbook_path] ||= Chef::Config[:cookbook_path]
@@ -72,7 +76,7 @@ class Chef
         else
           if @name_args.empty?
             show_usage
-            Chef::Log.fatal("You must specify the --all flag or at least one cookbook name")
+            ui.error("You must specify the --all flag or at least one cookbook name")
             exit 1
           end
           @name_args.each do |cookbook_name|
@@ -82,12 +86,13 @@ class Chef
               upload(cookbook)
               version_constraints_to_update[cookbook_name] = cookbook.version
             rescue Exceptions::CookbookNotFoundInRepo => e
-              Log.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
+              ui.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
               Log.debug(e)
             end
           end
         end
 
+        ui.info "upload complete"
         update_version_constraints(version_constraints_to_update) if config[:environment]
       end
 
@@ -107,7 +112,7 @@ class Chef
 
 
       def environment
-        @environment ||= Environment.load(config[:environment])
+        @environment ||= config[:environment] ? Environment.load(config[:environment]) : nil
       end
 
       private
@@ -116,7 +121,7 @@ class Chef
         environment
       rescue Net::HTTPServerException => e
         if e.response.code.to_s == "404"
-          Log.error "The environment #{config[:environment]} does not exist on the server"
+          ui.error "The environment #{config[:environment]} does not exist on the server, aborting."
           Log.debug(e)
           exit 1
         else
@@ -125,22 +130,38 @@ class Chef
       end
 
       def upload(cookbook)
-        Chef::Log.info("** #{cookbook.name} **")
+        if config[:all]
+          ui.info("** #{cookbook.name} **")
+        else
+          ui.info "Uploading #{cookbook.name}..."
+        end
+        check_for_broken_links(cookbook)
         Chef::CookbookUploader.new(cookbook, config[:cookbook_path], :force => config[:force]).upload_cookbook
       rescue Net::HTTPServerException => e
         case e.response.code
-        when "401"
-          Log.error "Request failed due to authentication (#{e}), check your client configuration (username, key)"
-          Log.debug(e)
-          exit 18
         when "409"
-          Log.error "Version #{cookbook.version} of cookbook #{cookbook.name} is frozen. Use --force to override."
+          ui.error "Version #{cookbook.version} of cookbook #{cookbook.name} is frozen. Use --force to override."
           Log.debug(e)
         else
           raise
         end
       end
 
+      # if only you people wouldn't put broken symlinks in your cookbooks in
+      # the first place. ;)
+      def check_for_broken_links(cookbook)
+        broken_files = cookbook.manifest_records_by_path.select do |path, info|
+          info[CHECKSUM].nil? || info[CHECKSUM] !~ MATCH_CHECKSUM
+        end
+        unless broken_files.empty?
+          broken_filenames = Array(broken_files).map {|path, info| path}
+          ui.error "The cookbook #{cookbook.name} has one or more broken files"
+          ui.info "This is probably caused by broken symlinks in the cookbook directory"
+          ui.info "The broken file(s) are: #{broken_filenames.join(' ')}"
+          exit 1
+        end
+      end
+
     end
   end
 end