knife-essentials 0.9.1 → 0.9.2

data/lib/chef/knife/diff_essentials.rb

@@ -42,15 +42,21 @@ class Chef
 
         # Get the matches (recursively)
         error = false
-        patterns.each do |pattern|
-          found_match = ChefFS::CommandLine.diff_print(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, output_mode, proc { |entry| format_path(entry) }, config[:diff_filter] ) do |diff|
-            stdout.print diff
-          end
-          if !found_match
-            ui.error "#{pattern}: No such file or directory on remote or local"
-            error = true
+        begin
+          patterns.each do |pattern|
+            found_match = ChefFS::CommandLine.diff_print(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, output_mode, proc { |entry| format_path(entry) }, config[:diff_filter] ) 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
+        rescue ChefFS::FileSystem::OperationFailedError => e
+          ui.error "Failed on #{format_path(e.entry)} in #{e.operation}: #{e.message}"
+          error = true
         end
+
         if error
           exit 1
         end

data/lib/chef_fs/file_system/cookbook_file.rb

@@ -37,16 +37,19 @@ module ChefFS
         old_sign_on_redirect = rest.sign_on_redirect
         rest.sign_on_redirect = false
         begin
-          begin
-            tmpfile = rest.get_rest(file[:url], true)
-            tmpfile.open
-            tmpfile.read
-          ensure
-            tmpfile.close!
-          end
+          tmpfile = rest.get_rest(file[:url], true)
+        rescue Net::HTTPServerException => e
+          raise ChefFS::FileSystem::OperationFailedError.new(:read, self, e), "#{e.message} retrieving #{file[:url]}"
         ensure
           rest.sign_on_redirect = old_sign_on_redirect
         end
+
+        begin
+          tmpfile.open
+          tmpfile.read
+        ensure
+          tmpfile.close!
+        end
       end
 
       def rest

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -47,11 +47,11 @@ module ChefFS
           @children ||= rest.get_rest(api_path).keys.sort.map do |key|
             _make_child_entry("#{key}.json", true)
           end
-        rescue Net::HTTPServerException
+        rescue Net::HTTPServerException => e
           if $!.response.code == "404"
             raise ChefFS::FileSystem::NotFoundError.new(self, $!)
           else
-            raise
+            raise ChefFS::FileSystem::OperationFailedError.new(:children, self, e)
           end
         end
       end

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -81,11 +81,11 @@ module ChefFS
         begin
           # REST will inflate the Chef object using json_class
           rest.get_rest(api_path)
-        rescue Net::HTTPServerException
+        rescue Net::HTTPServerException => e
           if $!.response.code == "404"
             raise ChefFS::FileSystem::NotFoundError.new(self, $!)
           else
-            raise
+            raise ChefFS::FileSystem::OperationFailedError.new(:read, self, e)
           end
         end
       end

data/lib/chef_fs/version.rb

@@ -1,4 +1,3 @@
 module ChefFS
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero