knife-essentials 0.8 → 0.8.1

data/README.rdoc

@@ -10,6 +10,7 @@ that is stored in the Chef server.
    knife download roles data_bags cookbooks/emacs
    knife upload apache*
    knife list data_bags/users
+   knife deps roles/base.json
    cd cookbooks && knife show *base*
 
 More verbs will be added as time goes by.
@@ -105,6 +106,16 @@ 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.
 
+== knife deps
+
+    knife deps [pattern1 pattern2 ...]
+
+Given a set of nodes, roles, or cookbooks, will traverse dependencies and show
+other roles, cookbooks, and environments that need to be loaded for them to
+work.  Use +--tree+ parameter to show this in a tree structure.  Use +--remote+
+to perform this operation against the data on the server rather than the local
+Chef repository.
+
 == NOTE ABOUT WILDCARDS
 
 knife-essentials supports wildcards internally, and will use them to sift through objects
@@ -128,4 +139,4 @@ yield slightly different results:
 
 You can avoid this problem permanently in zsh with this alias:
 
-    alias knife="noglob knife"
+    alias knife="noglob knife"

data/lib/chef/knife/delete_essentials.rb

@@ -15,6 +15,18 @@ class Chef
         :boolean => true,
         :default => false,
         :description => "Delete directories recursively."
+      option :remote_only,
+        :short => '-R',
+        :long => '--remote-only',
+        :boolean => true,
+        :default => false,
+        :description => "Only delete the remote copy (leave the local copy)."
+      option :local_only,
+        :short => '-L',
+        :long => '--local-only',
+        :boolean => true,
+        :default => false,
+        :description => "Only delete the local copy (leave the remote copy)."
 
       def run
         if name_args.length == 0
@@ -24,15 +36,40 @@ class Chef
         end
 
         # Get the matches (recursively)
-        pattern_args.each do |pattern|
-          ChefFS::FileSystem.list(chef_fs, pattern) do |result|
-            begin
-              result.delete(config[:recurse])
-              puts "Deleted #{result.path_for_printing}"
-            rescue ChefFS::FileSystem::NotFoundError
-              STDERR.puts "#{result.path_for_printing}: No such file or directory"
+        if config[:remote_only]
+          pattern_args.each do |pattern|
+            ChefFS::FileSystem.list(chef_fs, pattern) do |result|
+              delete_result(result)
             end
           end
+        elsif config[:local_only]
+          pattern_args.each do |pattern|
+            ChefFS::FileSystem.list(local_fs, pattern) do |result|
+              delete_result(result)
+            end
+          end
+        else
+          pattern_args.each do |pattern|
+            ChefFS::FileSystem.list_pairs(pattern, chef_fs, local_fs) do |chef_result, local_result|
+              delete_result(chef_result, local_result)
+            end
+          end
+        end
+      end
+
+      def delete_result(*results)
+        deleted_any = false
+        results.each do |result|
+          begin
+            result.delete(config[:recurse])
+            deleted_any = true
+          rescue ChefFS::FileSystem::NotFoundError
+          end
+        end
+        if deleted_any
+          puts "Deleted #{format_path(results[0].path)}"
+        else
+          STDERR.puts "#{format_path(results[0].path)}: No such file or directory"
         end
       end
     end

data/lib/chef/knife/{dependencies_essentials.rb → deps_essentials.rb}

@@ -3,10 +3,10 @@ require 'chef_fs/file_system'
 
 class Chef
   class Knife
-    remove_const(:Dependencies) if const_defined?(:Dependencies) # override Chef's version
-    class Dependencies < ::ChefFS::Knife
+    remove_const(:Deps) if const_defined?(:Deps) # override Chef's version
+    class Deps < ::ChefFS::Knife
       ChefFS = ::ChefFS
-      banner "knife dependencies PATTERN1 [PATTERNn]"
+      banner "knife deps PATTERN1 [PATTERNn]"
 
       common_options
 

data/lib/chef/knife/show_essentials.rb

@@ -10,10 +10,15 @@ class Chef
 
       common_options
 
+      option :local,
+        :long => '--local',
+        :boolean => true,
+        :description => "Show local files instead of remote"
+
       def run
         # Get the matches (recursively)
         pattern_args.each do |pattern|
-          ChefFS::FileSystem.list(chef_fs, pattern) do |result|
+          ChefFS::FileSystem.list(config[:local] ? local_fs : chef_fs, pattern) do |result|
             if result.dir?
               STDERR.puts "#{result.path_for_printing}: is a directory" if pattern.exact_path
             else

data/lib/chef_fs/file_system/nonexistent_fs_object.rb

@@ -33,6 +33,14 @@ module ChefFS
       def read
         raise ChefFS::FileSystem::NotFoundError, "Nonexistent #{path_for_printing}"
       end
+
+      def write(contents)
+        raise ChefFS::FileSystem::NotFoundError, "Nonexistent #{path_for_printing}"
+      end
+
+      def delete(recurse)
+        raise ChefFS::FileSystem::NotFoundError, "Nonexistent #{path_for_printing}"
+      end
     end
   end
 end

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.8"
+  VERSION = "0.8.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies: []
 description: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com
@@ -23,7 +23,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/chef/knife/delete_essentials.rb
-- lib/chef/knife/dependencies_essentials.rb
+- lib/chef/knife/deps_essentials.rb
 - lib/chef/knife/diff_essentials.rb
 - lib/chef/knife/download_essentials.rb
 - lib/chef/knife/list_essentials.rb