chef 0.9.0.a4 → 0.9.0.a6

data/lib/chef/cache/checksum.rb

@@ -24,6 +24,8 @@ require 'digest/md5'
 class Chef
   class Cache
     class Checksum < Chef::Cache
+      # singleton is inherited from Chef::Cache, but we like to be explicit.
+      include ::Singleton
     
       def self.checksum_for_file(*args)
         instance.checksum_for_file(*args)
@@ -62,6 +64,10 @@ class Chef
         checksum_file(file, Digest::MD5.new)
       end
       
+      def generate_md5_checksum(io)
+        checksum_io(io, Digest::MD5.new)
+      end
+      
       private
       
       def file_unchanged?(cached, fstat)
@@ -69,9 +75,16 @@ class Chef
       end
       
       def checksum_file(file, digest)
-        IO.foreach(file) {|line| digest.update(line) }
+        File.open(file) { |f| checksum_io(f, digest) }
+      end
+
+      def checksum_io(io, digest)
+        while chunk = io.read(1024 * 8)
+          digest.update(chunk)
+        end
         digest.hexdigest
       end
+
     end
   end
 end

data/lib/chef/config.rb

@@ -206,5 +206,10 @@ class Chef
 
     # Arbitrary knife configuration data
     knife Hash.new
+
+    # Those lists of regular expressions define what chef considers a
+    # valid user and group name
+    user_valid_regex [ /^([-a-zA-Z0-9_.]+)$/, /^\d+$/ ]
+    group_valid_regex [ /^([-a-zA-Z0-9_.]+)$/, /^\d+$/ ]
   end
 end

data/lib/chef/cookbook_loader.rb

@@ -104,6 +104,15 @@ class Chef
           if File.exists?(File.join(cookbook, "metadata.json"))
             cookbook_settings[cookbook_name][:metadata_filenames] << File.join(cookbook, "metadata.json")
           end
+
+          empty = cookbook_settings[cookbook_name].inject(true) do |all_empty, files|
+            all_empty && files.last.empty?
+          end
+
+          if empty
+            Chef::Log.warn "found a directory #{cookbook_name} in the cookbook path, but it contains no cookbook files. skipping."
+            cookbook_settings.delete(cookbook_name)
+          end
         end
       end
       remove_ignored_files_from(cookbook_settings)
@@ -144,6 +153,7 @@ class Chef
     def has_key?(cookbook_name)
       @cookbooks_by_name.has_key?(cookbook_name)
     end
+    alias :cookbook_exists? :has_key?
     
     def each
       @cookbooks_by_name.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |cname|
@@ -151,9 +161,14 @@ class Chef
       end
     end
 
+    def cookbook_names
+      @cookbooks_by_name.keys.sort
+    end
+
     def values
       @cookbooks_by_name.values
     end
+    alias :cookbooks :values
 
     private
     

data/lib/chef/cookbook_version.rb

@@ -123,6 +123,49 @@ class Chef
           }
           @
         },
+        "all_latest_version_by_id" => {
+          "map" => %q@
+          function(doc) {
+            if (doc.chef_type == "cookbook_version") {
+              emit(doc.cookbook_name, doc.version);
+            }
+          }
+          @,
+          "reduce" => %q@
+          function(keys, values, rereduce) {
+            var result = null;
+
+            for (var idx in values) {
+              var value = values[idx];
+
+              if (idx == 0) {
+                result = value;
+                continue;
+              }
+
+              var valueParts = value[1].split('.').map(function(v) { return parseInt(v); });
+              var resultParts = result[1].split('.').map(function(v) { return parseInt(v); });
+
+              if (valueParts[0] != resultParts[0]) {
+                if (valueParts[0] > resultParts[0]) {
+                  result = value;
+                }
+              }
+              else if (valueParts[1] != resultParts[1]) {
+                if (valueParts[1] > resultParts[1]) {
+                  result = value;
+                }
+              }
+              else if (valueParts[2] != resultParts[2]) {
+                if (valueParts[2] > resultParts[2]) {
+                  result = value;
+                }
+              }
+            }
+            return keys[idx][1];
+          }
+          @
+        },
       }
     }
     
