chef 0.9.0.b01 → 0.9.0.b02

data/lib/chef/cookbook/metadata/version.rb

@@ -32,13 +32,13 @@ class Chef::Cookbook::Metadata
     end
 
     def _parse(str="")
-      @major, @minor, @patch = case str
+      @major, @minor, @patch = case str.to_s
         when /^(\d+)\.(\d+)\.(\d+)$/
           [ $1.to_i, $2.to_i, $3.to_i ]
         when /^(\d+)\.(\d+)$/
           [ $1.to_i, $2.to_i, 0 ]
         else
-          raise "Metadata version does not match 'x.y.z' or 'x.y'"
+          raise "Metadata version '#{str.to_s}' does not match 'x.y.z' or 'x.y'"
       end
     end
 

data/lib/chef/cookbook/syntax_check.rb

@@ -0,0 +1,128 @@
+#
+# 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.
+#
+
+require 'chef/cache/checksum'
+require 'chef/mixin/shell_out'
+
+class Chef
+  class Cookbook
+    class SyntaxCheck
+      include Chef::Mixin::ShellOut
+
+      attr_reader :cookbook_path
+
+      def self.for_cookbook(cookbook_name, cookbook_path=nil)
+        cookbook_path ||= Chef::Config.cookbook_path
+        unless cookbook_path
+          raise ArgumentError, "Cannot find cookbook #{cookbook_name} unless Chef::Config.cookbook_path is set or an explicit cookbook path is given"
+        end
+        new(File.join(cookbook_path, cookbook_name.to_s))
+      end
+
+      def initialize(cookbook_path)
+        @cookbook_path = cookbook_path
+      end
+
+      def cache
+        Chef::Cache::Checksum.instance
+      end
+
+      def ruby_files
+        Dir[File.join(cookbook_path, '**', '*.rb')]
+      end
+
+      def untested_ruby_files
+        ruby_files.reject do |file|
+          if validated?(file)
+            Chef::Log.debug("ruby file #{file} is unchanged, skipping syntax check")
+            true
+          else
+            false
+          end
+        end
+      end
+
+      def template_files
+        Dir[File.join(cookbook_path, '**', '*.erb')]
+      end
+
+      def untested_template_files
+        template_files.reject do |file| 
+          if validated?(file)
+            Chef::Log.debug("template #{file} is unchanged, skipping syntax check")
+            true
+          else
+            false
+          end
+        end
+      end
+
+      def validated?(file)
+        !!cache.lookup_checksum(cache_key(file), File.stat(file))
+      end
+
+      def validated(file)
+        cache.generate_checksum(cache_key(file), file, File.stat(file))
+      end
+
+      def cache_key(file)
+        @cache_keys ||= {}
+        @cache_keys[file] ||= cache.generate_key(file, "chef-test")
+      end
+
+      def validate_ruby_files
+        untested_ruby_files.each do |ruby_file|
+          return false unless validate_ruby_file(ruby_file)
+          validated(ruby_file)
+        end
+      end
+
+      def validate_templates
+        untested_template_files.each do |template|
+          return false unless validate_template(template)
+          validated(template)
+        end
+      end
+
+      def validate_template(erb_file)
+        Chef::Log.debug("Testing template #{erb_file} for syntax errors...")
+        result = shell_out("sh -c 'erubis -x #{erb_file} | ruby -c'")
+        result.error!
+        true
+      rescue Chef::Exceptions::ShellCommandFailed
+        file_relative_path = erb_file[/^#{Regexp.escape(cookbook_path+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) }
+        false
+      end
+      
+      def validate_ruby_file(ruby_file)
+        Chef::Log.debug("Testing #{ruby_file} for syntax errors...")
+        result = shell_out("ruby -c #{ruby_file}")
+        result.error!
+        true
+      rescue Chef::Exceptions::ShellCommandFailed
+        file_relative_path = ruby_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
+        Chef::Log.fatal("Cookbook file #{file_relative_path} has a ruby syntax error:")
+        result.stderr.each_line { |l| Chef::Log.fatal(l.chomp) }
+        false
+      end
+      
+    end
+  end
+end

data/lib/chef/cookbook_version.rb

@@ -664,6 +664,23 @@ class Chef
       chef_server_rest.get_rest('cookbooks')
     end
 
+    ##
+    # Given a +cookbook_name+, get a list of all versions that exist on the
+    # server.
+    # ===Returns
+    # [String]::  Array of cookbook versions, which are strings like 'x.y.z'
+    # nil::       if the cookbook doesn't exist. an error will also be logged.
+    def self.available_versions(cookbook_name)
+      chef_server_rest.get_rest("cookbooks/#{cookbook_name}").values.flatten
+    rescue Net::HTTPServerException => e
+      if e.to_s =~ /^404/
+        Chef::Log.error("Cannot find a cookbook named #{cookbook_name}")
+        nil
+      else
+        raise
+      end
+    end
+
     # Get the newest version of all cookbooks
     def self.latest_cookbooks
       chef_server_rest.get_rest('cookbooks/_latest')

data/lib/chef/file_access_control.rb

@@ -16,6 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+require 'chef/log'
+
 class Chef
 
   # FileAccessControl objects set the owner, group and mode of +file+ to
@@ -55,7 +58,7 @@ class Chef
   
     # Workaround the fact that Ruby's Etc module doesn't believe in negative
     # uids, so negative uids show up as the diminished radix complement of
-    # the maximum fixnum size. For example, a uid of -2 is reported as 
+    # a uint. For example, a uid of -2 is reported as 4294967294
     def dimished_radix_complement(int)
       if int > UID_MAX
         int - UINT
@@ -71,10 +74,11 @@ class Chef
       elsif resource.owner.kind_of?(Integer)
         resource.owner
       else
+        Chef::Log.error("The `owner` parameter of the #@resource resource is set to an invalid value (#{resource.owner.inspect})")
         raise ArgumentError, "cannot resolve #{resource.owner.inspect} to uid, owner must be a string or integer"
       end
     rescue ArgumentError
-      raise Chef::Exceptions::UserIDNotFound, "cannot resolve user id for '#{resource.owner}'"
+      raise Chef::Exceptions::UserIDNotFound, "cannot determine user id for '#{resource.owner}', does the user exist on this system?"
     end
   
     def set_owner
@@ -92,10 +96,11 @@ class Chef
       elsif resource.group.kind_of?(Integer)
         resource.group
       else
+        Chef::Log.error("The `group` parameter of the #@resource resource is set to an invalid value (#{resource.owner.inspect})")
         raise ArgumentError, "cannot resolve #{resource.group.inspect} to gid, group must be a string or integer"
       end
     rescue ArgumentError
-      raise Chef::Exceptions::GroupIDNotFound, "cannot resolve group id for '#{resource.group}'"
+      raise Chef::Exceptions::GroupIDNotFound, "cannot determine group id for '#{resource.group}', does the group exist on this system?"
     end
   
     def set_group

data/lib/chef/knife.rb

@@ -46,7 +46,7 @@ class Chef
       load_commands
       @sub_classes.keys.sort.each do |snake_case|
         klass_instance = build_sub_class(snake_case) 
-        klass_instance.parse_options
+        klass_instance.parse_options([])
         puts klass_instance.opt_parser
         puts
       end
@@ -98,6 +98,14 @@ class Chef
       klass_instance
     end
 
+    def parse_options(args)
+      super
+    rescue OptionParser::InvalidOption => e
+      puts "Error: " + e.to_s
+      show_usage
+      exit(1)
+    end
+
     def ask_question(question, opts={})
       question = question + "[#{opts[:default]}] " if opts[:default]
         
@@ -159,17 +167,17 @@ class Chef
     def output(data)
       case config[:format]
       when "json", nil
-        puts JSON.pretty_generate(data)
+        stdout.puts JSON.pretty_generate(data)
       when "yaml"
         require 'yaml'
-        puts YAML::dump(data)
+        stdout.puts YAML::dump(data)
       when "text"
         # If you were looking for some attribute and there is only one match
         # just dump the attribute value
         if data.length == 1 and config[:attribute]
-          puts data.values[0]
+          stdout.puts data.values[0]
         else
-          pp data
+          PP.pp(data, stdout)
         end
       else
         raise ArgumentError, "Unknown output format #{config[:format]}"
@@ -224,10 +232,11 @@ class Chef
       parse_output ? JSON.parse(output) : output
     end
 
-    def confirm(question)
+    def confirm(question, append_instructions=true)
       return true if config[:yes]
 
-      print "#{question}? (Y/N) "
+      print question
+      print "? (Y/N) " if append_instructions
       answer = stdin.readline
       answer.chomp!
       case answer
@@ -243,6 +252,10 @@ class Chef
       end
     end
 
+    def show_usage
+      stdout.puts("USAGE: " + self.opt_parser.to_s)
+    end
+
     def load_from_file(klass, from_file, bag=nil) 
       relative_path = ""
       if klass == Chef::Role

data/lib/chef/knife/cookbook_bulk_delete.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2009, 2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +18,7 @@
 #
 
 require 'chef/knife'
+require 'chef/knife/cookbook_delete'
 
 class Chef
   class Knife
@@ -24,13 +26,26 @@ class Chef
 
       banner "Sub-Command: cookbook bulk delete REGEX (options)"
 
-      def run 
-        if @name_args.length < 1
+      def run
+        unless regex_str = @name_args.first
           Chef::Log.fatal("You must supply a regular expression to match the results against")
           exit 42
-        else
-          bulk_delete(Chef::CookbookVersion, "cookbook", "cookbook", rest.get_rest("cookbooks"), @name_args[0]) do |name, cookbook|
-            rest.delete_rest(cookbook)
+        end
+
+        regex = Regexp.new(regex_str)
+
+        all_cookbooks = Chef::CookbookVersion.list
+        cookbooks_names = all_cookbooks.keys.grep(regex)
+        cookbooks_to_delete = cookbooks_names.inject({}) { |hash, name| hash[name] = all_cookbooks[name];hash }
+        output(format_list_for_display(cookbooks_to_delete))
+
+        confirm("Do you really want to delete these cookbooks? All versions will be deleted. (Y/N) ", false)
+        
+        cookbooks_names.each do |cookbook_name|
+          versions = rest.get_rest("cookbooks/#{cookbook_name}").values.flatten
+          versions.each do |version|
+            object = rest.delete_rest("cookbooks/#{cookbook_name}/#{version}")
+            Chef::Log.info("Deleted cookbook  #{cookbook_name.ljust(25)} [#{version}]")
           end
         end
       end

data/lib/chef/knife/cookbook_delete.rb

@@ -21,21 +21,113 @@ require 'chef/knife'
 class Chef
   class Knife
     class CookbookDelete < Knife
+      
+      option :all, :short => '-a', :long => '--all', :boolean => true, :description => 'delete all versions'
 
       banner "Sub-Command: cookbook delete COOKBOOK VERSION (options)"
 
       def run
-        delete_object(Chef::CookbookVersion, "#{@name_args[0]} #{@name_args[1]}", "cookbook") do
-          rest.delete_rest("cookbooks/#{@name_args[0]}/#{@name_args[1]}")
+        @cookbook_name, @version = name_args
+        if @cookbook_name && @version
+          delete_explicit_version
+        elsif @cookbook_name && config[:all]
+          delete_all_versions
+        elsif @cookbook_name && @version.nil?
+          delete_without_explicit_version
+        elsif @cookbook_name.nil?
+          show_usage
+          Chef::Log.fatal("You must provide the name of the cookbook to delete")
+          exit(1)
         end
       end
 
-    end
-  end
-end
+      def delete_explicit_version
+        delete_object(Chef::CookbookVersion, "#{@cookbook_name} version #{@version}", "cookbook") do
+          rest.delete_rest("cookbooks/#{@cookbook_name}/#{@version}")
+        end
+      end
+
+      def delete_all_versions
+        confirm("Do you really want to delete all versions of #{@cookbook_name}")
+        delete_all_without_confirmation
+      end
+
+      def delete_all_without_confirmation
+        # look up the available versions again just in case the user
+        # got to the list of versions to delete and selected 'all'
+        # and also a specific version
+        @available_versions = nil
+        Array(available_versions).each do |version|
+          delete_version_without_confirmation(version)
+        end
+      end
 
+      def delete_without_explicit_version
+        if available_versions.nil?
+          # we already logged an error or 2 about it, so just bail
+          exit(1)
+        elsif available_versions.size == 1
+          @version = available_versions.first
+          delete_explicit_version
+        else
+          versions_to_delete = ask_which_versions_to_delete
+          delete_versions_without_confirmation(versions_to_delete)
+        end
+      end
 
+      def available_versions
+        @available_versions ||= rest.get_rest("cookbooks/#{@cookbook_name}").values.flatten
+      rescue Net::HTTPServerException => e
+        if e.to_s =~ /^404/
+          Chef::Log.error("Cannot find a cookbook named #{@cookbook_name} to delete")
+          nil
+        else
+          raise
+        end
+      end
 
+      def ask_which_versions_to_delete
+        question = "Which version(s) do you want to delete?\n"
+        valid_responses = {}
+        available_versions.each_with_index do |version, index|
+          valid_responses[(index + 1).to_s] = version
+          question << "#{index + 1}. #{@cookbook_name} #{version}\n"
+        end
+        valid_responses[(available_versions.size + 1).to_s] = :all
+        question << "#{available_versions.size + 1}. All versions\n\n"
+        responses = ask_question(question).split(',').map { |response| response.strip }
+        
+        if responses.empty?
+          Chef::Log.error("No versions specified, exiting")
+          exit(1)
+        end
+        versions = responses.map do |response|
+          if version = valid_responses[response]
+            version
+          else
+            Chef::Log.error("#{response} is not a valid choice, skipping it")
+          end
+        end
+        versions.compact
+      end
 
+      def delete_version_without_confirmation(version)
+        object = rest.delete_rest("cookbooks/#{@cookbook_name}/#{version}")
+        output(format_for_display(object)) if config[:print_after]
+        Chef::Log.info("Deleted cookbook[#{@cookbook_name}][#{version}]")
+      end
 
+      def delete_versions_without_confirmation(versions)
+        versions.each do |version|
+          if version == :all
+            delete_all_without_confirmation
+            break
+          else
+            delete_version_without_confirmation(version)
+          end
+        end
+      end
 
+    end
+  end
+end

data/lib/chef/knife/cookbook_download.rb

@@ -23,12 +23,13 @@ class Chef
   class Knife
     class CookbookDownload < Knife
 
-      banner "Sub-Command: cookbook download COOKBOOK VERSION (options)"
+      banner "Sub-Command: cookbook download COOKBOOK [VERSION] (options)"
 
-      option :version,
-       :short => "-v VERSION",
-       :long => "--version VERSION",
-       :description => "The version of the cookbook to download"
+      option :latest,
+       :short => "-N",
+       :long => "--latest",
+       :description => "The version of the cookbook to download",
+       :boolean => true
 
       option :download_directory,
        :short => "-d DOWNLOAD_DIRECTORY",
@@ -45,19 +46,22 @@ class Chef
       # specificity for downloads - need to implement --platform and
       # --fqdn here
       def run
-        if @name_args.length != 2
-          Chef::Log.fatal("You must supply a cookbook name and version to download!")
-          exit 42
+        @cookbook_name, @version = @name_args
+
+        if @cookbook_name.nil?
+          show_usage
+          Chef::Log.fatal("You must specify a cookbook name")
+          exit 1
+        elsif @version.nil?
+          determine_version
         end
           
-        cookbook_name = @name_args[0]
-        cookbook_version = @name_args[1] == 'latest' ? '_latest' : @name_args[1]
-        Chef::Log.info("Downloading #{cookbook_name} cookbook version #{cookbook_version}")
+        Chef::Log.info("Downloading #{@cookbook_name} cookbook version #{@version}")
         
-        cookbook = rest.get_rest("cookbooks/#{cookbook_name}/#{cookbook_version}")
+        cookbook = rest.get_rest("cookbooks/#{@cookbook_name}/#{@version}")
         manifest = cookbook.manifest
 
-        basedir = File.join(config[:download_directory], "#{cookbook_name}-#{cookbook.version}")
+        basedir = File.join(config[:download_directory], "#{@cookbook_name}-#{cookbook.version}")
         if File.exists?(basedir)
           if config[:force]
             Chef::Log.debug("Deleting #{basedir}")
@@ -83,6 +87,44 @@ class Chef
         Chef::Log.info("Cookbook downloaded to #{basedir}")
       end
 
+      def determine_version
+        if available_versions.size == 1
+          @version = available_versions.first
+        elsif config[:latest]
+          @version = available_versions.map { |v| Chef::Cookbook::Metadata::Version.new(v) }.sort.last
+        else
+          ask_which_version
+        end
+      end
+
+      def available_versions
+        @available_versions ||= begin
+          versions = Chef::CookbookVersion.available_versions(@cookbook_name).map do |version|
+            Chef::Cookbook::Metadata::Version.new(version)
+          end
+          versions.sort!
+          versions
+        end
+        #pp :available_versions => @available_versions
+        @available_versions
+      end
+
+      def ask_which_version
+        question = "Which version do you want to download?\n"
+        valid_responses = {}
+        available_versions.each_with_index do |version, index|
+          valid_responses[(index + 1).to_s] = version
+          question << "#{index + 1}. #{@cookbook_name} #{version}\n"
+        end
+        question += "\n"
+        response = ask_question(question).strip
+
+        unless @version = valid_responses[response]
+          Chef::Log.error("'#{response}' is not a valid value.")
+          exit(1)
+        end
+      end
+
     end
   end
 end

data/lib/chef/knife/cookbook_upload.rb

@@ -24,6 +24,7 @@ require 'chef/streaming_cookbook_uploader'
 require 'chef/cache/checksum'
 require 'chef/sandbox'
 require 'chef/cookbook_version'
+require 'chef/cookbook/syntax_check'
 require 'chef/cookbook/file_system_file_vendor'
 
 class Chef
@@ -50,6 +51,8 @@ class Chef
         else
           config[:cookbook_path] = Chef::Config[:cookbook_path]
         end
+        # Ugh, manipulating globals causes bugs.
+        @user_cookbook_path = config[:cookbook_path]
 
         Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest) }
 
@@ -70,23 +73,12 @@ class Chef
         end
       end
       
-      def test_ruby(cookbook_dir)
-        Chef::Log.info("Validating ruby files")
-        Dir[File.join(cookbook_dir, '**', '*.rb')].each do |ruby_file|
-          test_ruby_file(cookbook_dir, ruby_file)
-        end
-      end
-      
-      def test_templates(cookbook_dir)
-        Chef::Log.info("Validating templates")
-        Dir[File.join(cookbook_dir, '**', '*.erb')].each do |erb_file|
-          test_template_file(cookbook_dir, erb_file)
-        end
-      end
-      
       def upload_cookbook(cookbook)
         Chef::Log.info("Saving #{cookbook.name}")
         
+        # Validate the cookbook before staging it or else the syntax checker's
+        # cache will not be helpful.
+        validate_cookbook(cookbook)
         # create build directory
         tmp_cookbook_dir = create_build_dir(cookbook)
 
@@ -173,10 +165,6 @@ class Chef
           end
         end
         
-        # Validate ruby files and templates
-        test_ruby(tmp_cookbook_dir)
-        test_templates(tmp_cookbook_dir)
-
         # First, generate metadata
         Chef::Log.debug("Generating metadata")
         kcm = Chef::Knife::CookbookMetadata.new
@@ -201,30 +189,16 @@ class Chef
         end
       end
 
-      private
-
-      def test_template_file(cookbook_dir, erb_file)
-        Chef::Log.debug("Testing template #{erb_file} for syntax errors...")
-        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]
-        Chef::Log.fatal("Erb template #{file_relative_path} has a syntax error:")
-        result.stderr.each_line { |l| Chef::Log.fatal(l.chomp) }
-        exit(1)
+      def validate_cookbook(cookbook)
+        syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cookbook.name, @user_cookbook_path)
+        Chef::Log.info("Validating ruby files")
+        exit(1) unless syntax_checker.validate_ruby_files
+        Chef::Log.info("Validating templates")
+        exit(1) unless syntax_checker.validate_templates
+        Chef::Log.info("Syntax OK")
+        true
       end
 
-      def test_ruby_file(cookbook_dir, ruby_file)
-        Chef::Log.debug("Testing #{ruby_file} for syntax errors...")
-        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]
-        Chef::Log.fatal("Cookbook file #{file_relative_path} has a syntax error:")
-        result.stderr.each_line { |l| Chef::Log.fatal(l.chomp) }
-        exit(1)
-      end
-      
     end
   end
 end

data/lib/chef/knife/recipe_list.rb

@@ -0,0 +1,32 @@
+#
+# 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.
+#
+
+require 'chef/knife'
+class Chef::Knife::RecipeList < Chef::Knife
+  
+  banner "Sub-Command: recipe list [PATTERN]"
+
+  def run
+    recipes = rest.get_rest('cookbooks/_recipes')
+    if pattern = @name_args.first
+      recipes = recipes.grep(Regexp.new(pattern))
+    end
+    output(recipes)
+  end
+
+end

data/lib/chef/knife/ssh.rb

@@ -76,6 +76,7 @@ class Chef
                  end
                  r
                end
+        (Chef::Log.fatal("No nodes returned from search!"); exit 10) if list.length == 0
         session_from_list(list)
       end
 
@@ -201,6 +202,34 @@ class Chef
         exec("screen -c #{tf.path}")
       end
 
+      def tmux
+        begin
+          Chef::Mixin::Command.run_command(:command => "tmux new-session -d -s 'knife'")
+        rescue Chef::Exceptions::Exec
+        end
+        session.servers_for.each do |server|
+          begin
+            Chef::Mixin::Command.run_command(:command => "tmux new-window -d -n '#{server.host}' -t 'knife' 'ssh #{server.user ? "#{server.user}@#{server.host}" : server.host}'")
+          rescue Chef::Exceptions::Exec
+          end
+        end
+        exec("tmux attach-session -t knife")
+      end
+
+      def macterm
+        require 'appscript'
+        Appscript.app("/Applications/Utilities/Terminal.app").windows.first.activate  
+        Appscript.app("System Events").application_processes["Terminal.app"].keystroke("n", :using=>:command_down)
+        term = Appscript.app('Terminal')  
+        window = term.windows.first.get
+        session.servers_for.each do |server|
+          Appscript.app("System Events").application_processes["Terminal.app"].keystroke("t", :using=>:command_down)
+          cmd = "unset PROMPT_COMMAND; echo -e \"\\033]0;#{server.host}\\007\"; ssh #{server.user ? "#{server.user}@#{server.host}" : server.host}"
+          Appscript.app('Terminal').do_script(cmd, :in => window.tabs.last.get)
+          sleep 1
+        end
+      end
+
       def run 
         @longest = 0
 
@@ -215,6 +244,10 @@ class Chef
           interactive 
         when "screen"
           screen
+        when "tmux"
+          tmux
+        when "macterm"
+          macterm
         else
           ssh_command(@name_args[1..-1].join(" "))
         end

data/lib/chef/shef/shef_session.rb

@@ -172,7 +172,7 @@ module Shef
       @client.register
       @client.build_node #(@client.node_name, false)
       
-      @client.sync_cookbooks
+      @client.sync_cookbooks({})
     end
 
   end

data/lib/chef/version.rb

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

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 0
-  - b01
-  version: 0.9.0.b01
+  - b02
+  version: 0.9.0.b02
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 -07:00
+date: 2010-06-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -283,6 +283,7 @@ files:
 - lib/chef/cookbook/metadata/version.rb
 - lib/chef/cookbook/metadata.rb
 - lib/chef/cookbook/remote_file_vendor.rb
+- lib/chef/cookbook/syntax_check.rb
 - lib/chef/cookbook_loader.rb
 - lib/chef/cookbook_version.rb
 - lib/chef/couchdb.rb
@@ -344,6 +345,7 @@ files:
 - lib/chef/knife/rackspace_server_create.rb
 - lib/chef/knife/rackspace_server_delete.rb
 - lib/chef/knife/rackspace_server_list.rb
+- lib/chef/knife/recipe_list.rb
 - lib/chef/knife/role_bulk_delete.rb
 - lib/chef/knife/role_create.rb
 - lib/chef/knife/role_delete.rb