chef 0.8.16 → 0.9.0.a3

data/lib/chef/couchdb.rb

@@ -97,6 +97,7 @@ class Chef
       true
     end
 
+    # Save the object to Couch. Add to index if the object supports it.
     def store(obj_type, name, object)
       validate(
         {
@@ -109,12 +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")
-      
+      uuid = rows.empty? ? UUIDTools::UUID.random_create.to_s : rows.first.fetch("id")
+     
       db_put_response = @rest.put_rest("#{couchdb_database}/#{uuid}", object)
-      
-      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)
+
+      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

data/lib/chef/data_bag_item.rb

@@ -84,9 +84,9 @@ class Chef
     end
 
     def raw_data=(new_data)
-      raise ArgumentError, "Data Bag Items must contain a Hash or Mash!" unless new_data.kind_of?(Hash) || new_data.kind_of?(Mash)
-      raise ArgumentError, "Data Bag Items must have an id key in the hash! #{new_data.inspect}" unless new_data.has_key?("id")
-      raise ArgumentError, "Data Bag Item id does not match alphanumeric/-/_!" unless new_data["id"] =~ /^[\-[:alnum:]_]+$/
+      raise Exceptions::ValidationFailed, "Data Bag Items must contain a Hash or Mash!" unless new_data.kind_of?(Hash) || new_data.kind_of?(Mash)
+      raise Exceptions::ValidationFailed, "Data Bag Items must have an id key in the hash! #{new_data.inspect}" unless new_data.has_key?("id")
+      raise Exceptions::ValidationFailed, "Data Bag Item id does not match alphanumeric/-/_!" unless new_data["id"] =~ /^[\-[:alnum:]_]+$/
       @raw_data = new_data
     end
 
@@ -103,8 +103,8 @@ class Chef
     end
 
     def object_name
-      raise ArgumentError, "You must have an 'id' or :id key in the raw data" unless raw_data.has_key?('id')
-      raise ArgumentError, "You must have declared what bag this item belongs to!" unless data_bag
+      raise Exceptions::ValidationFailed, "You must have an 'id' or :id key in the raw data" unless raw_data.has_key?('id')
+      raise Exceptions::ValidationFailed, "You must have declared what bag this item belongs to!" unless data_bag
       
       id = raw_data['id']
       "data_bag_item_#{data_bag}_#{id}"

data/lib/chef/exceptions.rb

@@ -19,6 +19,7 @@ class Chef
   class Exceptions
     class Application < RuntimeError; end
     class Cron < RuntimeError; end
+    class Env < RuntimeError; end
     class Exec < RuntimeError; end
     class FileNotFound < RuntimeError; end  
     class Package < RuntimeError; end
@@ -42,5 +43,14 @@ class Chef
     class RedirectLimitExceeded < RuntimeError; end
     class AmbiguousRunlistSpecification < ArgumentError; end
     class CookbookNotFound < RuntimeError; end
+    class AttributeNotFound < RuntimeError; end
+    class InvalidCommandOption < RuntimeError; end
+    class CommandTimeout < RuntimeError; end
+    class ShellCommandFailed < RuntimeError; end
+    class RequestedUIDUnavailable < RuntimeError; end
+    class InvalidHomeDirectory < ArgumentError; end
+    class DsclCommandFailed < RuntimeError; end
+    class UserIDNotFound < ArgumentError; end
+    class GroupIDNotFound < ArgumentError; end
   end
 end

data/lib/chef/file_access_control.rb

@@ -0,0 +1,134 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2010 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.
+#
+class Chef
+
+  # FileAccessControl objects set the owner, group and mode of +file+ to
+  # the values specified by a value object, usually a Chef::Resource.
+  class FileAccessControl
+    UINT = (1 << 32)
+    UID_MAX = (1 << 30)
+  
+    attr_reader :resource
+  
+    attr_reader :file
+  
+    # FileAccessControl objects set the owner, group and mode of +file+ to
+    # the values specified by +resource+. +file+ is completely independent
+    # of any file or path attribute on +resource+, so it is possible to set
+    # access control settings on a tempfile (for example).
+    # === Arguments:
+    # resource:   probably a Chef::Resource::File object (or subclass), but
+    #             this is not required. Must respond to +owner+, +group+,
+    #             and +mode+
+    # file:       The file whose access control settings you wish to modify,
+    #             given as a String.
+    def initialize(resource, file)
+      @resource, @file = resource, file
+      @modified = false
+    end
+  
+    def modified?
+      @modified
+    end
+  
+    def set_all
+      set_owner
+      set_group
+      set_mode
+    end
+  
+    # 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
+    # the maximum fixnum size. For example, a uid of -2 is reported as 
+    def dimished_radix_complement(int)
+      if int > UID_MAX
+        int - UINT
+      else
+        int
+      end
+    end
+  
+    def target_uid
+      return nil if resource.owner.nil?
+      if resource.owner.kind_of?(String)
+        dimished_radix_complement( Etc.getpwnam(resource.owner).uid )
+      elsif resource.owner.kind_of?(Integer)
+        resource.owner
+      else
+        raise ArgumentError, "cannot resolve #{resource.owner.inspect} to uid, owner must be a string or integer"
+      end
+    rescue ArgumentError
+      raise Chef::Exceptions::UserIDNotFound, "cannot resolve user id for '#{resource.owner}'"
+    end
+  
+    def set_owner
+      if (uid = target_uid) && (uid != stat.uid)
+        Chef::Log.debug("setting owner on #{file} to #{uid}")
+        File.chown(uid, nil, file)
+        modified
+      end
+    end
+  
+    def target_gid
+      return nil if resource.group.nil?
+      if resource.group.kind_of?(String)
+        dimished_radix_complement( Etc.getgrnam(resource.group).gid )
+      elsif resource.group.kind_of?(Integer)
+        resource.group
+      else
+        raise ArgumentError, "cannot resolve #{resource.group.inspect} to gid, group must be a string or integer"
+      end
+    rescue ArgumentError
+      raise Chef::Exceptions::GroupIDNotFound, "cannot resolve group id for '#{resource.group}'"
+    end
+  
+    def set_group
+      if (gid = target_gid) && (gid != stat.gid)
+        Chef::Log.debug("setting group on #{file} to #{gid}")
+        File.chown(nil, gid, file)
+        modified
+      end
+    end
+
+    def target_mode
+      return nil if resource.mode.nil?
+      (resource.mode.respond_to?(:oct) ? resource.mode.oct : resource.mode.to_i) & 007777
+    end
+
+    def set_mode
+      if (mode = target_mode) && (mode != (stat.mode & 007777))
+        Chef::Log.debug("setting mode on #{file} to #{mode.to_s(8)}")
+        File.chmod(target_mode, file)
+        modified
+      end
+    end
+  
+
+    def stat
+      @stat ||= ::File.stat(file)
+    end
+  
+    private
+  
+    def modified
+      @modified = true
+    end
+  
+  end
+end

data/lib/chef/handler.rb

@@ -0,0 +1,62 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2010 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.
+#
+
+class Chef
+  class Handler
+
+    attr_accessor :config
+
+    def initialize(config={})
+      @config = config
+      @config[:path] ||= "/var/chef/reports"
+      @config
+    end
+
+    def build_report_data(node, runner, start_time, end_time, elapsed_time, exception=nil)
+      data = Hash.new
+      data[:node] = node if node
+      if runner
+        data[:resources] = {
+          :all => runner.run_context.resource_collection.all_resources,
+          :updated => runner.run_context.resource_collection.inject([]) { |m, r| m << r if r.updated; m }
+        }
+      end
+      if exception
+        data[:success] = false 
+        data[:exception] = {
+          :message => exception.message,
+          :backtrace => exception.backtrace
+        }
+      else
+        data[:success] = true
+      end
+      data[:elapsed_time] = elapsed_time 
+      data[:start_time] = start_time
+      data[:end_time] = end_time
+      data
+    end
+
+    def build_report_dir
+      unless File.exists?(config[:path])
+        FileUtils.mkdir_p(config[:path])
+        File.chmod(octal_mode("0700"), config[:path])
+      end
+    end
+
+  end
+end

data/lib/chef/handler/json_file.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2010 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/handler'
+require 'chef/resource/directory'
+
+class Chef
+  class Handler
+    class JsonFile < ::Chef::Handler
+
+      def initialize(config={})
+        super(config)
+      end
+
+      def report(node, runner, start_time, end_time, elapsed_time, exception)
+        if exception
+          Chef::Log.error("Creating JSON exception report")
+        else
+          Chef::Log.info("Creating JSON run report")
+        end
+
+        data = build_report_data(node, runner, start_time, end_time, elapsed_time, exception)
+        build_report_dir
+        savetime = Time.now.strftime("%Y%m%d%H%M%S")
+        File.open(File.join(config[:path], "chef-run-report-#{savetime}.json"), "w") do |file|
+          file.puts JSON.pretty_generate(data)
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/knife.rb

@@ -112,10 +112,20 @@ class Chef
     end
 
     def configure_chef
-      if !config[:config_file].nil? && File.exists?(config[:config_file]) && File.readable?(config[:config_file])
-        Chef::Config.from_file(config[:config_file]) 
+      unless config[:config_file]
+        full_path = Dir.pwd.split(File::SEPARATOR)
+        (full_path.length - 1).downto(0) do |i|
+          config_file_to_check = File.join([ full_path[0..i], ".chef", "knife.rb" ].flatten)
+          if File.exists?(config_file_to_check)
+            config[:config_file] = config_file_to_check 
+            break
+          end
+        end
+        config[:config_file] ||= File.join(ENV['HOME'], '.chef', 'knife.rb')
       end
 
+      Chef::Config.from_file(config[:config_file]) 
+
       Chef::Config[:log_level] = config[:log_level] if config[:log_level]
       Chef::Config[:log_location] = config[:log_location] if config[:log_location]
       Chef::Config[:node_name] = config[:node_name] if config[:node_name]
@@ -125,6 +135,8 @@ class Chef
       Chef::Log.init(Chef::Config[:log_location])
       Chef::Log.level(Chef::Config[:log_level])
 
+      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"}"
       end

data/lib/chef/knife/bootstrap.rb

@@ -0,0 +1,126 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2010 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'
+require 'json'
+require 'tempfile'
+
+class Chef
+  class Knife
+    class Bootstrap < Knife
+
+      banner "Sub-Command: knife bootstrap FQDN [RUN LIST...] (options)"
+
+      option :ssh_user,
+        :short => "-x USERNAME",
+        :long => "--ssh-user USERNAME",
+        :description => "The ssh username",
+        :default => "root" 
+
+      option :ssh_password,
+        :short => "-P PASSWORD",
+        :long => "--ssh-password PASSWORD",
+        :description => "The ssh password"
+
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The Chef node name for your new node"
+
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'highline'
+
+        server_name = @name_args[0]
+
+        puts "Bootstrapping Chef on #{h.color(server_name, :bold)}"
+
+        $stdout.sync = true
+
+        command =  <<EOH
+bash -c '
+if [ ! -f /usr/bin/chef-client ]; then
+  apt-get update
+  apt-get install -y ruby ruby1.8-dev build-essential wget libruby-extras libruby1.8-extras
+  cd /tmp
+  wget http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz
+  tar xvf rubygems-1.3.6.tgz
+  cd rubygems-1.3.6
+  ruby setup.rb
+  cp /usr/bin/gem1.8 /usr/bin/gem
+  gem install chef ohai --no-rdoc --no-ri --verbose
+fi
+
+mkdir -p /etc/chef
+
+(
+cat <<'EOP'
+#{IO.read(Chef::Config[:validation_key])}
+EOP
+) > /tmp/validation.pem
+awk NF /tmp/validation.pem > /etc/chef/validation.pem
+rm /tmp/validation.pem
+
+(
+cat <<'EOP'
+log_level        :info
+log_location     STDOUT
+chef_server_url  "#{Chef::Config[:chef_server_url]}" 
+validation_client_name "#{Chef::Config[:validation_client_name]}"
+#{config[:chef_node_name] == nil ? "# Using default node name" : "node_name \"#{config[:chef_node_name]}\""} 
+EOP
+) > /etc/chef/client.rb
+
+(
+cat <<'EOP'
+#{{ "run_list" => @name_args[1..-1] }.to_json}
+EOP
+) > /etc/chef/first-boot.json
+
+/usr/bin/chef-client -j /etc/chef/first-boot.json'
+EOH
+
+        ssh = Chef::Knife::Ssh.new
+        ssh.name_args = [ server_name, "sudo #{command}" ]
+        ssh.config[:ssh_user] = config[:ssh_user] 
+        ssh.config[:password] = config[:ssh_password]
+        ssh.config[:manual] = true
+
+        begin
+          ssh.run
+        rescue Net::SSH::AuthenticationFailed
+          unless config[:ssh_password]
+            puts "Failed to authenticate #{config[:ssh_user]} - trying password auth"
+            ssh = Chef::Knife::Ssh.new
+            ssh.name_args = [ server_name, "sudo #{command}" ]
+            ssh.config[:ssh_user] = config[:ssh_user] 
+            ssh.config[:manual] = true
+            ssh.config[:password] = ssh.get_password
+            ssh.run
+          end
+        end
+
+      end
+    end
+  end
+end
+