knife-essentials 0.4 → 0.5

data/lib/chef/knife/diff.rb

@@ -6,6 +6,8 @@ class Chef
     class Diff < ChefFS::Knife
       banner "diff PATTERNS"
 
+      common_options
+
       option :recurse,
         :long => '--[no-]recurse',
         :boolean => true,
@@ -22,8 +24,6 @@ class Chef
         :boolean => true,
         :description => "Only show names and statuses of modified files: Added, Deleted, Modified, and Type Changed."
 
-      common_options
-
       def run
         if config[:name_only]
           output_mode = :name_only

data/lib/chef/knife/download.rb

@@ -6,6 +6,8 @@ class Chef
     class Download < ChefFS::Knife
       banner "download PATTERNS"
 
+      common_options
+
       option :recurse,
         :long => '--[no-]recurse',
         :boolean => true,
@@ -18,12 +20,25 @@ class Chef
         :default => false,
         :description => "Delete matching local files and directories that do not exist remotely."
 
+      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)"
+
+      option :dry_run,
+        :long => '--dry-run',
+        :short => '-n',
+        :boolean => true,
+        :default => false,
+        :description => "Don't take action, only print what would happen"
+
       def run
         patterns = pattern_args_from(name_args.length > 0 ? name_args : [ "" ])
 
         # Get the matches (recursively)
         patterns.each do |pattern|
-          ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config[:purge])
+          ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config)
         end
       end
     end

data/lib/chef/knife/list.rb

@@ -6,6 +6,8 @@ class Chef
     class List < ChefFS::Knife
       banner "list [-dR] [PATTERN1 ... PATTERNn]"
 
+      common_options
+
       option :recursive,
         :short => '-R',
         :boolean => true,

data/lib/chef/knife/show.rb

@@ -6,6 +6,8 @@ class Chef
     class Show < ChefFS::Knife
       banner "show [PATTERN1 ... PATTERNn]"
 
+      common_options
+
       def run
         # Get the matches (recursively)
         pattern_args.each do |pattern|

data/lib/chef/knife/upload.rb

@@ -0,0 +1,47 @@
+require 'chef_fs/knife'
+require 'chef_fs/command_line'
+
+class Chef
+  class Knife
+    class Upload < ChefFS::Knife
+      banner "upload PATTERNS"
+
+      common_options
+
+      option :recurse,
+        :long => '--[no-]recurse',
+        :boolean => true,
+        :default => true,
+        :description => "List directories recursively."
+
+      option :purge,
+        :long => '--[no-]purge',
+        :boolean => true,
+        :default => false,
+        :description => "Delete matching local files and directories that do not exist remotely."
+
+      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)"
+
+      option :dry_run,
+        :long => '--dry-run',
+        :short => '-n',
+        :boolean => true,
+        :default => false,
+        :description => "Don't take action, only print what would happen"
+
+      def run
+        patterns = pattern_args_from(name_args.length > 0 ? name_args : [ "" ])
+
+        # Get the matches (recursively)
+        patterns.each do |pattern|
+          ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config)
+        end
+      end
+    end
+  end
+end
+

data/lib/chef_fs/file_system.rb

@@ -42,7 +42,7 @@ module ChefFS
     # the entry at the end of the path.
     #
     # ==== Attributes
-    # 
+    #
     # * +entry+ - the entry to start looking under.  Relative
     #   paths will be resolved from here.
     # * +path+ - the path to resolve.  If it starts with +/+,
@@ -72,26 +72,32 @@ module ChefFS
     # given pattern will look identical to src.
     #
     # ==== Attributes
-    # 
+    #
     # * +pattern+ - ChefFS::FilePattern to match children under
     # * +src_root+ - the root from which things will be copied
     # * +dest_root+ - the root to which things will be copied
     # * +recurse_depth+ - the maximum depth to copy things. +nil+
     #   means infinite depth.  0 means no recursion.
-    # * +purge+ - if +true+, items in +dest+ that are not in +src+
+    # * +options+ - hash of options:
+    #   - +purge+ - if +true+, items in +dest+ that are not in +src+
     #   will be deleted from +dest+.  If +false+, these items will
     #   be left alone.
+    #   - +force+ - if +true+, matching files are always copied from
+    #     +src+ to +dest+.  If +false+, they will only be copied if
+    #     actually different (which will take time to determine).
+    #   - +dry_run+ - if +true+, action will not actually be taken;
+    #     things will be printed out instead.
     #
     # ==== Examples
     #
     #     ChefFS::FileSystem.copy_to(FilePattern.new('/cookbooks', chef_fs, local_fs, nil, true)
     #
-    def self.copy_to(pattern, src_root, dest_root, recurse_depth, purge)
+    def self.copy_to(pattern, src_root, dest_root, recurse_depth, options)
       found_result = false
       # Find things we might want to copy
       ChefFS::Diff::diffable_leaves_from_pattern(pattern, src_root, dest_root, recurse_depth) do |src_leaf, dest_leaf, child_recurse_depth|
         found_result = true
-        copy_leaves(src_leaf, dest_leaf, child_recurse_depth, purge)
+        copy_leaves(src_leaf, dest_leaf, child_recurse_depth, options)
       end
       if !found_result && pattern.exact_path
         yield "#{pattern}: No such file or directory on remote or local"
@@ -101,7 +107,7 @@ module ChefFS
     private
 
     # Copy two known leaves (could be files or dirs)
-    def self.copy_leaves(src_entry, dest_entry, recurse_depth, purge)
+    def self.copy_leaves(src_entry, dest_entry, recurse_depth, options)
       # A NOTE about this algorithm:
       # There are cases where this algorithm does too many network requests.
       # knife upload with a specific filename will first check if the file
@@ -114,11 +120,15 @@ module ChefFS
       # Will need to decide how that works with checksums, though.
 
       if !src_entry.exists?
-        if purge
+        if options[:purge]
           # If we would not have uploaded it, we will not purge it.
           if src_entry.parent.can_have_child?(dest_entry.name, dest_entry.dir?)
-            dest_entry.delete
-            puts "Delete extra entry #{dest_entry.path_for_printing} (purge is on)"
+            if options[:dry_run]
+              puts "Would delete #{dest_entry.path_for_printing}"
+            else
+              dest_entry.delete
+              puts "Delete extra entry #{dest_entry.path_for_printing} (purge is on)"
+            end
           else
             Chef::Log.info("Not deleting extra entry #{dest_entry.path_for_printing} (purge is off)")
           end
@@ -127,18 +137,27 @@ module ChefFS
       elsif !dest_entry.exists?
         if dest_entry.parent.can_have_child?(src_entry.name, src_entry.dir?)
           if src_entry.dir?
-            new_dest_dir = dest_entry.parent.create_child(src_entry.name, nil)
-            puts "Created #{dest_entry.path_for_printing}/"
+            if options[:dry_run]
+              puts "Would create #{dest_entry.path_for_printing}"
+              new_dest_dir = dest_entry.parent.child(src_entry.name)
+            else
+              new_dest_dir = dest_entry.parent.create_child(src_entry.name, nil)
+              puts "Created #{dest_entry.path_for_printing}/"
+            end
             # Directory creation is recursive.
             if recurse_depth != 0
               src_entry.children.each do |src_child|
                 new_dest_child = new_dest_dir.child(src_child.name)
-                copy_leaves(src_child, new_dest_child, recurse_depth ? recurse_depth - 1 : recurse_depth, purge)
+                copy_leaves(src_child, new_dest_child, recurse_depth ? recurse_depth - 1 : recurse_depth, options)
               end
             end
           else
-            dest_entry.parent.create_child(src_entry.name, src_entry.read)
-            puts "Created #{dest_entry.path_for_printing}"
+            if options[:dry_run]
+              puts "Would create #{dest_entry.path_for_printing}"
+            else
+              dest_entry.parent.create_child(src_entry.name, src_entry.read)
+              puts "Created #{dest_entry.path_for_printing}"
+            end
           end
         end
 
@@ -159,11 +178,24 @@ module ChefFS
             return
           else
             # Both are files!  Copy them unless we're sure they are the same.
-            different, src_value, dest_value = ChefFS::Diff.diff_files_quick(src_entry, dest_entry)
-            if different || different == nil
+            if options[:force]
+              should_copy = true
+              src_value = src_entry.read
+            else
+              should_copy, src_value, dest_value = ChefFS::Diff.diff_files(src_entry, dest_entry)
               src_value = src_entry.read if src_value == :not_retrieved
-              dest_entry.write(src_value)
-              puts "Updated #{dest_entry.path_for_printing}"
+              if should_copy == nil
+                should_copy = true
+              end
+            end
+            if should_copy
+              if options[:dry_run]
+                puts "Would update #{dest_entry.path_for_printing}"
+              else
+                src_value = src_entry.read if src_value == :not_retrieved
+                dest_entry.write(src_value)
+                puts "Updated #{dest_entry.path_for_printing}"
+              end
             end
           end
         end

data/lib/chef_fs/file_system/data_bags_dir.rb

@@ -20,6 +20,17 @@ module ChefFS
       def can_have_child?(name, is_dir)
         is_dir
       end
+
+      def create_child(name, file_contents)
+        begin
+          rest.post_rest(api_path, { 'name' => name })
+        rescue Net::HTTPServerException
+          if $!.response.code != "409"
+            raise
+          end
+        end
+        DataBagDir.new(name, self, true)
+      end
     end
   end
 end

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -33,6 +33,18 @@ module ChefFS
         end
       end
 
+      def create_child(name, file_contents)
+        json = Chef::JSONCompat.from_json(file_contents).to_hash
+        base_name = name[0,name.length-5]
+        if json.include?('name') && json['name'] != base_name
+          raise "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{json['name']}')"
+        elsif json.include?('id') && json['id'] != base_name
+          raise "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{json['id']}')"
+        end
+        rest.post_rest(api_path, json)
+        RestListEntry.new(name, self, true)
+      end
+
       def environment
         parent.environment
       end

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -62,8 +62,23 @@ module ChefFS
         :json
       end
 
-      def write(contents)
-        rest.put_rest(api_path, contents)
+      def write(file_contents)
+        json = Chef::JSONCompat.from_json(file_contents).to_hash
+        base_name = name[0,name.length-5]
+        if json.include?('name') && json['name'] != base_name
+          raise "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{json['name']}')"
+        elsif json.include?('id') && json['id'] != base_name
+          raise "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{json['id']}')"
+        end
+        begin
+          rest.put_rest(api_path, json)
+        rescue Net::HTTPServerException
+          if $!.response.code == "404"
+            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+          else
+            raise
+          end
+        end
       end
     end
   end

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.4"
+  VERSION = "0.5"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000Z
+date: 2012-05-10 00:00:00.000000000Z
 dependencies: []
 description: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com
@@ -26,6 +26,7 @@ files:
 - lib/chef/knife/download.rb
 - lib/chef/knife/list.rb
 - lib/chef/knife/show.rb
+- lib/chef/knife/upload.rb
 - lib/chef_fs/command_line.rb
 - lib/chef_fs/diff.rb
 - lib/chef_fs/file_pattern.rb