knife-essentials 0.8.4 → 0.8.5

data/lib/chef_fs/file_system/cookbook_dir.rb

@@ -99,6 +99,7 @@ module ChefFS
               container.add_child(CookbookFile.new(parts[parts.length-1], container, segment_file))
             end
           end
+          @children = @children.sort_by { |c| c.name }
         end
         @children
       end
@@ -107,16 +108,18 @@ module ChefFS
         exists?
       end
 
-      def read
-        # This will only be called if dir? is false, which means exists? is false.
-        raise ChefFS::FileSystem::NotFoundError, path_for_printing
-      end
-
       def delete(recurse)
         if recurse
-          rest.delete_rest(api_path)
+          begin
+            rest.delete_rest(api_path)
+          rescue Net::HTTPServerException
+            if $!.response.code == "404"
+              raise ChefFS::FileSystem::NotFoundError.new(self, $!)
+            end
+          end
         else
-          raise ChefFS::FileSystem::MustDeleteRecursivelyError.new, "#{path_for_printing} must be deleted recursively"
+          raise NotFoundError.new(self) if !exists?
+          raise MustDeleteRecursivelyError.new(self), "#{path_for_printing} must be deleted recursively"
         end
       end
 
@@ -133,8 +136,10 @@ module ChefFS
           return [ !exists?, nil, nil ]
         end
         are_same = true
-        ChefFS::CommandLine::diff_entries(self, other, nil, :name_only) do
-          are_same = false
+        ChefFS::CommandLine::diff_entries(self, other, nil, :name_only) do |type, old_entry, new_entry|
+          if [ :directory_to_file, :file_to_directory, :deleted, :added, :modified ].include?(type)
+            are_same = false
+          end
         end
         [ are_same, nil, nil ]
       end
@@ -154,7 +159,7 @@ module ChefFS
 
         # The negative (not found) response is cached
         if @could_not_get_chef_object
-          raise ChefFS::FileSystem::NotFoundError.new(@could_not_get_chef_object), "#{path_for_printing} not found"
+          raise ChefFS::FileSystem::NotFoundError.new(self, @could_not_get_chef_object)
         end
 
         begin
@@ -173,7 +178,7 @@ module ChefFS
         rescue Net::HTTPServerException
           if $!.response.code == "404"
             @could_not_get_chef_object = $!
-            raise ChefFS::FileSystem::NotFoundError.new(@could_not_get_chef_object), "#{path_for_printing} not found"
+            raise ChefFS::FileSystem::NotFoundError.new(self, @could_not_get_chef_object)
           else
             raise
           end
@@ -183,7 +188,7 @@ module ChefFS
         rescue Net::HTTPFatalError
           if $!.response.code == "500"
             @could_not_get_chef_object = $!
-            raise ChefFS::FileSystem::NotFoundError.new(@could_not_get_chef_object), "#{path_for_printing} not found"
+            raise ChefFS::FileSystem::NotFoundError.new(self, @could_not_get_chef_object)
           else
             raise
           end

data/lib/chef_fs/file_system/cookbooks_dir.rb

@@ -32,7 +32,7 @@ module ChefFS
       end
 
       def children
-        @children ||= rest.get_rest(api_path).map { |key, value| CookbookDir.new(key, self, value) }
+        @children ||= rest.get_rest(api_path).map { |key, value| CookbookDir.new(key, self, value) }.sort_by { |c| c.name }
       end
 
       def create_child_from(other)

data/lib/chef_fs/file_system/data_bag_dir.rb

@@ -35,7 +35,7 @@ module ChefFS
 
       def read
         # This will only be called if dir? is false, which means exists? is false.
-        raise ChefFS::FileSystem::NotFoundError, "#{path_for_printing} not found"
+        raise ChefFS::FileSystem::NotFoundError.new(self)
       end
 
       def exists?
@@ -61,13 +61,14 @@ module ChefFS
 
       def delete(recurse)
         if !recurse
