knife-essentials 1.1.1 → 1.2

data/lib/chef/knife/delete_essentials.rb

@@ -1,5 +1,4 @@
 require 'chef_fs/knife'
-require 'chef_fs/file_system'
 
 class Chef
   class Knife
@@ -8,7 +7,9 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife delete [PATTERN1 ... PATTERNn]"
 
-      common_options
+      deps do
+        require 'chef_fs/file_system'
+      end
 
       option :recurse,
         :short => '-r',
@@ -16,16 +17,16 @@ class Chef
         :boolean => true,
         :default => false,
         :description => "Delete directories recursively."
-      option :remote_only,
-        :long => '--remote-only',
+      option :both,
+        :long => '--both',
         :boolean => true,
         :default => false,
-        :description => "Only delete the remote copy (leave the local copy)."
-      option :local_only,
-        :long => '--local-only',
+        :description => "Delete both the local and remote copies."
+      option :local,
+        :long => '--local',
         :boolean => true,
         :default => false,
-        :description => "Only delete the local copy (leave the remote copy)."
+        :description => "Delete the local copy (leave the remote copy)."
 
       def run
         if name_args.length == 0
@@ -36,26 +37,26 @@ class Chef
 
         # Get the matches (recursively)
         error = false
-        if config[:remote_only]
+        if config[:local]
           pattern_args.each do |pattern|
-            ChefFS::FileSystem.list(chef_fs, pattern).each do |result|
+            ChefFS::FileSystem.list(local_fs, pattern).each do |result|
               if delete_result(result)
                 error = true
               end
             end
           end
-        elsif config[:local_only]
+        elsif config[:both]
           pattern_args.each do |pattern|
-            ChefFS::FileSystem.list(local_fs, pattern).each do |result|
-              if delete_result(result)
+            ChefFS::FileSystem.list_pairs(pattern, chef_fs, local_fs).each do |chef_result, local_result|
+              if delete_result(chef_result, local_result)
                 error = true
               end
             end
           end
-        else
+        else # Remote only
           pattern_args.each do |pattern|
-            ChefFS::FileSystem.list_pairs(pattern, chef_fs, local_fs).each do |chef_result, local_result|
-              if delete_result(chef_result, local_result)
+            ChefFS::FileSystem.list(chef_fs, pattern).each do |result|
+              if delete_result(result)
                 error = true
               end
             end

data/lib/chef/knife/deps_essentials.rb

@@ -1,6 +1,4 @@
 require 'chef_fs/knife'
-require 'chef_fs/file_system'
-require 'chef/run_list'
 
 class Chef
   class Knife
@@ -9,7 +7,10 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife deps PATTERN1 [PATTERNn]"
 
-      common_options
+      deps do
+        require 'chef_fs/file_system'
+        require 'chef/run_list'
+      end
 
       option :recurse,
         :long => '--[no-]recurse',

data/lib/chef/knife/diff_essentials.rb

@@ -1,5 +1,4 @@
 require 'chef_fs/knife'
-require 'chef_fs/command_line'
 
 class Chef
   class Knife
@@ -8,7 +7,9 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife diff PATTERNS"
 
-      common_options
+      deps do
+        require 'chef_fs/command_line'
+      end
 
       option :recurse,
         :long => '--[no-]recurse',

data/lib/chef/knife/download_essentials.rb

@@ -1,5 +1,4 @@
 require 'chef_fs/knife'
-require 'chef_fs/command_line'
 
 class Chef
   class Knife
@@ -8,7 +7,9 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife download PATTERNS"
 
-      common_options
+      deps do
+        require 'chef_fs/command_line'
+      end
 
       option :recurse,
         :long => '--[no-]recurse',

data/lib/chef/knife/edit_essentials.rb

@@ -1,6 +1,4 @@
 require 'chef_fs/knife'
-require 'chef_fs/file_system'
-require 'chef_fs/file_system/not_found_error'
 
 class Chef
   class Knife
@@ -9,7 +7,10 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife edit [PATTERN1 ... PATTERNn]"
 
-      common_options
+      deps do
+        require 'chef_fs/file_system'
+        require 'chef_fs/file_system/not_found_error'
+      end
 
       option :local,
         :long => '--local',

data/lib/chef/knife/list_essentials.rb

@@ -1,6 +1,4 @@
 require 'chef_fs/knife'
-require 'chef_fs/file_system'
-require 'highline'
 
 class Chef
   class Knife
@@ -9,7 +7,10 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife list [-dfR1p] [PATTERN1 ... PATTERNn]"
 
-      common_options
+      deps do
+        require 'chef_fs/file_system'
+        require 'highline'
+      end
 
       option :recursive,
         :short => '-R',

data/lib/chef/knife/raw_essentials.rb

@@ -1,6 +1,4 @@
-require 'json'
-require 'chef_fs/data_handler/data_handler_base'
-require 'chef_fs/raw_request'
+require 'chef/knife'
 
 class Chef
   class Knife
@@ -9,6 +7,12 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife raw REQUEST_PATH"
 
+      deps do
+        require 'json'
+        require 'chef_fs/data_handler/data_handler_base'
+        require 'chef_fs/raw_request'
+      end
+
       option :method,
         :long => '--method METHOD',
         :short => '-m METHOD',

data/lib/chef/knife/serve_essentials.rb

@@ -1,14 +1,4 @@
 require 'chef_fs/knife'
-require 'chef_zero/server'
-require 'chef_zero/data_store/memory_store'
-
-# For ChefFSStore
-require 'chef_fs/file_pattern'
-require 'chef_fs/file_system'
-require 'chef_fs/file_system/not_found_error'
-require 'chef_fs/file_system/memory_root'
-require 'chef_zero/data_store/data_already_exists_error'
-require 'chef_zero/data_store/data_not_found_error'
 
 class Chef
   class Knife
@@ -17,7 +7,26 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife show [PATTERN1 ... PATTERNn]"
 
-      common_options
+      deps do
+        begin
+          require 'chef_zero/server'
+        rescue LoadError
+          STDERR.puts <<EOM
+ERROR: chef-zero must be installed to run "knife serve"!  To install:
+
+    gem install chef-zero
+
+EOM
+          exit(1)
+        end
+        require 'chef_zero/data_store/memory_store'
+        require 'chef_fs/file_pattern'
+        require 'chef_fs/file_system'
+        require 'chef_fs/file_system/not_found_error'
+        require 'chef_fs/file_system/memory_root'
+        require 'chef_zero/data_store/data_already_exists_error'
+        require 'chef_zero/data_store/data_not_found_error'
+      end
 
       option :remote,
         :long => '--remote',

data/lib/chef/knife/show_essentials.rb

@@ -1,6 +1,4 @@
 require 'chef_fs/knife'
-require 'chef_fs/file_system'
-require 'chef_fs/file_system/not_found_error'
 
 class Chef
   class Knife
@@ -9,7 +7,10 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife show [PATTERN1 ... PATTERNn]"
 
-      common_options
+      deps do
+        require 'chef_fs/file_system'
+        require 'chef_fs/file_system/not_found_error'
+      end
 
       option :local,
         :long => '--local',

data/lib/chef/knife/upload_essentials.rb

@@ -1,5 +1,4 @@
 require 'chef_fs/knife'
-require 'chef_fs/command_line'
 
 class Chef
   class Knife
@@ -8,7 +7,9 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife upload PATTERNS"
 
-      common_options
+      deps do
+        require 'chef_fs/command_line'
+      end
 
       option :recurse,
         :long => '--[no-]recurse',
@@ -26,7 +27,13 @@ class Chef
         :long => '--[no-]force',
         :boolean => true,
         :default => false,
-        :description => "Force upload of files even if they match (quicker and harmless, but doesn't print out what it changed)"
+        :description => "Force upload of files even if they match (quicker for many files).  Will overwrite frozen cookbooks."
+
+      option :freeze,
+        :long => '--[no-]freeze',
+        :boolean => true,
+        :default => false,
+        :description => "Freeze cookbooks that get uploaded."
 
       option :dry_run,
         :long => '--dry-run',

data/lib/chef/knife/xargs_essentials.rb

@@ -1,6 +1,4 @@
 require 'chef_fs/knife'
-require 'chef_fs/file_system'
-require 'chef_fs/file_system/not_found_error'
 
 class Chef
   class Knife
@@ -9,7 +7,10 @@ class Chef
       ChefFS = ::ChefFS
       banner "knife xargs [COMMAND]"
 
-      common_options
+      deps do
+        require 'chef_fs/file_system'
+        require 'chef_fs/file_system/not_found_error'
+      end
 
       # TODO modify to remote-only / local-only pattern (more like delete)
       option :local,

data/lib/chef_fs/file_system.rb

@@ -340,7 +340,7 @@ module ChefFS
               if options[:dry_run]
                 ui.output "Would update #{dest_path}" if ui
               else
-                dest_entry.copy_from(src_entry)
+                dest_entry.copy_from(src_entry, options)
                 ui.output "Updated #{dest_path}" if ui
               end
             end

data/lib/chef_fs/file_system/already_exists_error.rb

@@ -0,0 +1,29 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2012 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_fs/file_system/operation_failed_error'
+
+module ChefFS
+  module FileSystem
+    class AlreadyExistsError < OperationFailedError
+      def initialize(operation, entry, cause = nil)
+        super(operation, entry, cause)
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/cookbook_dir.rb

@@ -162,8 +162,8 @@ module ChefFS
         [ are_same, nil, nil ]
       end
 
-      def copy_from(other)
-        parent.upload_cookbook_from(other)
+      def copy_from(other, options = {})
+        parent.upload_cookbook_from(other, options)
       end
 
       def rest

data/lib/chef_fs/file_system/cookbook_frozen_error.rb

@@ -0,0 +1,29 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2012 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_fs/file_system/already_exists_error'
+
+module ChefFS
+  module FileSystem
+    class CookbookFrozenError < AlreadyExistsError
+      def initialize(operation, entry, cause = nil)
+        super(operation, entry, cause)
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/cookbooks_dir.rb

@@ -19,6 +19,8 @@
 require 'chef_fs/file_system/rest_list_dir'
 require 'chef_fs/file_system/cookbook_dir'
 require 'chef_fs/raw_request'
+require 'chef_fs/file_system/operation_failed_error'
+require 'chef_fs/file_system/cookbook_frozen_error'
 
 require 'tmpdir'
 
@@ -58,20 +60,18 @@ module ChefFS
         end
       end
 
-      def create_child_from(other)
-        upload_cookbook_from(other)
+      def create_child_from(other, options = {})
+        upload_cookbook_from(other, options)
       end
 
-      def upload_cookbook_from(other)
-        Chef::Config[:versioned_cookbooks] ? upload_versioned_cookbook(other) : upload_unversioned_cookbook(other)
+      def upload_cookbook_from(other, options = {})
+        Chef::Config[:versioned_cookbooks] ? upload_versioned_cookbook(other, options) : upload_unversioned_cookbook(other, options)
       rescue Timeout::Error => e
         raise ChefFS::FileSystem::OperationFailedError.new(:write, self, e), "Timeout writing: #{e}"
       rescue Net::HTTPServerException => e
         case e.response.code
         when "409"
-          ui.error "Version #{other_cookbook_version.version} of cookbook #{other_cookbook_version.name} is frozen. Use --force to override."
-          Chef::Log.debug(e)
-          raise Exceptions::CookbookFrozen
+          raise ChefFS::FileSystem::CookbookFrozenError.new(:write, self, e), "Cookbook #{other.name} is frozen"
         else
           raise ChefFS::FileSystem::OperationFailedError.new(:write, self, e), "HTTP error writing: #{e}"
         end
@@ -81,7 +81,7 @@ module ChefFS
       # Cookbook Version uploader also requires a lot of refactoring
       # to make this work. So instead, we make a temporary cookbook
       # symlinking back to real cookbook, and upload the proxy.
-      def upload_versioned_cookbook(other)
+      def upload_versioned_cookbook(other, options)
         cookbook_name = ChefFS::FileSystem::ChefRepositoryFileSystemEntry.canonical_cookbook_name(other.name)
 
         Dir.mktmpdir do |temp_cookbooks_path|
@@ -94,8 +94,11 @@ module ChefFS
           proxy_loader = Chef::Cookbook::CookbookVersionLoader.new(proxy_cookbook_path, other.parent.chefignore)
           proxy_loader.load_cookbooks
 
+          cookbook_to_upload = proxy_loader.cookbook_version
+          cookbook_to_upload.freeze_version if options[:freeze]
+
           # Instantiate a new uploader based on the proxy loader
-          uploader = Chef::CookbookUploader.new(proxy_loader.cookbook_version, proxy_cookbook_path, :rest => rest)
+          uploader = Chef::CookbookUploader.new(cookbook_to_upload, proxy_cookbook_path, :force => options[:force], :rest => rest)
 
           with_actual_cookbooks_dir(temp_cookbooks_path) do
             upload_cookbook!(uploader)
@@ -103,8 +106,10 @@ module ChefFS
         end
       end
 
-      def upload_unversioned_cookbook(other)
-        uploader = Chef::CookbookUploader.new(other.chef_object, other.parent.file_path, :rest => rest)
+      def upload_unversioned_cookbook(other, options)
+        cookbook_to_upload = other.chef_object
+        cookbook_to_upload.freeze_version if options[:freeze]
+        uploader = Chef::CookbookUploader.new(cookbook_to_upload, other.parent.file_path, :force => options[:force], :rest => rest)
 
         with_actual_cookbooks_dir(other.parent.file_path) do
           upload_cookbook!(uploader)
@@ -122,7 +127,7 @@ module ChefFS
       end
 
       # Chef 11 changes this API
-      def upload_cookbook!(uploader)
+      def upload_cookbook!(uploader, options = {})
         if uploader.respond_to?(:upload_cookbook)
           uploader.upload_cookbook
         else

data/lib/chef_fs/file_system/data_bags_dir.rb

@@ -57,7 +57,9 @@ module ChefFS
         rescue Timeout::Error => e
           raise ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e), "Timeout creating child '#{name}': #{e}"
         rescue Net::HTTPServerException => e
-          if e.response.code != "409"
+          if e.response.code == "409"
+            raise ChefFS::FileSystem::AlreadyExistsError.new(:create_child, self, e), "Cannot create #{name} under #{path}: already exists"
+          else
             raise ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e), "HTTP error creating child '#{name}': #{e}"
           end
         end

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -81,6 +81,8 @@ module ChefFS
         rescue Net::HTTPServerException => e
           if e.response.code == "404"
             raise ChefFS::FileSystem::NotFoundError.new(self, e)
+          elsif $!.response.code == "409"
+            raise ChefFS::FileSystem::AlreadyExistsError.new(:create_child, self, e), "Failure creating '#{name}': #{path}/#{name} already exists"
           else
             raise ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e), "Failure creating '#{name}': #{e.message}"
           end

data/lib/chef_fs/knife.rb

@@ -16,16 +16,22 @@
 # limitations under the License.
 #
 
-require 'chef_fs/file_system/chef_server_root_dir'
-require 'chef_fs/file_system/chef_repository_file_system_root_dir'
-require 'chef_fs/file_pattern'
-require 'chef_fs/path_utils'
-require 'chef_fs/parallelizer'
-require 'chef/config'
+require 'chef/knife'
 
 module ChefFS
   class Knife < Chef::Knife
-    def self.common_options
+    # Workaround for CHEF-3932
+    def self.deps
+      super do
+        require 'chef_fs/file_system/chef_server_root_dir'
+        require 'chef_fs/file_system/chef_repository_file_system_root_dir'
+        require 'chef_fs/file_pattern'
+        require 'chef_fs/path_utils'
+        require 'chef_fs/parallelizer'
+        require 'chef/config'
+        yield
+      end
+
       option :repo_mode,
         :long => '--repo-mode MODE',
         :description => "Specifies the local repository layout.  Values: static, everything, hosted_everything.  Default: everything/hosted_everything"
@@ -39,6 +45,13 @@ module ChefFS
         :description => 'Maximum number of simultaneous requests to send (default: 10)'
     end
 
+    def self.inherited(c)
+      super
+      # Ensure we always get to do our includes, whether subclass calls deps or not
+      c.deps do
+      end
+    end
+
     def configure_chef
       super
       Chef::Config[:repo_mode] = config[:repo_mode] if config[:repo_mode]

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.1.1"
+  VERSION = "1.2"
 end

data/spec/chef_fs/diff_spec.rb

@@ -23,8 +23,9 @@ require 'chef_fs/command_line'
 # Removes the date stamp from the diff and replaces it with ' DATE'
 # example match: "/dev/null\t2012-10-16 16:15:54.000000000 +0000"
 # windows match: "--- /dev/null\tTue Oct 16 18:04:34 2012"
-def remove_date(diff)
-  diff.gsub(/([+-]{3}.*)\t.*/, '\1 DATE')
+def remove_os_differences(diff)
+  diff = diff.gsub(/([+-]{3}.*)\t.*/, '\1 DATE')
+  diff.gsub(/^@@ -\d(,\d)? \+\d(,\d)? @@/, 'CONTEXT_LINE_NUMBERS')
 end
 
 describe 'diff', :uses_diff => true do
@@ -88,33 +89,33 @@ describe 'diff', :uses_diff => true do
     it 'ChefFS::CommandLine.diff_print(/)' do
       results = []
       ChefFS::CommandLine.diff_print(pattern('/'), a, b, nil, nil) do |diff|
-        results << remove_date(diff)
+        results << remove_os_differences(diff)
       end
       results.should =~ [
         'diff --knife a/both_dirs/sub_both_files_different b/both_dirs/sub_both_files_different
 --- a/both_dirs/sub_both_files_different DATE
 +++ b/both_dirs/sub_both_files_different DATE
-@@ -1 +1 @@
+CONTEXT_LINE_NUMBERS
 -a
 +b
 ','diff --knife a/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub b/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub
 new file
 --- /dev/null DATE
 +++ b/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub DATE
-@@ -0,0 +1 @@
+CONTEXT_LINE_NUMBERS
 +subsub
 ','diff --knife a/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub b/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub
 deleted file
 --- a/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub DATE
 +++ /dev/null DATE
-@@ -1 +0,0 @@
+CONTEXT_LINE_NUMBERS
 -subsub
 ','Only in a/both_dirs: sub_a_only_dir
 ','diff --knife a/both_dirs/sub_a_only_file b/both_dirs/sub_a_only_file
 deleted file
 --- a/both_dirs/sub_a_only_file DATE
 +++ /dev/null DATE
-@@ -1 +0,0 @@
+CONTEXT_LINE_NUMBERS
 -sub_a_only_file
 ','File a/both_dirs/sub_dir_in_a_file_in_b is a directory while file b/both_dirs/sub_dir_in_a_file_in_b is a regular file
 ','File a/both_dirs/sub_file_in_a_dir_in_b is a regular file while file b/both_dirs/sub_file_in_a_dir_in_b is a directory
@@ -123,32 +124,32 @@ deleted file
 new file
 --- /dev/null DATE
 +++ b/both_dirs/sub_b_only_file DATE
-@@ -0,0 +1 @@
+CONTEXT_LINE_NUMBERS
 +sub_b_only_file
 ','diff --knife a/both_files_different b/both_files_different
 --- a/both_files_different DATE
 +++ b/both_files_different DATE
-@@ -1 +1 @@
+CONTEXT_LINE_NUMBERS
 -a
 +b
 ','diff --knife a/dirs_empty_in_a_filled_in_b/subsub b/dirs_empty_in_a_filled_in_b/subsub
 new file
 --- /dev/null DATE
 +++ b/dirs_empty_in_a_filled_in_b/subsub DATE
-@@ -0,0 +1 @@
+CONTEXT_LINE_NUMBERS
 +subsub
 ','diff --knife a/dirs_empty_in_b_filled_in_a/subsub b/dirs_empty_in_b_filled_in_a/subsub
 deleted file
 --- a/dirs_empty_in_b_filled_in_a/subsub DATE
 +++ /dev/null DATE
-@@ -1 +0,0 @@
+CONTEXT_LINE_NUMBERS
 -subsub
 ','Only in a: a_only_dir
 ','diff --knife a/a_only_file b/a_only_file
 deleted file
 --- a/a_only_file DATE
 +++ /dev/null DATE
-@@ -1 +0,0 @@
+CONTEXT_LINE_NUMBERS
 -a_only_file
 ','File a/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
 ','File a/file_in_a_dir_in_b is a regular file while file b/file_in_a_dir_in_b is a directory
@@ -157,40 +158,40 @@ deleted file
 new file
 --- /dev/null DATE
 +++ b/b_only_file DATE
-@@ -0,0 +1 @@
+CONTEXT_LINE_NUMBERS
 +b_only_file
 ' ]
     end
     it 'ChefFS::CommandLine.diff_print(/both_dirs)' do
       results = []
       ChefFS::CommandLine.diff_print(pattern('/both_dirs'), a, b, nil, nil) do |diff|
-        results << remove_date(diff)
+        results << remove_os_differences(diff)
       end
       results.should =~ [
         'diff --knife a/both_dirs/sub_both_files_different b/both_dirs/sub_both_files_different
 --- a/both_dirs/sub_both_files_different DATE
 +++ b/both_dirs/sub_both_files_different DATE
-@@ -1 +1 @@
+CONTEXT_LINE_NUMBERS
 -a
 +b
 ','diff --knife a/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub b/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub
 new file
 --- /dev/null DATE
 +++ b/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub DATE
-@@ -0,0 +1 @@
+CONTEXT_LINE_NUMBERS
 +subsub
 ','diff --knife a/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub b/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub
 deleted file
 --- a/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub DATE
 +++ /dev/null DATE
-@@ -1 +0,0 @@
+CONTEXT_LINE_NUMBERS
 -subsub
 ','Only in a/both_dirs: sub_a_only_dir
 ','diff --knife a/both_dirs/sub_a_only_file b/both_dirs/sub_a_only_file
 deleted file
 --- a/both_dirs/sub_a_only_file DATE
 +++ /dev/null DATE
-@@ -1 +0,0 @@
+CONTEXT_LINE_NUMBERS
 -sub_a_only_file
 ','File a/both_dirs/sub_dir_in_a_file_in_b is a directory while file b/both_dirs/sub_dir_in_a_file_in_b is a regular file
 ','File a/both_dirs/sub_file_in_a_dir_in_b is a regular file while file b/both_dirs/sub_file_in_a_dir_in_b is a directory
@@ -199,21 +200,21 @@ deleted file
 new file
 --- /dev/null DATE
 +++ b/both_dirs/sub_b_only_file DATE
-@@ -0,0 +1 @@
+CONTEXT_LINE_NUMBERS
 +sub_b_only_file
 ' ]
     end
     it 'ChefFS::CommandLine.diff_print(/) with depth 1' do
       results = []
       ChefFS::CommandLine.diff_print(pattern('/'), a, b, 1, nil) do |diff|
-        results << remove_date(diff)
+        results << remove_os_differences(diff)
       end
       results.should =~ [
 'Common subdirectories: b/both_dirs
 ','diff --knife a/both_files_different b/both_files_different
 --- a/both_files_different DATE
 +++ b/both_files_different DATE
-@@ -1 +1 @@
+CONTEXT_LINE_NUMBERS
 -a
 +b
 ','Common subdirectories: b/both_dirs_empty
@@ -224,7 +225,7 @@ new file
 deleted file
 --- a/a_only_file DATE
 +++ /dev/null DATE
-@@ -1 +0,0 @@
+CONTEXT_LINE_NUMBERS
 -a_only_file
 ','File a/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
 ','File a/file_in_a_dir_in_b is a regular file while file b/file_in_a_dir_in_b is a directory
@@ -233,21 +234,21 @@ deleted file
 new file
 --- /dev/null DATE
 +++ b/b_only_file DATE
-@@ -0,0 +1 @@
+CONTEXT_LINE_NUMBERS
 +b_only_file
 ' ]
     end
     it 'ChefFS::CommandLine.diff_print(/*_*) with depth 0' do
       results = []
       ChefFS::CommandLine.diff_print(pattern('/*_*'), a, b, 0, nil) do |diff|
-        results << remove_date(diff)
+        results << remove_os_differences(diff)
       end
       results.should =~ [
 'Common subdirectories: b/both_dirs
 ','diff --knife a/both_files_different b/both_files_different
 --- a/both_files_different DATE
 +++ b/both_files_different DATE
-@@ -1 +1 @@
+CONTEXT_LINE_NUMBERS
 -a
 +b
 ','Common subdirectories: b/both_dirs_empty
@@ -258,7 +259,7 @@ new file
 deleted file
 --- a/a_only_file DATE
 +++ /dev/null DATE
-@@ -1 +0,0 @@
+CONTEXT_LINE_NUMBERS
 -a_only_file
 ','File a/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
 ','File a/file_in_a_dir_in_b is a regular file while file b/file_in_a_dir_in_b is a directory
@@ -267,14 +268,14 @@ deleted file
 new file
 --- /dev/null DATE
 +++ b/b_only_file DATE
-@@ -0,0 +1 @@
+CONTEXT_LINE_NUMBERS
 +b_only_file
 ' ]
     end
     it 'ChefFS::CommandLine.diff_print(/) in name-only mode' do
       results = []
       ChefFS::CommandLine.diff_print(pattern('/'), a, b, nil, :name_only) do |diff|
-        results << remove_date(diff)
+        results << remove_os_differences(diff)
       end
       results.should =~ [
           "b/both_dirs/sub_both_files_different\n",
@@ -300,7 +301,7 @@ new file
     it 'ChefFS::CommandLine.diff_print(/) in name-status mode' do
       results = []
       ChefFS::CommandLine.diff_print(pattern('/'), a, b, nil, :name_status) do |diff|
-        results << remove_date(diff)
+        results << remove_os_differences(diff)
       end
       results.should =~ [
           "M\tb/both_dirs/sub_both_files_different\n",

data/spec/integration/delete_spec.rb

@@ -100,8 +100,8 @@ EOM
       file 'roles/x.json', {}
       file 'users/x.json', {}
 
-      it 'knife delete /cookbooks/x fails' do
-        knife('delete /cookbooks/x').should_fail <<EOM
+      it 'knife delete --both /cookbooks/x fails' do
+        knife('delete --both /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
@@ -109,8 +109,8 @@ EOM
         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"
+      it 'knife delete --both -r /cookbooks/x deletes x' do
+        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
         knife('list -Rf /').should_succeed <<EOM
 /clients
 /clients/chef-validator.json
@@ -150,8 +150,8 @@ EOM
 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"
+      it 'knife delete -r --local /cookbooks/x deletes x locally but not remotely' do
+        knife('delete -r --local /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
         knife('list -Rf /').should_succeed server_everything
         knife('list -Rf --local /').should_succeed <<EOM
 /clients
@@ -172,8 +172,8 @@ EOM
 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"
+      it 'knife delete -r /cookbooks/x deletes x remotely but not locally' do
+        knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
         knife('list -Rf /').should_succeed <<EOM
 /clients
 /clients/chef-validator.json
@@ -201,8 +201,8 @@ EOM
       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
+        it 'knife delete --both /data_bags/empty fails but deletes local version' do
+          knife('delete --both /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
@@ -252,8 +252,8 @@ EOM
         end
       end
 
-      it 'knife delete /data_bags/x fails' do
-        knife('delete /data_bags/x').should_fail <<EOM
+      it 'knife delete --both /data_bags/x fails' do
+        knife('delete --both /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
@@ -261,8 +261,8 @@ EOM
         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"
+      it 'knife delete --both -r /data_bags/x deletes x' do
+        knife('delete --both -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
         knife('list -Rf /').should_succeed <<EOM
 /clients
 /clients/chef-validator.json
@@ -302,8 +302,8 @@ EOM
 EOM
       end
 
-      it 'knife delete /environments/x.json deletes x' do
-        knife('delete /environments/x.json').should_succeed "Deleted /environments/x.json\n"
+      it 'knife delete --both /environments/x.json deletes x' do
+        knife('delete --both /environments/x.json').should_succeed "Deleted /environments/x.json\n"
         knife('list -Rf /').should_succeed <<EOM
 /clients
 /clients/chef-validator.json
@@ -345,8 +345,8 @@ EOM
 EOM
       end
 
-      it 'knife delete /roles/x.json deletes x' do
-        knife('delete /roles/x.json').should_succeed "Deleted /roles/x.json\n"
+      it 'knife delete --both /roles/x.json deletes x' do
+        knife('delete --both /roles/x.json').should_succeed "Deleted /roles/x.json\n"
         knife('list -Rf /').should_succeed <<EOM
 /clients
 /clients/chef-validator.json
@@ -388,8 +388,8 @@ EOM
 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"
+      it 'knife delete --both /environments/_default.json fails but still deletes the local copy' do
+        knife('delete --both /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_everything
         knife('list -Rf --local /').should_succeed <<EOM
 /clients
@@ -411,14 +411,14 @@ EOM
 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"
+      it 'knife delete --both /environments/nonexistent.json fails' do
+        knife('delete --both /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
         knife('list -Rf /').should_succeed server_everything
         knife('list -Rf --local /').should_succeed everything
       end
 
-      it 'knife delete / fails' do
-        knife('delete /').should_fail <<EOM
+      it 'knife delete --both / fails' do
+        knife('delete --both /').should_fail <<EOM
 ERROR: / (remote) cannot be deleted.
 ERROR: / (local) cannot be deleted.
 EOM
@@ -426,8 +426,8 @@ EOM
         knife('list -Rf --local /').should_succeed everything
       end
 
-      it 'knife delete -r /* fails' do
-        knife('delete -r /*').should_fail <<EOM
+      it 'knife delete --both -r /* fails' do
+        knife('delete --both -r /*').should_fail <<EOM
 ERROR: / (remote) cannot be deleted.
 ERROR: / (local) cannot be deleted.
 ERROR: /clients (remote) cannot be deleted.
@@ -459,14 +459,14 @@ EOM
       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"
+      it 'knife delete --both /cookbooks/x fails' do
+        knife('delete --both /cookbooks/x').should_fail "ERROR: /cookbooks/x (remote) must be deleted recursively!  Pass -r to knife delete.\n"
         knife('list -Rf /').should_succeed server_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"
+      it 'knife delete --both -r /cookbooks/x deletes x' do
+        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
         knife('list -Rf /').should_succeed <<EOM
 /clients
 /clients/chef-validator.json
@@ -490,14 +490,14 @@ 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"
+      it 'knife delete --both /data_bags/x fails' do
+        knife('delete --both /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 server_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"
+      it 'knife delete --both -r /data_bags/x deletes x' do
+        knife('delete --both -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
         knife('list -Rf /').should_succeed <<EOM
 /clients
 /clients/chef-validator.json
@@ -521,8 +521,8 @@ 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"
+      it 'knife delete --both /environments/x.json deletes x' do
+        knife('delete --both /environments/x.json').should_succeed "Deleted /environments/x.json\n"
         knife('list -Rf /').should_succeed <<EOM
 /clients
 /clients/chef-validator.json
@@ -547,8 +547,8 @@ 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"
+      it 'knife delete --both /roles/x.json deletes x' do
+        knife('delete --both /roles/x.json').should_succeed "Deleted /roles/x.json\n"
         knife('list -Rf /').should_succeed <<EOM
 /clients
 /clients/chef-validator.json
@@ -573,20 +573,20 @@ 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"
+      it 'knife delete --both /environments/_default.json fails' do
+        knife('delete --both /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 server_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"
+      it 'knife delete --both / fails' do
+        knife('delete --both /').should_fail "ERROR: / (remote) cannot be deleted.\nERROR: / (local) cannot be deleted.\n"
         knife('list -Rf /').should_succeed server_everything
         knife('list -Rf --local /').should_succeed nothing
       end
 
-      it 'knife delete -r /* fails' do
-        knife('delete -r /*').should_fail <<EOM
+      it 'knife delete --both -r /* fails' do
+        knife('delete --both -r /*').should_fail <<EOM
 ERROR: / (remote) cannot be deleted.
 ERROR: / (local) cannot be deleted.
 ERROR: /clients (remote) cannot be deleted.
@@ -608,8 +608,8 @@ EOM
         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"
+      it 'knife delete --both /environments/nonexistent.json fails' do
+        knife('delete --both /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
         knife('list -Rf /').should_succeed server_everything
         knife('list -Rf --local /').should_succeed nothing
       end
@@ -665,14 +665,14 @@ EOM
       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"
+      it 'knife delete --both /cookbooks/x fails' do
+        knife('delete --both /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"
+      it 'knife delete --both -r /cookbooks/x deletes x' do
+        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
         knife('list -Rf /').should_succeed server_nothing
         knife('list -Rf --local /').should_succeed <<EOM
 /clients
@@ -693,14 +693,14 @@ EOM
 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"
+      it 'knife delete --both /data_bags/x fails' do
+        knife('delete --both /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"
+      it 'knife delete --both -r /data_bags/x deletes x' do
+        knife('delete --both -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
 /clients
@@ -721,8 +721,8 @@ EOM
 EOM
       end
 
-      it 'knife delete /environments/x.json deletes x' do
-        knife('delete /environments/x.json').should_succeed "Deleted /environments/x.json\n"
+      it 'knife delete --both /environments/x.json deletes x' do
+        knife('delete --both /environments/x.json').should_succeed "Deleted /environments/x.json\n"
         knife('list -Rf /').should_succeed server_nothing
         knife('list -Rf --local /').should_succeed <<EOM
 /clients
@@ -744,8 +744,8 @@ EOM
 EOM
       end
 
-      it 'knife delete /roles/x.json deletes x' do
-        knife('delete /roles/x.json').should_succeed "Deleted /roles/x.json\n"
+      it 'knife delete --both /roles/x.json deletes x' do
+        knife('delete --both /roles/x.json').should_succeed "Deleted /roles/x.json\n"
         knife('list -Rf /').should_succeed server_nothing
         knife('list -Rf --local /').should_succeed <<EOM
 /clients
@@ -767,8 +767,8 @@ EOM
 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"
+      it 'knife delete --both /environments/_default.json fails but still deletes the local copy' do
+        knife('delete --both /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
 /clients
@@ -790,14 +790,14 @@ EOM
 EOM
       end
 
-      it 'knife delete / fails' do
-        knife('delete /').should_fail "ERROR: / (remote) cannot be deleted.\nERROR: / (local) cannot be deleted.\n"
+      it 'knife delete --both / fails' do
+        knife('delete --both /').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
+      it 'knife delete --both -r /* fails' do
+        knife('delete --both -r /*').should_fail <<EOM
 ERROR: / (remote) cannot be deleted.
 ERROR: / (local) cannot be deleted.
 ERROR: /clients (remote) cannot be deleted.
@@ -819,8 +819,8 @@ EOM
         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"
+      it 'knife delete --both /environments/nonexistent.json fails' do
+        knife('delete --both /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
@@ -875,8 +875,8 @@ EOM
       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"
+      it 'knife delete --both -r /cookbooks/x deletes the latest version on the server and the local version' do
+        knife('delete --both -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
@@ -886,8 +886,8 @@ EOM
       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"
+      it 'knife delete --both /cookbooks/x deletes the latest version on the server and the local version' do
+        knife('delete --both -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
@@ -896,8 +896,8 @@ EOM
     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"
+      it 'knife delete --both /cookbooks/x deletes the server and client version of the cookbook' do
+        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
         knife('raw /cookbooks/x').should_fail(/404/)
         knife('list --local /cookbooks').should_succeed ''
       end
@@ -906,8 +906,8 @@ EOM
     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"
+      it 'knife delete --both /cookbooks/x deletes the server and client version of the cookbook' do
+        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
         knife('raw /cookbooks/x').should_fail(/404/)
         knife('list --local /cookbooks').should_succeed ''
       end
@@ -919,7 +919,7 @@ EOM
       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('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
         knife('raw /cookbooks/x').should_succeed /2.0.11/
       end
     end

data/spec/integration/upload_spec.rb

@@ -368,6 +368,38 @@ EOM
           knife('diff --name-status /cookbooks').should_succeed ''
         end
       end
+
+      when_the_repository 'has a different file in the cookbook' do
+        file 'cookbooks/x/metadata.rb', 'version  "1.0.0"'
+
+        it 'knife upload --freeze freezes the cookbook' do
+          knife('upload --freeze /cookbooks/x').should_succeed <<EOM
+Updated /cookbooks/x
+EOM
+          # Modify a file and attempt to upload
+          file 'cookbooks/x/metadata.rb', 'version "1.0.0" # This is different'
+          knife('upload /cookbooks/x').should_fail "ERROR: /cookbooks failed to write: Cookbook x is frozen\n"
+        end
+      end
+    end
+
+    when_the_chef_server 'has a frozen cookbook' do
+      cookbook 'frozencook', '1.0.0', {
+        'metadata.rb' => 'version "1.0.0"'
+      }, :frozen => true
+
+      when_the_repository 'has an update to said cookbook' do
+        file 'cookbooks/frozencook/metadata.rb', 'version "1.0.0" # This is different'
+
+        it 'knife upload fails to upload the frozen cookbook' do
+          knife('upload /cookbooks/frozencook').should_fail "ERROR: /cookbooks failed to write: Cookbook frozencook is frozen\n"
+        end
+        it 'knife upload --force uploads the frozen cookbook' do
+          knife('upload --force /cookbooks/frozencook').should_succeed <<EOM
+Updated /cookbooks/frozencook
+EOM
+        end
+      end
     end
 
     when_the_repository 'has a cookbook' do

data/spec/support/knife_support.rb

@@ -27,8 +27,8 @@ module KnifeSupport
         :skip_expires => true
       }
 
-      # This is Chef::Knife.run without load_commands and load_deps--we'll
-      # load stuff ourselves, thank you very much
+      # This is Chef::Knife.run without load_commands--we'll load stuff
+      # ourselves, thank you very much
       stdout = StringIO.new
       stderr = StringIO.new
       old_loggers = Chef::Log.loggers
@@ -37,6 +37,7 @@ module KnifeSupport
         puts "knife: #{args.join(' ')}" if DEBUG
         subcommand_class = Chef::Knife.subcommand_class_from(args)
         subcommand_class.options = Chef::Application::Knife.options.merge(subcommand_class.options)
+        subcommand_class.load_deps
         instance = subcommand_class.new(args)
 
         # Capture stdout/stderr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: '1.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,7 @@ files:
 - lib/chef_fs/file_system/acl_dir.rb
 - lib/chef_fs/file_system/acl_entry.rb
 - lib/chef_fs/file_system/acls_dir.rb
+- lib/chef_fs/file_system/already_exists_error.rb
 - lib/chef_fs/file_system/base_fs_dir.rb
 - lib/chef_fs/file_system/base_fs_object.rb
 - lib/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb
@@ -154,6 +155,7 @@ files:
 - lib/chef_fs/file_system/chef_server_root_dir.rb
 - lib/chef_fs/file_system/cookbook_dir.rb
 - lib/chef_fs/file_system/cookbook_file.rb
+- lib/chef_fs/file_system/cookbook_frozen_error.rb
 - lib/chef_fs/file_system/cookbook_subdir.rb
 - lib/chef_fs/file_system/cookbooks_acl_dir.rb
 - lib/chef_fs/file_system/cookbooks_dir.rb