chef 0.8.4 → 0.8.6

data/lib/chef.rb

@@ -27,7 +27,7 @@ require 'chef/config'
 Dir[File.join(File.dirname(__FILE__), 'chef/mixin/**/*.rb')].sort.each { |lib| require lib }
 
 class Chef
-  VERSION = '0.8.4'
+  VERSION = '0.8.6'
 end
 
 # Adds a Dir.glob to Ruby 1.8.5, for compat

data/lib/chef/exceptions.rb

@@ -35,5 +35,6 @@ class Chef
     class CouchDBNotFound < RuntimeError; end
     class PrivateKeyMissing < RuntimeError; end
     class CannotWritePrivateKey < RuntimeError; end
+    class RoleNotFound < RuntimeError; end
   end
 end

data/lib/chef/knife/client_show.rb

@@ -27,8 +27,8 @@ class Chef
       banner "Sub-Command: client show CLIENT (options)"
 
       option :attribute,
-        :short => "-a [ATTR]",
-        :long => "--attribute [ATTR]",
+        :short => "-a ATTR",
+        :long => "--attribute ATTR",
         :description => "Show only one attribute"
 
       def run 

data/lib/chef/knife/cookbook_upload.rb

@@ -25,7 +25,7 @@ class Chef
   class Knife
     class CookbookUpload < Knife
 
-      banner "Sub-Command: cookbook upload COOKBOOK (options)"
+      banner "Sub-Command: cookbook upload [COOKBOOKS...] (options)"
 
       option :cookbook_path,
         :short => "-o PATH:PATH",
@@ -52,17 +52,20 @@ class Chef
             upload_cookbook(cookbook.name.to_s)
           end
         else
-          upload_cookbook(@name_args[0]) 
+          @name_args.each do |cb|
+            Chef::Log.info("** #{cb} **")
+            upload_cookbook(cb)
+          end
         end
       end
-
+      
       def test_ruby(cookbook_dir)
         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}")
         end
       end
-
+      
       def test_templates(cookbook_dir)
         Dir[File.join(cookbook_dir, '**', '*.erb')].each do |erb_file|
           Chef::Log.info("Testing template #{erb_file} for syntax errors...")
@@ -166,7 +169,7 @@ class Chef
         Chef::Log.debug("Removing local staging directory at #{tmp_cookbook_dir}")
         FileUtils.rm_rf tmp_cookbook_dir
       end
-
+      
     end
   end
 end

data/lib/chef/knife/node_run_list_add.rb

@@ -27,8 +27,8 @@ class Chef
       banner "Sub-Command: node run_list add [NODE] [ENTRY] (options)"
 
       option :after,
-        :short => "-a [ITEM]",
-        :long  => "--after [ITEM]",
+        :short => "-a ITEM",
+        :long  => "--after ITEM",
         :description => "Place the ENTRY in the run list after ITEM"
 
       def run 

data/lib/chef/knife/role_show.rb

@@ -27,8 +27,8 @@ class Chef
       banner "Sub-Command: role show ROLE (options)"
 
       option :attribute,
-        :short => "-a [ATTR]",
-        :long => "--attribute [ATTR]",
+        :short => "-a ATTR",
+        :long => "--attribute ATTR",
         :description => "Show only one attribute"
 
       def run 

data/lib/chef/knife/search.rb

@@ -46,8 +46,8 @@ class Chef
         :proc => lambda { |i| i.to_i }
 
       option :attribute,
-        :short => "-a [ATTR]",
-        :long => "--attribute [ATTR]",
+        :short => "-a ATTR",
+        :long => "--attribute ATTR",
         :description => "Show only one attribute"
 
       option :run_list,

data/lib/chef/mixin/command.rb

@@ -171,7 +171,7 @@ class Chef
           if status.exitstatus != args[:returns]
             # if the log level is not debug, through output of command when we fail
             output = ""
-            if Chef::Log.logger.level > 0
+            if Chef::Log.level == :debug
               output << "\n---- Begin output of #{args[:command]} ----\n"
               output << "#{command_output}"
               output << "---- End output of #{args[:command]} ----\n"

data/lib/chef/platform.rb

@@ -67,7 +67,15 @@ class Chef
           :mdadm => Chef::Provider::Mdadm
         }
       },
-       :suse   => {
+      :fedora   => {
+        :default => {
+          :service => Chef::Provider::Service::Redhat,
+          :cron => Chef::Provider::Cron,
+          :package => Chef::Provider::Package::Yum,
+          :mdadm => Chef::Provider::Mdadm
+        }
+      },
+      :suse     => {
         :default => {
           :service => Chef::Provider::Service::Redhat,
           :cron => Chef::Provider::Cron,

data/lib/chef/provider/deploy/revision.rb

@@ -28,7 +28,7 @@ class Chef
         protected
         
         def release_created(release)
-          sorted_releases { |r| r << release }
+          sorted_releases {|r| r.delete(release); r << release }
         end
         
         def release_deleted(release)

data/lib/chef/resource/user.rb

@@ -72,6 +72,8 @@ class Chef
         )
       end
       
+      alias_method :group, :gid
+      
       def home(arg=nil)
         set_or_return(
           :home,

data/lib/chef/rest.rb

@@ -40,10 +40,11 @@ class Chef
     
     attr_accessor :url, :cookies, :client_name, :signing_key, :signing_key_filename, :sign_on_redirect, :sign_request
     
-    def initialize(url, client_name=Chef::Config[:node_name], signing_key_filename=Chef::Config[:client_key])
+    def initialize(url, client_name=Chef::Config[:node_name], signing_key_filename=Chef::Config[:client_key], options={})
       @url = url
       @cookies = CookieJar.instance
       @client_name = client_name
+      @default_headers = options[:headers] || {}
       if signing_key_filename
         @signing_key_filename = signing_key_filename
         @signing_key = load_signing_key(signing_key_filename) 
@@ -177,7 +178,9 @@ class Chef
       end
 
       http.read_timeout = Chef::Config[:rest_timeout]
-
+      
+      headers = @default_headers.merge(headers)
+      
       unless raw
         headers = headers.merge({ 
           'Accept' => "application/json",

data/lib/chef/run_list.rb

@@ -116,7 +116,7 @@ class Chef
       self
     end
 
-    def expand(from='server', couchdb=nil)
+    def expand(from='server', couchdb=nil, rest=nil)
       couchdb = couchdb ? couchdb : Chef::CouchDB.new
       recipes = Array.new
       default_attrs = Mash.new
@@ -128,21 +128,29 @@ class Chef
         when 'recipe'
           recipes << name unless recipes.include?(name)
         when 'role'
-          role = nil
-          next if @seen_roles.include?(name)
-          if from == 'disk' || Chef::Config[:solo]
-            # Load the role from disk
-            role = Chef::Role.from_disk("#{name}")
-          elsif from == 'server'
-            # Load the role from the server
-            r = Chef::REST.new(Chef::Config[:role_url])
-            role = r.get_rest("roles/#{name}")
-          elsif from == 'couchdb'
-            # Load the role from couchdb
-            role = Chef::Role.cdb_load(name, couchdb)
-          end
-          @seen_roles << name
-          rec, d, o = role.run_list.expand(from)
+          role = begin
+                   next if @seen_roles.include?(name)
+                   @seen_roles << name
+                   if from == 'disk' || Chef::Config[:solo]
+                     # Load the role from disk
+                     Chef::Role.from_disk("#{name}") || Chef::Exceptions::RoleNotFound
+                   elsif from == 'server'
+                     # Load the role from the server
+                     begin
+                       (rest || Chef::REST.new(Chef::Config[:role_url])).get_rest("roles/#{name}") 
+                     rescue Net::HTTPServerException
+                       raise Chef::Exceptions::RoleNotFound if $!.message == '404 "Not Found"'
+                       raise
+                     end
+                   elsif from == 'couchdb'
+                     # Load the role from couchdb
+                     Chef::Role.cdb_load(name, couchdb) rescue Chef::Exceptions::CouchDBNotFound raise(Chef::Exceptions::RoleNotFound)
+                   end
+                 rescue Chef::Exceptions::RoleNotFound
+                   Chef::Log.error("Role #{name} is in the runlist but does not exist. Skipping expand.")
+                   next
+                 end
+          rec, d, o = role.run_list.expand(from, couchdb, rest)
           rec.each { |r| recipes <<  r unless recipes.include?(r) }
           default_attrs = Chef::Mixin::DeepMerge.merge(default_attrs, Chef::Mixin::DeepMerge.merge(role.default_attributes,d))
           override_attrs = Chef::Mixin::DeepMerge.merge(override_attrs, Chef::Mixin::DeepMerge.merge(role.override_attributes, o))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -08:00
+date: 2010-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,9 +82,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -150,7 +150,7 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: ruby-hmac
+  name: moneta
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
@@ -161,18 +161,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: moneta
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id012
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: adam@opscode.com
 executables: