chef 0.10.0.qs.1 → 0.10.0.rc.0

data/distro/common/man/man1/knife-tag.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-TAG" "1" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "KNIFE\-TAG" "1" "April 2011" "Chef 0.10.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-tag\fR \- Apply tags to nodes on a Chef Server

data/distro/common/man/man1/knife.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE" "1" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "KNIFE" "1" "April 2011" "Chef 0.10.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\fR \- Chef Server API client utility

data/distro/common/man/man1/shef.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "SHEF" "1" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "SHEF" "1" "April 2011" "Chef 0.10.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBshef\fR \- Interactive Chef Console

data/distro/common/man/man8/chef-client.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-CLIENT" "8" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "April 2011" "Chef 0.10.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-client\fR \- Runs a client node connecting to a chef\-server\.

data/distro/common/man/man8/{chef-expander.8 → chef-expander-cluster.8}

@@ -1,13 +1,13 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-EXPANDER" "8" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "CHEF\-EXPANDER\-CLUSTER" "8" "April 2011" "Chef 0.10.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
-\fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
+\fBchef\-expander\-cluster\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
 .
 .SH "SYNOPSIS"
-\fBchef\-expander\fR \fI(options)\fR
+\fBchef\-expander\-cluster\fR \fI(options)\fR
 .
 .TP
 \fB\-c\fR, \fB\-\-config CONFIG_FILE\fR
@@ -52,7 +52,7 @@ Chef Expander fetches messages from RabbitMQ, processes them into the correct fo
 \fBRunning Chef Expander\fR
 .
 .P
-Chef Expander is designed for clustered operation, though small installations will only need one worker process\. To run Chef Expander with one worker process, run chef\-expander \-n 1\. You will then have a master and worker process, which looks like this in ps:
+Chef Expander is designed for clustered operation, though small installations will only need one worker process\. To run Chef Expander with one worker process, run chef\-expander\-cluster \-n 1\. You will then have a master and worker process, which looks like this in ps:
 .
 .IP "" 4
 .
@@ -60,7 +60,7 @@ Chef Expander is designed for clustered operation, though small installations wi
 
 your\-shell> ps aux|grep expander
 you   52110   0\.1  0\.7  2515476  62748 s003  S+    3:49PM   0:00\.80 chef\-expander worker #1 (vnodes 0\-1023)
-you   52108   0\.1  0\.5  2492880  41696 s003  S+    3:49PM   0:00\.91 ruby bin/chef\-expander \-n 1
+you   52108   0\.1  0\.5  2492880  41696 s003  S+    3:49PM   0:00\.91 ruby bin/chef\-expander\-cluster \-n 1
 .
 .fi
 .

data/distro/common/man/man8/chef-expanderctl.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-EXPANDERCTL" "8" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "April 2011" "Chef 0.10.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-expanderctl\fR \- management program for chef\-expander

data/distro/common/man/man8/chef-server-webui.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SERVER\-WEBUI" "8" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "April 2011" "Chef 0.10.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.

data/distro/common/man/man8/chef-server.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SERVER" "8" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "April 2011" "Chef 0.10.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-server\fR \- Start the Chef Server merb application slice\.

data/distro/common/man/man8/chef-solo.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SOLO" "8" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "April 2011" "Chef 0.10.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.

data/distro/common/man/man8/chef-solr.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SOLR" "8" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "April 2011" "Chef 0.10.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solr\fR \- Runs as Chef\'s search server

data/distro/common/markdown/man8/{chef-expander.mkd → chef-expander-cluster.mkd}

@@ -1,9 +1,9 @@
-chef-expander(8) -- fetches messages from RabbitMQ, processes, and loads into chef-solr
+chef-expander-cluster(8) -- fetches messages from RabbitMQ, processes, and loads into chef-solr
 ========================================
 
 ## SYNOPSIS
 
-__chef-expander__ _(options)_
+__chef-expander-cluster__ _(options)_
 
   * `-c`, `--config CONFIG_FILE`:
     a configuration file to use
@@ -33,13 +33,13 @@ __Running Chef Expander__
 
 Chef Expander is designed for clustered operation, though small
 installations will only need one worker process. To run Chef
-Expander with one worker process, run chef-expander -n 1.
+Expander with one worker process, run chef-expander-cluster -n 1.
 You will then have a master and worker process, which looks like
 this in ps:
 
     your-shell> ps aux|grep expander
     you   52110   0.1  0.7  2515476  62748 s003  S+    3:49PM   0:00.80 chef-expander worker #1 (vnodes 0-1023)
-    you   52108   0.1  0.5  2492880  41696 s003  S+    3:49PM   0:00.91 ruby bin/chef-expander -n 1
+    you   52108   0.1  0.5  2492880  41696 s003  S+    3:49PM   0:00.91 ruby bin/chef-expander-cluster -n 1
 
 Workers are single threaded and therefore cannot use more than 100%
 of a single CPU. If you find that your queues are getting backlogged,

data/distro/redhat/etc/init.d/chef-expander

@@ -33,7 +33,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon $prog -d -c "$config" -L "$logfile" -P "$pidfile" "$options"
+    daemon $prog -d -c "$config" -L "$logfile" "$options"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

data/distro/redhat/etc/init.d/chef-solr

@@ -33,7 +33,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon $prog -d -c "$config" -L "$logfile" -P "$pidfile" "$options"
+    daemon $prog -d -c "$config" -L "$logfile" "$options"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

data/lib/chef.rb

@@ -38,4 +38,3 @@ require 'chef/monkey_patches/tempfile'
 require 'chef/monkey_patches/dir'
 require 'chef/monkey_patches/string'
 require 'chef/monkey_patches/numeric'
-require 'chef/monkey_patches/object'

data/lib/chef/api_client.rb

@@ -60,12 +60,6 @@ class Chef
       }
     }
 
-    INDEX_OBJECT_TYPE = 'client'.freeze
-
-    def self.index_object_type
-      INDEX_OBJECT_TYPE
-    end
-
     attr_accessor :couchdb_rev, :couchdb_id, :couchdb
 
     # Create a new Chef::ApiClient object.

data/lib/chef/application.rb

@@ -127,12 +127,13 @@ class Chef::Application
   class << self
     def debug_stacktrace(e)
       message = "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
-      chef_stacktrace_out = "Generated at #{Time.now.to_s}\n"
-      chef_stacktrace_out += message
-
-      Chef::FileCache.store("chef-stacktrace.out", chef_stacktrace_out)
-      Chef::Log.fatal("Stacktrace dumped to #{Chef::FileCache.load("chef-stacktrace.out", false)}")
+      filename = File.join(Chef::Config[:file_cache_path], "chef-stacktrace.out") 
+      Chef::Log.fatal("Stacktrace dumped to #{filename}")
       Chef::Log.debug(message)
+      chef_stacktrace_out = File.open(filename, "w")
+      chef_stacktrace_out.puts "Generated at #{Time.now.to_s}"
+      chef_stacktrace_out.puts message
+      chef_stacktrace_out.close
       true
     end
 

data/lib/chef/application/client.rb

@@ -128,11 +128,6 @@ class Chef::Application::Client < Chef::Application
     :description  => "Set the client key file location",
     :proc         => nil
 
-  option :environment,
-    :short        => '-E ENVIRONMENT',
-    :long         => '--environment ENVIRONMENT',
-    :description  => 'Set the Chef Environment on the node'
-
   option :version,
     :short        => "-v",
     :long         => "--version",

data/lib/chef/cookbook_uploader.rb

@@ -100,11 +100,8 @@ class Chef
           raise
         end
       end
-
       # files are uploaded, so save the manifest
-      save_url = opts[:force] ? cookbook.force_save_url : cookbook.save_url
-      rest.put_rest(save_url, cookbook)
-
+      opts[:force] ? cookbook.force_save : cookbook.save
       Chef::Log.info("Upload complete!")
     end
 

data/lib/chef/cookbook_version.rb

@@ -823,18 +823,21 @@ class Chef
       self.class.chef_server_rest
     end
 
-    # Return the URL to save (PUT) this object to the server via the
-    # REST api. If there is an existing document on the server and it
-    # is marked frozen, a PUT will result in a 409 Conflict.
-    def save_url
-      "cookbooks/#{name}/#{version}"
-    end
-
-    # Adds the `force=true` parameter to the upload URL. This allows
-    # the user to overwrite a frozen cookbook (a PUT against the
-    # normal #save_url raises a 409 Conflict in this case).
-    def force_save_url
-      "cookbooks/#{name}/#{version}?force=true"
+    # Save this object to the server via the REST api. If there is an existing
+    # document on the server and it is marked frozen, a
+    # Net::HTTPServerException will be raised for 409 Conflict.
+    def save
+      chef_server_rest.put_rest("cookbooks/#{name}/#{version}", self)
+      self
+    end
+    alias :create :save
+
+    # Adds the `force=true` parameter to the upload. This allows the user to
+    # overwrite a frozen cookbook (normal #save raises a
+    # Net::HTTPServerException for 409 Conflict in this case).
+    def force_save
+      chef_server_rest.put_rest("cookbooks/#{name}/#{version}?force=true", self)
+      self
     end
 
     def destroy

data/lib/chef/data_bag_item.rb

@@ -218,17 +218,17 @@ class Chef
     def save(item_id=@raw_data['id'])
       r = chef_server_rest
       begin
-        r.put_rest("data/#{data_bag}/#{item_id}", self)
+        r.put_rest("data/#{data_bag}/#{item_id}", @raw_data)
       rescue Net::HTTPServerException => e
         raise e unless e.response.code == "404"
-        r.post_rest("data/#{data_bag}", self)
+        r.post_rest("data/#{data_bag}", @raw_data)
       end
       self
     end
 
     # Create this Data Bag Item via RESTful API
     def create
-      chef_server_rest.post_rest("data/#{data_bag}", self)
+      chef_server_rest.post_rest("data/#{data_bag}", @raw_data)
       self
     end
 

data/lib/chef/handler/error_report.rb

@@ -24,8 +24,15 @@ class Chef
     class ErrorReport < ::Chef::Handler
 
       def report
-        Chef::FileCache.store("failed-run-data.json", Chef::JSONCompat.to_json_pretty(data))
-        Chef::Log.fatal("Saving node information to #{Chef::FileCache.load("failed-run-data.json", false)}")
+        Chef::Log.fatal("Saving node information to #{report_path}")
+
+        File.open(report_path, "w") do |file|
+          file.puts Chef::JSONCompat.to_json_pretty(data)
+        end
+      end
+
+      def report_path
+        File.join(Chef::Config[:file_cache_path], "failed-run-data.json")
       end
 
     end

data/lib/chef/knife.rb

@@ -407,7 +407,6 @@ class Chef
       when NameError, NoMethodError
         ui.error "knife encountered an unexpected error"
         ui.info  "This may be a bug in the '#{self.class.common_name}' knife command or plugin"
-        ui.info  "Please collect the output of this command with the `-VV` option before filing a bug report."
         ui.info  "Exception: #{e.class.name}: #{e.message}"
       when Chef::Exceptions::PrivateKeyMissing
         ui.error "Your private key could not be loaded from #{api_key}"

data/lib/chef/knife/bootstrap.rb

@@ -24,13 +24,11 @@ class Chef
     class Bootstrap < Knife
 
       deps do
-        require 'chef/knife/core/bootstrap_context'
         require 'chef/json_compat'
         require 'tempfile'
         require 'highline'
         require 'net/ssh'
         require 'net/ssh/multi'
-        Chef::Knife::Ssh.load_deps
       end
 
       banner "knife bootstrap FQDN (options)"
@@ -68,9 +66,9 @@ class Chef
         :description => "Install the pre-release chef gems"
 
       option :bootstrap_version,
-        :long => "--bootstrap-version VERSION",
+        :long => "--bootstrap-version",
         :description => "The version of Chef to install",
-        :proc => lambda { |v| Chef::Config[:knife][:bootstrap_version] = v }
+        :proc => lambda { |v| Chef::Config[:bootstrap_version] = v }
 
       option :distro,
         :short => "-d DISTRO",
@@ -128,7 +126,9 @@ class Chef
       end
 
       def render_template(template=nil)
-        context = Knife::Core::BootstrapContext.new(config, config[:run_list], Chef::Config)
+        context = {}
+        context[:run_list] = config[:run_list]
+        context[:config] = config
         Erubis::Eruby.new(template).evaluate(context)
       end
 
@@ -193,6 +193,36 @@ class Chef
         command
       end
 
+      module TemplateHelper
+
+        #
+        # == Chef::Knife::Bootstrap::TemplateHelper
+        #
+        # The methods in the TemplateHelper module expect to have access to
+        # the instance varialbles set above as part of the context in the
+        # Chef::Knife::Bootstrap#render_context method. Those instance
+        # variables are:
+        #
+        # * @config   - a hash of knife's config values
+        # * @run_list - the run list for the node to boostrap
+        #
+
+        ::Erubis::Context.send(:include, Chef::Knife::Bootstrap::TemplateHelper)
+
+        def bootstrap_version_string(type=nil)
+          version = Chef::Config[:bootstrap_version] || Chef::VERSION
+          case type
+          when :gems
+            if @config[:prerelease]
+              "--prerelease"
+            else
+              "--version #{version}"
+            end
+          else
+            version
+          end
+        end
+      end
     end
   end
 end

data/lib/chef/knife/bootstrap/archlinux-gems.erb

@@ -4,7 +4,7 @@ if [ ! -f /usr/bin/chef-client ]; then
   pacman -S --noconfirm ruby ntp base-devel
   ntpdate -u pool.ntp.org
   gem install ohai --no-rdoc --no-ri --verbose
-  gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
+  gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string(:gems) %>
 fi
 
 mkdir -p /etc/chef

data/lib/chef/knife/bootstrap/centos5-gems.erb

@@ -1,9 +1,9 @@
 bash -c '
 if [ ! -f /usr/bin/chef-client ]; then
   rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
-  wget -O /etc/yum.repos.d/aegis.repo http://rpm.aegisco.com/aegisco/el5/aegisco.repo
+  rpm -Uvh http://download.elff.bravenet.com/5/i386/elff-release-5-3.noarch.rpm
 
-  yum install -y ruby-1.8.7.334-2.el5 ruby-devel-1.8.7.334-2.el5 gcc gcc-c++ automake autoconf make
+  yum install -y ruby ruby-devel gcc gcc-c++ automake autoconf make
 
   cd /tmp
   wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
@@ -15,13 +15,13 @@ fi
 gem update --system
 gem update
 gem install ohai --no-rdoc --no-ri --verbose
-gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
+gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string(:gems) %>
 
 mkdir -p /etc/chef
 
 (
 cat <<'EOP'
-<%= validation_key %>
+<%= IO.read(Chef::Config[:validation_key]) %>
 EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
@@ -29,7 +29,15 @@ rm /tmp/validation.pem
 
 (
 cat <<'EOP'
-<%= config_content %>
+log_level        :info
+log_location     STDOUT
+chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
+validation_client_name "<%= Chef::Config[:validation_client_name] %>"
+<% if @config[:chef_node_name] == nil %>
+# Using default node name (fqdn)
+<% else %>
+node_name "<%= @config[:chef_node_name] %>"
+<% end %>
 EOP
 ) > /etc/chef/client.rb
 
@@ -39,4 +47,4 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/first-boot.json
 
-<%= start_chef %>'
+/usr/bin/chef-client -j /etc/chef/first-boot.json'