chef 0.10.4 → 0.10.6.beta.1

data/distro/debian/etc/init.d/chef-client

@@ -32,55 +32,61 @@ fi
 
 DAEMON_OPTS="-d -P $PIDFILE -L $LOGFILE -c $CONFIG -i $INTERVAL -s $SPLAY"
 
-running_pid() {                                                                 
+running_pid() {
   pid=$1
-  name=$2                                                                     
-  [ -z "$pid" ] && return 1                                                   
-  [ ! -d /proc/$pid ] &&  return 1                                            
+  name=$2
+  [ -z "$pid" ] && return 1
+  [ ! -d /proc/$pid ] &&  return 1
   cmd=`awk '/Name:/ {print $2}' /proc/$pid/status`
-  [ "$cmd" != "$name" ] &&  return 1                                          
-  return 0 
-}   
+  [ "$cmd" != "$name" ] &&  return 1
+  return 0
+}
 
-running() {                                                                     
+running() {
   [ ! -f "$PIDFILE" ] && return 1
   pid=`cat $PIDFILE`
-  running_pid $pid $NAME || return 1                                        
+  running_pid $pid $NAME || return 1
   return 0
-}   
+}
 
-start_server() {                                                                
-  if [ -z "$DAEMONUSER" ] ; then                                          
-    start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS                       
+start_server() {
+  if [ -z "$DAEMONUSER" ] ; then
+    start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
   errcode=$?
   else
-    start-stop-daemon --start --quiet --pidfile $PIDFILE \              
-      --chuid $DAEMONUSER \ 
-      --exec $DAEMON -- $DAEMON_OPTS                          
-    errcode=$?  
-  fi  
-  return $errcode                                                         
-}       
+    start-stop-daemon --start --quiet --pidfile $PIDFILE \
+      --chuid $DAEMONUSER \
+      --exec $DAEMON -- $DAEMON_OPTS
+    errcode=$?
+  fi
+  return $errcode
+}
 
-stop_server() {                                                                 
-   if [ -z "$DAEMONUSER" ] ; then                                          
-     killproc -p $PIDFILE $DAEMON                                        
+stop_server() {
+   if [ -z "$DAEMONUSER" ] ; then
+     killproc -p $PIDFILE $DAEMON
      errcode=$?
    else
-     start-stop-daemon --stop --quiet --pidfile $PIDFILE \               
-       --user $DAEMONUSER \ 
+     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+       --user $DAEMONUSER \
        --exec $DAEMON
-     errcode=$?  
-   fi  
-   return $errcode                                                         
-}       
+     errcode=$?
+   fi
+   return $errcode
+}
 
-reload_server() {                                                               
-  [ ! -f "$PIDFILE" ] && return 1                                             
-  pid=pidofproc $PIDFILE # This is the daemon's pid                           
-  /bin/kill -1 $pid
-  return $?
-}   
+reload_server() {
+  if [ -z "$DAEMONUSER" ] ; then
+     killproc -p $PIDFILE $DAEMON -HUP
+     errcode=$?
+   else
+     start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE \
+       --user $DAEMONUSER \
+       --exec $DAEMON
+     errcode=$?
+   fi
+   return $errcode
+}
 
 force_stop() {
   [ ! -e "$PIDFILE" ] && return
@@ -108,7 +114,7 @@ case "$1" in
         exit 0
     fi
     if start_server ; then
-        [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
+        [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
         if  running ;  then
             log_end_msg 0
         else
@@ -161,8 +167,12 @@ case "$1" in
     fi
     ;;
   reload)
-    log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
-    log_warning_msg "cannot re-read the config file (use restart)."
+    if running; then
+      log_daemon_msg "Reloading $DESC" "$NAME"
+      errcode=0
+      reload_server || errcode=$?
+      log_end_msg $errcode
+    fi
     ;;
   *)
     N=/etc/init.d/$NAME

data/distro/redhat/etc/init.d/chef-client

@@ -1,5 +1,5 @@
 #!/bin/bash
-# 
+#
 # chef-client Startup script for the Chef client
 #
 # chkconfig: - 98 02
@@ -57,7 +57,11 @@ restart () {
 }
 
 reload() {
-    restart
+    echo -n $"Reloading $prog: "
+    killproc -p $pidfile chef-client -HUP
+    retval=$?
+    echo
+    return $retval 
 }
 
 force_reload() {

data/lib/chef/checksum.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 require 'chef/log'
+require 'chef/checksum/storage'
 require 'uuidtools'
 
 class Chef
@@ -26,6 +27,8 @@ class Chef
     attr_accessor :checksum, :create_time
     attr_accessor :couchdb_id, :couchdb_rev
 
+    attr_reader :storage
+
     # When a Checksum commits a sandboxed file to its final home in the checksum
     # repo, this attribute will have the original on-disk path where the file
     # was stored; it will be used if the commit is reverted to restore the sandbox
@@ -59,6 +62,7 @@ class Chef
       @create_time = Time.now.iso8601
       @checksum = checksum
       @original_committed_file_location = nil
+      @storage = Storage::Filesystem.new(Chef::Config.checksum_path, checksum)
     end
     
     def to_json(*a)
@@ -89,26 +93,12 @@ class Chef
       checksum
     end
 
-
-    ##
-    # On-Disk Checksum File Repo (Chef Server API)
-    ##
-
-    def file_location
-      File.join(checksum_repo_directory, checksum)
-    end
-
-    def checksum_repo_directory
-      File.join(Chef::Config.checksum_path, checksum[0..1])
-    end
-
     # Moves the given +sandbox_file+ into the checksum repo using the path
     # 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}")
-      FileUtils.mkdir_p(checksum_repo_directory)
-      File.rename(sandbox_file, file_location)
+      Chef::Log.info("Commiting sandbox file: move #{sandbox_file} to #{@storage}")
+      @storage.commit(sandbox_file)
       cdb_save
     end
 
@@ -122,8 +112,8 @@ 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}")
-      File.rename(file_location, original_committed_file_location)
+      Chef::Log.warn("Reverting sandbox file commit: moving #{@storage} back to #{original_committed_file_location}")
+      @storage.revert(original_committed_file_location)
       cdb_destroy
     end
 
@@ -169,13 +159,8 @@ class Chef
 
     private
 
-    # Deletes the file backing this checksum from the on-disk repo.
-    # Purging the checksums is how users can get back to a valid state if
-    # they've deleted files, so we silently swallow Errno::ENOENT here.
     def purge_file
-      FileUtils.rm(file_location)
-    rescue Errno::ENOENT
-      true
+      @storage.purge
     end
 
   end

data/lib/chef/checksum/storage.rb

@@ -0,0 +1,18 @@
+#
+# Author:: Andrea Campi (<andrea.campi@zephirworks.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/checksum/storage/filesystem'

data/lib/chef/checksum/storage/filesystem.rb

@@ -0,0 +1,56 @@
+#
+# Author:: Tim Hinderliter (<tim@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.
+
+class Chef
+  class Checksum
+    class Storage
+      class Filesystem
+        def initialize(base_dir, checksum)
+          @base_dir = base_dir
+          @checksum = checksum
+        end
+
+        def file_location
+          File.join(checksum_repo_directory, @checksum)
+        end
+        alias :to_s :file_location
+
+        def checksum_repo_directory
+          File.join(Chef::Config.checksum_path, @checksum[0..1])
+        end
+
+        def commit(sandbox_file)
+          FileUtils.mkdir_p(checksum_repo_directory)
+          File.rename(sandbox_file, file_location)
+        end
+
+        def revert(original_committed_file_location)
+          File.rename(file_location, original_committed_file_location)
+        end
+
+        # Deletes the file backing this checksum from the on-disk repo.
+        # Purging the checksums is how users can get back to a valid state if
+        # they've deleted files, so we silently swallow Errno::ENOENT here.
+        def purge
+          FileUtils.rm(file_location)
+        rescue Errno::ENOENT
+          true
+        end
+      end
+    end
+  end
+end

data/lib/chef/config.rb

@@ -147,7 +147,8 @@ class Chef
     json_attribs nil
     log_level :info
     log_location STDOUT
-    verbose_logging nil
+    # toggle info level log items that can create a lot of output
+    verbose_logging true 
     node_name nil
     node_path "/var/chef/node"
 
@@ -183,7 +184,7 @@ class Chef
     # Where should chef-solo download recipes from?
     recipe_url nil
 
-    solr_url "http://localhost:8983"
+    solr_url "http://localhost:8983/solr"
     solr_jetty_path "/var/chef/solr-jetty"
     solr_data_path "/var/chef/solr/data"
     solr_home_path "/var/chef/solr"
@@ -228,6 +229,9 @@ class Chef
     # Exception Handlers
     exception_handlers []
 
+    # Start handlers
+    start_handlers []
+
     # Checksum Cache
     # Uses Moneta on the back-end
     cache_type "BasicFile"

data/lib/chef/cookbook/syntax_check.rb

@@ -109,7 +109,7 @@ class Chef
 
       def validate_template(erb_file)
         Chef::Log.debug("Testing template #{erb_file} for syntax errors...")
-        result = shell_out("sh -c 'erubis -x #{erb_file} | ruby -c'")
+        result = shell_out("erubis -x #{erb_file} | ruby -c")
         result.error!
         true
       rescue Chef::Exceptions::ShellCommandFailed

data/lib/chef/cookbook_version.rb

@@ -630,7 +630,24 @@ class Chef
       if found_pref
         @manifest_records_by_path[found_pref]
       else
-        raise Chef::Exceptions::FileNotFound, "cookbook #{name} does not contain file #{segment}/#{filename}"
+        if segment == :files || segment == :templates
+          error_message = "Cookbook '#{name}' (#{version}) does not contain a file at any of these locations:\n"
+          error_locations = [
+            "  #{segment}/#{node[:platform]}-#{node[:platform_version]}/#{filename}",
+            "  #{segment}/#{node[:platform]}/#{filename}",
+            "  #{segment}/default/#{filename}",
+          ]
+          error_message << error_locations.join("\n")
+          existing_files = segment_filenames(segment)
+          # Show the files that the cookbook does have. If the user made a typo,
+          # hopefully they'll see it here.
+          unless existing_files.empty?
+            error_message << "\n\nThis cookbook _does_ contain: ['#{existing_files.join("','")}']"
+          end
+          raise Chef::Exceptions::FileNotFound, error_message
+        else
+          raise Chef::Exceptions::FileNotFound, "cookbook #{name} does not contain file #{segment}/#{filename}"
+        end
       end
     end
 
@@ -675,7 +692,7 @@ class Chef
 
       best_pref = preferences.find { |pref| !filenames_by_pref[pref].empty? }
 
-      raise Chef::Exceptions::FileNotFound, "cookbook #{name} has no directory #{segment}/#{dirname}" unless best_pref
+      raise Chef::Exceptions::FileNotFound, "cookbook #{name} has no directory #{segment}/default/#{dirname}" unless best_pref
 
       filenames_by_pref[best_pref]
 
@@ -710,7 +727,7 @@ class Chef
 
       best_pref = preferences.find { |pref| !records_by_pref[pref].empty? }
 
-      raise Chef::Exceptions::FileNotFound, "cookbook #{name} has no directory #{segment}/#{dirname}" unless best_pref
+      raise Chef::Exceptions::FileNotFound, "cookbook #{name} (#{version}) has no directory #{segment}/default/#{dirname}" unless best_pref
 
       records_by_pref[best_pref]
     end
@@ -736,13 +753,24 @@ class Chef
 
         fqdn = node[:fqdn]
 
+        # Break version into components, eg: "5.7.1" => [ "5.7.1", "5.7", "5" ]
+        search_versions = []
+        parts = version.to_s.split('.')
+
+        parts.size.times do
+          search_versions << parts.join('.')
+          parts.pop
+        end
+
         # Most specific to least specific places to find the path
-        [
-         File.join(segment.to_s, "host-#{fqdn}", path),
-         File.join(segment.to_s, "#{platform}-#{version}", path),
-         File.join(segment.to_s, platform.to_s, path),
-         File.join(segment.to_s, "default", path)
-        ]
+        search_path = [ File.join(segment.to_s, "host-#{fqdn}", path) ]
+        search_versions.each do |v|
+          search_path << File.join(segment.to_s, "#{platform}-#{v}", path)
+        end
+        search_path << File.join(segment.to_s, platform.to_s, path)
+        search_path << File.join(segment.to_s, "default", path)
+
+        search_path
       else
         [File.join(segment, path)]
       end

data/lib/chef/file_access_control.rb

@@ -107,7 +107,7 @@ class Chef
     def set_group
       if (gid = target_gid) && (gid != stat.gid)
         File.chown(nil, gid, file)
-        Chef::Log.info("#{log_string} owner changed to #{gid}")
+        Chef::Log.info("#{log_string} group changed to #{gid}")
         modified
       end
     end

data/lib/chef/handler.rb

@@ -57,6 +57,27 @@ class Chef
   #
   class Handler
 
+    # The list of currently configured start handlers
+    def self.start_handlers
+      Array(Chef::Config[:start_handlers])
+    end
+
+    # Run the start handlers. This will usually be called by a notification
+    # from Chef::Client
+    def self.run_start_handlers(run_status)
+      Chef::Log.info("Running start handlers")
+      start_handlers.each do |handler|
+        handler.run_report_safely(run_status)
+      end
+      Chef::Log.info("Start handlers complete.")
+    end
+
+    # Wire up a notification to run the start handlers when the chef run
+    # starts.
+    Chef::Client.when_run_starts do |run_status|
+      run_start_handlers(run_status)
+    end
+
     # The list of currently configured report handlers
     def self.report_handlers
       Array(Chef::Config[:report_handlers])

data/lib/chef/knife/bootstrap.rb

@@ -113,9 +113,10 @@ class Chef
         else
           bootstrap_files = []
           bootstrap_files << File.join(File.dirname(__FILE__), 'bootstrap', "#{config[:distro]}.erb")
-          bootstrap_files << File.join(Dir.pwd, ".chef", "bootstrap", "#{config[:distro]}.erb")
+          bootstrap_files << File.join(@@chef_config_dir, "bootstrap", "#{config[:distro]}.erb")
           bootstrap_files << File.join(ENV['HOME'], '.chef', 'bootstrap', "#{config[:distro]}.erb")
           bootstrap_files << Gem.find_files(File.join("chef","knife","bootstrap","#{config[:distro]}.erb"))
+          bootstrap_files.flatten!
         end
 
         template = Array(bootstrap_files).find do |bootstrap_template|
@@ -180,6 +181,7 @@ class Chef
         ssh.config[:identity_file] = config[:identity_file]
         ssh.config[:manual] = true
         ssh.config[:no_host_key_verify] = config[:no_host_key_verify]
+        ssh.config[:on_error] = :raise
         ssh
       end