chef 0.8.6 → 0.8.8

data/lib/chef.rb

@@ -27,7 +27,7 @@ require 'chef/config'
 Dir[File.join(File.dirname(__FILE__), 'chef/mixin/**/*.rb')].sort.each { |lib| require lib }
 
 class Chef
-  VERSION = '0.8.6'
+  VERSION = '0.8.8'
 end
 
 # Adds a Dir.glob to Ruby 1.8.5, for compat

data/lib/chef/application/client.rb

@@ -77,6 +77,12 @@ class Chef::Application::Client < Chef::Application
     :description => "Daemonize the process",
     :proc => lambda { |p| true }
 
+  option :pid_file,
+    :short        => "-P PID_FILE",
+    :long         => "--pid PIDFILE",
+    :description  => "Set the PID file location, defaults to /tmp/chef-client.pid",
+    :proc         => nil
+
   option :interval,
     :short => "-i SECONDS",
     :long => "--interval SECONDS",

data/lib/chef/certificate.rb

@@ -72,6 +72,9 @@ class Chef
 
           File.open(ca_cert_file, "w") { |f| f.write ca_cert.to_pem }
           File.open(ca_keypair_file, File::WRONLY|File::EXCL|File::CREAT, 0600) { |f| f.write keypair.to_pem }
+          if (Chef::Config[:signing_ca_user] && Chef::Config[:signing_ca_group])
+            FileUtils.chown(Chef::Config[:signing_ca_user], Chef::Config[:signing_ca_group], ca_keypair_file)
+          end
         end
         self
       end
@@ -146,6 +149,9 @@ class Chef
           File.open(key_file, File::WRONLY|File::EXCL|File::CREAT, 0600) do |f|
             f.print(api_client.private_key)
           end
+          if (Chef::Config[:signing_ca_user] && Chef::Config[:signing_ca_group])
+            FileUtils.chown(Chef::Config[:signing_ca_user], Chef::Config[:signing_ca_group], key_file)
+          end
         end
       end
 

data/lib/chef/config.rb

@@ -183,6 +183,8 @@ class Chef
     # In truth, these don't even have to change
     signing_ca_cert "/var/chef/ca/cert.pem"
     signing_ca_key "/var/chef/ca/key.pem"
+    signing_ca_user nil
+    signing_ca_group nil
     signing_ca_country "US"
     signing_ca_state "Washington"
     signing_ca_location "Seattle"

data/lib/chef/knife/ssh.rb

@@ -37,6 +37,13 @@ class Chef
         :description => "The attribute to use for opening the connection - default is fqdn",
         :default => "fqdn" 
 
+      option :manual,
+        :short => "-m",
+        :long => "--manual-list",
+        :boolean => true,
+        :description => "QUERY is a space separated list of servers",
+        :default => false
+
       def session
         @session ||= Net::SSH::Multi.start(:concurrent_connections => config[:concurrency])
       end
@@ -47,13 +54,27 @@ class Chef
       end
 
       def configure_session
-        q = Chef::Search::Query.new
-        q.search(:node, @name_args[0]) do |item|
-          data = format_for_display(item)
-          Chef::Log.debug("Adding #{data[config[:attribute]]}")
-          session.use data[config[:attribute]]
-          @longest = data[config[:attribute]].length if data[config[:attribute]].length > @longest
+        list = case config[:manual]
+               when true
+                 @name_args[0].split(" ")
+               when false
+                 r = Array.new
+                 q = Chef::Search::Query.new
+                 q.search(:node, @name_args[0]) do |item|
+                   r << format_for_display(item)[config[:attribute]]
+                 end
+                 r
+               end
+        session_from_list(list)
+      end
+
+      def session_from_list(list)
+        list.each do |item|
+          Chef::Log.debug("Adding #{item}")
+          session.use item 
+          @longest = item.length if item.length > @longest
         end
+        session
       end
 
       def fixup_sudo(command)
@@ -147,6 +168,19 @@ class Chef
         end
       end
 
+      def screen
+        tf = Tempfile.new("knife-ssh-screen")
+        tf.puts("caption always '%w'")
+        tf.puts("hardstatus alwayslastline 'knife ssh #{@name_args[0]}'")
+        window = 0
+        session.servers_for.collect { |s| s.host }.each do |server|
+          tf.puts("screen -t \"#{server}\" #{window} ssh #{server}")
+          window += 1
+        end
+        tf.close
+        exec("screen -c #{tf.path}")
+      end
+
       def run 
         @longest = 0
 
@@ -156,8 +190,11 @@ class Chef
 
         configure_session
 
-        if @name_args[1] == "interactive"
+        case @name_args[1]
+        when "interactive"
           interactive 
+        when "screen"
+          screen
         else
           ssh_command(@name_args[1..-1].join(" "))
         end

data/lib/chef/provider/remote_directory.rb

@@ -73,9 +73,13 @@ class Chef
           raise NotFound, "Cannot find a suitable directory"
         end
 
+        file_list = Array.new
         Dir[::File.join(directory, '**', '*')].sort.reverse.select do |file|
-          file[/^#{directory}\/(.+)$/, 1] unless ::File.directory?(file)
+          unless ::File.directory?(file)
+            file_list << file[/^#{directory}\/(.+)$/, 1]
+          end
         end
+        file_list
       end
       
       def generate_client_file_list

data/lib/chef/provider/service/upstart.rb

@@ -178,7 +178,10 @@ class Chef
             stdout.each do |line|
               # rsyslog stop/waiting
               # service goal/state
-              line =~ /\w+ (\w+)\/(\w+)/
+              # OR
+              # rsyslog (stop) waiting
+              # service (goal) state
+              line =~ /\w+ \(?(\w+)\)?[\/ ](\w+)/
               data = Regexp.last_match
               return data[2]
             end

data/lib/chef/streaming_cookbook_uploader.rb

@@ -23,7 +23,6 @@ class Chef
         boundary = '----RubyMultipartClient' + rand(1000000).to_s + 'ZZZZZ'
         parts = []
         content_file = nil
-        content_body = nil
         
         timestamp = Time.now.utc.iso8601
         secret_key = OpenSSL::PKey::RSA.new(File.read(secret_key_filename))
@@ -40,10 +39,9 @@ class Chef
               parts << StreamPart.new(value, File.size(filepath))
               parts << StringPart.new("\r\n")
             else
-              content_body = value.to_s
               parts << StringPart.new( "--" + boundary + "\r\n" +
                                        "Content-Disposition: form-data; name=\"" + key.to_s + "\"\r\n\r\n")
-              parts << StringPart.new(content_body + "\r\n")
+              parts << StringPart.new(value.to_s + "\r\n")
             end
           end
           parts << StringPart.new("--" + boundary + "--\r\n")
@@ -57,6 +55,15 @@ class Chef
         
         Chef::Log.logger.debug("Signing: method: #{http_verb}, path: #{url.path}, file: #{content_file}, User-id: #{user_id}, Timestamp: #{timestamp}")
         
+        # We use the body for signing the request if the file parameter
+        # wasn't a valid file or wasn't included. Extract the body (with 
+        # multi-part delimiters intact) to sign the request.
+        # TODO: tim: 2009-12-28: It'd be nice to remove this special case, and
+        # always hash the entire request body. In the file case it would just be
+        # expanded multipart text - the entire body of the POST.
+        content_body = parts.inject("") { |result,part| result + part.read(0, part.size) }
+        content_file.rewind if content_file # we consumed the file for the above operation, so rewind it.
+        
         signing_options = {
           :http_method=>http_verb,
           :path=>url.path,

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 6
-  version: 0.8.6
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -08:00
+date: 2010-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,7 +138,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: amqp
+  name: moneta
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
@@ -149,18 +149,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: moneta
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id011
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: adam@opscode.com
 executables: