chef 0.9.10 → 0.9.12

data/lib/chef/cookbook_version.rb

@@ -208,6 +208,10 @@ class Chef
       @valid_cache_entries = nil
     end
 
+    def self.cache
+      Chef::FileCache
+    end
+
     # Setup a notification to clear the valid_cache_entries when a Chef client
     # run starts
     Chef::Client.when_run_starts do |run_status|
@@ -221,14 +225,7 @@ class Chef
     def self.sync_cookbooks(cookbook_hash)
       Chef::Log.debug("Cookbooks to load: #{cookbook_hash.inspect}")
 
-      # Remove all cookbooks no longer relevant to this node
-      Chef::FileCache.find(File.join(%w{cookbooks ** *})).each do |cache_file|
-        cache_file =~ /^cookbooks\/([^\/]+)\//
-        unless cookbook_hash.has_key?($1)
-          Chef::Log.info("Removing #{cache_file} from the cache; its cookbook is no longer needed on this client.")
-          Chef::FileCache.delete(cache_file)
-        end
-      end
+      clear_obsoleted_cookbooks(cookbook_hash)
 
       # Synchronize each of the node's cookbooks, and add to the
       # valid_cache_entries hash.
@@ -239,6 +236,19 @@ class Chef
       true
     end
 
+    # Iterates over cached cookbooks' files, removing files belonging to
+    # cookbooks that don't appear in +cookbook_hash+
+    def self.clear_obsoleted_cookbooks(cookbook_hash)
+      # Remove all cookbooks no longer relevant to this node
+      cache.find(File.join(%w{cookbooks ** *})).each do |cache_file|
+        cache_file =~ /^cookbooks\/([^\/]+)\//
+        unless cookbook_hash.has_key?($1)
+          Chef::Log.info("Removing #{cache_file} from the cache; its cookbook is no longer needed on this client.")
+          cache.delete(cache_file)
+        end
+      end
+    end
+
     # Update the file caches for a given cache segment.  Takes a segment name
     # and a hash that matches one of the cookbooks/_attribute_files style
     # remote file listings.
@@ -268,8 +278,8 @@ class Chef
           valid_cache_entries[cache_filename] = true
 
           current_checksum = nil
-          if Chef::FileCache.has_key?(cache_filename)
-            current_checksum = checksum_cookbook_file(Chef::FileCache.load(cache_filename, false))
+          if cache.has_key?(cache_filename)
+            current_checksum = checksum_cookbook_file(cache.load(cache_filename, false))
           end
 
           # If the checksums are different between on-disk (current) and on-server
@@ -279,13 +289,13 @@ class Chef
             raw_file = chef_server_rest.get_rest(manifest_record[:url], true)
 
             Chef::Log.info("Storing updated #{cache_filename} in the cache.")
-            Chef::FileCache.move_to(raw_file.path, cache_filename)
+            cache.move_to(raw_file.path, cache_filename)
           else
             Chef::Log.debug("Not storing #{cache_filename}, as the cache is up to date.")
           end
 
           # make the segment filenames a full path.
-          full_path_cache_filename = Chef::FileCache.load(cache_filename, false)
+          full_path_cache_filename = cache.load(cache_filename, false)
           segment_filenames << full_path_cache_filename
         end
 
@@ -301,12 +311,14 @@ class Chef
     end
 
     def self.cleanup_file_cache
-      # Delete each file in the cache that we didn't encounter in the
-      # manifest.
-      Chef::FileCache.find(File.join(%w{cookbooks ** *})).each do |cache_filename|
-        unless valid_cache_entries[cache_filename]
-          Chef::Log.info("Removing #{cache_filename} from the cache; it is no longer on the server.")
-          Chef::FileCache.delete(cache_filename)
+      unless Chef::Config[:solo]
+        # Delete each file in the cache that we didn't encounter in the
+        # manifest.
+        cache.find(File.join(%w{cookbooks ** *})).each do |cache_filename|
+          unless valid_cache_entries[cache_filename]
+            Chef::Log.info("Removing #{cache_filename} from the cache; it is no longer on the server.")
+            cache.delete(cache_filename)
+          end
         end
       end
     end

data/lib/chef/file_cache.rb

@@ -57,9 +57,9 @@ class Chef
         true
       end
 
-      # Move a file in to the cache.  Useful with the REST raw file output.
+      # Move a file into the cache.  Useful with the REST raw file output.
       #
-      # === Parameteres
+      # === Parameters
       # file<String>:: The path to the file you want in the cache
       # path<String>:: The relative name you want the new file to use
       def move_to(file, path)

data/lib/chef/provider/remote_file.rb

@@ -53,7 +53,7 @@ class Chef
         end
         enforce_ownership_and_permissions
 
-        @new_resource.updated_by_last_action(true)
+        @new_resource.updated_by_last_action?
       end
 
       def action_create_if_missing

data/lib/chef/provider/user/useradd.rb

@@ -22,21 +22,24 @@ class Chef
   class Provider
     class User 
       class Useradd < Chef::Provider::User
+        UNIVERSAL_OPTIONS = [[:comment, "-c"], [:gid, "-g"], [:password, "-p"], [:shell, "-s"], [:uid, "-u"]]
+
         def create_user
-          command = "useradd"
-          command << set_options
+          command = compile_command("useradd") do |useradd|
+            useradd << universal_options
+            useradd << useradd_options
+          end
           run_command(:command => command)
         end
         
         def manage_user
-          command = "usermod"
-          command << set_options
+          command = compile_command("usermod") { |u| u << universal_options }
           run_command(:command => command)
         end
         
         def remove_user
           command = "userdel"
-          command << " -r" if @new_resource.manage_home || @new_resource.supports[:manage_home]
+          command << " -r" if managing_home_dir?
           command << " #{@new_resource.username}"
           run_command(:command => command)
         end
@@ -82,41 +85,52 @@ class Chef
         def unlock_user
           run_command(:command => "usermod -U #{@new_resource.username}")
         end
+
+        def compile_command(base_command)
+          yield base_command
+          base_command << " #{@new_resource.username}"
+          base_command
+        end
         
-        def set_options
+        def universal_options
           opts = ''
           
-          field_list = {
-            'comment' => "-c",
-            'gid' => "-g",
-            'uid' => "-u",
-            'shell' => "-s",
-            'password' => "-p"
-          }
-          field_list.sort{ |a,b| a[0] <=> b[0] }.each do |field, option|
-            field_symbol = field.to_sym
-            if @current_resource.send(field_symbol) != @new_resource.send(field_symbol)
-              if @new_resource.send(field_symbol)
-                Chef::Log.debug("Setting #{@new_resource} #{field} to #{@new_resource.send(field_symbol)}")
-                opts << " #{option} '#{@new_resource.send(field_symbol)}'"
+          UNIVERSAL_OPTIONS.each do |field, option|
+            if @current_resource.send(field) != @new_resource.send(field)
+              if @new_resource.send(field)
+                Chef::Log.debug("Setting #{@new_resource} #{field} to #{@new_resource.send(field)}")
+                opts << " #{option} '#{@new_resource.send(field)}'"
               end
             end
           end
-          if @current_resource.home != @new_resource.home && @new_resource.home
-            if @new_resource.manage_home || @new_resource.supports[:manage_home]
+          if updating_home?
+            if managing_home_dir?
               Chef::Log.debug("Managing the home directory for #{@new_resource}")
-              opts << " -d '#{@new_resource.home}' -m"
+              opts << " -d '#{@new_resource.home}'"
             else
               Chef::Log.debug("Setting #{@new_resource} home to #{@new_resource.home}")
               opts << " -d '#{@new_resource.home}'"
             end
           end
-          opts << " -r" if @new_resource.system
           opts << " -o" if @new_resource.non_unique || @new_resource.supports[:non_unique]
-          opts << " #{@new_resource.username}"
           opts
         end
-      
+
+        def useradd_options
+          opts = ''
+          opts << " -m" if updating_home? && managing_home_dir?
+          opts << " -r" if @new_resource.system
+          opts
+        end
+
+        def updating_home?
+          @current_resource.home != @new_resource.home && @new_resource.home
+        end
+
+        def managing_home_dir?
+          @new_resource.manage_home || @new_resource.supports[:manage_home]
+        end
+
       end
     end
   end

data/lib/chef/shef/ext.rb

@@ -226,16 +226,6 @@ E
         :attributes
       end
 
-      desc "returns the current node (i.e., this host)"
-      def node
-        Shef.session.node
-      end
-
-      desc "pretty print the node's attributes"
-      def ohai(key=nil)
-        pp(key ? node.attribute[key] : node.attribute)
-      end
-
       desc "run chef using the current recipe"
       def run_chef
         Chef::Log.level = :debug
@@ -295,6 +285,18 @@ E
       end
     end
 
+    MainContextExtensions = Proc.new do
+      desc "returns the current node (i.e., this host)"
+      def node
+        Shef.session.node
+      end
+
+      desc "pretty print the node's attributes"
+      def ohai(key=nil)
+        pp(key ? node.attribute[key] : node.attribute)
+      end
+    end
+
     RESTApiExtensions = Proc.new do
       desc "edit an object in your EDITOR"
       explain(<<-E)
@@ -530,6 +532,7 @@ E
 
     def self.extend_context_object(obj)
       obj.instance_eval(&ObjectUIExtensions)
+      obj.instance_eval(&MainContextExtensions)
       obj.instance_eval(&RESTApiExtensions)
       obj.extend(FileUtils)
       obj.extend(Chef::Mixin::Language)

data/lib/chef/shef/shef_session.rb

@@ -190,7 +190,7 @@ module Shef
       @client.register
       @client.build_node
       
-      @client.sync_cookbooks({})
+      @client.sync_cookbooks
     end
 
   end
@@ -263,7 +263,7 @@ module Shef
       @client.register
       @client.build_node
 
-      @client.sync_cookbooks({})
+      @client.sync_cookbooks
     end
 
   end

data/lib/chef/version.rb

@@ -17,5 +17,5 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.9.10'
+  VERSION = '0.9.12'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 10
-  version: 0.9.10
+  - 12
+  version: 0.9.12
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -07:00
+date: 2010-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency