chef 0.9.10.rc.1 → 0.9.10.rc.2

data/lib/chef/knife/bootstrap.rb

@@ -109,49 +109,64 @@ class Chef
         context = {}
         context[:run_list] = config[:run_list]
         context[:config] = config
-        command = Erubis::Eruby.new(template).evaluate(context)
+        Erubis::Eruby.new(template).evaluate(context)
       end
 
       def run 
         require 'highline'
 
-        if @name_args.first == nil
-          Chef::Log.error("Must pass an FQDN or ip to bootstrap")
-          exit 1
-        end
-
-        config[:server_name] = Array(@name_args).first
+        validate_name_args!
 
         $stdout.sync = true
 
-        command = render_template(load_template(config[:bootstrap_template]))
+        Chef::Log.info("Bootstrapping Chef on #{h.color(config[:server_name], :bold)}")
 
-        if config[:use_sudo]
-          command = "sudo #{command}"
+        begin
+          knife_ssh.run
+        rescue Net::SSH::AuthenticationFailed
+          unless config[:ssh_password]
+            puts "Failed to authenticate #{config[:ssh_user]} - trying password auth"
+            knife_ssh_with_password_auth.run
+          end
         end
+      end
 
-        Chef::Log.info("Bootstrapping Chef on #{h.color(config[:server_name], :bold)}")
+      def validate_name_args!
+        if Array(@name_args).first.nil?
+          Chef::Log.error("Must pass an FQDN or ip to bootstrap")
+          exit 1
+        end
+      end
 
+      def server_name
+        Array(@name_args).first
+      end
+
+      def knife_ssh
         ssh = Chef::Knife::Ssh.new
-        ssh.name_args = [ config[:server_name], command ]
+        ssh.name_args = [ server_name, ssh_command ]
         ssh.config[:ssh_user] = config[:ssh_user] 
-        ssh.config[:password] = config[:ssh_password]
+        ssh.config[:ssh_password] = config[:ssh_password]
         ssh.config[:identity_file] = config[:identity_file]
         ssh.config[:manual] = true
+        ssh
+      end
 
-        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 = [ config[:server_name], command ]
-            ssh.config[:ssh_user] = config[:ssh_user] 
-            ssh.config[:manual] = true
-            ssh.config[:password] = ssh.get_password
-            ssh.run
-          end
+      def knife_ssh_with_password_auth
+        ssh = knife_ssh
+        ssh.config[:identity_file] = nil
+        ssh.config[:ssh_password] = ssh.get_password
+        ssh
+      end
+
+      def ssh_command
+        command = render_template(load_template(config[:bootstrap_template]))
+
+        if config[:use_sudo]
+          command = "sudo #{command}"
         end
+
+        command
       end
 
     end

data/lib/chef/knife/rackspace_server_create.rb

@@ -144,7 +144,7 @@ EOH
         ssh.name_args = [ server.addresses["public"][0], "/bin/bash /etc/install-chef && /usr/bin/chef-client -j /etc/chef/first-boot.json" ]
         ssh.config[:ssh_user] = "root"
         ssh.config[:manual] = true
-        ssh.config[:password] = saved_password
+        ssh.config[:ssh_password] = saved_password
         ssh.password = saved_password
         ssh.run
 

data/lib/chef/node/attribute.rb

@@ -364,6 +364,10 @@ class Chef
         data_hash
       end
 
+      def auto_vivifiy_on_read?
+        auto_vivifiy_on_read
+      end
+
       def auto_vivifiy(data_hash, key)
         if data_hash.has_key?(key)
           unless data_hash[key].respond_to?(:has_key?)
@@ -417,6 +421,9 @@ class Chef
             self[symbol]
           elsif key?(symbol.to_s)
             self[symbol.to_s]
+          elsif auto_vivifiy_on_read?
+            self[symbol] = Mash.new
+            self[symbol]
           else
             raise ArgumentError, "Attribute #{symbol} is not defined!" unless auto_vivifiy_on_read
           end

data/lib/chef/version.rb

@@ -17,5 +17,5 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.9.10.rc.1'
+  VERSION = '0.9.10.rc.2'
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 9
   - 10
   - rc
-  - 1
-  version: 0.9.10.rc.1
+  - 2
+  version: 0.9.10.rc.2
 platform: ruby
 authors: 
 - Adam Jacob
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency