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

data/lib/chef/knife/cookbook_site_install.rb

@@ -32,9 +32,9 @@ class Chef
       banner "knife cookbook site install COOKBOOK [VERSION] (options)"
       category "cookbook site"
 
-      option :deps,
-       :short => "-d",
-       :long => "--dependencies",
+      option :no_deps,
+       :short => "-D",
+       :long => "--no-dependencies",
        :boolean => true,
        :description => "Grab dependencies automatically"
 
@@ -93,12 +93,12 @@ class Chef
         end
 
 
-        if config[:deps]
+        unless config[:no_deps]
           md = Chef::Cookbook::Metadata.new
           md.from_file(File.join(@install_path, @cookbook_name, "metadata.rb"))
           md.dependencies.each do |cookbook, version_list|
             # Doesn't do versions.. yet
-            nv = Chef::Knife::CookbookSiteVendor.new
+            nv = self.class.new
             nv.config = config
             nv.name_args = [ cookbook ]
             nv.run

data/lib/chef/knife/cookbook_site_list.rb

@@ -31,12 +31,16 @@ class Chef
         :description => "Show corresponding URIs"
 
       def run
-        output(format_list_for_display(get_cookbook_list))
+        if config[:with_uri]
+          ui.msg(format_list_for_display(get_cookbook_list))
+        else
+          ui.msg(ui.list(get_cookbook_list.keys.sort, :columns_down))
+        end
       end
 
       def get_cookbook_list(items=10, start=0, cookbook_collection={})
         cookbooks_url = "http://cookbooks.opscode.com/api/v1/cookbooks?items=#{items}&start=#{start}"
-        cr = rest.get_rest(cookbooks_url)
+        cr = noauth_rest.get_rest(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook
         end

data/lib/chef/knife/cookbook_site_search.rb

@@ -30,7 +30,7 @@ class Chef
 
       def search_cookbook(query, items=10, start=0, cookbook_collection={})
         cookbooks_url = "http://cookbooks.opscode.com/api/v1/search?q=#{query}&items=#{items}&start=#{start}"
-        cr = rest.get_rest(cookbooks_url)
+        cr = noauth_rest.get_rest(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook
         end

data/lib/chef/knife/cookbook_site_show.rb

@@ -27,16 +27,16 @@ class Chef
       def run
         case @name_args.length
         when 1 
-          cookbook_data = rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}")
+          cookbook_data = noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}")
         when 2
-          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
         output(format_for_display(cookbook_data))
       end
 
       def get_cookbook_list(items=10, start=0, cookbook_collection={})
         cookbooks_url = "http://cookbooks.opscode.com/api/v1/cookbooks?items=#{items}&start=#{start}"
