chef 0.9.0.a90 → 0.9.0.a91

data/lib/chef/config.rb

@@ -42,6 +42,9 @@ class Chef
       newkey
     end
 
+    def self.inspect
+      configuration.inspect
+    end
 
     # Override the config dispatch to set the value of multiple server options simultaneously
     # 

data/lib/chef/knife/configure.rb

@@ -113,13 +113,17 @@ EOH
       end
 
       def ask_user_for_config
-        @chef_server            = config[:chef_server_url] || ask_question("Your chef server URL? ", :default => 'http://localhost:4000')
-        @new_client_name        = config[:node_name] || ask_question("Select a user name for your new client: ", :default => Etc.getlogin)
-        @admin_client_name      = config[:admin_client_name] || ask_question("Your existing admin client user name? ", :default => 'chef-webui')
-        @admin_client_key       = config[:admin_client_key] || ask_question("The location of your existing admin key? ", :default => '/etc/chef/webui.pem')
-        @validation_client_name = config[:validation_client_name] || ask_question("Your validation client user name? ", :default => 'chef-validator')
-        @validation_key         = config[:validation_key] || ask_question("The location of your validation key? ", :default => '/etc/chef/validation.pem')
-        @chef_repo              = config[:repository] || ask_question("Path to a chef repository (or leave blank)? ")
+        @chef_server            = config[:chef_server_url] || ask_question("Please enter the chef server URL: ", :default => 'http://localhost:4000')
+        if config[:initial]
+          @new_client_name        = config[:node_name] || ask_question("Please enter a clientname for the new client: ", :default => Etc.getlogin)
+          @admin_client_name      = config[:admin_client_name] || ask_question("Please enter the existing admin clientname: ", :default => 'chef-webui')
+          @admin_client_key       = config[:admin_client_key] || ask_question("Please enter the location of the existing admin client's private key: ", :default => '/etc/chef/webui.pem')
+        else
+          @new_client_name        = config[:node_name] || ask_question("Please enter an existing username or clientname for the API: ", :default => Etc.getlogin)
+        end
+        @validation_client_name = config[:validation_client_name] || ask_question("Please enter the validation clientname: ", :default => 'chef-validator')
+        @validation_key         = config[:validation_key] || ask_question("Please enter the location of the validation key: ", :default => '/etc/chef/validation.pem')
+        @chef_repo              = config[:repository] || ask_question("Please enter the path to a chef repository (or leave blank): ")
 
         @new_client_key = config[:client_key] || File.join(chef_config_path, "#{@new_client_name}.pem")
       end

data/lib/chef/knife/cookbook_upload.rb

@@ -208,10 +208,10 @@ class Chef
         result = shell_out("sh -c 'erubis -x #{erb_file} | ruby -c'")
         result.error!
       rescue Chef::Exceptions::ShellCommandFailed
-        file_relative_path = erb_file[/^#{Regexp.escape(cookbook_dir)}#{File::Separator}(.*)/, 1]
+        file_relative_path = erb_file[/^#{Regexp.escape(cookbook_dir+File::Separator)}(.*)/, 1]
         Chef::Log.fatal("Erb template #{file_relative_path} has a syntax error:")
         result.stderr.each_line { |l| Chef::Log.fatal(l.chomp) }
-        exit
+        exit(1)
       end
 
       def test_ruby_file(cookbook_dir, ruby_file)
@@ -219,10 +219,10 @@ class Chef
         result = shell_out("ruby -c #{ruby_file}")
         result.error!
       rescue Chef::Exceptions::ShellCommandFailed
-        file_relative_path = ruby_file[/^#{Regexp.escape(cookbook_dir)}#{File::Separator}(.*)/, 1]
+        file_relative_path = ruby_file[/^#{Regexp.escape(cookbook_dir+File::Separator)}(.*)/, 1]
         Chef::Log.fatal("Cookbook file #{file_relative_path} has a syntax error:")
         result.stderr.each_line { |l| Chef::Log.fatal(l.chomp) }
-        exit
+        exit(1)
       end
       
     end

data/lib/chef/mixin/deprecation.rb

@@ -0,0 +1,65 @@
+#
+# Author:: Daniel DeLeo (<dan@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
+  module Mixin
+    module Deprecation
+      class DeprecatedObjectProxyBase
+        KEEPERS = %w{__id__ __send__ instance_eval == equal? initialize object_id}
+        instance_methods.each { |method_name| undef_method(method_name) unless KEEPERS.include?(method_name.to_s)}
+      end
+
+      class DeprecatedInstanceVariable < DeprecatedObjectProxyBase
+        def initialize(target, ivar_name, level=nil)
+          @target, @ivar_name = target, ivar_name
+          @level ||= :warn
+        end
+
+        def method_missing(method_name, *args, &block)
+          log_deprecation_msg(caller[0..3])
+          @target.send(method_name, *args, &block)
+        end
+
+        def inspect
+          @target.inspect
+        end
+
+        private
+
+        def log_deprecation_msg(*called_from)
+          called_from = called_from.flatten
+          log("Accessing #{@ivar_name} by the variable @#{@ivar_name} is deprecated. Support will be removed in a future release.")
+          log("Please update your cookbooks to use #{@ivar_name} in place of @#{@ivar_name}. Accessed from:")
+          called_from.each {|l| log(l)}
+        end
+
+        def log(msg)
+          # WTF: I don't get the log prefix (i.e., "[timestamp] LEVEL:") if I
+          # send to Chef::Log. No one but me should use method_missing, ever.
+          Chef::Log.logger.send(@level, msg)
+        end
+
+      end
+
+      def deprecated_ivar(obj, name, level=nil)
+        DeprecatedInstanceVariable.new(obj, name, level)
+      end
+
+    end
+  end
+end

data/lib/chef/provider/package/rubygems.rb

@@ -149,7 +149,9 @@ class Chef
           # Other options are passed to Gem::DependencyInstaller.new
           def install(gem_dependency, options={})
             with_gem_sources(*options.delete(:sources)) do
-              dependency_installer(options).install(gem_dependency)
+              with_correct_verbosity do
+                dependency_installer(options).install(gem_dependency)
+              end
             end
           end
 
@@ -161,7 +163,17 @@ class Chef
           # Options are passed to Gem::Uninstaller.new
           def uninstall(gem_name, gem_version=nil, opts={})
             gem_version ? opts[:version] = gem_version : opts[:all] = true
-            uninstaller(gem_name, opts).uninstall
+            with_correct_verbosity do
+              uninstaller(gem_name, opts).uninstall
+            end
+          end
+
+          ##
+          # Set rubygems' user interaction to ConsoleUI or SilentUI depending
+          # on our current debug level
+          def with_correct_verbosity
+            Gem::DefaultUserInteraction.ui = Chef::Log.debug? ? Gem::ConsoleUI.new : Gem::SilentUI.new
+            yield
           end
 
           def dependency_installer(opts={})

data/lib/chef/recipe.rb

@@ -23,6 +23,8 @@ require 'chef/mixin/from_file'
 require 'chef/mixin/language'
 require 'chef/mixin/language_include_recipe'
 
+require 'chef/mixin/deprecation'
+
 class Chef
   class Recipe
     
@@ -30,6 +32,7 @@ class Chef
     include Chef::Mixin::Language
     include Chef::Mixin::LanguageIncludeRecipe
     include Chef::Mixin::RecipeDefinitionDSLCore
+    include Chef::Mixin::Deprecation
     
     attr_accessor :cookbook_name, :recipe_name, :recipe, :params, :run_context
 
@@ -54,6 +57,7 @@ class Chef
       @run_context = run_context
       # TODO: 5/19/2010 cw/tim: determine whether this can be removed
       @params = Hash.new
+      @node = deprecated_ivar(run_context.node, :node, :warn)
     end
     
     # Used in DSL mixins

data/lib/chef/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 class Chef
-  VERSION = '0.9.0.a90'
+  VERSION = '0.9.0.a91'
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 0
-  - a90
-  version: 0.9.0.a90
+  - a91
+  version: 0.9.0.a91
 platform: ruby
 authors: 
 - Adam Jacob
@@ -364,6 +364,7 @@ files:
 - lib/chef/mixin/convert_to_class_name.rb
 - lib/chef/mixin/create_path.rb
 - lib/chef/mixin/deep_merge.rb
+- lib/chef/mixin/deprecation.rb
 - lib/chef/mixin/find_preferred_file.rb
 - lib/chef/mixin/from_file.rb
 - lib/chef/mixin/language.rb