chef 0.9.18 → 0.10.0.beta.0

data/README.rdoc

@@ -38,14 +38,12 @@ Install these via your platform's preferred method; for example apt, yum, ports,
 * RabbitMQ[http://www.rabbitmq.com/]
 * GCC and C Standard Libraries, header files, etc. (i.e., build-essential on debian/ubuntu)
 * Ruby development package
-* libxml2 development package
 
 === Runtime Rubygem Dependencies
 ==== Chef Client and Solo
 * ohai
 * bunny
 * erubis
-* extlib
 * highline
 * json (1.4.4 - 1.4.6)
 * mixlib-authentication
@@ -61,7 +59,6 @@ Install these via your platform's preferred method; for example apt, yum, ports,
 All of the above, plus the following:
 * coderay
 * haml
-* libxml-ruby
 * merb-assets
 * merb-core
 * merb-haml

data/distro/arch/etc/rc.d/chef-server

@@ -51,11 +51,7 @@ case "$1" in
 
   stop)
     stat_busy "Stopping $daemon_name daemon"
-<<<<<<< HEAD
     PID=$(get_pid)
-=======
-    PID=$(gid_pid)
->>>>>>> 26fafb3... CHEF-1938, add boot scripts for archlinux
     [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail

data/distro/arch/etc/rc.d/chef-server-webui

@@ -51,11 +51,7 @@ case "$1" in
 
   stop)
     stat_busy "Stopping $daemon_name daemon"
-<<<<<<< HEAD
     PID=$(get_pid)
-=======
-    PID=$(gid_pid)
->>>>>>> 26fafb3... CHEF-1938, add boot scripts for archlinux
     [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail

data/distro/arch/etc/rc.d/chef-solr

@@ -51,11 +51,7 @@ case "$1" in
 
   stop)
     stat_busy "Stopping $daemon_name daemon"
-<<<<<<< HEAD
     PID=$(get_pid)
-=======
-    PID=$(gid_pid)
->>>>>>> 26fafb3... CHEF-1938, add boot scripts for archlinux
     [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail

data/distro/arch/etc/rc.d/chef-solr-indexer

@@ -51,11 +51,7 @@ case "$1" in
 
   stop)
     stat_busy "Stopping $daemon_name daemon"
-<<<<<<< HEAD
     PID=$(get_pid)
