knife-essentials 1.0.0.beta1 → 1.0.0.beta2

data/lib/chef/knife/download_essentials.rb

@@ -35,6 +35,12 @@ class Chef
         :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

data/lib/chef/knife/upload_essentials.rb

@@ -35,6 +35,12 @@ class Chef
         :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

data/lib/chef_fs/file_system.rb

@@ -368,8 +368,10 @@ module ChefFS
               return
             else
 
-              # Both are files!  Copy them unless we're sure they are the same.
-              if options[:force]
+              # Both are files!  Copy them unless we're sure they are the same.'
+              if options[:diff] == false
+                should_copy = false
+              elsif options[:force]
                 should_copy = true
                 src_value = nil
               else

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.0.0.beta1"
+  VERSION = "1.0.0.beta2"
 end

data/spec/integration/download_spec.rb

@@ -90,6 +90,11 @@ EOM
             knife('download /').should_succeed "Updated /roles/x.json\n"
             knife('diff --name-status /').should_succeed ''
           end
+
+          it 'knife download --no-diff does not change the role' do
+            knife('download --no-diff /').should_succeed ''
+            knife('diff --name-status /').should_succeed "M\t/roles/x.json\n"
+          end
         end
 
         context 'except the role file is textually different, but not ACTUALLY different' do
@@ -186,6 +191,32 @@ EOM
           knife('diff --name-status /').should_succeed ''
         end
 
+        it 'knife download --no-diff creates the extra files' do
+          knife('download /').should_succeed <<EOM
+Created /clients
+Created /clients/chef-validator.json
+Created /clients/chef-webui.json
+Created /clients/x.json
+Created /cookbooks
+Created /cookbooks/x
+Created /cookbooks/x/metadata.rb
+Created /data_bags
+Created /data_bags/x
+Created /data_bags/x/y.json
+Created /environments
+Created /environments/_default.json
+Created /environments/x.json
+Created /nodes
+Created /nodes/x.json
+Created /roles
+Created /roles/x.json
+Created /users
+Created /users/admin.json
+Created /users/x.json
+EOM
+          knife('diff --name-status /').should_succeed ''
+        end
+
         context 'when current directory is top level' do
           cwd '.'
           it 'knife download with no parameters reports an error' do

data/spec/integration/upload_spec.rb

@@ -90,6 +90,10 @@ EOM
             knife('upload /').should_succeed "Updated /roles/x.json\n"
             knife('diff --name-status /').should_succeed ''
           end
+          it 'knife upload --no-diff does not change the role' do
+            knife('upload /').should_succeed ''
+            knife('diff --name-status /').should_succeed "M\t/roles/x.json\n"
+          end
         end
 
         context 'except the role file is textually different, but not ACTUALLY different' do
@@ -139,6 +143,22 @@ Created /environments/y.json
 Created /nodes/y.json
 Created /roles/y.json
 Created /users/y.json
+EOM
+            knife('diff --name-status /').should_succeed ''
+          end
+
+          it 'knife upload --no-diff adds the new files' do
+            knife('upload /').should_succeed <<EOM
+Created /clients/y.json
+Updated /cookbooks/x
+Created /cookbooks/y
+Created /data_bags/x/z.json
+Created /data_bags/y
+Created /data_bags/y/zz.json
+Created /environments/y.json
+Created /nodes/y.json
+Created /roles/y.json
+Created /users/y.json
 EOM
             knife('diff --name-status /').should_succeed ''
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero