chef 0.10.0.beta.8 → 0.10.0.beta.9

data/lib/chef/cookbook_uploader.rb

@@ -1,3 +1,4 @@
+
 require 'rest_client'
 require 'chef/exceptions'
 require 'chef/knife/cookbook_metadata'
@@ -10,6 +11,23 @@ require 'chef/cookbook/file_system_file_vendor'
 class Chef
   class CookbookUploader
 
+    def self.work_queue
+      @work_queue ||= Queue.new
+    end
+
+    def self.setup_worker_threads
+      @worker_threads ||= begin
+        work_queue
+        (1...10).map do
+          Thread.new do
+            loop do
+              work_queue.pop.call
+            end
+          end
+        end
+      end
+    end
+
     attr_reader :cookbook
     attr_reader :path
     attr_reader :opts
@@ -35,51 +53,32 @@ class Chef
     end
 
     def upload_cookbook
+      Thread.abort_on_exception = true
       Chef::Log.info("Saving #{cookbook.name}")
 
       # Syntax Check
       validate_cookbook
-      # Generate metadata.json from metadata.rb
-      build_metadata
-
       # generate checksums of cookbook files and create a sandbox
       checksum_files = cookbook.checksums
       checksums = checksum_files.inject({}){|memo,elt| memo[elt.first]=nil ; memo}
       new_sandbox = rest.post_rest("sandboxes", { :checksums => checksums })
 
       Chef::Log.info("Uploading files")
+
+      self.class.setup_worker_threads
+
       # upload the new checksums and commit the sandbox
       new_sandbox['checksums'].each do |checksum, info|
         if info['needs_upload'] == true
           Chef::Log.info("Uploading #{checksum_files[checksum]} (checksum hex = #{checksum}) to #{info['url']}")
-
-          # 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(checksum_files[checksum])
-          # TODO - 5/28/2010, cw: make signing and sending the request streaming
-          sign_obj = Mixlib::Authentication::SignedHeaderAuth.signing_object(
-                                                                             :http_method => :put,
-                                                                             :path        => URI.parse(info['url']).path,
-                                                                             :body        => file_contents,
-                                                                             :timestamp   => timestamp,
-                                                                             :user_id     => rest.client_name
-                                                                             )
-          headers = { 'content-type' => 'application/x-binary', 'content-md5' => checksum64, :accept => 'application/json' }
-          headers.merge!(sign_obj.sign(OpenSSL::PKey::RSA.new(rest.signing_key)))
-
-          begin
-            RestClient::Resource.new(info['url'], :headers=>headers, :timeout=>1800, :open_timeout=>1800).put(file_contents)
-          rescue RestClient::Exception => e
-            Chef::Log.error("Upload failed: #{e.message}\n#{e.response.body}")
-            raise
-          end
+          self.class.work_queue << uploader_function_for(checksum_files[checksum], checksum, info['url'])
         else
           Chef::Log.debug("#{checksum_files[checksum]} has not changed")
         end
       end
+
+      sleep 0.1 until self.class.work_queue.empty?
+
       sandbox_url = new_sandbox['uri']
       Chef::Log.debug("Committing sandbox")
       # Retry if S3 is claims a checksum doesn't exist (the eventual
@@ -100,15 +99,35 @@ class Chef
       Chef::Log.info("Upload complete!")
     end
 
-    def build_metadata
-      Chef::Log.debug("Generating metadata")
-      # FIXME: This knife command should be factored out into a
-      # library for use here
-      kcm = Chef::Knife::CookbookMetadata.new
-      kcm.config[:cookbook_path] = path
-      kcm.name_args = [ cookbook.name.to_s ]
-      kcm.run
-      cookbook.reload_metadata!
+    def worker_thread(work_queue)
+    end
+
+    def uploader_function_for(file, checksum, url)
+      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)
+        # TODO - 5/28/2010, cw: make signing and sending the request streaming
+        sign_obj = Mixlib::Authentication::SignedHeaderAuth.signing_object(
+                                                                           :http_method => :put,
+                                                                           :path        => URI.parse(url).path,
+                                                                           :body        => file_contents,
+                                                                           :timestamp   => timestamp,
+                                                                           :user_id     => rest.client_name
+                                                                           )
+        headers = { 'content-type' => 'application/x-binary', 'content-md5' => checksum64, :accept => 'application/json' }
+        headers.merge!(sign_obj.sign(OpenSSL::PKey::RSA.new(rest.signing_key)))
+
+        begin
+          RestClient::Resource.new(url, :headers=>headers, :timeout=>1800, :open_timeout=>1800).put(file_contents)
+        rescue RestClient::Exception => e
+          Chef::Log.error("Upload failed: #{e.message}\n#{e.response.body}")
+          raise
+        end
+      end
     end
 
     def validate_cookbook

data/lib/chef/cookbook_version.rb

@@ -861,7 +861,9 @@ class Chef
     # [String]::  Array of cookbook versions, which are strings like 'x.y.z'
     # nil::       if the cookbook doesn't exist. an error will also be logged.
     def self.available_versions(cookbook_name)
-      chef_server_rest.get_rest("cookbooks/#{cookbook_name}").values.flatten
+      chef_server_rest.get_rest("cookbooks/#{cookbook_name}")[cookbook_name]["versions"].map do |cb|
+        cb["version"]
+      end
     rescue Net::HTTPServerException => e
       if e.to_s =~ /^404/
         Chef::Log.error("Cannot find a cookbook named #{cookbook_name}")

data/lib/chef/couchdb.rb

@@ -78,7 +78,6 @@ class Chef
     end
     
     def create_design_document(name, data)
-      create_db
       to_update = true
       begin
         old_doc = @rest.get_rest("#{couchdb_database}/_design/#{name}")

data/lib/chef/knife/cookbook_list.rb

@@ -32,7 +32,7 @@ class Chef
 
       option :all_versions,
         :short => "-a",
-        :long => "--show-all-versions",
+        :long => "--all",
         :description => "Show all available versions."
 
       def run

data/lib/chef/knife/cookbook_show.rb

@@ -25,6 +25,7 @@ class Chef
       deps do
         require 'chef/json_compat'
         require 'uri'
+        require 'chef/cookbook_version'
       end
 
       banner "knife cookbook show COOKBOOK [VERSION] [PART] [FILENAME] (options)"

data/lib/chef/knife/core/generic_presenter.rb

@@ -53,7 +53,7 @@ class Chef
 
         # Returns a String representation of +data+ that is suitable for output
         # to a terminal or perhaps for data interchange with another program.
-        # The representation of the +data+ depends on the value of the 
+        # The representation of the +data+ depends on the value of the
         # `config[:format]` setting.
         def format(data)
           case parse_format_option
@@ -171,9 +171,9 @@ class Chef
               collected[cookbook] = versions["versions"].map {|v| v['version']}
               collected
             end
-            key_length = versions_by_cookbook.keys.map {|name| name.size }.max + 2
+            key_length = versions_by_cookbook.empty? ? 0 : versions_by_cookbook.keys.map {|name| name.size }.max + 2
             versions_by_cookbook.sort.map do |cookbook, versions|
-              "#{cookbook.ljust(key_length)} #{versions.join(',')}"
+              "#{cookbook.ljust(key_length)} #{versions.join('  ')}"
             end
           end
         end

data/lib/chef/knife/help.rb

@@ -25,14 +25,18 @@ class Chef
       def run
         if name_args.empty?
           ui.info "Usage: knife SUBCOMMAND (options)"
-          show_usage
+          ui.msg ""
+          # This command is atypical, the user is likely not interested in usage of
+          # this command, but knife in general. So hack the banner.
+          opt_parser.banner = "General Knife Options:"
+          ui.msg opt_parser.to_s
           ui.msg ""
           ui.info "For further help:"
           ui.info(<<-MOAR_HELP)
   knife help list             list help topics
   knife help knife            show general knife help
   knife help TOPIC            display the manual for TOPIC
-  knife COMMAND --help        show the options for a command
+  knife SUBCOMMAND --help     show the options for a command
 MOAR_HELP
           exit 1
         else

data/lib/chef/knife/tag_create.rb

@@ -1,3 +1,23 @@
+#
+# Author:: Ryan Davis (<ryand-ruby@zenspider.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Author:: Nuo Yan (<nuo@opscode.com>)
+# Copyright:: Copyright (c) 2011 Ryan Davis and 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/knife'
 
 class Chef
@@ -12,19 +32,20 @@ class Chef
 
       def run
         name = @name_args[0]
-        tags = @name_args[1..-1].join(",").split(/\s*,\s*/)
+        tags = @name_args[1..-1]
 
-        unless name or tags.empty?
+        if name.nil? || tags.nil? || tags.empty?
           show_usage
-          # TODO: blah blah
-          ui.fatal("You must specify a node name")
+          ui.fatal("You must specify a node name and at least one tag.")
           exit 1
         end
 
         node = Chef::Node.load name
         tags.each do |tag|
-          node.tags << tag
+          (node.tags << tag).uniq!
         end
+        node.save
+        ui.info("Created tags #{tags.join(", ")} for node #{name}.")
       end
     end
   end

data/lib/chef/knife/tag_delete.rb

@@ -1,3 +1,23 @@
+#
+# Author:: Ryan Davis (<ryand-ruby@zenspider.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Author:: Nuo Yan (<nuo@opscode.com>)
+# Copyright:: Copyright (c) 2011 Ryan Davis and 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/knife'
 
 class Chef
@@ -12,19 +32,28 @@ class Chef
 
       def run
         name = @name_args[0]
-        tags = @name_args[1..-1].join(",").split(/\s*,\s*/)
+        tags = @name_args[1..-1]
 
-        unless name or tags.empty?
+        if name.nil? || tags.nil? || tags.empty?
           show_usage
-          # TODO: blah blah
-          ui.fatal("You must specify a node name")
+          ui.fatal("You must specify a node name and at least one tag.")
           exit 1
         end
 
         node = Chef::Node.load name
+        deleted_tags = Array.new
         tags.each do |tag|
-          node.tags.delete tag
+          unless node.tags.delete(tag).nil?
+            deleted_tags << tag
+          end
         end
+        node.save
+        message = if deleted_tags.empty?
+                    "Nothing has changed. The tags requested to be deleted do not exist."
+                  else
+                    "Deleted the following tags: #{deleted_tags.join(", ")}."
+                  end
+        ui.info(message)
       end
     end
   end

data/lib/chef/knife/tag_list.rb

@@ -1,3 +1,23 @@
+#
+# Author:: Ryan Davis (<ryand-ruby@zenspider.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Author:: Nuo Yan (<nuo@opscode.com>)
+# Copyright:: Copyright (c) 2011 Ryan Davis and 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/knife'
 
 class Chef
@@ -12,17 +32,15 @@ class Chef
 
       def run
         name = @name_args[0]
-        tags = @name_args[1..-1].join(",").split(/\s*,\s*/)
 
-        unless name or tags.empty?
+        if name.nil?
           show_usage
-          # TODO: blah blah
-          ui.fatal("You must specify a node name")
+          ui.fatal("You must specify a node name.")
           exit 1
         end
 
-        node = Chef::Node.load name
-        output node.tags
+        node = Chef::Node.load(name)
+        output(node.tags)
       end
     end
   end

data/lib/chef/node.rb

@@ -36,6 +36,7 @@ require 'chef/node/attribute'
 require 'chef/index_queue'
 require 'chef/mash'
 require 'chef/json_compat'
+require 'chef/search/query'
 
 class Chef
   class Node

data/lib/chef/role.rb

@@ -26,6 +26,7 @@ require 'chef/run_list'
 require 'chef/index_queue'
 require 'chef/mash'
 require 'chef/json_compat'
+require 'chef/search/query'
 
 class Chef
   class Role

data/lib/chef/shef.rb

@@ -20,6 +20,7 @@ require 'pp'
 require 'etc'
 require 'mixlib/cli'
 
+require 'chef'
 require 'chef/version'
 require 'chef/client'
 require 'chef/config'

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.10.0.beta.8'
+  VERSION = '0.10.0.beta.9'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

metadata

@@ -2,7 +2,7 @@
 name: chef
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.10.0.beta.8
+  version: 0.10.0.beta.9
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -07:00
+date: 2011-04-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -226,6 +226,7 @@ files:
 - distro/common/html/knife-status.1.html
 - distro/common/html/knife-tag.1.html
 - distro/common/html/knife.1.html
+- distro/common/html/shef.1.html
 - distro/common/man/man1/knife-bootstrap.1
 - distro/common/man/man1/knife-client.1
 - distro/common/man/man1/knife-configure.1
@@ -236,7 +237,6 @@ files:
 - distro/common/man/man1/knife-exec.1
 - distro/common/man/man1/knife-index.1
 - distro/common/man/man1/knife-node.1
-- distro/common/man/man1/knife-recipe.1
 - distro/common/man/man1/knife-role.1
 - distro/common/man/man1/knife-search.1
 - distro/common/man/man1/knife-ssh.1
@@ -259,13 +259,13 @@ files:
 - distro/common/markdown/man1/knife-exec.mkd
 - distro/common/markdown/man1/knife-index.mkd
 - distro/common/markdown/man1/knife-node.mkd
-- distro/common/markdown/man1/knife-recipe.mkd
 - distro/common/markdown/man1/knife-role.mkd
 - distro/common/markdown/man1/knife-search.mkd
 - distro/common/markdown/man1/knife-ssh.mkd
 - distro/common/markdown/man1/knife-status.mkd
 - distro/common/markdown/man1/knife-tag.mkd
 - distro/common/markdown/man1/knife.mkd
+- distro/common/markdown/man1/shef.mkd
 - distro/common/markdown/README
 - distro/debian/etc/default/chef-client
 - distro/debian/etc/default/chef-server