-        cr = rest.get_rest(cookbooks_url)
+        cr = noauth_rest.get_rest(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook
         end

data/lib/chef/knife/cookbook_upload.rb

@@ -68,9 +68,10 @@ class Chef
         version_constraints_to_update = {}
 
         if config[:all]
+          justify_width = cookbook_repo.cookbook_names.map {|name| name.size}.max.to_i + 2
           cookbook_repo.each do |cookbook_name, cookbook|
             cookbook.freeze_version if config[:freeze]
-            upload(cookbook)
+            upload(cookbook, justify_width)
             version_constraints_to_update[cookbook_name] = cookbook.version
           end
         else
@@ -79,11 +80,12 @@ class Chef
             ui.error("You must specify the --all flag or at least one cookbook name")
             exit 1
           end
+          justify_width = @name_args.map {|name| name.size }.max.to_i + 2
           @name_args.each do |cookbook_name|
             begin
               cookbook = cookbook_repo[cookbook_name]
               cookbook.freeze_version if config[:freeze]
-              upload(cookbook)
+              upload(cookbook, justify_width)
               version_constraints_to_update[cookbook_name] = cookbook.version
             rescue Exceptions::CookbookNotFoundInRepo => e
               ui.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
@@ -129,12 +131,9 @@ class Chef
         end
       end
 
-      def upload(cookbook)
-        if config[:all]
-          ui.info("** #{cookbook.name} **")
-        else
-          ui.info "Uploading #{cookbook.name}..."
-        end
+      def upload(cookbook, justify_width)
+        ui.info("Uploading #{cookbook.name.to_s.ljust(justify_width + 10)} [#{cookbook.version}]")
+
         check_for_broken_links(cookbook)
         Chef::CookbookUploader.new(cookbook, config[:cookbook_path], :force => config[:force]).upload_cookbook
       rescue Net::HTTPServerException => e

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

@@ -93,7 +93,7 @@ class Chef
       # determined by the value of `config[:color]`. When output is not to a
       # terminal, colored output is never used
       def color?
-        Chef::Config[:color] && stdout.tty?
+        Chef::Config[:color] && stdout.tty? && (RUBY_PLATFORM !~ /mswin|mingw32|windows/)
       end
 
       def ask(*args, &block)

data/lib/chef/knife/node_bulk_delete.rb

@@ -30,13 +30,47 @@ class Chef
       banner "knife node bulk delete REGEX (options)"
 
       def run
-        if @name_args.length < 1
+        if name_args.length < 1
           ui.fatal("You must supply a regular expression to match the results against")
           exit 42
-        else
-          bulk_delete(Chef::Node, "node", nil, nil, @name_args[0])
+        end
+
+
+        nodes_to_delete = {}
+        matcher = /#{name_args[0]}/
+
+        all_nodes.each do |name, node|
+          next unless name =~ matcher
+          nodes_to_delete[name] = node
+        end
+
+        if nodes_to_delete.empty?
+          ui.msg "No nodes match the expression /#{name_args[0]}/"
+          exit 0
+        end
+
+        ui.msg("The following nodes will be deleted:")
+        ui.msg("")
+        ui.msg(ui.list(nodes_to_delete.keys.sort, :columns_down))
+        ui.msg("")
+        ui.confirm("Are you sure you want to delete these nodes")
+
+
+        nodes_to_delete.sort.each do |name, node|
+          node.destroy
+          ui.msg("Deleted node #{name}")
         end
       end
+
+      def all_nodes
+        node_uris_by_name = Chef::Node.list
+
+        node_uris_by_name.keys.inject({}) do |nodes_by_name, name|
+          nodes_by_name[name] = Chef::Node.new.tap {|n| n.name(name)}
+          nodes_by_name
+        end
+      end
+
     end
   end
 end

data/lib/chef/knife/recipe_list.rb

@@ -23,7 +23,6 @@ class Chef::Knife::RecipeList < Chef::Knife
 
   def run
     recipes = rest.get_rest('cookbooks/_recipes')
-    recipes = recipes.keys.map { |cb| recipes[cb].map {|ver, rec| rec.map{ |rn| "#{cb}::#{rn} (#{ver})" }}}.flatten.uniq
     if pattern = @name_args.first
       recipes = recipes.grep(Regexp.new(pattern))
     end

data/lib/chef/knife/role_bulk_delete.rb

@@ -31,10 +31,33 @@ class Chef
 
       def run
         if @name_args.length < 1
-          ui.fatal("You must supply a regular expression to match the results against")
-          exit 42
-        else
-          bulk_delete(Chef::Role, "role", nil, nil, @name_args[0])
+          ui.error("You must supply a regular expression to match the results against")
+          exit 1
+        end
+
+        all_roles = Chef::Role.list(true)
+
+        matcher = /#{@name_args[0]}/
+        roles_to_delete = {}
+        all_roles.each do |name, role|
+          next unless name =~ matcher
+          roles_to_delete[role.name] = role
+        end
+
+        if roles_to_delete.empty?
+          ui.info "No roles match the expression /#{@name_args[0]}/"
+          exit 0
+        end
+
+        ui.msg("The following roles will be deleted:")
+        ui.msg("")
+        ui.msg(ui.list(roles_to_delete.keys.sort, :columns_down))
+        ui.msg("")
+        ui.confirm("Are you sure you want to delete these roles")
+
+        roles_to_delete.sort.each do |name, role|
+          role.destroy
+          ui.msg("Deleted role #{name}")
         end
       end
     end

data/lib/chef/mixin/language.rb

@@ -143,7 +143,7 @@ class Chef
       end
 
       def data_bag(bag)
-        DataBag.validate_name!(bag)
+        DataBag.validate_name!(bag.to_s)
         rbag = DataBag.load(bag)
         rbag.keys
       rescue Exception
@@ -152,7 +152,7 @@ class Chef
       end
 
       def data_bag_item(bag, item)
-        DataBag.validate_name!(bag)
+        DataBag.validate_name!(bag.to_s)
         DataBagItem.validate_id!(item)
         DataBagItem.load(bag, item)
       rescue Exception

data/lib/chef/resource/deploy_revision.rb

@@ -24,11 +24,16 @@ class Chef
     class DeployRevision < Chef::Resource::Deploy
       def initialize(*args, &block)
         super
+        @resource_name = :deploy_revision
         @provider = Chef::Provider::Deploy::Revision
       end
     end
     
     class DeployBranch < Chef::Resource::DeployRevision
+      def initialize(*args, &block)
+        super
+        @resource_name = :deploy_branch
+      end
     end
     
   end

data/lib/chef/rest.rb

@@ -305,14 +305,11 @@ class Chef
         end
         raise Timeout::Error, "Timeout connecting to #{url.host}:#{url.port} for #{rest_request.path}, giving up"
       rescue Net::HTTPFatalError => e
-        case e.response
-        when Net::HTTPServiceUnavailable
-          if http_retry_count - http_attempts + 1 > 0
-            sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
-            Chef::Log.error("Service Unavailable for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
-            sleep(sleep_time)
-            retry
-          end
+        if http_retry_count - http_attempts + 1 > 0
+          sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
+          Chef::Log.error("Server returned error for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
+          sleep(sleep_time)
+          retry
         end
         raise
       end

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.9'
+  VERSION = '0.10.0.beta.10'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/lib/chef/version_class.rb

@@ -6,9 +6,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.
@@ -50,7 +50,7 @@ class Chef
     def eql?(other)
       other.is_a?(Version) && self == other
     end
-    
+
     private
 
     def parse(str="")
@@ -62,7 +62,7 @@ class Chef
           [ $1.to_i, $2.to_i, 0 ]
         else
           msg = "'#{str.to_s}' does not match 'x.y.z' or 'x.y'"
-          raise Chef::Exceptions::InvalidCookbookVersion.new msg
+          raise Chef::Exceptions::InvalidCookbookVersion.new( msg )
         end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: chef
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.10.0.beta.9
+  version: 0.10.0.beta.10
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -07:00
+date: 2011-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.7
+        version: 0.6.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -104,7 +104,7 @@ dependencies:
         version: 1.4.4
     - - <=
       - !ruby/object:Gem::Version 
-        version: 1.4.6
+        version: 1.5.2
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -209,6 +209,13 @@ files:
 - distro/arch/etc/rc.d/chef-server-webui
 - distro/arch/etc/rc.d/chef-solr
 - distro/arch/etc/rc.d/chef-solr-indexer
+- distro/common/html/chef-client.8.html
+- distro/common/html/chef-expander-cluster.8.html
+- distro/common/html/chef-expanderctl.8.html
+- distro/common/html/chef-server-webui.8.html
+- distro/common/html/chef-server.8.html
+- distro/common/html/chef-solo.8.html
+- distro/common/html/chef-solr.8.html
 - distro/common/html/knife-bootstrap.1.html
 - distro/common/html/knife-client.1.html
 - distro/common/html/knife-configure.1.html
@@ -245,6 +252,8 @@ files:
 - distro/common/man/man1/knife.1
 - distro/common/man/man1/shef.1
 - distro/common/man/man8/chef-client.8
+- distro/common/man/man8/chef-expander-cluster.8
+- distro/common/man/man8/chef-expanderctl.8
 - distro/common/man/man8/chef-server-webui.8
 - distro/common/man/man8/chef-server.8
 - distro/common/man/man8/chef-solo.8
@@ -266,6 +275,13 @@ files:
 - distro/common/markdown/man1/knife-tag.mkd
 - distro/common/markdown/man1/knife.mkd
 - distro/common/markdown/man1/shef.mkd
+- distro/common/markdown/man8/chef-client.mkd
+- distro/common/markdown/man8/chef-expander-cluster.mkd
+- distro/common/markdown/man8/chef-expanderctl.mkd
+- distro/common/markdown/man8/chef-server-webui.mkd
+- distro/common/markdown/man8/chef-server.mkd
+- distro/common/markdown/man8/chef-solo.mkd
+- distro/common/markdown/man8/chef-solr.mkd
 - distro/common/markdown/README
 - distro/debian/etc/default/chef-client
 - distro/debian/etc/default/chef-server