-=======
-    PID=$(gid_pid)
->>>>>>> 26fafb3... CHEF-1938, add boot scripts for archlinux
     [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail

data/lib/chef.rb

@@ -17,8 +17,8 @@
 #
 
 require 'chef/version'
-
-require 'extlib'
+require 'chef/nil_argument'
+require 'chef/mash'
 require 'chef/exceptions'
 require 'chef/log'
 require 'chef/config'
@@ -37,4 +37,4 @@ require 'chef/handler/json_file'
 require 'chef/monkey_patches/tempfile'
 require 'chef/monkey_patches/dir'
 require 'chef/monkey_patches/string'
-require 'chef/monkey_patches/numeric'
+require 'chef/monkey_patches/numeric'

data/lib/chef/api_client.rb

@@ -23,7 +23,7 @@ require 'chef/mixin/from_file'
 require 'chef/couchdb'
 require 'chef/certificate'
 require 'chef/index_queue'
-require 'extlib'
+require 'chef/mash'
 require 'chef/json_compat'
 
 class Chef

data/lib/chef/application.rb

@@ -86,9 +86,19 @@ class Chef::Application
 
   end
 
-  # Initialize and configure the logger
+  # Initialize and configure the logger. If the configured log location is not
+  # STDOUT, but stdout is a TTY and we're not daemonizing, we set up a secondary
+  # logger with output to stdout. This way, we magically do the right thing when
+  # the user has configured logging to a file but they're running chef in the
+  # shell to debug something.
   def configure_logging
     Chef::Log.init(Chef::Config[:log_location])
+    if ( Chef::Config[:log_location] != STDOUT ) && STDOUT.tty? && (!Chef::Config[:daemonize])
+      stdout_logger = Logger.new(STDOUT)
+      STDOUT.sync = true
+      stdout_logger.formatter = Chef::Log.logger.formatter
+      Chef::Log.loggers <<  stdout_logger
+    end
     Chef::Log.level = Chef::Config[:log_level]
   end
 

data/lib/chef/application/client.rb

@@ -7,9 +7,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.
@@ -25,14 +25,14 @@ require 'chef/rest'
 
 
 class Chef::Application::Client < Chef::Application
-  
-  option :config_file, 
+
+  option :config_file,
     :short => "-c CONFIG",
     :long  => "--config CONFIG",
     :default => "/etc/chef/client.rb",
     :description => "The configuration file to use"
 
-  option :log_level, 
+  option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
     :description  => "Set the log level (debug, info, warn, error, fatal)",
@@ -44,12 +44,6 @@ class Chef::Application::Client < Chef::Application
     :description  => "Set the log file location, defaults to STDOUT - recommended for daemonizing",
     :proc         => nil
 
-  option :verbose_logging,
-    :short        => "-V",
-    :long         => "--verbose",
-    :description  => "Ensures logging goes to STDOUT as well as to other configured log location(s).",
-    :proc         => lambda { |p| true }
-
   option :help,
     :short        => "-h",
     :long         => "--help",
@@ -58,7 +52,7 @@ class Chef::Application::Client < Chef::Application
     :boolean      => true,
     :show_options => true,
     :exit         => 0
-    
+
   option :user,
     :short => "-u USER",
     :long => "--user USER",
@@ -90,7 +84,7 @@ class Chef::Application::Client < Chef::Application
     :proc => lambda { |s| s.to_i }
 
   option :once,
-    :long => "--short",
+    :long => "--once",
     :description => "Cancel any interval or splay options, run chef once and exit",
     :boolean => true
 
@@ -138,20 +132,22 @@ class Chef::Application::Client < Chef::Application
     :proc         => lambda {|v| puts "Chef: #{::Chef::VERSION}"},
     :exit         => 0
 
+  attr_reader :chef_client_json
+
   def initialize
     super
 
     @chef_client = nil
     @chef_client_json = nil
   end
-  
+
   # Reconfigure the chef client
   # Re-open the JSON attributes and load them into the node
-  def reconfigure 
-    super 
+  def reconfigure
+    super
 
     Chef::Config[:chef_server_url] = config[:chef_server_url] if config.has_key? :chef_server_url
-   
+
     if Chef::Config[:daemonize]
       Chef::Config[:interval] ||= 1800
     end
@@ -191,14 +187,14 @@ class Chef::Application::Client < Chef::Application
 
   def configure_logging
     super
-    Chef::Log.verbose = Chef::Config[:verbose_logging]
-    Mixlib::Authentication::Log.logger = Ohai::Log.logger = Chef::Log.logger
+    Mixlib::Authentication::Log.use_log_devices( Chef::Log )
+    Ohai::Log.use_log_devices( Chef::Log )
   end
-  
+
   def setup_application
     Chef::Daemon.change_privilege
   end
-  
+
   # Run the chef client, optionally daemonizing or looping at intervals.
   def run_application
     if Chef::Config[:version]
@@ -208,7 +204,7 @@ class Chef::Application::Client < Chef::Application
     if Chef::Config[:daemonize]
       Chef::Daemon.daemonize("chef-client")
     end
-    
+
     loop do
       begin
         if Chef::Config[:splay]

data/lib/chef/application/knife.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.
@@ -17,17 +17,8 @@
 
 require 'chef/knife'
 require 'chef/application'
-require 'chef/client'
-require 'chef/config'
-require 'chef/log'
-require 'chef/node'
-require 'chef/role'
-require 'chef/data_bag'
-require 'chef/data_bag_item'
-require 'chef/rest'
-require 'chef/search/query'
-require 'tmpdir'
-require 'uri'
+require 'mixlib/log'
+require 'ohai'
 
 class Chef::Application::Knife < Chef::Application
 
@@ -35,12 +26,13 @@ class Chef::Application::Knife < Chef::Application
 
   banner "Usage: #{$0} sub-command (options)"
 
-  option :config_file, 
+  option :config_file,
     :short => "-c CONFIG",
     :long  => "--config CONFIG",
-    :description => "The configuration file to use"
+    :description => "The configuration file to use",
+    :proc => lambda { |path| File.expand_path(path, Dir.pwd) }
 
-  option :log_level, 
+  option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
     :description  => "Set the log level (debug, info, warn, error, fatal)",
@@ -52,25 +44,30 @@ class Chef::Application::Knife < Chef::Application
     :description  => "Set the log file location, defaults to STDOUT",
     :proc         => nil
 
+  option :environment,
+    :short        => "-E ENVIRONMENT",
+    :long         => "--environment ENVIRONMENT",
+    :description  => "Set the Chef environment"
+
   option :editor,
     :short        => "-e EDITOR",
     :long         => "--editor EDITOR",
     :description  => "Set the editor to use for interactive commands",
     :default      => ENV['EDITOR']
-  
+
   option :no_editor,
     :short        => "-n",
     :long         => "--no-editor",
     :description  => "Do not open EDITOR, just accept the data as is",
     :boolean      => true
-  
+
   option :help,
     :short        => "-h",
     :long         => "--help",
     :description  => "Show this message",
     :on           => :tail,
     :boolean      => true
-    
+
   option :node_name,
     :short => "-u USER",
     :long => "--user USER",
@@ -79,7 +76,8 @@ class Chef::Application::Knife < Chef::Application
   option :client_key,
     :short => "-k KEY",
     :long => "--key KEY",
-    :description => "API Client Key"
+    :description => "API Client Key",
+    :proc => lambda { |path| File.expand_path(path, Dir.pwd) }
 
   option :chef_server_url,
     :short => "-s URL",
@@ -96,6 +94,7 @@ class Chef::Application::Knife < Chef::Application
     :description => "Accept default values for all questions"
 
   option :print_after,
+    :short => "-p",
     :long => "--print-after",
     :description => "Show the data after a destructive operation"
 
@@ -113,16 +112,16 @@ class Chef::Application::Knife < Chef::Application
     :proc         => lambda {|v| puts "Chef: #{::Chef::VERSION}"},
     :exit         => 0
 
-  # Run knife 
+  # Run knife
   def run
     Mixlib::Log::Formatter.show_time = false
     validate_and_parse_options
     Chef::Knife.run(ARGV, options)
     exit 0
   end
-  
+
   private
-  
+
   def validate_and_parse_options
     # Checking ARGV validity *before* parse_options because parse_options
     # mangles ARGV in some situations
@@ -131,16 +130,16 @@ class Chef::Application::Knife < Chef::Application
     elsif no_subcommand_given?
       if (want_help? || want_version?)
         print_help_and_exit
-      else 
+      else
         print_help_and_exit(2, NO_COMMAND_GIVEN)
       end
     end
   end
-  
+
   def no_subcommand_given?
     ARGV[0] =~ /^-/
   end
-  
+
   def no_command_given?
     ARGV.empty?
   end
@@ -152,10 +151,10 @@ class Chef::Application::Knife < Chef::Application
   def want_version?
     ARGV[0] =~ /^(--version|-v)$/
   end
-  
+
   def print_help_and_exit(exitcode=1, fatal_message=nil)
     Chef::Log.error(fatal_message) if fatal_message
-  
+
     begin
       self.parse_options
     rescue OptionParser::InvalidOption => e
@@ -166,5 +165,5 @@ class Chef::Application::Knife < Chef::Application
     Chef::Knife.list_commands
     exit exitcode
   end
-  
+
 end

data/lib/chef/application/solo.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,14 +26,14 @@ require 'open-uri'
 require 'fileutils'
 
 class Chef::Application::Solo < Chef::Application
-  
-  option :config_file, 
+
+  option :config_file,
     :short => "-c CONFIG",
     :long  => "--config CONFIG",
     :default => "/etc/chef/solo.rb",
     :description => "The configuration file to use"
 
-  option :log_level, 
+  option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
     :description  => "Set the log level (debug, info, warn, error, fatal)",
@@ -101,7 +101,7 @@ class Chef::Application::Solo < Chef::Application
       :long => "--recipe-url RECIPE_URL",
       :description => "Pull down a remote gzipped tarball of recipes and untar it to the cookbook cache.",
       :proc => nil
-  
+
   option :version,
     :short        => "-v",
     :long         => "--version",
@@ -110,21 +110,23 @@ class Chef::Application::Solo < Chef::Application
     :proc         => lambda {|v| puts "Chef: #{::Chef::VERSION}"},
     :exit         => 0
 
+  attr_reader :chef_solo_json
+
   def initialize
     super
     @chef_solo = nil
     @chef_solo_json = nil
   end
-  
+
   def reconfigure
     super
-    
+
     Chef::Config[:solo] = true
 
     if Chef::Config[:daemonize]
       Chef::Config[:interval] ||= 1800
     end
-    
+
     if Chef::Config[:json_attribs]
       begin
         json_io = case Chef::Config[:json_attribs]
@@ -151,7 +153,7 @@ class Chef::Application::Solo < Chef::Application
         Chef::Application.fatal!("Could not parse the provided JSON file (#{Chef::Config[:json_attribs]})!: " + error.message, 2)
       end
     end
-    
+
     if Chef::Config[:recipe_url]
       cookbooks_path = Array(Chef::Config[:cookbook_path]).detect{|e| e =~ /\/cookbooks\/*$/ }
       recipes_path = File.expand_path(File.join(cookbooks_path, '..'))
@@ -168,11 +170,11 @@ class Chef::Application::Solo < Chef::Application
       Chef::Mixin::Command.run_command(:command => "tar zxvfC #{path} #{recipes_path}")
     end
   end
-  
+
   def setup_application
     Chef::Daemon.change_privilege
   end
-  
+
   def run_application
     if Chef::Config[:daemonize]
       Chef::Daemon.daemonize("chef-client")