chef 0.8.10 → 0.8.14

data/bin/chef-client

@@ -18,9 +18,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-
 require 'rubygems'
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require 'chef'
 require 'chef/application/client'
 
 Chef::Application::Client.new.run

data/bin/chef-solo

@@ -18,9 +18,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-
 require 'rubygems'
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'chef/application/solo'
 
 Chef::Application::Solo.new.run

data/bin/knife

@@ -18,9 +18,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
-
 require 'rubygems'
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 require 'chef/application/knife'
 
 Chef::Application::Knife.new.run

data/bin/shef

@@ -26,11 +26,8 @@ require "irb"
 require "irb/completion"
 
 # TODO::EVIL
-begin
-  require "#{File.dirname(__FILE__)}/../lib/chef"
-rescue LoadError
-  # the bin got moved, e.g., by rubygems
-end
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+
 require "chef/shef"
 
 # dirty hack to make IRB initialize shef

data/lib/chef.rb

@@ -16,22 +16,25 @@
 # limitations under the License.
 #
 
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'rubygems'
 require 'extlib'
 require 'chef/exceptions'
 require 'chef/log'
 require 'chef/config'
-Dir[File.join(File.dirname(__FILE__), 'chef/mixin/**/*.rb')].sort.each { |lib| require lib }
+require 'chef/providers'
+require 'chef/resources'
+
+require 'chef/compile'
+require 'chef/daemon'
+require 'chef/runner'
+require 'chef/webui_user'
+require 'chef/openid_registration'
 
 class Chef
-  VERSION = '0.8.10'
+  VERSION = "0.8.14"
 end
 
 # Adds a Dir.glob to Ruby 1.8.5, for compat
-if RUBY_VERSION < "1.8.6" 
+if RUBY_VERSION < "1.8.6" || RUBY_PLATFORM =~ /mswin|mingw32|windows/
   class Dir 
     class << self 
       alias_method :glob_, :glob 
@@ -41,6 +44,7 @@ if RUBY_VERSION < "1.8.6"
             pattern.is_a? Array and !pattern.empty?
           ) or pattern.is_a? String
         )
+        pattern.gsub!(/\\/, "/") if RUBY_PLATFORM =~ /mswin|mingw32|windows/
         [pattern].flatten.inject([]) { |r, p| r + glob_(p, flags) }
       end
       alias_method :[], :glob 

data/lib/chef/application.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.
@@ -22,10 +22,10 @@ require 'mixlib/cli'
 
 class Chef::Application
   include Mixlib::CLI
-   
-  def initialize   
+
+  def initialize
     super
-    
+
     trap("TERM") do
       Chef::Application.fatal!("SIGTERM received, stopping", 1)
     end
@@ -33,23 +33,28 @@ class Chef::Application
     trap("INT") do
       Chef::Application.fatal!("SIGINT received, stopping", 2)
     end
-    
-    trap("HUP") do 
-      Chef::Log.info("SIGHUP received, reconfiguring")
-      reconfigure
+
+    unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
+      trap("HUP") do
+        Chef::Log.info("SIGHUP received, reconfiguring")
+        reconfigure
+      end
     end
-    
+
     at_exit do
-      # tear down the logger 
-    end  
+      # tear down the logger
+    end
+
+    # Always switch to a readable directory. Keeps subsequent Dir.chdir() {}
+    # from failing due to permissions when launched as a less privileged user.
   end
-  
+
   # Reconfigure the application. You'll want to override and super this method.
   def reconfigure
     configure_chef
     configure_logging
   end
-  
+
   # Get this party started
   def run
     reconfigure
@@ -60,25 +65,25 @@ class Chef::Application
   # Parse the configuration file
   def configure_chef
     parse_options
-    
+
     Chef::Config.from_file(config[:config_file]) if !config[:config_file].nil? && File.exists?(config[:config_file]) && File.readable?(config[:config_file])
     Chef::Config.merge!(config)
   end
-  
+
   # Initialize and configure the logger
   def configure_logging
     Chef::Log.init(Chef::Config[:log_location])
     Chef::Log.level = Chef::Config[:log_level]
   end
-  
+
   # Called prior to starting the application, by the run method
   def setup_application
-    raise Chef::Exceptions::Application, "#{self.to_s}: you must override setup_application"      
+    raise Chef::Exceptions::Application, "#{self.to_s}: you must override setup_application"
   end
-  
+
   # Actually run the application
   def run_application
-    raise Chef::Exceptions::Application, "#{self.to_s}: you must override run_application"  
+    raise Chef::Exceptions::Application, "#{self.to_s}: you must override run_application"
   end
 
   class << self

data/lib/chef/application/client.rb

@@ -113,12 +113,18 @@ class Chef::Application::Client < Chef::Application
     :description => "The chef server URL",
     :proc => nil
 
-  option :validation_token,
-    :short => "-t TOKEN",
-    :long => "--token TOKEN",
-    :description => "Set the openid validation token",
-    :proc => nil
-  
+  option :validation_key,
+    :short        => "-K KEY_FILE",
+    :long         => "--validation_key KEY_FILE",
+    :description  => "Set the validation key file location, used for registering new clients",
+    :proc         => nil
+
+  option :client_key,
+    :short        => "-k KEY_FILE",
+    :long         => "--client_key KEY_FILE",
+    :description  => "Set the client key file location",
+    :proc         => nil
+
   option :version,
     :short        => "-v",
     :long         => "--version",
@@ -185,7 +191,6 @@ class Chef::Application::Client < Chef::Application
 
     @chef_client = Chef::Client.new
     @chef_client.json_attribs = @chef_client_json
-    @chef_client.validation_token = Chef::Config[:validation_token]
     @chef_client.node_name = Chef::Config[:node_name]   
   end
   

data/lib/chef/application/knife.rb

@@ -94,7 +94,13 @@ class Chef::Application::Knife < Chef::Application
     :short => "-p",
     :long => "--print-after",
     :description => "Show the data after a destructive operation"
-  
+
+  option :format,
+    :short => "-f FORMAT",
+    :long => "--format FORMAT",
+    :description => "Which format to use for output",
+    :default => "json"
+
   option :version,
     :short        => "-v",
     :long         => "--version",

data/lib/chef/application/solo.rb

@@ -158,7 +158,7 @@ class Chef::Application::Solo < Chef::Application
     end
     
     if Chef::Config[:recipe_url]
-      cookbooks_path = Chef::Config[:cookbook_path].detect{|e| e =~ /\/cookbooks\/*$/ }
+      cookbooks_path = Array(Chef::Config[:cookbook_path]).detect{|e| e =~ /\/cookbooks\/*$/ }
       recipes_path = File.expand_path(File.join(cookbooks_path, '..'))
       target_file = File.join(recipes_path, 'recipes.tgz')
 

data/lib/chef/applications.rb

@@ -0,0 +1,4 @@
+require 'chef/application/agent'
+require 'chef/application/client'
+require 'chef/application/knife'
+require 'chef/application/solo'

data/lib/chef/cache/checksum.rb

@@ -28,8 +28,9 @@ class Chef
         instance.checksum_for_file(*args)
       end
       
-      def checksum_for_file(file)
-        key, fstat = filename_to_key(file), File.stat(file)
+      def checksum_for_file(file, key=nil)
+        key ||= generate_key(file)
+        fstat = File.stat(file)
         lookup_checksum(key, fstat) || generate_checksum(key, file, fstat)
       end
       
@@ -48,6 +49,10 @@ class Chef
         checksum
       end
       
+      def generate_key(file, group="chef")
+        "#{group}-file-#{file.gsub(/(#{File::SEPARATOR}|\.)/, '-')}"
+      end
+
       private
       
       def file_unchanged?(cached, fstat)
@@ -59,10 +64,6 @@ class Chef
         IO.foreach(file) {|line| digest.update(line) }
         digest.hexdigest
       end
-      
-      def filename_to_key(file)
-        "chef-file-#{file.gsub(/(#{File::SEPARATOR}|\.)/, '-')}"
-      end
 
     end
   end

data/lib/chef/certificate.rb

@@ -128,11 +128,11 @@ class Chef
         return client_cert.public_key, client_keypair
       end
 
-      def gen_validation_key(name=Chef::Config[:validation_client_name], key_file=Chef::Config[:validation_key])
+      def gen_validation_key(name=Chef::Config[:validation_client_name], key_file=Chef::Config[:validation_key], admin=false)
         # Create the validation key
         api_client = Chef::ApiClient.new
         api_client.name(name)
-        api_client.admin(true)
+        api_client.admin(admin)
         
         begin
           # If both the couch record and file exist, don't do anything. Otherwise,

data/lib/chef/client.rb

@@ -37,12 +37,11 @@ class Chef
     include Chef::Mixin::GenerateURL
     include Chef::Mixin::Checksum
     
-    attr_accessor :node, :registration, :json_attribs, :validation_token, :node_name, :ohai, :rest
+    attr_accessor :node, :registration, :json_attribs, :node_name, :ohai, :rest
     
     # Creates a new Chef::Client.
     def initialize()
       @node = nil
-      @validation_token = nil
       @registration = nil
       @json_attribs = nil
       @node_name = nil
@@ -85,7 +84,6 @@ class Chef
       build_node(@node_name)
       save_node
       sync_cookbooks
-      save_node
       converge
       save_node
       
@@ -274,7 +272,7 @@ class Chef
       Chef::FileCache.list.each do |cache_file|
         if cache_file =~ /^cookbooks\/(.+?)\//
           unless cookbook_hash.has_key?($1)
-            Chef::Log.info("Removing #{cache_file} from the cache; it's cookbook is no longer needed on this client.")
+            Chef::Log.info("Removing #{cache_file} from the cache; its cookbook is no longer needed on this client.")
             Chef::FileCache.delete(cache_file) 
           end
         end
@@ -312,6 +310,22 @@ class Chef
       Chef::Log.debug("Compiling recipes for node #{@node_name}")
       unless solo
         Chef::Config[:cookbook_path] = File.join(Chef::Config[:file_cache_path], "cookbooks")
+        Chef::Log.warn("Node #{@node_name} has an empty run list.") if @node.run_list.empty?
+      else
+        # Check for cookbooks in the path given
+        # Chef::Config[:cookbook_path] can be a string or an array
+        # if it's an array, go through it and check each one, raise error at the last one if no files are found
+        Chef::Log.fatal "BUGBUG: cookbook_path: #{Chef::Config[:cookbook_path]}"
+        Array(Chef::Config[:cookbook_path]).each_with_index do |cookbook_path, index|
+          if directory_not_empty?(cookbook_path)
+            Chef::Log.fatal "BUGBUG: cb path not empty: #{cookbook_path}"
+            break
+          else
+            msg = "No cookbook found in #{Chef::Config[:cookbook_path].inspect}, make sure cookboook_path is set correctly."
+            Chef::Log.fatal(msg)
+            raise Chef::Exceptions::CookbookNotFound, msg if is_last_element?(index, Chef::Config[:cookbook_path])
+          end
+        end
       end
       compile = Chef::Compile.new(@node)
       
@@ -319,6 +333,16 @@ class Chef
       Chef::Runner.new(@node, compile.collection, compile.definitions, compile.cookbook_loader).converge
       true
     end
+    
+    private
+    
+    def directory_not_empty?(path)
+      File.exists?(path) && (Dir.entries(path).size > 2)
+    end
+    
+    def is_last_element?(index, object)
+      object.kind_of?(Array) ? index == object.size - 1 : true 
+    end  
 
   end
 end

data/lib/chef/config.rb

@@ -143,15 +143,14 @@ class Chef
     search_url "http://localhost:4000"
     solo  false
     splay nil
-    ssl_client_cert ""
-    ssl_client_key ""
+    ssl_client_cert nil
+    ssl_client_key nil
     ssl_verify_mode :verify_none
     ssl_ca_path nil
     ssl_ca_file nil
     template_url "http://localhost:4000"
     umask 0022
     user nil
-    validation_token nil
     role_path "/var/chef/roles"
     role_url "http://localhost:4000"
     recipe_url nil
@@ -197,5 +196,7 @@ class Chef
     cache_type "BasicFile"
     cache_options({ :path => "/var/chef/cache/checksums", :skip_expires => true })
 
+    # Arbitrary knife configuration data
+    knife Hash.new
   end
 end

data/lib/chef/cookbook_loader.rb

@@ -114,7 +114,12 @@ class Chef
         @cookbook[cookbook].provider_files = cookbook_settings[cookbook][:provider_files].values
         @metadata[cookbook] = Chef::Cookbook::Metadata.new(@cookbook[cookbook])
         cookbook_settings[cookbook][:metadata_files].each do |meta_json|
-          @metadata[cookbook].from_json(IO.read(meta_json))
+          begin
+            @metadata[cookbook].from_json(IO.read(meta_json))
+          rescue JSON::ParserError
+            puts "Couldn't parse JSON in " + meta_json
+            raise
+          end
         end
       end
     end

data/lib/chef/daemon.rb

@@ -121,6 +121,8 @@ class Chef
       # Change process user/group to those specified in Chef::Config
       #
       def change_privilege
+        Dir.chdir("/")
+
         if Chef::Config[:user] and Chef::Config[:group]
           Chef::Log.info("About to change privilege to #{Chef::Config[:user]}:#{Chef::Config[:group]}")
           _change_privilege(Chef::Config[:user], Chef::Config[:group])

data/lib/chef/data_bag_item.rb

@@ -22,7 +22,8 @@ require 'chef/config'
 require 'chef/mixin/params_validate'
 require 'chef/mixin/from_file'
 require 'chef/couchdb'
-require 'chef/data_bag_item'
+require 'chef/index_queue'
+require 'chef/data_bag'
 require 'extlib'
 require 'json'
 

data/lib/chef/exceptions.rb

@@ -37,5 +37,10 @@ class Chef
     class CannotWritePrivateKey < RuntimeError; end
     class RoleNotFound < RuntimeError; end
     class ValidationFailed < ArgumentError; end
+    class InvalidPrivateKey < ArgumentError; end
+    class ConfigurationError < ArgumentError; end
+    class RedirectLimitExceeded < RuntimeError; end
+    class AmbiguousRunlistSpecification < ArgumentError; end
+    class CookbookNotFound < RuntimeError; end
   end
 end

data/lib/chef/file_cache.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.
@@ -26,7 +26,7 @@ class Chef
     class << self
       include Chef::Mixin::ParamsValidate
       include Chef::Mixin::CreatePath
-      
+
       # Write a file to the File Cache.
       #
       # === Parameters
@@ -47,7 +47,7 @@ class Chef
             :contents => { :kind_of => String },
           }
         )
-      
+
         file_path_array = File.split(path)
         file_name = file_path_array.pop
         cache_path = create_cache_path(File.join(file_path_array))
@@ -56,7 +56,7 @@ class Chef
         io.close
         true
       end
-      
+
       # Move a file in to the cache.  Useful with the REST raw file output.
       #
       # === Parameteres
@@ -73,19 +73,19 @@ class Chef
             :path => { :kind_of => String },
           }
         )
-        
+
         file_path_array = File.split(path)
         file_name = file_path_array.pop
         if File.exists?(file) && File.writable?(file)
           FileUtils.mv(
-            file, 
+            file,
             File.join(create_cache_path(File.join(file_path_array), true), file_name)
           )
         else
           raise RuntimeError, "Cannot move #{file} to #{path}!"
         end
       end
-    
+
       # Read a file from the File Cache
       #
       # === Parameters
@@ -116,7 +116,7 @@ class Chef
           cache_path
         end
       end
-      
+
       # Delete a file from the File Cache
       #
       # === Parameters
@@ -140,7 +140,7 @@ class Chef
         end
         true
       end
-      
+
       # List all the files in the Cache
       #
       # === Returns
@@ -149,19 +149,19 @@ class Chef
         keys = Array.new
         Dir[File.join(Chef::Config[:file_cache_path], '**', '*')].each do |f|
           if File.file?(f)
-            path = f.match("^#{Chef::Config[:file_cache_path]}\/(.+)")[1]
+            path = f.match("^#{Dir[Chef::Config[:file_cache_path]].first}\/(.+)")[1]
             keys << path
           end
         end
         keys
       end
-      
+
       # Whether or not this file exists in the Cache
       #
       # === Parameters
-      # path:: The path to the file you want to check - is relative 
+      # path:: The path to the file you want to check - is relative
       #   to Chef::Config[:file_cache_path]
-      # 
+      #
       # === Returns
       # True:: If the file exists
       # False:: If it does not
@@ -181,25 +181,25 @@ class Chef
           false
         end
       end
-      
+
       # Create a full path to a given file in the cache. By default,
       # also creates the path if it does not exist.
       #
       # === Parameters
       # path:: The path to create, relative to Chef::Config[:file_cache_path]
       # create_if_missing:: True by default - whether to create the path if it does not exist
-      # 
+      #
       # === Returns
       # String:: The fully expanded path
       def create_cache_path(path, create_if_missing=true)
         cache_dir = File.expand_path(File.join(Chef::Config[:file_cache_path], path))
         if create_if_missing
-          create_path(cache_dir) 
+          create_path(cache_dir)
         else
           cache_dir
         end
       end
-  
+
     end
   end
 end