upload.rb in chef-11.6.0.hotfix.1

- old
+ new

@@ -1,14 +1,15 @@
 require 'chef/chef_fs/knife'
-require 'chef/chef_fs/command_line'
 
 class Chef
   class Knife
     class Upload < Chef::ChefFS::Knife
       banner "knife upload PATTERNS"
 
-      common_options
+      deps do
+        require 'chef/chef_fs/command_line'
+      end
 
       option :recurse,
         :long => '--[no-]recurse',
         :boolean => true,
         :default => true,
@@ -22,27 +23,45 @@
 
       option :force,
         :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',
         :short => '-n',
         :boolean => true,
         :default => false,
         :description => "Don't take action, only print what would happen"
 
+      option :diff,
+        :long => '--[no-]diff',
+        :boolean => true,
+        :default => true,
+        :description => 'Turn off to avoid uploading existing files; only new (and possibly deleted) files with --no-diff'
+
       def run
         if name_args.length == 0
           show_usage
           ui.fatal("Must specify at least one argument.  If you want to upload everything in this directory, type \"knife upload .\"")
           exit 1
         end
 
+        error = false
         pattern_args.each do |pattern|
-          Chef::ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config)
+          if Chef::ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
+            error = true
+          end
+        end
+        if error
+          exit 1
         end
       end
     end
   end
 end