knife-essentials 0.6 → 0.6.1

data/README.rdoc

@@ -8,11 +8,19 @@ that is stored in the Chef server.
 
    knife diff cookbooks/*apache*
    knife download roles data_bags cookbooks/emacs
+   knife upload apache*
    knife list data_bags/users
-   knife show roles/*base*
+   cd cookbooks && knife show *base*
 
-The plugin is in early days: more verbs will be added as time goes by, including
-+edit+, +delete+, +upload+ and +download+.
+More verbs will be added as time goes by.
+
+= INSTALLATION:
+
+This plugin can be installed as a Ruby Gem.
+
+    gem install knife-essentials
+
+You can also copy the source repository and install it using +rake install+.
 
 = PRINCIPLES
 
@@ -43,12 +51,6 @@ When you're in the +roles+ directory, the system knows that's what you are
 working with.  Just type +knife show base.json+ and it will show you the base
 role from the server.  knife-essentials knows.
 
-= INSTALLATION:
-
-This plugin builds a Ruby Gem (but has not yet been released to RubyGems).  To install it, run:
-
-    rake install
-
 = KNIFE PLUGINS
 
 chef_fs installs a number of useful knife verbs, including:

data/lib/chef_fs/command_line.rb

@@ -5,10 +5,10 @@ module ChefFS
     def self.diff(pattern, a_root, b_root, recurse_depth, output_mode)
       found_result = false
       ChefFS::FileSystem.list_pairs(pattern, a_root, b_root) do |a, b|
-        found_result = true
-        diff_entries(a, b, recurse_depth, output_mode) do |diff|
+        existed = diff_entries(a, b, recurse_depth, output_mode) do |diff|
           yield diff
         end
+        found_result = true if existed
       end
       if !found_result && pattern.exact_path
         yield "#{pattern}: No such file or directory on remote or local"
@@ -76,10 +76,12 @@ module ChefFS
           end
         end
 
+      # Neither is a directory, so they are diffable with file diff
       else
-        # Neither is a directory, so they are diffable with file diff
         are_same, old_value, new_value = ChefFS::FileSystem.compare(old_entry, new_entry)
-        if !are_same
+        if are_same
+          return old_value != :none
+        else
           if old_value == :none
             old_exists = false
           elsif old_value.nil?
@@ -98,10 +100,10 @@ module ChefFS
           # If one of the files doesn't exist, we only want to print the diff if the
           # other file *could be uploaded/downloaded*.
           if !old_exists && !old_entry.parent.can_have_child?(new_entry.name, new_entry.dir?)
-            return
+            return true
           end
           if !new_exists && !new_entry.parent.can_have_child?(old_entry.name, old_entry.dir?)
-            return
+            return true
           end
 
           if output_mode == :name_only
@@ -146,6 +148,7 @@ module ChefFS
           end
         end
       end
+      return true
     end
 
     private

data/lib/chef_fs/file_system.rb

@@ -224,13 +224,14 @@ module ChefFS
         end
 
       elsif !dest_entry.exists?
-        if dest_entry.parent.can_have_child?(src_entry.name, src_entry.dir?)
+        dest_parent = get_or_create_parent(dest_entry, options)
+        if dest_parent.can_have_child?(src_entry.name, src_entry.dir?)
           if src_entry.dir?
             if options[:dry_run]
               puts "Would create #{dest_entry.path_for_printing}"
-              new_dest_dir = dest_entry.parent.child(src_entry.name)
+              new_dest_dir = dest_parent.child(src_entry.name)
             else
-              new_dest_dir = dest_entry.parent.create_child(src_entry.name, nil)
+              new_dest_dir = dest_parent.create_child(src_entry.name, nil)
               puts "Created #{dest_entry.path_for_printing}/"
             end
             # Directory creation is recursive.
@@ -286,6 +287,7 @@ module ChefFS
             Chef::Log.error("File #{dest_entry.path_for_printing} is a directory while file #{dest_entry.path_for_printing} is a regular file\n")
             return
           else
+
             # Both are files!  Copy them unless we're sure they are the same.
             if options[:force]
               should_copy = true
@@ -308,6 +310,20 @@ module ChefFS
       end
     end
 
+    def self.get_or_create_parent(entry, options)
+      parent = entry.parent
+      if !parent.exists?
+        parent_parent = get_or_create_parent(entry.parent, options)
+        if options[:dry_run]
+          puts "Would create #{parent.path_for_printing}"
+        else
+          parent = parent_parent.create_child(parent.name, true)
+          puts "Created #{parent.path_for_printing}"
+        end
+      end
+      return parent
+    end
+
   end
 end
 

data/lib/chef_fs/file_system/base_fs_object.rb

@@ -26,7 +26,12 @@ module ChefFS
 
       def path_for_printing
         if parent
-          ChefFS::PathUtils::join(parent.path_for_printing, name)
+          parent_path = parent.path_for_printing
+          if parent_path == '.'
+            name
+          else
+            ChefFS::PathUtils::join(parent.path_for_printing, name)
+          end
         else
           name
         end

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -25,7 +25,11 @@ module ChefFS
 
       def exists?
         if @exists.nil?
-          @exists = parent.children.any? { |child| child.name == name }
+          begin
+            @exists = parent.children.any? { |child| child.name == name }
+          rescue ChefFS::FileSystem::NotFoundError
+            @exists = false
+          end
         end
         @exists
       end

data/lib/chef_fs/knife.rb

@@ -14,7 +14,10 @@ module ChefFS
     end
 
     def base_path
-      @base_path ||= "/" + ChefFS::PathUtils::relative_to(File.absolute_path(Dir.pwd), chef_repo)
+      @base_path ||= begin
+        relative_to_base = ChefFS::PathUtils::relative_to(File.absolute_path(Dir.pwd), chef_repo)
+        relative_to_base == '.' ? '/' : "/#{relative_to_base}"
+      end
     end
 
     def chef_fs

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.6"
+  VERSION = "0.6.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-19 00:00:00.000000000Z
+date: 2012-05-24 00:00:00.000000000Z
 dependencies: []
 description: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com