chef 0.10.0.beta.9 → 0.10.0.beta.10

data/lib/chef/config.rb

@@ -239,6 +239,6 @@ class Chef
     # 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+$/ ]
+    group_valid_regex [ /^([-a-zA-Z0-9_.\\ ]+)$/, /^\d+$/ ]
   end
 end

data/lib/chef/cookbook/metadata.rb

@@ -18,6 +18,7 @@
 # limitations under the License.
 #
 
+require 'chef/mash'
 require 'chef/mixin/from_file'
 require 'chef/mixin/params_validate'
 require 'chef/mixin/check_helper'

data/lib/chef/cookbook_uploader.rb

@@ -1,4 +1,5 @@
 
+require 'set'
 require 'rest_client'
 require 'chef/exceptions'
 require 'chef/knife/cookbook_metadata'
@@ -67,17 +68,22 @@ class Chef
 
       self.class.setup_worker_threads
 
+      checksums_to_upload = Set.new
+
       # upload the new checksums and commit the sandbox
       new_sandbox['checksums'].each do |checksum, info|
         if info['needs_upload'] == true
+          checksums_to_upload << checksum
           Chef::Log.info("Uploading #{checksum_files[checksum]} (checksum hex = #{checksum}) to #{info['url']}")
-          self.class.work_queue << uploader_function_for(checksum_files[checksum], checksum, info['url'])
+          self.class.work_queue << uploader_function_for(checksum_files[checksum], checksum, info['url'], checksums_to_upload)
         else
           Chef::Log.debug("#{checksum_files[checksum]} has not changed")
         end
       end
 
-      sleep 0.1 until self.class.work_queue.empty?
+      until checksums_to_upload.empty?
+        sleep 0.1
+      end
 
       sandbox_url = new_sandbox['uri']
       Chef::Log.debug("Committing sandbox")
@@ -102,14 +108,14 @@ class Chef
     def worker_thread(work_queue)
     end
 
-    def uploader_function_for(file, checksum, url)
+    def uploader_function_for(file, checksum, url, checksums_to_upload)
       lambda do
         # Checksum is the hexadecimal representation of the md5,
         # but we need the base64 encoding for the content-md5
         # header
         checksum64 = Base64.encode64([checksum].pack("H*")).strip
         timestamp = Time.now.utc.iso8601
-        file_contents = File.read(file)
+        file_contents = File.open(file, "rb") {|f| f.read}
         # TODO - 5/28/2010, cw: make signing and sending the request streaming
         sign_obj = Mixlib::Authentication::SignedHeaderAuth.signing_object(
                                                                            :http_method => :put,
@@ -123,8 +129,9 @@ class Chef
 
         begin
           RestClient::Resource.new(url, :headers=>headers, :timeout=>1800, :open_timeout=>1800).put(file_contents)
+          checksums_to_upload.delete(checksum)
         rescue RestClient::Exception => e
-          Chef::Log.error("Upload failed: #{e.message}\n#{e.response.body}")
+          ui.error("Failed to upload #@cookbook : #{e.message}\n#{e.response.body}")
           raise
         end
       end

data/lib/chef/couchdb.rb

@@ -7,9 +7,9 @@
 # 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.
@@ -45,7 +45,7 @@ class Chef
 
     def create_id_map
       create_design_document(
-        "id_map", 
+        "id_map",
         {
           "version" => 1,
           "language" => "javascript",
@@ -59,7 +59,7 @@ class Chef
             },
             "id_to_name" => {
               "map" => <<-EOJS
-                function(doc) { 
+                function(doc) {
                   emit(doc._id, [ doc.chef_type, doc.name ]);
                 }
               EOJS
@@ -69,14 +69,14 @@ class Chef
       )
     end
 
-    def create_db
+    def create_db(check_for_existing=true)
       @database_list = @rest.get_rest("_all_dbs")
-      unless @database_list.detect { |db| db == couchdb_database }
+      if !check_for_existing || !@database_list.any? { |db| db == couchdb_database }
         response = @rest.put_rest(couchdb_database, Hash.new)
       end
       couchdb_database
     end
-    
+
     def create_design_document(name, data)
       to_update = true
       begin
@@ -87,7 +87,7 @@ class Chef
         else
           to_update = false
         end
-      rescue 
+      rescue
         Chef::Log.debug("Creating #{name} views for the first time because: #{$!}")
       end
       if to_update
@@ -110,14 +110,14 @@ class Chef
       )
       rows = get_view("id_map", "name_to_id", :key => [ obj_type, name ])["rows"]
       uuid = rows.empty? ? UUIDTools::UUID.random_create.to_s : rows.first.fetch("id")
-     
+
       db_put_response = @rest.put_rest("#{couchdb_database}/#{uuid}", object)
 
       if object.respond_to?(:add_to_index)
         Chef::Log.info("Sending #{obj_type}(#{uuid}) to the index queue for addition.")
         object.add_to_index(:database => couchdb_database, :id => uuid, :type => obj_type)
       end
-      
+
       db_put_response
     end
 
@@ -134,9 +134,9 @@ class Chef
                )
       doc = find_by_name(obj_type, name)
       doc.couchdb = self if doc.respond_to?(:couchdb)
-      doc 
+      doc
     end
-  
+
     def delete(obj_type, name, rev=nil)
       validate(
         {
@@ -148,7 +148,7 @@ class Chef
           :name => { :kind_of => String },
         }
       )
-      del_id = nil 
+      del_id = nil
       object, uuid = find_by_name(obj_type, name, true)
       unless rev
         if object.respond_to?(:couchdb_rev)
@@ -159,7 +159,7 @@ class Chef
       end
       response = @rest.delete_rest("#{couchdb_database}/#{uuid}?rev=#{rev}")
       response.couchdb = self if response.respond_to?(:couchdb=)
-      
+
       if object.respond_to?(:delete_from_index)
         Chef::Log.info("Sending #{obj_type}(#{uuid}) to the index queue for deletion..")
         object.delete_from_index(:database => couchdb_database, :id => uuid, :type => obj_type)
@@ -167,10 +167,10 @@ class Chef
 
       response
     end
-  
+
     def list(view, inflate=false)
       validate(
-        { 
+        {
           :view => view,
         },
         {
@@ -186,7 +186,7 @@ class Chef
       end
       r
     end
-  
+
     def has_key?(obj_type, name)
       validate(
         {
@@ -214,7 +214,7 @@ class Chef
       if with_id
         [ r["rows"][0]["doc"], r["rows"][0]["id"] ]
       else
-        r["rows"][0]["doc"] 
+        r["rows"][0]["doc"]
       end
     end
 
@@ -229,7 +229,7 @@ class Chef
       response = @rest.post_rest("#{couchdb_database}/_all_docs?include_docs=true", { "keys" => to_fetch.flatten })
       response["rows"].collect { |r| r["doc"] }
     end
-    
+
     def view_uri(design, view)
       "#{couchdb_database}/_design/#{design}/_view/#{view}"
     end
@@ -237,10 +237,10 @@ class Chef
     def server_stats
       @rest.get_rest('/')
     end
- 
+
     def db_stats
       @rest.get_rest("/#{@db}")
     end
- 
+
   end
 end

data/lib/chef/file_access_control.rb

@@ -26,7 +26,7 @@ class Chef
   # the values specified by a value object, usually a Chef::Resource.
   class FileAccessControl
     UINT = (1 << 32)
-    UID_MAX = (1 << 31)
+    UID_MAX = (1 << 32) - 10
   
     attr_reader :resource
   
@@ -60,7 +60,7 @@ class Chef
     # Workaround the fact that Ruby's Etc module doesn't believe in negative
     # uids, so negative uids show up as the diminished radix complement of
     # a uint. For example, a uid of -2 is reported as 4294967294
-    def dimished_radix_complement(int)
+    def diminished_radix_complement(int)
       if int > UID_MAX
         int - UINT
       else
@@ -71,7 +71,7 @@ class Chef
     def target_uid
       return nil if resource.owner.nil?
       if resource.owner.kind_of?(String)
-        dimished_radix_complement( Etc.getpwnam(resource.owner).uid )
+        diminished_radix_complement( Etc.getpwnam(resource.owner).uid )
       elsif resource.owner.kind_of?(Integer)
         resource.owner
       else
@@ -93,7 +93,7 @@ class Chef
     def target_gid
       return nil if resource.group.nil?
       if resource.group.kind_of?(String)
-        dimished_radix_complement( Etc.getgrnam(resource.group).gid )
+        diminished_radix_complement( Etc.getgrnam(resource.group).gid )
       elsif resource.group.kind_of?(Integer)
         resource.group
       else

data/lib/chef/knife.rb

@@ -288,7 +288,8 @@ class Chef
         read_config_file(config[:config_file])
       else
         # ...but do log a message if no config was found.
-        self.msg("No knife configuration file found")
+        Chef::Config[:color] = config[:color] && !config[:no_color]
+        ui.warn("No knife configuration file found")
       end
 
       Chef::Config[:color] = config[:color] && !config[:no_color]
@@ -320,7 +321,7 @@ class Chef
       Chef::Log.debug("Using configuration from #{config[:config_file]}")
 
       if Chef::Config[:node_name].nil?
-        raise ArgumentError, "No user specified, pass via -u or specifiy 'node_name' in #{config[:config_file] ? config[:config_file] : "~/.chef/knife.rb"}"
+        #raise ArgumentError, "No user specified, pass via -u or specifiy 'node_name' in #{config[:config_file] ? config[:config_file] : "~/.chef/knife.rb"}"
       end
     end
 
@@ -476,7 +477,7 @@ class Chef
       output(format_for_display(object)) if config[:print_after]
 
       obj_name = delete_name ? "#{delete_name}[#{name}]" : object
-      self.msg("Deleted #{obj_name}!")
+      self.msg("Deleted #{obj_name}")
     end
 
     def bulk_delete(klass, fancy_name, delete_name=nil, list=nil, regex=nil, &block)
@@ -514,6 +515,13 @@ class Chef
       end
     end
 
+    def noauth_rest
+      @rest ||= begin
+        require 'chef/rest'
+        Chef::REST.new(Chef::Config[:chef_server_url], false, false)
+      end
+    end
+
     def server_url
       Chef::Config[:chef_server_url]
     end

data/lib/chef/knife/bootstrap/centos5-gems.erb

@@ -1,11 +1,17 @@
 bash -c '
-rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
-rpm -Uvh http://download.elff.bravenet.com/5/i386/elff-release-5-3.noarch.rpm
+if [ ! -f /usr/bin/chef-client ]; then
+  rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
+  rpm -Uvh http://download.elff.bravenet.com/5/i386/elff-release-5-3.noarch.rpm
 
-yum install -q -y ruby ruby-devel gcc gcc-c++ automake autoconf rubygems make
+  yum install -q -y ruby ruby-devel gcc gcc-c++ automake autoconf make
+
+  cd /tmp
+  wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
+  tar zxf rubygems-1.3.7.tgz
+  cd rubygems-1.3.7
+  ruby setup.rb --no-format-executable
+fi
 
-gem update --system
-gem update
 gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
 
 mkdir -p /etc/chef
@@ -25,10 +31,10 @@ log_location     STDOUT
 chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
 validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 <% if @config[:chef_node_name] == nil %>
-# Using default node name"
+# Using default node name (fqdn)
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
-<% end %> 
+<% end %>
 EOP
 ) > /etc/chef/client.rb
 

data/lib/chef/knife/bootstrap/fedora13-gems.erb

@@ -25,7 +25,7 @@ validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 # Using default node name"
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
-<% end %> 
+<% end %>
 EOP
 ) > /etc/chef/client.rb
 

data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb

@@ -1,6 +1,6 @@
 bash -c '
 if [ ! -f /usr/bin/chef-client ]; then
-  echo "chef	chef/chef_server_url	string	<%= Chef::Config[:chef_server_url] %>" | debconf-set-selections 
+  echo "chef	chef/chef_server_url	string	<%= Chef::Config[:chef_server_url] %>" | debconf-set-selections
   [ -f /etc/apt/sources.list.d/opscode.list ] || echo "deb http://apt.opscode.com lucid main" > /etc/apt/sources.list.d/opscode.list
   wget -O- http://apt.opscode.com/packages@opscode.com.gpg.key | apt-key add -
 fi
@@ -21,7 +21,7 @@ rm /tmp/validation.pem
 
 <% if @config[:chef_node_name] %>
 [ `grep -qx "node_name \"<%= @config[:chef_node_name] %>\"" /etc/chef/client.rb` ] || echo "node_name \"<%= @config[:chef_node_name] %>\"" >> /etc/chef/client.rb
-<% end -%> 
+<% end -%>
 
 (
 cat <<'EOP'

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

@@ -27,7 +27,7 @@ log_location     STDOUT
 chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
 validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 <% if @config[:chef_node_name] == nil %>
-# Using default node name"
+# Using default node name (fqdn)
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
 <% end %>

data/lib/chef/knife/client_create.rb

@@ -57,7 +57,7 @@ class Chef
 
         key = output.save
 
-        ui.info("Created (or updated) #{output}")
+        ui.info("Created #{output}")
 
         if config[:file]
           File.open(config[:file], "w") do |f|

data/lib/chef/knife/configure.rb

@@ -25,6 +25,7 @@ class Chef
       attr_reader :chef_repo, :new_client_key, :validation_client_name, :validation_key
 
       deps do
+        require 'ohai'
         Chef::Knife::ClientCreate.load_deps
       end
 
@@ -113,7 +114,8 @@ EOH
       end
 
       def ask_user_for_config
-        @chef_server            = config[:chef_server_url] || ask_question("Please enter the chef server URL: ", :default => 'http://localhost:4000')
+        server_name = guess_servername
+        @chef_server            = config[:chef_server_url] || ask_question("Please enter the chef server URL: ", :default => "http://#{server_name}:4000")
         if config[:initial]
           @new_client_name        = config[:node_name] || ask_question("Please enter a clientname for the new client: ", :default => Etc.getlogin)
           @admin_client_name      = config[:admin_client_name] || ask_question("Please enter the existing admin clientname: ", :default => 'chef-webui')
@@ -128,6 +130,13 @@ EOH
         @new_client_key = config[:client_key] || File.join(chef_config_path, "#{@new_client_name}.pem")
       end
 
+      def guess_servername
+        o = Ohai::System.new
+        o.require_plugin 'os'
+        o.require_plugin 'hostname'
+        o[:fqdn] || 'localhost'
+      end
+
       def config_file
         config[:config_file]
       end

data/lib/chef/knife/cookbook_bulk_delete.rb

@@ -43,11 +43,21 @@ class Chef
         all_cookbooks = Chef::CookbookVersion.list
         cookbooks_names = all_cookbooks.keys.grep(regex)
         cookbooks_to_delete = cookbooks_names.inject({}) { |hash, name| hash[name] = all_cookbooks[name];hash }
-        output(format_list_for_display(cookbooks_to_delete))
+        ui.msg "All versions of the following cookbooks will be deleted:"
+        ui.msg ""
+        ui.msg ui.list(cookbooks_to_delete.keys.sort, :columns_down)
+        ui.msg ""
 
-        ui.confirm("Do you really want to delete these cookbooks? All versions will be deleted. (Y/N) ", false)
+        unless config[:yes]
+          ui.confirm("Do you really want to delete these cookbooks? (Y/N) ", false)
+
+          if config[:purge]
+            ui.msg("Files that are common to multiple cookbooks are shared, so purging the files may break other cookbooks.")
+            ui.confirm("Are you sure you want to purge files instead of just deleting the cookbooks")
+          end
+          ui.msg ""
+        end
 
-        ui.confirm("Files that are common to multiple cookbooks are shared, so purging the files may disable other cookbooks. Are you sure you want to purge files instead of just deleting the cookbooks") if config[:purge]
 
         cookbooks_names.each do |cookbook_name|
           versions = rest.get_rest("cookbooks/#{cookbook_name}")[cookbook_name]["versions"].map {|v| v["version"]}.flatten

data/lib/chef/knife/cookbook_site_download.rb

@@ -33,17 +33,17 @@ class Chef
 
       def run
         if @name_args.length == 1
-          current = rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}")
-          cookbook_data = rest.get_rest(current["latest_version"])
+          current = noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}")
+          cookbook_data = noauth_rest.get_rest(current["latest_version"])
         else
-          cookbook_data = rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
+          cookbook_data = noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
         end
 
         @version = cookbook_data['version']
 
         ui.info("Downloading #{@name_args[0]} from the cookbooks site at version #{cookbook_data['version']} to #{config[:file]}")
-        rest.sign_on_redirect = false
-        tf = rest.get_rest(cookbook_data["file"], true)
+        noauth_rest.sign_on_redirect = false
+        tf = noauth_rest.get_rest(cookbook_data["file"], true)
         unless config[:file]
           config[:file] = File.join(Dir.pwd, "#{@name_args[0]}-#{cookbook_data['version']}.tar.gz")
         end