-          raise ChefFS::FileSystem::MustDeleteRecursivelyError.new, "#{path_for_printing} must be deleted recursively"
+          raise NotFoundError.new(self) if !exists?
+          raise MustDeleteRecursivelyError.new(self), "#{path_for_printing} must be deleted recursively"
         end
         begin
           rest.delete_rest(api_path)
         rescue Net::HTTPServerException
           if $!.response.code == "404"
-            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            raise ChefFS::FileSystem::NotFoundError.new(self, $!)
           end
         end
       end

data/lib/chef_fs/file_system/data_bag_item.rb

@@ -46,7 +46,7 @@ module ChefFS
           rest.put_rest(api_path, json)
         rescue Net::HTTPServerException
           if $!.response.code == "404"
-            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            raise ChefFS::FileSystem::NotFoundError.new(self, $!)
           else
             raise
           end

data/lib/chef_fs/file_system/data_bags_dir.rb

@@ -33,12 +33,12 @@ module ChefFS
 
       def children
         begin
-          @children ||= rest.get_rest(api_path).keys.map do |entry|
+          @children ||= rest.get_rest(api_path).keys.sort.map do |entry|
             DataBagDir.new(entry, self, true)
           end
         rescue Net::HTTPServerException
           if $!.response.code == "404"
-            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            raise ChefFS::FileSystem::NotFoundError.new(self, $!)
           else
             raise
           end

data/lib/chef_fs/file_system/{operation_skipped_error.rb → default_environment_cannot_be_modified_error.rb}

@@ -20,9 +20,14 @@ require 'chef_fs/file_system/operation_not_allowed_error'
 
 module ChefFS
   module FileSystem
-    class OperationSkippedError < OperationNotAllowedError
-      def initialize(operation, cause = nil)
-        super(operation, cause)
+    class DefaultEnvironmentCannotBeModifiedError < OperationNotAllowedError
+      def initialize(operation, entry, cause = nil)
+        super(operation, entry, cause)
+      end
+
+      def reason
+        result = super
+        result + " (default environment cannot be modified)"
       end
     end
   end

data/lib/chef_fs/file_system/environments_dir.rb

@@ -19,7 +19,7 @@
 require 'chef_fs/file_system/base_fs_dir'
 require 'chef_fs/file_system/rest_list_entry'
 require 'chef_fs/file_system/not_found_error'
-require 'chef_fs/file_system/operation_skipped_error'
+require 'chef_fs/file_system/default_environment_cannot_be_modified_error'
 
 module ChefFS
   module FileSystem
@@ -43,15 +43,13 @@ module ChefFS
         end
 
         def delete(recurse)
-          Chef::Log.warn("The default environment (#{name}) cannot be deleted.  Skipping.")
-          raise NotFoundError, "Nonexistent #{path_for_printing}" if !exists?
-          raise OperationSkippedError.new(:delete), "#{path_for_printing} cannot be deleted."
+          raise NotFoundError.new(self) if !exists?
+          raise DefaultEnvironmentCannotBeModifiedError.new(:delete, self), "#{path_for_printing} cannot be deleted."
         end
 
         def write(file_contents)
-          Chef::Log.warn("The default environment (#{name}) cannot be deleted.  Skipping.")
-          raise NotFoundError, "Nonexistent #{path_for_printing}" if !exists?
-          raise OperationSkippedError.new(:write), "#{path_for_printing} cannot be updated."
+          raise NotFoundError.new(self) if !exists?
+          raise DefaultEnvironmentCannotBeModifiedError.new(:write, self), "#{path_for_printing} cannot be updated."
         end
       end
     end

data/lib/chef_fs/file_system/file_system_entry.rb

@@ -19,6 +19,7 @@
 require 'chef_fs/file_system/base_fs_dir'
 require 'chef_fs/file_system/rest_list_dir'
 require 'chef_fs/file_system/not_found_error'
+require 'chef_fs/file_system/must_delete_recursively_error'
 require 'chef_fs/path_utils'
 require 'fileutils'
 
@@ -40,7 +41,7 @@ module ChefFS
         begin
           @children ||= Dir.entries(file_path).select { |entry| entry != '.' && entry != '..' }.map { |entry| FileSystemEntry.new(entry, self) }
         rescue Errno::ENOENT
-          raise ChefFS::FileSystem::NotFoundError.new($!), "#{file_path} not found"
+          raise ChefFS::FileSystem::NotFoundError.new(self, $!)
         end
       end
 
@@ -60,11 +61,10 @@ module ChefFS
 
       def delete(recurse)
         if dir?
-          if recurse
-            FileUtils.rm_rf(file_path)
-          else
-            File.rmdir(file_path)
+          if !recurse
+            raise MustDeleteRecursivelyError.new(self, $!)
           end
+          FileUtils.rm_rf(file_path)
         else
           File.delete(file_path)
         end
@@ -74,7 +74,7 @@ module ChefFS
         begin
           File.open(file_path, "rb") {|f| f.read}
         rescue Errno::ENOENT
-          raise ChefFS::FileSystem::NotFoundError.new($!), "#{file_path} not found"
+          raise ChefFS::FileSystem::NotFoundError.new(self, $!)
         end
       end
 

data/lib/chef_fs/file_system/must_delete_recursively_error.rb

@@ -21,9 +21,12 @@ require 'chef_fs/file_system/file_system_error'
 module ChefFS
   module FileSystem
     class MustDeleteRecursivelyError < FileSystemError
-      def initialize(cause = nil)
+      def initialize(entry, cause = nil)
         super(cause)
+        @entry = entry
       end
+
+      attr_reader :entry
     end
   end
 end

data/lib/chef_fs/file_system/nodes_dir.rb

@@ -32,10 +32,10 @@ module ChefFS
       def children
         @children ||= begin
           env_api_path = environment ? "environments/#{environment}/#{api_path}" : api_path
-          rest.get_rest(env_api_path).keys.map { |key| RestListEntry.new("#{key}.json", self, true) }
+          rest.get_rest(env_api_path).keys.sort.map { |key| RestListEntry.new("#{key}.json", self, true) }
         rescue Net::HTTPServerException
           if $!.response.code == "404"
-            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            raise ChefFS::FileSystem::NotFoundError.new(self, $!)
           else
             raise
           end

data/lib/chef_fs/file_system/nonexistent_fs_object.rb

@@ -29,18 +29,6 @@ module ChefFS
       def exists?
         false
       end
-
-      def read
-        raise ChefFS::FileSystem::NotFoundError, "Nonexistent #{path_for_printing}"
-      end
-
-      def write(contents)
-        raise ChefFS::FileSystem::NotFoundError, "Nonexistent #{path_for_printing}"
-      end
-
-      def delete(recurse)
-        raise ChefFS::FileSystem::NotFoundError, "Nonexistent #{path_for_printing}"
-      end
     end
   end
 end

data/lib/chef_fs/file_system/not_found_error.rb

@@ -21,9 +21,12 @@ require 'chef_fs/file_system/file_system_error'
 module ChefFS
   module FileSystem
     class NotFoundError < FileSystemError
-      def initialize(cause = nil)
+      def initialize(entry, cause = nil)
         super(cause)
+        @entry = entry
       end
+
+      attr_reader :entry
     end
   end
 end

data/lib/chef_fs/file_system/operation_not_allowed_error.rb

@@ -21,8 +21,26 @@ require 'chef_fs/file_system/file_system_error'
 module ChefFS
   module FileSystem
     class OperationNotAllowedError < FileSystemError
-      def initialize(operation, cause = nil)
+      def initialize(operation, entry, cause = nil)
         super(cause)
+        @operation = operation
+        @entry = entry
+      end
+
+      attr_reader :operation
+      attr_reader :entry
+
+      def reason
+        case operation
+        when :delete
+          "cannot be deleted"
+        when :write
+          "cannot be updated"
+        when :create_child
+          "cannot have a child created under it"
+        when :read
+          "cannot be read"
+        end
       end
     end
   end

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -42,12 +42,12 @@ module ChefFS
 
       def children
         begin
-          @children ||= rest.get_rest(api_path).keys.map do |key|
+          @children ||= rest.get_rest(api_path).keys.sort.map do |key|
             _make_child_entry("#{key}.json", true)
           end
         rescue Net::HTTPServerException
           if $!.response.code == "404"
-            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            raise ChefFS::FileSystem::NotFoundError.new(self, $!)
           else
             raise
           end

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -57,7 +57,7 @@ module ChefFS
           rest.delete_rest(api_path)
         rescue Net::HTTPServerException
           if $!.response.code == "404"
-            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            raise ChefFS::FileSystem::NotFoundError.new(self, $!)
           else
             raise
           end
@@ -74,7 +74,7 @@ module ChefFS
           rest.get_rest(api_path)
         rescue Net::HTTPServerException
           if $!.response.code == "404"
-            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            raise ChefFS::FileSystem::NotFoundError.new(self, $!)
           else
             raise
           end
@@ -110,7 +110,7 @@ module ChefFS
           rest.put_rest(api_path, json)
         rescue Net::HTTPServerException
           if $!.response.code == "404"
-            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            raise ChefFS::FileSystem::NotFoundError.new(self, $!)
           else
             raise
           end

data/lib/chef_fs/knife.rb

@@ -124,7 +124,7 @@ module ChefFS
           realest_path = ChefFS::PathUtils.realest_path(path)
           if absolute_path[0,realest_path.length] == realest_path &&
             (absolute_path.length == realest_path.length ||
-              absolute_path[realest_path.length] =~ /#{PathUtils.regexp_path_separator}/)
+              absolute_path[realest_path.length,1] =~ /#{PathUtils.regexp_path_separator}/)
             relative_path = ChefFS::PathUtils::relative_to(absolute_path, realest_path)
             return relative_path == '.' ? "/#{name}" : "/#{name}/#{relative_path}"
           end
@@ -148,13 +148,14 @@ module ChefFS
     end
 
     # Print the given server path, relative to the current directory
-    def format_path(server_path)
+    def format_path(entry)
+      server_path = entry.path
       if base_path && server_path[0,base_path.length] == base_path
         if server_path == base_path
           return "."
-        elsif server_path[base_path.length] == "/"
+        elsif server_path[base_path.length,1] == "/"
           return server_path[base_path.length + 1, server_path.length - base_path.length - 1]
-        elsif base_path == "/" && server_path[0] == "/"
+        elsif base_path == "/" && server_path[0,1] == "/"
           return server_path[1, server_path.length - 1]
         end
       end

data/lib/chef_fs/path_utils.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef_fs'
+require 'pathname'
 
 module ChefFS
   class PathUtils
@@ -67,14 +68,15 @@ module ChefFS
     # PathUtils.realest_path('/x/*/z') == '/blarghle/*/z'
     # PathUtils.realest_path('/*/y/z') == '/*/y/z'
     def self.realest_path(path)
+      path = Pathname.new(path)
       begin
-        File.realpath(path)
+        path.realpath.to_s
       rescue Errno::ENOENT
-        dirname = File.dirname(path)
+        dirname = path.dirname
         if dirname
-          PathUtils.join(realest_path(dirname), File.basename(path))
+          PathUtils.join(realest_path(dirname), path.basename.to_s)
         else
-          path
+          path.to_s
         end
       end
     end

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end
 

data/spec/integration/delete_spec.rb

@@ -0,0 +1,684 @@
+require 'support/integration_helper'
+require 'chef/knife/delete_essentials'
+require 'chef/knife/list_essentials'
+require 'chef/knife/raw_essentials'
+
+describe 'knife delete' do
+  extend IntegrationSupport
+  include KnifeSupport
+
+  let :everything do
+    <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+  end
+
+  let :server_nothing do
+    <<EOM
+/cookbooks
+/data_bags
+/environments
+/environments/_default.json
+/roles
+EOM
+  end
+
+  let :nothing do
+    <<EOM
+/cookbooks
+/data_bags
+/environments
+/roles
+EOM
+  end
+
+  when_the_chef_server "has one of each thing" do
+    client 'x', '{}'
+    cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }
+    data_bag 'x', { 'y' => '{}' }
+    environment 'x', '{}'
+    node 'x', '{}'
+    role 'x', '{}'
+    user 'x', '{}'
+
+    when_the_repository 'also has one of each thing' do
+      file 'clients/x.json', {}
+      file 'cookbooks/x/metadata.rb', ''
+      file 'data_bags/x/y.json', {}
+      file 'environments/_default.json', {}
+      file 'environments/x.json', {}
+      file 'nodes/x.json', {}
+      file 'roles/x.json', {}
+      file 'users/x.json', {}
+
+      it 'knife delete /cookbooks/x fails' do
+        knife('delete /cookbooks/x').should_fail <<EOM
+ERROR: /cookbooks/x (remote) must be deleted recursively!  Pass -r to knife delete.
+ERROR: /cookbooks/x (local) must be deleted recursively!  Pass -r to knife delete.
+EOM
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed everything
+      end
+
+      it 'knife delete -r /cookbooks/x deletes x' do
+        knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('list -Rf /').should_succeed <<EOM
+/cookbooks
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+      end
+
+      it 'knife delete -r --local-only /cookbooks/x deletes x locally but not remotely' do
+        knife('delete -r --local-only /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+      end
+
+      it 'knife delete -r --remote-only /cookbooks/x deletes x remotely but not locally' do
+        knife('delete -r --remote-only /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('list -Rf /').should_succeed <<EOM
+/cookbooks
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+        knife('list -Rf --local /').should_succeed everything
+      end
+
+      # TODO delete empty data bag (particularly different on local side)
+      context 'with an empty data bag on both' do
+        data_bag 'empty', {}
+        directory 'data_bags/empty'
+        it 'knife delete /data_bags/empty fails but deletes local version' do
+          knife('delete /data_bags/empty').should_fail <<EOM
+ERROR: /data_bags/empty (remote) must be deleted recursively!  Pass -r to knife delete.
+ERROR: /data_bags/empty (local) must be deleted recursively!  Pass -r to knife delete.
+EOM
+          knife('list -Rf /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/empty
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+          knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/empty
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+        end
+      end
+
+      it 'knife delete /data_bags/x fails' do
+        knife('delete /data_bags/x').should_fail <<EOM
+ERROR: /data_bags/x (remote) must be deleted recursively!  Pass -r to knife delete.
+ERROR: /data_bags/x (local) must be deleted recursively!  Pass -r to knife delete.
+EOM
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed everything
+      end
+
+      it 'knife delete -r /data_bags/x deletes x' do
+        knife('delete -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
+        knife('list -Rf /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+      end
+
+      it 'knife delete /environments/x.json deletes x' do
+        knife('delete /environments/x.json').should_succeed "Deleted /environments/x.json\n"
+        knife('list -Rf /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/roles
+/roles/x.json
+EOM
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/roles
+/roles/x.json
+EOM
+      end
+
+      it 'knife delete /roles/x.json deletes x' do
+        knife('delete /roles/x.json').should_succeed "Deleted /roles/x.json\n"
+        knife('list -Rf /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+EOM
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+EOM
+      end
+
+      it 'knife delete /environments/_default.json fails but still deletes the local copy' do
+        knife('delete /environments/_default.json').should_fail :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n", :stdout => "Deleted /environments/_default.json\n"
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+      end
+
+      it 'knife delete /environments/nonexistent.json fails' do
+        knife('delete /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed everything
+      end
+
+      it 'knife delete / fails' do
+        knife('delete /').should_fail <<EOM
+ERROR: / (remote) cannot be deleted.
+ERROR: / (local) cannot be deleted.
+EOM
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed everything
+      end
+
+      it 'knife delete -r /* fails' do
+        knife('delete -r /*').should_fail <<EOM
+ERROR: / (remote) cannot be deleted.
+ERROR: / (local) cannot be deleted.
+ERROR: /cookbooks (remote) cannot be deleted.
+ERROR: /cookbooks (local) cannot be deleted.
+ERROR: /data_bags (remote) cannot be deleted.
+ERROR: /data_bags (local) cannot be deleted.
+ERROR: /environments (remote) cannot be deleted.
+ERROR: /environments (local) cannot be deleted.
+ERROR: /roles (remote) cannot be deleted.
+ERROR: /roles (local) cannot be deleted.
+EOM
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed everything
+      end
+    end
+
+    when_the_repository 'has only top-level directories' do
+      directory 'clients'
+      directory 'cookbooks'
+      directory 'data_bags'
+      directory 'environments'
+      directory 'nodes'
+      directory 'roles'
+      directory 'users'
+
+      it 'knife delete /cookbooks/x fails' do
+        knife('delete /cookbooks/x').should_fail "ERROR: /cookbooks/x (remote) must be deleted recursively!  Pass -r to knife delete.\n"
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed nothing
+      end
+
+      it 'knife delete -r /cookbooks/x deletes x' do
+        knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('list -Rf /').should_succeed <<EOM
+/cookbooks
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+        knife('list -Rf --local /').should_succeed nothing
+      end
+
+      it 'knife delete /data_bags/x fails' do
+        knife('delete /data_bags/x').should_fail "ERROR: /data_bags/x (remote) must be deleted recursively!  Pass -r to knife delete.\n"
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed nothing
+      end
+
+      it 'knife delete -r /data_bags/x deletes x' do
+        knife('delete -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
+        knife('list -Rf /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+        knife('list -Rf --local /').should_succeed nothing
+      end
+
+      it 'knife delete /environments/x.json deletes x' do
+        knife('delete /environments/x.json').should_succeed "Deleted /environments/x.json\n"
+        knife('list -Rf /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/roles
+/roles/x.json
+EOM
+        knife('list -Rf --local /').should_succeed nothing
+      end
+
+      it 'knife delete /roles/x.json deletes x' do
+        knife('delete /roles/x.json').should_succeed "Deleted /roles/x.json\n"
+        knife('list -Rf /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+EOM
+        knife('list -Rf --local /').should_succeed nothing
+      end
+
+      it 'knife delete /environments/_default.json fails' do
+        knife('delete /environments/_default.json').should_fail "", :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n"
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed nothing
+      end
+
+      it 'knife delete / fails' do
+        knife('delete /').should_fail "ERROR: / (remote) cannot be deleted.\nERROR: / (local) cannot be deleted.\n"
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed nothing
+      end
+
+      it 'knife delete -r /* fails' do
+        knife('delete -r /*').should_fail <<EOM
+ERROR: / (remote) cannot be deleted.
+ERROR: / (local) cannot be deleted.
+ERROR: /cookbooks (remote) cannot be deleted.
+ERROR: /cookbooks (local) cannot be deleted.
+ERROR: /data_bags (remote) cannot be deleted.
+ERROR: /data_bags (local) cannot be deleted.
+ERROR: /environments (remote) cannot be deleted.
+ERROR: /environments (local) cannot be deleted.
+ERROR: /roles (remote) cannot be deleted.
+ERROR: /roles (local) cannot be deleted.
+EOM
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed nothing
+      end
+
+      it 'knife delete /environments/nonexistent.json fails' do
+        knife('delete /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
+        knife('list -Rf /').should_succeed everything
+        knife('list -Rf --local /').should_succeed nothing
+      end
+
+      context 'and cwd is at the top level' do
+        cwd '.'
+        it 'knife delete fails' do
+          knife('delete').should_fail "FATAL: Must specify at least one argument.  If you want to delete everything in this directory, type \"knife delete --recurse .\"\n", :stdout => /USAGE/
+          knife('list -Rf /').should_succeed <<EOM
+cookbooks
+cookbooks/x
+cookbooks/x/metadata.rb
+data_bags
+data_bags/x
+data_bags/x/y.json
+environments
+environments/_default.json
+environments/x.json
+roles
+roles/x.json
+EOM
+          knife('list -Rf --local /').should_succeed <<EOM
+cookbooks
+data_bags
+environments
+roles
+EOM
+        end
+      end
+    end
+  end
+
+  when_the_chef_server 'is empty' do
+    when_the_repository 'has one of each thing' do
+      file 'clients/x.json', {}
+      file 'cookbooks/x/metadata.rb', ''
+      file 'data_bags/x/y.json', {}
+      file 'environments/_default.json', {}
+      file 'environments/x.json', {}
+      file 'nodes/x.json', {}
+      file 'roles/x.json', {}
+      file 'users/x.json', {}
+
+      it 'knife delete /cookbooks/x fails' do
+        knife('delete /cookbooks/x').should_fail "ERROR: /cookbooks/x (local) must be deleted recursively!  Pass -r to knife delete.\n"
+        knife('list -Rf /').should_succeed server_nothing
+        knife('list -Rf --local /').should_succeed everything
+      end
+
+      it 'knife delete -r /cookbooks/x deletes x' do
+        knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('list -Rf /').should_succeed server_nothing
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+      end
+
+      it 'knife delete /data_bags/x fails' do
+        knife('delete /data_bags/x').should_fail "ERROR: /data_bags/x (local) must be deleted recursively!  Pass -r to knife delete.\n"
+        knife('list -Rf /').should_succeed server_nothing
+        knife('list -Rf --local /').should_succeed everything
+      end
+
+      it 'knife delete -r /data_bags/x deletes x' do
+        knife('delete -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
+        knife('list -Rf /').should_succeed server_nothing
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+      end
+
+      it 'knife delete /environments/x.json deletes x' do
+        knife('delete /environments/x.json').should_succeed "Deleted /environments/x.json\n"
+        knife('list -Rf /').should_succeed server_nothing
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/roles
+/roles/x.json
+EOM
+      end
+
+      it 'knife delete /roles/x.json deletes x' do
+        knife('delete /roles/x.json').should_succeed "Deleted /roles/x.json\n"
+        knife('list -Rf /').should_succeed server_nothing
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/_default.json
+/environments/x.json
+/roles
+EOM
+      end
+
+      it 'knife delete /environments/_default.json fails but still deletes the local copy' do
+        knife('delete /environments/_default.json').should_fail :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n", :stdout => "Deleted /environments/_default.json\n"
+        knife('list -Rf /').should_succeed server_nothing
+        knife('list -Rf --local /').should_succeed <<EOM
+/cookbooks
+/cookbooks/x
+/cookbooks/x/metadata.rb
+/data_bags
+/data_bags/x
+/data_bags/x/y.json
+/environments
+/environments/x.json
+/roles
+/roles/x.json
+EOM
+      end
+
+      it 'knife delete / fails' do
+        knife('delete /').should_fail "ERROR: / (remote) cannot be deleted.\nERROR: / (local) cannot be deleted.\n"
+        knife('list -Rf /').should_succeed server_nothing
+        knife('list -Rf --local /').should_succeed everything
+      end
+
+      it 'knife delete -r /* fails' do
+        knife('delete -r /*').should_fail <<EOM
+ERROR: / (remote) cannot be deleted.
+ERROR: / (local) cannot be deleted.
+ERROR: /cookbooks (remote) cannot be deleted.
+ERROR: /cookbooks (local) cannot be deleted.
+ERROR: /data_bags (remote) cannot be deleted.
+ERROR: /data_bags (local) cannot be deleted.
+ERROR: /environments (remote) cannot be deleted.
+ERROR: /environments (local) cannot be deleted.
+ERROR: /roles (remote) cannot be deleted.
+ERROR: /roles (local) cannot be deleted.
+EOM
+        knife('list -Rf /').should_succeed server_nothing
+        knife('list -Rf --local /').should_succeed everything
+      end
+
+      it 'knife delete /environments/nonexistent.json fails' do
+        knife('delete /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
+        knife('list -Rf /').should_succeed server_nothing
+        knife('list -Rf --local /').should_succeed everything
+      end
+
+      context 'and cwd is at the top level' do
+        cwd '.'
+        it 'knife delete fails' do
+          knife('delete').should_fail "FATAL: Must specify at least one argument.  If you want to delete everything in this directory, type \"knife delete --recurse .\"\n", :stdout => /USAGE/
+          knife('list -Rf /').should_succeed <<EOM
+cookbooks
+data_bags
+environments
+environments/_default.json
+roles
+EOM
+          knife('list -Rf --local /').should_succeed <<EOM
+cookbooks
+cookbooks/x
+cookbooks/x/metadata.rb
+data_bags
+data_bags/x
+data_bags/x/y.json
+environments
+environments/_default.json
+environments/x.json
+roles
+roles/x.json
+EOM
+        end
+      end
+    end
+  end
+
+  when_the_repository 'has a cookbook' do
+    file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
+    file 'cookbooks/x/onlyin1.0.0.rb', 'old_text'
+
+    when_the_chef_server 'has a later version for the cookbook' do
+      cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => '' }
+      cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
+
+      # TODO this seems wrong
+      it 'knife delete /cookbooks/x deletes the latest version on the server and the local version' do
+        knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('raw /cookbooks/x').should_succeed(/1.0.0/)
+        knife('list --local /cookbooks').should_succeed ''
+      end
+    end
+
+    when_the_chef_server 'has an earlier version for the cookbook' do
+      cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => ''}
+      cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
+
+      it 'knife delete /cookbooks/x deletes the latest version on the server and the local version' do
+        knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('raw /cookbooks/x').should_succeed(/0.9.9/)
+        knife('list --local /cookbooks').should_succeed ''
+      end
+    end
+
+    when_the_chef_server 'has a later version for the cookbook, and no current version' do
+      cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
+
+      it 'knife delete /cookbooks/x deletes the server and client version of the cookbook' do
+        knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('raw /cookbooks/x').should_fail(/404/)
+        knife('list --local /cookbooks').should_succeed ''
+      end
+    end
+
+    when_the_chef_server 'has an earlier version for the cookbook, and no current version' do
+      cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
+
+      it 'knife delete /cookbooks/x deletes the server and client version of the cookbook' do
+        knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('raw /cookbooks/x').should_fail(/404/)
+        knife('list --local /cookbooks').should_succeed ''
+      end
+    end
+  end
+
+  when_the_repository 'is empty' do
+    when_the_chef_server 'has two versions of a cookbook' do
+      cookbook 'x', '2.0.11', { 'metadata.rb' => 'version "2.0.11"' }
+      cookbook 'x', '11.0.0', { 'metadata.rb' => 'version "11.0.0"' }
+      it 'knife delete deletes the latest version' do
+        knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('raw /cookbooks/x').should_succeed /2.0.11/
+      end
+    end
+  end
+end