knife-essentials 0.8.4 → 0.8.5

data/lib/chef/knife/delete_essentials.rb

@@ -11,18 +11,17 @@ class Chef
       common_options
 
       option :recurse,
+        :short => '-r',
         :long => '--[no-]recurse',
         :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,
@@ -36,41 +35,71 @@ class Chef
         end
 
         # Get the matches (recursively)
+        error = false
         if config[:remote_only]
           pattern_args.each do |pattern|
             ChefFS::FileSystem.list(chef_fs, pattern) do |result|
-              delete_result(result)
+              if delete_result(result)
+                error = true
+              end
             end
           end
         elsif config[:local_only]
           pattern_args.each do |pattern|
             ChefFS::FileSystem.list(local_fs, pattern) do |result|
-              delete_result(result)
+              if delete_result(result)
+                error = true
+              end
             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)
+              if delete_result(chef_result, local_result)
+                error = true
+              end
             end
           end
         end
+
+        if error
+          exit 1
+        end
+      end
+
+      def format_path_with_root(entry)
+        root = entry.root == chef_fs ? " (remote)" : " (local)"
+        "#{format_path(entry)}#{root}"
       end
 
       def delete_result(*results)
         deleted_any = false
+        found_any = false
+        error = false
         results.each do |result|
           begin
             result.delete(config[:recurse])
             deleted_any = true
+            found_any = true
           rescue ChefFS::FileSystem::NotFoundError
+            # This is not an error unless *all* of them were not found
+          rescue ChefFS::FileSystem::MustDeleteRecursivelyError => e
+            ui.error "#{format_path_with_root(e.entry)} must be deleted recursively!  Pass -r to knife delete."
+            found_any = true
+            error = true
+          rescue ChefFS::FileSystem::OperationNotAllowedError => e
+            ui.error "#{format_path_with_root(e.entry)} #{e.reason}."
+            found_any = true
+            error = true
           end
         end
         if deleted_any
-          output("Deleted #{format_path(results[0].path)}")
-        else
-          ui.error "#{format_path(results[0].path)}: No such file or directory"
+          output("Deleted #{format_path(results[0])}")
+        elsif !found_any
+          ui.error "#{format_path(results[0])}: No such file or directory"
+          error = true
         end
+        error
       end
     end
   end

data/lib/chef/knife/deps_essentials.rb

@@ -54,13 +54,13 @@ class Chef
             child_entry = ChefFS::FileSystem.resolve_path(@root, child)
             print_flattened_dependencies(child_entry, dependencies)
           end
-          output format_path(entry.path)
+          output format_path(entry)
         end
       end
 
       def print_dependencies_tree(entry, dependencies, printed = {}, depth = 0)
         dependencies[entry.path] = get_dependencies(entry) if !dependencies[entry.path]
-        output "#{'  '*depth}#{format_path(entry.path)}"
+        output "#{'  '*depth}#{format_path(entry)}"
         if !printed[entry.path] && (config[:recurse] || depth == 0)
           printed[entry.path] = true
           dependencies[entry.path].each do |child|
@@ -104,13 +104,13 @@ class Chef
             result
 
           elsif !entry.exists?
-            raise ChefFS::FileSystem::NotFoundError, "Nonexistent #{entry.path_for_printing}"
+            raise ChefFS::FileSystem::NotFoundError.new(entry)
 
           else
             []
           end
-        rescue ChefFS::FileSystem::NotFoundError
-          ui.error "#{format_path(entry.path)}: No such file or directory"
+        rescue ChefFS::FileSystem::NotFoundError => e
+          ui.error "#{format_path(e.entry)}: No such file or directory"
           self.exit_code = 2
           []
         end

data/lib/chef/knife/diff_essentials.rb

@@ -36,10 +36,18 @@ class Chef
         patterns = pattern_args_from(name_args.length > 0 ? name_args : [ "" ])
 
         # Get the matches (recursively)
+        error = false
         patterns.each do |pattern|
-          ChefFS::CommandLine.diff_print(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, output_mode, proc { |entry| format_path(entry.path) } ) do |diff|
+          found_match = ChefFS::CommandLine.diff_print(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, output_mode, proc { |entry| format_path(entry) } ) do |diff|
             stdout.print diff
           end
+          if !found_match
+            ui.error "#{pattern}: No such file or directory on remote or local"
+            error = true
+          end
+        end
+        if error
+          exit 1
         end
       end
     end

data/lib/chef/knife/download_essentials.rb

@@ -44,7 +44,7 @@ class Chef
 
         error = false
         pattern_args.each do |pattern|
-          error ||= ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry.path) })
+          error ||= ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
         end
         if error
           exit 1

data/lib/chef/knife/list_essentials.rb

@@ -51,7 +51,7 @@ class Chef
             elsif result.exists?
               results << result
             elsif pattern.exact_path
-              ui.error "#{format_path(result.path)}: No such file or directory"
+              ui.error "#{format_path(result)}: No such file or directory"
               self.exit_code = 1
             end
           end
@@ -80,7 +80,7 @@ class Chef
           else
             printed_something = true
           end
-          output "#{format_path(result.path)}:"
+          output "#{format_path(result)}:"
           print_results(children.map { |result| maybe_add_slash(result.name, result.dir?) }.sort, "")
         end
 
@@ -90,8 +90,8 @@ class Chef
       def add_dir_result(result)
         begin
           children = result.children.sort_by { |child| child.name }
-        rescue ChefFS::FileSystem::NotFoundError
-          ui.error "#{format_path(result.path)}: No such file or directory"
+        rescue ChefFS::FileSystem::NotFoundError => e
+          ui.error "#{format_path(e.entry)}: No such file or directory"
           return []
         end
 
@@ -107,7 +107,7 @@ class Chef
       end
 
       def print_result_paths(results, indent = "")
-        print_results(results.map { |result| maybe_add_slash(format_path(result.path), result.dir?) }, indent)
+        print_results(results.map { |result| maybe_add_slash(format_path(result), result.dir?) }, indent)
       end
 
       def print_results(results, indent)

data/lib/chef/knife/raw_essentials.rb

@@ -40,7 +40,13 @@ class Chef
           data = IO.read(config[:input])
         end
         chef_rest = Chef::REST.new(Chef::Config[:chef_server_url])
-        output api_request(chef_rest, config[:method].to_sym, chef_rest.create_url(name_args[0]), {}, data)
+        begin
+          output api_request(chef_rest, config[:method].to_sym, chef_rest.create_url(name_args[0]), {}, data)
+        rescue Net::HTTPServerException => e
+          ui.error "Server responded with error #{e.response.code} \"#{e.response.message}\""
+          ui.error "Error Body: #{e.response.body}" if e.response.body && e.response.body != ''
+          exit 1
+        end
       end
 
       ACCEPT_ENCODING = "Accept-Encoding".freeze
@@ -86,7 +92,6 @@ class Chef
               msg << (exception["error"].respond_to?(:join) ? exception["error"].join(", ") : exception["error"].to_s)
               Chef::Log.info(msg)
             end
-            output response.body
             response.error!
           end
         end

data/lib/chef/knife/show_essentials.rb

@@ -1,5 +1,6 @@
 require 'chef_fs/knife'
 require 'chef_fs/file_system'
+require 'chef_fs/file_system/not_found_error'
 
 class Chef
   class Knife
@@ -17,21 +18,30 @@ class Chef
 
       def run
         # Get the matches (recursively)
+        error = false
         pattern_args.each do |pattern|
           ChefFS::FileSystem.list(config[:local] ? local_fs : chef_fs, pattern) do |result|
             if result.dir?
-              ui.error "#{result.path_for_printing}: is a directory" if pattern.exact_path
+              ui.error "#{format_path(result)}: is a directory" if pattern.exact_path
+              error = true
             else
               begin
                 value = result.read
-                output "#{result.path_for_printing}:"
+                output "#{format_path(result)}:"
                 output(format_for_display(value))
-              rescue ChefFS::FileSystem::NotFoundError
-                ui.error "#{result.path_for_printing}: No such file or directory"
+              rescue ChefFS::FileSystem::OperationNotAllowedError => e
+                ui.error "#{format_path(e.entry)}: #{e.reason}."
+                error = true
+              rescue ChefFS::FileSystem::NotFoundError => e
+                ui.error "#{format_path(e.entry)}: No such file or directory"
+                error = true
               end
             end
           end
         end
+        if error
+          exit 1
+        end
       end
     end
   end

data/lib/chef/knife/upload_essentials.rb

@@ -44,7 +44,7 @@ class Chef
 
         error = false
         pattern_args.each do |pattern|
-          error ||= ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry.path) })
+          error ||= ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
         end
         if error
           exit 1

data/lib/chef_fs/command_line.rb

@@ -27,7 +27,9 @@ module ChefFS
       end
 
       get_content = (output_mode != :name_only && output_mode != :name_status)
+      found_match = false
       diff(pattern, a_root, b_root, recurse_depth, get_content) do |type, old_entry, new_entry, old_value, new_value|
+        found_match = true unless type == :both_nonexistent
         old_path = format_path.call(old_entry)
         new_path = format_path.call(new_entry)
 
@@ -90,21 +92,22 @@ module ChefFS
             elsif output_mode == :name_status
               yield "M\t#{new_path}\n"
             end
+          when :both_nonexistent
+          when :added_cannot_upload
+          when :deleted_cannot_download
+          when :same
+            # Skip these silently
           end
         end
       end
+      found_match
     end
 
     def self.diff(pattern, a_root, b_root, recurse_depth, get_content)
-      found_result = false
       ChefFS::FileSystem.list_pairs(pattern, a_root, b_root) do |a, b|
-        existed = diff_entries(a, b, recurse_depth, get_content) do |diff|
+        diff_entries(a, b, recurse_depth, get_content) 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"
       end
     end
 
