knife-essentials 0.6.1 → 0.7

data/lib/chef/knife/delete.rb

@@ -0,0 +1,33 @@
+require 'chef_fs/knife'
+require 'chef_fs/file_system'
+
+class Chef
+  class Knife
+    class Delete < ChefFS::Knife
+      banner "delete [PATTERN1 ... PATTERNn]"
+
+      common_options
+
+      option :recurse,
+        :long => '--[no-]recurse',
+        :boolean => true,
+        :default => false,
+        :description => "Delete directories recursively."
+
+      def run
+        # 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"
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/chef/knife/show.rb

@@ -13,14 +13,14 @@ class Chef
         pattern_args.each do |pattern|
           ChefFS::FileSystem.list(chef_fs, pattern) do |result|
             if result.dir?
-              STDERR.puts "#{format_path(result.path)}: is a directory" if pattern.exact_path
+              STDERR.puts "#{result.path_for_printing}: is a directory" if pattern.exact_path
             else
               begin
                 value = result.read
-                puts "#{format_path(result.path)}:"
+                puts "#{result.path_for_printing}:"
                 output(format_for_display(value))
               rescue ChefFS::FileSystem::NotFoundError
-                STDERR.puts "#{format_path(result.path)}: No such file or directory" if pattern.exact_path
+                STDERR.puts "#{result.path_for_printing}: No such file or directory"
               end
             end
           end

data/lib/chef_fs/file_system.rb

@@ -96,9 +96,9 @@ module ChefFS
     #
     def self.copy_to(pattern, src_root, dest_root, recurse_depth, options)
       found_result = false
-      list_pairs(pattern, src_root, dest_root) do |a, b|
+      list_pairs(pattern, src_root, dest_root) do |src, dest|
         found_result = true
-        copy_entries(a, b, recurse_depth, options)
+        copy_entries(src, dest, recurse_depth, options)
       end
       if !found_result && pattern.exact_path
         puts "#{pattern}: No such file or directory on remote or local"
@@ -215,8 +215,8 @@ module ChefFS
             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)"
+              dest_entry.delete(true)
+              puts "Deleted 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)")
@@ -314,9 +314,7 @@ module ChefFS
       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
+        if !options[:dry_run]
           parent = parent_parent.create_child(parent.name, true)
           puts "Created #{parent.path_for_printing}"
         end

data/lib/chef_fs/file_system/chef_server_root_dir.rb

@@ -50,12 +50,15 @@ module ChefFS
           if repo_mode == 'everything'
             result += [
               RestListDir.new("clients", self),
-              NodesDir.new(self)
+              NodesDir.new(self),
+              RestListDir.new("users", self)
             ]
           end
           result.sort_by { |child| child.name }
         end
       end
+
+      # Yeah, sorry, I'm not putting delete on this thing.
     end
   end
 end

data/lib/chef_fs/file_system/cookbook_dir.rb

@@ -103,6 +103,9 @@ module ChefFS
       end
 
       def compare_to(other)
+        if !other.dir?
+          return [ !exists?, nil, nil ]
+        end
         are_same = true
         ChefFS::CommandLine::diff_entries(self, other, nil, :name_only) do
           are_same = false

data/lib/chef_fs/file_system/data_bag_dir.rb

@@ -1,6 +1,7 @@
 require 'chef_fs/file_system/rest_list_dir'
 require 'chef_fs/file_system/data_bag_item'
 require 'chef_fs/file_system/not_found_error'
+require 'chef_fs/file_system/must_delete_recursively_error'
 
 module ChefFS
   module FileSystem
@@ -30,6 +31,18 @@ module ChefFS
         DataBagItem.new(name, self, exists)
       end
 
+      def delete(recurse)
+        if !recurse
+          raise ChefFS::FileSystem::MustDeleteRecursivelyError.new, "#{path_for_printing} must be deleted recursively"
+        end
+        begin
+          rest.delete_rest(api_path)
+        rescue Net::HTTPServerException
+          if $!.response.code == "404"
+            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+          end
+        end
+      end
     end
   end
 end

data/lib/chef_fs/file_system/file_system_entry.rb

@@ -40,9 +40,13 @@ module ChefFS
         File.directory?(file_path)
       end
 
-      def delete
+      def delete(recurse)
         if dir?
-          FileUtils.rm_rf(file_path)
+          if recurse
+            FileUtils.rm_rf(file_path)
+          else
+            File.rmdir(file_path)
+          end
         else
           File.delete(file_path)
         end

data/lib/chef_fs/file_system/file_system_error.rb

@@ -0,0 +1,11 @@
+module ChefFS
+  module FileSystem
+    class FileSystemError < StandardError
+      def initialize(cause = nil)
+        @cause = cause
+      end
+
+      attr_reader :cause
+    end
+  end
+end

data/lib/chef_fs/file_system/must_delete_recursively_error.rb

@@ -0,0 +1,11 @@
+require 'chef_fs/file_system/file_system_error'
+
+module ChefFS
+  module FileSystem
+    class MustDeleteRecursivelyError < FileSystemError
+      def initialize(cause = nil)
+        super(cause)
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/not_found_error.rb

@@ -1,11 +1,11 @@
+require 'chef_fs/file_system/file_system_error'
+
 module ChefFS
   module FileSystem
-    class NotFoundError < StandardError
+    class NotFoundError < FileSystemError
       def initialize(cause = nil)
-        @cause = cause
+        super(cause)
       end
-
-      attr_reader :cause
     end
   end
 end

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -59,7 +59,6 @@ module ChefFS
       def _make_child_entry(name, exists = nil)
         RestListEntry.new(name, self, exists)
       end
-
     end
   end
 end

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -34,7 +34,7 @@ module ChefFS
         @exists
       end
 
-      def delete
+      def delete(recurse)
         begin
           rest.delete_rest(api_path)
         rescue Net::HTTPServerException

data/lib/chef_fs/version.rb

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

data/spec/chef_fs/file_system/chef_server_root_dir_spec.rb

@@ -140,20 +140,20 @@ describe ChefFS::FileSystem::ChefServerRootDir do
       root_dir.path_for_printing.should == 'remote/'
     end
     it 'has correct children' do
-      root_dir.children.map { |child| child.name }.should =~ %w(clients cookbooks data_bags environments nodes roles)
+      root_dir.children.map { |child| child.name }.should =~ %w(clients cookbooks data_bags environments nodes roles users)
     end
     it 'can have children with the known names' do
-      %w(clients cookbooks data_bags environments nodes roles).each { |child| root_dir.can_have_child?(child, true).should be_true }
+      %w(clients cookbooks data_bags environments nodes roles users).each { |child| root_dir.can_have_child?(child, true).should be_true }
     end
     it 'cannot have files as children' do
-      %w(clients cookbooks data_bags environments nodes roles).each { |child| root_dir.can_have_child?(child, false).should be_false }
+      %w(clients cookbooks data_bags environments nodes roles users).each { |child| root_dir.can_have_child?(child, false).should be_false }
       root_dir.can_have_child?('blah', false).should be_false
     end
     it 'cannot have other child directories than the known names' do
       root_dir.can_have_child?('blah', true).should be_false
     end
     it 'child() responds to children' do
-      %w(clients cookbooks data_bags environments nodes roles).each { |child| root_dir.child(child).exists?.should be_true }
+      %w(clients cookbooks data_bags environments nodes roles users).each { |child| root_dir.child(child).exists?.should be_true }
     end
     context 'nonexistent child()' do
       let(:nonexistent_child) { root_dir.child('blah') }
@@ -209,4 +209,11 @@ describe ChefFS::FileSystem::ChefServerRootDir do
 
     it_behaves_like 'a json rest endpoint dir'
   end
+
+  context 'root.child(users)' do
+    let(:endpoint_name) { 'users' }
+    let(:endpoint) { root_dir.child('users') }
+
+    it_behaves_like 'a json rest endpoint dir'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -22,6 +22,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- lib/chef/knife/delete.rb
 - lib/chef/knife/diff.rb
 - lib/chef/knife/download.rb
 - lib/chef/knife/list.rb
@@ -44,7 +45,9 @@ files:
 - lib/chef_fs/file_system/data_bag_item.rb
 - lib/chef_fs/file_system/data_bags_dir.rb
 - lib/chef_fs/file_system/file_system_entry.rb
+- lib/chef_fs/file_system/file_system_error.rb
 - lib/chef_fs/file_system/file_system_root_dir.rb
+- lib/chef_fs/file_system/must_delete_recursively_error.rb
 - lib/chef_fs/file_system/nodes_dir.rb
 - lib/chef_fs/file_system/nonexistent_fs_object.rb
 - lib/chef_fs/file_system/not_found_error.rb