@@ -62,7 +62,7 @@ def index_latest
   def index_recipes
     all_cookbooks = Array(Chef::CookbookVersion.cdb_list_latest(true))
     all_cookbooks.map! do |cookbook|
-      cookbook.manifest["recipes"].map { |r| "#{cookbook.name}::#{r['name']}" }
+      cookbook.manifest["recipes"].map { |r| "#{cookbook.name}::#{File.basename(r['name'], ".rb")}" }
     end
     all_cookbooks.flatten!
     all_cookbooks.sort!
 
@@ -36,7 +36,7 @@
             %div.sortable
               %ul#node_available_recipes.connectedSortable
                 - @available_recipes.each do |recipe|
-                  %li{ :id => "recipe[#{File.basename(recipe, ".rb")}]", :class => 'ui-state-default' }= h File.basename(recipe, ".rb")
+                  %li{ :id => "recipe[#{recipe}]",:title => recipe, :class => 'ui-state-default' }= h recipe
 
 
     %div.group.form{:style => "position:relative;"}
 
@@ -36,7 +36,7 @@
                   %tr
                     %td{:colspan => 2} This node has no recipes applied.
                 - else
-                  - full_recipe_list.each do |recipe|
+                  - @node.run_list.each_with_index do |recipe, i|
                     %tr
                       %td.position= i
                       %td= recipe
 
@@ -40,7 +40,7 @@
             %div.sortable
               %ul#node_available_recipes.connectedSortable
                 - @available_recipes.each do |recipe|
-                  %li{ :id => "recipe[#{File.basename(recipe, ".rb")}]", :class => 'ui-state-default' }= h File.basename(recipe, ".rb")
+                  %li{ :id => "recipe[#{recipe}]", :title => recipe, :class => 'ui-state-default' }= h recipe
 
     %div.group.form{:style => "position:relative;"}
       %label.label Default and Override Attributes 
 
@@ -39,7 +39,7 @@
                   %tr
                     %td{:colspan => 2} This node has no recipes applied.
                 - else
-                  - recipes.each do |recipe|
+                  - recipes.each_with_index do |recipe, i|
                     %tr
                       %td.position= i
                       %td= recipes
 
@@ -45,10 +45,10 @@ def run
           config[:cookbook_path] = Chef::Config[:cookbook_path]
         end
 
-        if config[:all] 
+        if config[:all]
           cl = Chef::CookbookLoader.new
-          cl.each do |cookbook|
-            test_cookbook(cookbook.name.to_s)
+          cl.each do |key, cookbook|
+            test_cookbook(key)
           end
         else
           @name_args.each do |cb|
@@ -60,42 +60,21 @@ def run
       def test_cookbook(cookbook)
         Chef::Log.info("Running syntax check on #{cookbook}")
         Array(config[:cookbook_path]).reverse.each do |path|
-          cookbook_dir = File.expand_path(File.join(path, cookbook))
-          test_ruby(cookbook_dir)
-          test_templates(cookbook_dir)
+          syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cookbook, path)
+          test_ruby(syntax_checker)
+          test_templates(syntax_checker)
         end
       end
 
-      def test_ruby(cookbook_dir)
-        cache = Chef::Cache::Checksum.instance
-        Dir[File.join(cookbook_dir, '**', '*.rb')].each do |ruby_file|
-          key = cache.generate_key(ruby_file, "chef-test")
-          fstat = File.stat(ruby_file)
 
-          if cache.lookup_checksum(key, fstat) 
-            Chef::Log.info("No change in checksum of #{ruby_file}")
-          else
-            Chef::Log.info("Testing #{ruby_file} for syntax errors...")
-            Chef::Mixin::Command.run_command(:command => "ruby -c #{ruby_file}", :output_on_failure => true)
-            cache.generate_checksum(key, ruby_file, fstat)
-          end
-        end
+      def test_ruby(syntax_checker)
+        Chef::Log.info("Validating ruby files")
+        exit(1) unless syntax_checker.validate_ruby_files
       end
-
-      def test_templates(cookbook_dir)
-        cache = Chef::Cache::Checksum.instance
-        Dir[File.join(cookbook_dir, '**', '*.erb')].each do |erb_file|
-          key = cache.generate_key(erb_file, "chef-test")
-          fstat = File.stat(erb_file)
-
-          if cache.lookup_checksum(key, fstat) 
-            Chef::Log.info("No change in checksum of #{erb_file}")
-          else
-            Chef::Log.info("Testing template #{erb_file} for syntax errors...")
-            Chef::Mixin::Command.run_command(:command => "sh -c 'erubis -x #{erb_file} | ruby -c'", :output_on_failure => true)
-            cache.generate_checksum(key, erb_file, fstat)
-          end
-        end
+      
+      def test_templates(syntax_checker)
+        Chef::Log.info("Validating templates")
+        exit(1) unless syntax_checker.validate_templates
       end
 
     end
 
@@ -133,7 +133,19 @@ def upload_cookbook(cookbook)
         end
         sandbox_url = new_sandbox['uri']
         Chef::Log.debug("Committing sandbox")
-        catch_auth_exceptions{ rest.put_rest(sandbox_url, {:is_completed => true}) }
+        # Retry if S3 is claims a checksum doesn't exist (the eventual
+        # in eventual consistency)
+        retries = 0
+        begin
+          catch_auth_exceptions{ rest.put_rest(sandbox_url, {:is_completed => true}) }
+        rescue Net::HTTPServerException => e
+          if e.to_s =~ /400 "Bad Request"/ && retries += 1 <= 1
+            sleep 2
+            retry
+          else
+            raise
+          end
+        end
 
         # files are uploaded, so save the manifest
         catch_auth_exceptions{ build_dir_cookbook.save }
 
@@ -25,14 +25,16 @@ class DataBagCreate < Knife
 
       banner "Sub-Command: data bag create BAG [ITEM] (options)"
 
-      def run 
+      def run
+        # create the data bag
+        rest.post_rest("data", { "name" => @name_args[0] })
+        Chef::Log.info("Created data_bag[#{@name_args[0]}]")
+
+        # if an item is specified, create it, as well
         if @name_args.length == 2
           create_object({ "id" => @name_args[1] }, "data_bag_item[#{@name_args[1]}]") do |output|
             rest.post_rest("data/#{@name_args[0]}", output)
           end
-        else
-          rest.post_rest("data", { "name" => @name_args[0] })
-          Chef::Log.info("Created data_bag[#{@name_args[0]}]")
         end
       end
     end