knife-essentials 0.1 → 0.1.1

data/README.rdoc

@@ -94,21 +94,27 @@ Works just like 'ls', except it lists files on the server.
 Works just like +knife node show+, +knife role show+, etc. except there is One Verb To Rule
 Them All.
 
-== NOTE
-
-Since these patterns are also interpreted by the shell in Unix,
-you will need to backslash them if you want these knife commands to actually
-look at the server.  For example, if you want to list all data bags starting
-with "a" on the server, you can do
-
-    knife list data_bags/a\*
-
-If you do this instead, the shell will expand the pattern before passing it to knife:
-
-    knife list data_bags/a*
-
-Expands to the list of data bags on your local filesystem:
-
-    knife list data_bags/aardvarks data_bags/anagrams
-
-But this means that if the server has a data bag named +arp_tables+, you won't see it.
+== NOTE ABOUT WILDCARDS
+
+knife-essentials supports wildcards internally, and will use them to sift through objects
+on the server.  This can be very useful.  However, since it uses the same wildcard
+characters as the Unix command line (+*+, +?+, etc.), you need to backslash them so that
+the +*+ actually reaches the server.  If you don't, the shell will expand the * into
+actual filenames and knife will never know you typed +*+ in the first place.  For example,
+if the Chef server has data bags +aardvarks+, +anagrams+ and +arp_tables+, but your local
+filesystem only has +aardvarks+ and +anagrams+, backslashing vs. not backslashing will
+yield slightly different results:
+
+    # This actually asks the server for everything starting with a
+    $ knife list data_bags/a\*
+    aardvarks/ anagrams/ arp_tables/
+    # But this ...
+    $ knife list data_bags/a*
+    aardvarks/ anagrams/
+    # Is actually expanded by the command line to this:
+    $ knife list data_bags/aardvarks data_bags/aardvarks
+    aardvarks/ anagrams/
+
+You can avoid this problem permanently in zsh with this alias:
+
+    alias knife="noglob knife"

data/lib/chef_fs/diff.rb

@@ -121,8 +121,8 @@ module ChefFS
     # infinitely.
     #
     def self.diffable_leaves(a, b, recurse_depth)
-      # If we have children, recurse into them and diff the children instead of returning ourselves.
-      if recurse_depth != 0 && a.dir? && b.dir? && a.children.length > 0 && b.children.length > 0
+      # If both are directories, recurse into them and diff the children instead of returning ourselves.
+      if recurse_depth != 0 && a.dir? && b.dir?
         a_children_names = Set.new
         a.children.each do |a_child|
           a_children_names << a_child.name

data/lib/chef_fs/file_system/cookbook_dir.rb

@@ -50,6 +50,15 @@ module ChefFS
         @children
       end
 
+      def dir?
+        exists?
+      end
+
+      def read
+        # This will only be called if dir? is false, which means exists? is false.
+        raise ChefFS::FileSystem::NotFoundException, path_for_printing
+      end
+
       def exists?
         if !@versions
           child = parent.children.select { |child| child.name == name }.first

data/lib/chef_fs/file_system/data_bag_dir.rb

@@ -11,6 +11,15 @@ module ChefFS
         @exists = nil
       end
 
+      def dir?
+        exists?
+      end
+
+      def read
+        # This will only be called if dir? is false, which means exists? is false.
+        raise ChefFS::FileSystem::NotFoundException, path_for_printing
+      end
+
       def exists?
         if @exists.nil?
           @exists = parent.children.any? { |child| child.name == name }

data/lib/chef_fs/path_utils.rb

@@ -16,7 +16,8 @@ module ChefFS
       end
       # dot-dot up from 'source' to the common ancestor, then
       # descend to 'dest' from the common ancestor
-      ChefFS::PathUtils.join(*(['..']*(source_parts.length-i) + dest_parts[i,dest.length-i]))
+      result = ChefFS::PathUtils.join(*(['..']*(source_parts.length-i) + dest_parts[i,dest.length-i]))
+      result == '' ? '.' : result
     end
 
     def self.join(*parts)

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end
 

data/spec/chef_fs/diff_spec.rb

@@ -14,6 +14,8 @@ describe ChefFS::Diff do
           :sub_both_files => nil,
           :sub_both_files_different => "a\n",
 					:sub_both_dirs_empty => {},
+          :sub_dirs_empty_in_a_filled_in_b => {},
+          :sub_dirs_empty_in_b_filled_in_a => { :subsub => nil },
 					:sub_a_only_dir => { :subsub => nil },
 					:sub_a_only_file => nil,
 					:sub_dir_in_a_file_in_b => {},
@@ -21,7 +23,9 @@ describe ChefFS::Diff do
 				},
 				:both_files => nil,
         :both_files_different => "a\n",
-				:both_dirs_empty => {},
+        :both_dirs_empty => {},
+        :dirs_empty_in_a_filled_in_b => {},
+        :dirs_empty_in_b_filled_in_a => { :subsub => nil },
 				:a_only_dir => { :subsub => nil },
 				:a_only_file => nil,
 				:dir_in_a_file_in_b => {},
@@ -35,6 +39,8 @@ describe ChefFS::Diff do
 					:sub_both_files => nil,
           :sub_both_files_different => "b\n",
 					:sub_both_dirs_empty => {},
+          :sub_dirs_empty_in_a_filled_in_b => { :subsub => nil },
+          :sub_dirs_empty_in_b_filled_in_a => {},
 					:sub_b_only_dir => { :subsub => nil },
 					:sub_b_only_file => nil,
 					:sub_dir_in_a_file_in_b => nil,
@@ -43,6 +49,8 @@ describe ChefFS::Diff do
 				:both_files => nil,
         :both_files_different => "b\n",
 				:both_dirs_empty => {},
+        :dirs_empty_in_a_filled_in_b => { :subsub => nil },
+        :dirs_empty_in_b_filled_in_a => {},
 				:b_only_dir => { :subsub => nil },
 				:b_only_file => nil,
 				:dir_in_a_file_in_b => nil,
@@ -55,7 +63,8 @@ describe ChefFS::Diff do
           /both_dirs/sub_both_dirs/subsub
           /both_dirs/sub_both_files
           /both_dirs/sub_both_files_different
-          /both_dirs/sub_both_dirs_empty
+          /both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub
+          /both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub
           /both_dirs/sub_a_only_dir
           /both_dirs/sub_a_only_file
           /both_dirs/sub_b_only_dir
@@ -64,7 +73,8 @@ describe ChefFS::Diff do
           /both_dirs/sub_file_in_a_dir_in_b
           /both_files
           /both_files_different
-          /both_dirs_empty
+          /dirs_empty_in_b_filled_in_a/subsub
+          /dirs_empty_in_a_filled_in_b/subsub
           /a_only_dir
           /a_only_file
           /b_only_dir
@@ -96,14 +106,16 @@ describe ChefFS::Diff do
           /both_dirs/sub_both_dirs/subsub
           /both_dirs/sub_both_files
           /both_dirs/sub_both_files_different
-          /both_dirs/sub_both_dirs_empty
+          /both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub
+          /both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub
           /both_dirs/sub_a_only_dir
           /both_dirs/sub_a_only_file
           /both_dirs/sub_b_only_dir
           /both_dirs/sub_b_only_file
           /both_dirs/sub_dir_in_a_file_in_b
           /both_dirs/sub_file_in_a_dir_in_b
-          /both_dirs_empty
+          /dirs_empty_in_b_filled_in_a/subsub
+          /dirs_empty_in_a_filled_in_b/subsub
           /a_only_dir
           /b_only_dir
           /dir_in_a_file_in_b
@@ -122,7 +134,18 @@ describe ChefFS::Diff do
 @@ -1 +1 @@
 -a
 +b
-','Common subdirectories: /both_dirs/sub_both_dirs_empty
+','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 @@
++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 @@
+-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
@@ -145,7 +168,18 @@ new file
 @@ -1 +1 @@
 -a
 +b
-','Common subdirectories: /both_dirs_empty
+','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 @@
++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 @@
+-subsub
 ','Only in a: a_only_dir
 ','diff --knife a/a_only_file b/a_only_file
 deleted file
@@ -176,7 +210,18 @@ new file
 @@ -1 +1 @@
 -a
 +b
-','Common subdirectories: /both_dirs/sub_both_dirs_empty
+','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 @@
++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 @@
+-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
@@ -209,6 +254,8 @@ new file
 -a
 +b
 ','Common subdirectories: /both_dirs_empty
+','Common subdirectories: /dirs_empty_in_b_filled_in_a
+','Common subdirectories: /dirs_empty_in_a_filled_in_b
 ','Only in a: a_only_dir
 ','diff --knife a/a_only_file b/a_only_file
 deleted file
@@ -241,6 +288,8 @@ new file
 -a
 +b
 ','Common subdirectories: /both_dirs_empty
+','Common subdirectories: /dirs_empty_in_b_filled_in_a
+','Common subdirectories: /dirs_empty_in_a_filled_in_b
 ','Only in a: a_only_dir
 ','diff --knife a/a_only_file b/a_only_file
 deleted file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ bindir: bin
 cert_chain: []
 date: 2012-04-26 00:00:00.000000000Z
 dependencies: []
-description: A library that treats the Chef server as if it were a filesystem
+description: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com
 executables: []
 extensions: []
@@ -75,5 +75,5 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A library that treats the Chef server as if it were a filesystem
+summary: Universal knife verbs that work with your Chef repository
 test_files: []