@@ -147,7 +150,11 @@ module ChefFS
       else
         are_same, old_value, new_value = ChefFS::FileSystem.compare(old_entry, new_entry)
         if are_same
-          return old_value != :none
+          if old_value == :none
+            yield [ :both_nonexistent, old_entry, new_entry ]
+          else
+            yield [ :same, old_entry, new_entry ]
+          end
         else
           if old_value == :none
             old_exists = false
@@ -168,10 +175,12 @@ 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 true
+            yield [ :old_cannot_upload, old_entry, new_entry ]
+            return
           end
           if !new_exists && !new_entry.parent.can_have_child?(old_entry.name, old_entry.dir?)
-            return true
+            yield [ :new_cannot_upload, old_entry, new_entry ]
+            return
           end
 
           if get_content
@@ -197,7 +206,6 @@ module ChefFS
           end
         end
       end
-      return true
     end
 
     private

data/lib/chef_fs/file_system.rb

@@ -17,7 +17,7 @@
 #
 
 require 'chef_fs/path_utils'
-require 'chef_fs/file_system/operation_skipped_error'
+require 'chef_fs/file_system/default_environment_cannot_be_modified_error'
 require 'chef_fs/file_system/operation_not_allowed_error'
 
 module ChefFS
@@ -348,10 +348,10 @@ module ChefFS
             end
           end
         end
-      rescue OperationSkippedError
-        # If it was simply skipped, a warning has already been printed.
+      rescue DefaultEnvironmentCannotBeModifiedError => e
+        ui.warn "#{format_path.call(e.entry)} #{e.reason}."
       rescue OperationNotAllowedError => e
-        ui.error e.message
+        ui.error "#{format_path.call(e.entry)} #{e.reason}."
         error = true
       end
       error

data/lib/chef_fs/file_system/base_fs_object.rb

@@ -99,13 +99,13 @@ module ChefFS
 
       # Override children to report your *actual* list of children as an array.
       def children
-        raise NotFoundError, "Nonexistent #{path_for_printing}" if !exists?
+        raise NotFoundError.new(self) if !exists?
         []
       end
 
       # Expand this entry into a chef object (Chef::Role, ::Node, etc.)
       def chef_object
-        raise NotFoundError, "Nonexistent #{path_for_printing}" if !exists?
+        raise NotFoundError.new(self) if !exists?
         nil
       end
 
@@ -116,15 +116,15 @@ module ChefFS
       # your entry class, and will be called without actually reading the
       # file_contents.  This is used for knife upload /cookbooks/cookbookname.
       def create_child(name, file_contents)
-        raise NotFoundError, "Nonexistent #{path_for_printing}" if !exists?
-        raise OperationNotAllowedError.new(:create_child), "#{path_for_printing} cannot have a child created under it."
+        raise NotFoundError.new(self) if !exists?
+        raise OperationNotAllowedError.new(:create_child, self)
       end
 
       # Delete this item, possibly recursively.  Entries MUST NOT delete a
       # directory unless recurse is true.
       def delete(recurse)
-        raise NotFoundError, "Nonexistent #{path_for_printing}" if !exists?
-        raise OperationNotAllowedError.new(:delete), "#{path_for_printing} cannot be deleted."
+        raise NotFoundError.new(self) if !exists?
+        raise OperationNotAllowedError.new(:delete, self)
       end
 
       # Ask whether this entry is a directory.  If not, it is a file.
@@ -158,14 +158,14 @@ module ChefFS
 
       # Read the contents of this file entry.
       def read
-        raise NotFoundError, "Nonexistent #{path_for_printing}" if !exists?
-        raise OperationNotAllowedError.new(:read), "#{path_for_printing} cannot be read."
+        raise NotFoundError.new(self) if !exists?
+        raise OperationNotAllowedError.new(:read, self)
       end
 
       # Write the contents of this file entry.
       def write(file_contents)
-        raise NotFoundError, "Nonexistent #{path_for_printing}" if !exists?
-        raise OperationNotAllowedError.new(:write), "#{path_for_printing} cannot be updated."
+        raise NotFoundError.new(self) if !exists?
+        raise OperationNotAllowedError.new(:write, self)
       end
 
       # Important directory attributes: name, parent, path, root

data/lib/chef_fs/file_system/chef_repository_file_system_root_dir.rb

@@ -37,7 +37,7 @@ module ChefFS
       attr_reader :child_paths
 
       def children
-        @children ||= child_paths.keys.map { |name| make_child_entry(name) }.select { |child| !child.nil? }
+        @children ||= child_paths.keys.sort.map { |name| make_child_entry(name) }.select { |child| !child.nil? }
       end
 
       def can_have_child?(name, is_dir)

data/lib/chef_fs/file_system/chef_server_root_dir.rb

@@ -76,8 +76,6 @@ module ChefFS
           result.sort_by { |child| child.name }
         end
       end
-
-      # Yeah, sorry, I'm not putting delete on this thing.
     end
   end
 end