@@ -595,10 +638,14 @@ class Chef
     ##
     # REST API
     ##
-    def chef_server_rest
+    def self.chef_server_rest
       Chef::REST.new(Chef::Config[:chef_server_url])
     end
 
+    def chef_server_rest
+      self.class.chef_server_rest
+    end
+
     def save
       chef_server_rest.put_rest("cookbooks/#{name}/#{version}", self)
       self
@@ -612,7 +659,16 @@ class Chef
 
     def self.load(name, version="_latest")
       version = "_latest" if version == "latest"
-      Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("cookbooks/#{name}/#{version}")
+      chef_server_rest.get_rest("cookbooks/#{name}/#{version}")
+    end
+
+    def self.list
+      chef_server_rest.get_rest('cookbooks')
+    end
+
+    # Get the newest version of all cookbooks
+    def self.latest_cookbooks
+      chef_server_rest.get_rest('cookbooks/_latest')
     end
 
     ##
@@ -620,7 +676,7 @@ class Chef
     ##
     
     def self.cdb_by_name(cookbook_name, couchdb=nil)
-      cdb = couchdb || Chef::CouchDB.new
+      cdb = (couchdb || Chef::CouchDB.new)
       options = { :startkey => cookbook_name, :endkey => cookbook_name }
       rs = cdb.get_view("cookbooks", "all_with_version", options)
       rs["rows"].inject({}) { |memo, row| memo.has_key?(row["key"]) ? memo[row["key"]] << row["value"] : memo[row["key"]] = [ row["value"] ]; memo }
@@ -629,7 +685,24 @@ class Chef
     def self.create_design_document(couchdb=nil)
       (couchdb || Chef::CouchDB.new).create_design_document("cookbooks", DESIGN_DOCUMENT)
     end
-    
+
+    def self.cdb_list_latest(inflate=false, couchdb=nil)
+      couchdb ||= Chef::CouchDB.new
+      if inflate
+        doc_ids = cdb_list_latest_ids
+        couchdb.bulk_get(doc_ids)
+      else
+        results = couchdb.get_view("cookbooks", "all_latest_version", :group=>true)["rows"]
+        results.inject({}) { |mapped, row| mapped[row["key"]] = row["value"]; mapped}
+      end
+    end
+
+    def self.cdb_list_latest_ids(inflate=false, couchdb=nil)
+      couchdb ||= Chef::CouchDB.new
+      results = couchdb.get_view("cookbooks", "all_latest_version_by_id", :group=>true)["rows"]
+      results.map { |name_and_id| name_and_id["value"]}
+    end
+
     def self.cdb_list(inflate=false, couchdb=nil)
       rs = (couchdb || Chef::CouchDB.new).list("cookbooks", inflate)
       lookup = (inflate ? "value" : "key")

data/lib/chef/couchdb.rb

@@ -220,8 +220,7 @@ class Chef
     def get_view(design, view, options={})
       view_string = view_uri(design, view)
       view_string << "?" if options.length != 0
-      first = true;
-      options.each { |k,v| view_string << "#{first ? '' : '&'}#{k}=#{URI.escape(v.to_json)}"; first = false }
+      view_string << options.map { |k,v| "#{k}=#{URI.escape(v.to_json)}"}.join('&')
       @rest.get_rest(view_string)
     end
 

data/lib/chef/knife.rb

@@ -121,10 +121,20 @@ class Chef
             break
           end
         end
-        config[:config_file] ||= File.join(ENV['HOME'], '.chef', 'knife.rb')
+        # If we haven't set a config yet and $HOME is set, and the home
+        # knife.rb exists, use it:
+        if (!config[:config_file]) && ENV['HOME'] && File.exist?(File.join(ENV['HOME'], '.chef', 'knife.rb'))
+          config[:config_file] = File.join(ENV['HOME'], '.chef', 'knife.rb')
+        end
       end
 
-      Chef::Config.from_file(config[:config_file]) 
+      # Don't try to load a knife.rb if it doesn't exist.
+      if config[:config_file]
+        Chef::Config.from_file(config[:config_file])
+      else
+        # ...but do log a message if no config was found.
+        Chef::Log.info("No knife configuration file found")
+      end
 
       Chef::Config[:log_level] = config[:log_level] if config[:log_level]
       Chef::Config[:log_location] = config[:log_location] if config[:log_location]

data/lib/chef/knife/configure.rb

@@ -104,7 +104,9 @@ EOH
       end
 
       def ask_user_for_config_path
-        config[:config_file] ||= ask_question("Where should I put the config file? ")
+        config[:config_file] ||= ask_question("Where should I put the config file? ", :default => '~/.chef/knife.rb')
+        # have to use expand path to expand the tilde character to the user's home
+        config[:config_file] = File.expand_path(config[:config_file])
         if File.exists?(config[:config_file])
           confirm("Overwrite #{config[:config_file]}")
         end

data/lib/chef/knife/cookbook_metadata.rb

@@ -54,7 +54,7 @@ class Chef
       end
 
       def generate_metadata(cookbook)
-        Chef::Log.info("Generating metadata for #{cookbook}")
+        Chef::Log.info("Generating Metadata")
         config[:cookbook_path].reverse.each do |path|
           file = File.expand_path(File.join(path, cookbook, 'metadata.rb'))
           generate_metadata_from_file(cookbook, file)
@@ -63,7 +63,7 @@ class Chef
 
       def generate_metadata_from_file(cookbook, file)
         if File.exists?(file)
-          Chef::Log.info("Generating from #{file}")
+          Chef::Log.debug("Generating metadata for #{cookbook} from #{file}")
           md = Chef::Cookbook::Metadata.new
           md.name(cookbook)
           md.from_file(file)
@@ -72,7 +72,7 @@ class Chef
             f.write(JSON.pretty_generate(md))
           end
           generated = true
-          Chef::Log.info("Generated #{json_file}")
+          Chef::Log.debug("Generated #{json_file}")
         else
           Chef::Log.debug("No #{file} found; skipping!")
         end

data/lib/chef/knife/cookbook_upload.rb

@@ -29,6 +29,7 @@ require 'chef/cookbook/file_system_file_vendor'
 class Chef
   class Knife
     class CookbookUpload < Knife
+      include Chef::Mixin::ShellOut
 
       banner "Sub-Command: cookbook upload [COOKBOOKS...] (options)"
 
@@ -59,23 +60,27 @@ class Chef
             upload_cookbook(cookbook)
           end
         else
-          @name_args.each{|cookbook_name| upload_cookbook(cl[cookbook_name]) }
+          @name_args.each do |cookbook_name|
+            if cl.cookbook_exists?(cookbook_name)
+              upload_cookbook(cl[cookbook_name])
+            else
+              Chef::Log.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
+            end
+          end
         end
       end
       
       def test_ruby(cookbook_dir)
         Chef::Log.info("Validating ruby files")
         Dir[File.join(cookbook_dir, '**', '*.rb')].each do |ruby_file|
-          Chef::Log.info("Testing #{ruby_file} for syntax errors...")
-          Chef::Mixin::Command.run_command(:command => "ruby -c #{ruby_file}")
+          test_ruby_file(cookbook_dir, ruby_file)
         end
       end
       
       def test_templates(cookbook_dir)
         Chef::Log.info("Validating templates")
         Dir[File.join(cookbook_dir, '**', '*.erb')].each do |erb_file|
-          Chef::Log.info("Testing template #{erb_file} for syntax errors...")
-          Chef::Mixin::Command.run_command(:command => "sh -c 'erubis -x #{erb_file} | ruby -c'")
+          test_template_file(cookbook_dir, erb_file)
         end
       end
       
@@ -187,6 +192,30 @@ class Chef
           end
         end
       end
+
+      private
+
+      def test_template_file(cookbook_dir, erb_file)
+        Chef::Log.debug("Testing template #{erb_file} for syntax errors...")
+        result = shell_out("sh -c 'erubis -x #{erb_file} | ruby -c'")
+        result.error!
+      rescue Chef::Exceptions::ShellCommandFailed
+        file_relative_path = erb_file[/^#{Regexp.escape(cookbook_dir)}#{File::Separator}(.*)/, 1]
+        Chef::Log.fatal("Erb template #{file_relative_path} has a syntax error:")
+        result.stderr.each_line { |l| Chef::Log.fatal(l.chomp) }
+        exit
+      end
+
+      def test_ruby_file(cookbook_dir, ruby_file)
+        Chef::Log.debug("Testing #{ruby_file} for syntax errors...")
+        result = shell_out("ruby -c #{ruby_file}")
+        result.error!
+      rescue Chef::Exceptions::ShellCommandFailed
+        file_relative_path = ruby_file[/^#{Regexp.escape(cookbook_dir)}#{File::Separator}(.*)/, 1]
+        Chef::Log.fatal("Cookbook file #{file_relative_path} has a syntax error:")
+        result.stderr.each_line { |l| Chef::Log.fatal(l.chomp) }
+        exit
+      end
       
     end
   end

data/lib/chef/provider/file.rb

@@ -51,14 +51,13 @@ class Chef
           @current_resource.owner(cstats.uid)
           @current_resource.group(cstats.gid)
           @current_resource.mode(octal_mode(cstats.mode))
-          @current_resource.checksum(checksum(@current_resource.path))
         end
         @current_resource
       end
 
       # Compare the content of a file.  Returns true if they are the same, false if they are not.
       def compare_content
-        @current_resource.checksum == new_resource_content_checksum
+        checksum(@current_resource.path) == new_resource_content_checksum
       end
 
       # Set the content of the file, assuming it is not set correctly already.

data/lib/chef/provider/remote_file.rb

@@ -29,6 +29,11 @@ class Chef
 
       include Chef::Mixin::FindPreferredFile
 
+      def load_current_resource
+        super
+        @current_resource.checksum(checksum(@current_resource.path)) if ::File.exist?(@current_resource.path)
+      end
+
       def action_create
         Chef::Log.debug("Checking #{@new_resource} for changes")
 

data/lib/chef/provider/template.rb

@@ -33,10 +33,15 @@ class Chef
 
     class Template < Chef::Provider::File
 
-      #include Chef::Mixin::Checksum
+      include Chef::Mixin::Checksum
       include Chef::Mixin::Template
       #include Chef::Mixin::FindPreferredFile
 
+      def load_current_resource
+        super
+        @current_resource.checksum(checksum(@current_resource.path)) if ::File.exist?(@current_resource.path)
+      end
+
       def action_create
         render_with_context(template_location) do |rendered_template|
           rendered(rendered_template)

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

@@ -36,7 +36,7 @@ class Chef
         
         def remove_user
           command = "userdel"
-          command << " -r" if @new_resource.supports[:manage_home]
+          command << " -r" if @new_resource.manage_home || @new_resource.supports[:manage_home]
           command << " #{@new_resource.username}"
           run_command(:command => command)
         end
@@ -89,7 +89,7 @@ class Chef
             end
           end
           if @current_resource.home != @new_resource.home && @new_resource.home
-            if @new_resource.supports[:manage_home]
+            if @new_resource.manage_home || @new_resource.supports[:manage_home]
               Chef::Log.debug("Managing the home directory for #{@new_resource}")
               opts << " -d '#{@new_resource.home}' -m"
             else
@@ -97,7 +97,8 @@ class Chef
               opts << " -d '#{@new_resource.home}'"
             end
           end
-          opts << " -o" if @new_resource.supports[:non_unique]
+          opts << " -r" if @new_resource.system
+          opts << " -o" if @new_resource.non_unique || @new_resource.supports[:non_unique]
           opts << " #{@new_resource.username}"
           opts
         end

data/lib/chef/resource/directory.rb

@@ -43,7 +43,7 @@ class Chef
         set_or_return(
           :group,
           arg,
-          :regex => [ /^([a-z]|[A-Z]|[0-9]|_|-)+$/, /^\d+$/ ]
+          :regex => Chef::Config[:group_valid_regex]
         )
       end
       
@@ -59,7 +59,7 @@ class Chef
         set_or_return(
           :owner,
           arg,
-          :regex => [ /^([a-z]|[A-Z]|[0-9]|_|-)+$/, /^\d+$/ ]
+          :regex => Chef::Config[:user_valid_regex]
         )
       end
       

data/lib/chef/resource/file.rb

@@ -59,7 +59,7 @@ class Chef
         set_or_return(
           :group,
           arg,
-          :regex => [ /^([a-z]|[A-Z]|[0-9]|_|-)+$/, /^\d+$/ ]
+          :regex => Chef::Config[:group_valid_regex]
         )
       end
 
@@ -75,7 +75,7 @@ class Chef
         set_or_return(
           :owner,
           arg,
-          :regex => [ /^([a-z]|[A-Z]|[0-9]|_|-)+$/, /^\d+$/ ]
+          :regex => Chef::Config[:user_valid_regex]
         )
       end
 

data/lib/chef/resource/link.rb

@@ -61,7 +61,7 @@ class Chef
         set_or_return(
           :group,
           arg,
-          :regex => [ /^([a-z]|[A-Z]|[0-9]|_|-)+$/, /^\d+$/ ]
+          :regex => Chef::Config[:group_valid_regex]
         )
       end
       
@@ -69,7 +69,7 @@ class Chef
         set_or_return(
           :owner,
           arg,
-          :regex => [ /^([a-z]|[A-Z]|[0-9]|_|-)+$/, /^\d+$/ ]
+          :regex => Chef::Config[:user_valid_regex]
         )
       end
 

data/lib/chef/resource/remote_directory.rb

@@ -67,7 +67,7 @@ class Chef
         set_or_return(
           :files_group,
           arg,
-          :regex => [ /^([a-z]|[A-Z]|[0-9]|_|-)+$/, /^\d+$/ ]
+          :regex => Chef::Config[:group_valid_regex]
         )
       end
 
@@ -83,7 +83,7 @@ class Chef
         set_or_return(
           :files_owner,
           arg,
-          :regex => [ /^([a-z]|[A-Z]|[0-9]|_|-)+$/, /^\d+$/ ]
+          :regex => Chef::Config[:user_valid_regex]
         )
       end
 

data/lib/chef/resource/user.rb

@@ -32,6 +32,9 @@ class Chef
         @home = nil
         @shell = nil
         @password = nil
+        @system = false
+        @manage_home = false
+        @non_unique = false
         @action = :create
         @supports = { 
           :manage_home => false,
@@ -97,6 +100,30 @@ class Chef
           :kind_of => [ String ]
         )
       end
+
+      def system(arg=nil)
+        set_or_return(
+          :system,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
+      def manage_home(arg=nil)
+        set_or_return(
+          :manage_home,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
+      def non_unique(arg=nil)
+        set_or_return(
+          :non_unique,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
       
     end
   end

data/lib/chef/sandbox.rb

@@ -84,7 +84,13 @@ class Chef
       @create_time = Time.now.iso8601
       @checksums = Array.new
     end
-    
+
+    def include?(checksum)
+      @checksums.include?(checksum)
+    end
+
+    alias :member? :include?
+
     def to_json(*a)
       result = {
         :guid => guid,

data/lib/chef/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 class Chef
-  VERSION = '0.9.0.a4'
+  VERSION = '0.9.0.a6'
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 0
-  - a4
-  version: 0.9.0.a4
+  - a6
+  version: 0.9.0.a6
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -07:00
+date: 2010-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency