chef-dk 0.11.2 → 0.12.0

data/lib/chef-dk/service_exception_inspectors/base.rb

@@ -1,40 +1,40 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module ChefDK
-  module ServiceExceptionInspectors
-
-    class Base
-
-      attr_reader :exception
-
-      def initialize(exception)
-        @exception = exception
-      end
-
-      def message
-        exception.message
-      end
-
-      def extended_error_info
-        ""
-      end
-
-    end
-  end
-end
-
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module ChefDK
+  module ServiceExceptionInspectors
+
+    class Base
+
+      attr_reader :exception
+
+      def initialize(exception)
+        @exception = exception
+      end
+
+      def message
+        exception.message
+      end
+
+      def extended_error_info
+        ""
+      end
+
+    end
+  end
+end
+

data/lib/chef-dk/service_exception_inspectors/http.rb

@@ -1,121 +1,121 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'ffi_yajl'
-
-module ChefDK
-  module ServiceExceptionInspectors
-    class HTTP
-
-      attr_reader :exception
-
-      def initialize(exception)
-        @exception = exception
-      end
-
-      def message
-        "HTTP #{code} #{response_message}: " + parsed_response_body
-      end
-
-      def extended_error_info
-        <<-END
---- REQUEST DATA ----
-#{http_method} #{uri}
-#{request_headers}
-#{req_body}
-
---- RESPONSE DATA ---
-#{code} #{response_message}
-#{response_headers}
-
-#{response_body}
-
-END
-      end
-
-      def response
-        exception.response
-      end
-
-      def code
-        response.code
-      end
-
-      def response_message
-        response.message
-      end
-
-      def response_body
-        response.body
-      end
-
-      def parsed_response_body
-        if response_body && !response_body.empty?
-          attempt_error_message_extract
-        else
-          "(No explanation provided by server)"
-        end
-      end
-
-      def attempt_error_message_extract
-        error_body = FFI_Yajl::Parser.parse(response_body)
-        if error_body.respond_to?(:key?) && error_body.key?("error")
-          Array(error_body["error"]).join(", ")
-        else
-          error_body.to_s
-        end
-      rescue
-        response_body
-      end
-
-      def response_headers
-        headers_s = ""
-        response.each_header do |key, value|
-          headers_s << key << ": " << value << "\n"
-        end
-        headers_s
-      end
-
-      def request
-        exception.chef_rest_request
-      end
-
-      def uri
-        request.uri.to_s + request.path.to_s
-      end
-
-      def http_method
-        request.method
-      end
-
-      def request_headers
-        headers_s = ""
-        request.each_header do |key, value|
-          headers_s << key << ": " << value << "\n"
-        end
-        headers_s
-      end
-
-      def req_body
-        request.body
-      end
-
-    end
-  end
-end
-
-
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'ffi_yajl'
+
+module ChefDK
+  module ServiceExceptionInspectors
+    class HTTP
+
+      attr_reader :exception
+
+      def initialize(exception)
+        @exception = exception
+      end
+
+      def message
+        "HTTP #{code} #{response_message}: " + parsed_response_body
+      end
+
+      def extended_error_info
+        <<-END
+--- REQUEST DATA ----
+#{http_method} #{uri}
+#{request_headers}
+#{req_body}
+
+--- RESPONSE DATA ---
+#{code} #{response_message}
+#{response_headers}
+
+#{response_body}
+
+END
+      end
+
+      def response
+        exception.response
+      end
+
+      def code
+        response.code
+      end
+
+      def response_message
+        response.message
+      end
+
+      def response_body
+        response.body
+      end
+
+      def parsed_response_body
+        if response_body && !response_body.empty?
+          attempt_error_message_extract
+        else
+          "(No explanation provided by server)"
+        end
+      end
+
+      def attempt_error_message_extract
+        error_body = FFI_Yajl::Parser.parse(response_body)
+        if error_body.respond_to?(:key?) && error_body.key?("error")
+          Array(error_body["error"]).join(", ")
+        else
+          error_body.to_s
+        end
+      rescue
+        response_body
+      end
+
+      def response_headers
+        headers_s = ""
+        response.each_header do |key, value|
+          headers_s << key << ": " << value << "\n"
+        end
+        headers_s
+      end
+
+      def request
+        exception.chef_rest_request
+      end
+
+      def uri
+        request.uri.to_s + request.path.to_s
+      end
+
+      def http_method
+        request.method
+      end
+
+      def request_headers
+        headers_s = ""
+        request.each_header do |key, value|
+          headers_s << key << ": " << value << "\n"
+        end
+        headers_s
+      end
+
+      def req_body
+        request.body
+      end
+
+    end
+  end
+end
+
+

data/lib/chef-dk/service_exceptions.rb

@@ -1,143 +1,143 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##
-# Exceptions for Service classes have more complex behaviors and more
-# dependencies, so they are split into their own file here.
-##
-
-require 'chef-dk/service_exception_inspectors'
-
-module ChefDK
-
-  module NestedExceptionWithInspector
-
-    attr_reader :cause
-    attr_reader :inspector
-
-    def initialize(message, cause)
-      super(message)
-      @message = message
-      @inspector = inspector_for(cause)
-      @cause = cause
-    end
-
-    def reason
-      "(#{cause.class.name}) #{inspector.message}"
-    end
-
-    def extended_error_info
-      inspector.extended_error_info
-    end
-
-    def message
-      @message
-    end
-
-    def to_s
-      "#{message}\nCaused by: #{reason}"
-    end
-
-    private
-
-    def inspector_for(exception)
-      if exception.respond_to?(:response)
-        ServiceExceptionInspectors::HTTP.new(exception)
-      else
-        ServiceExceptionInspectors::Base.new(exception)
-      end
-    end
-
-  end
-
-  # Base class for errors raised by ChefDK::PolicyfileServices objects. Don't
-  # raise this directly, create a descriptively-named subclass. You can rescue
-  # this to catch all errors from PolicyfileServices objects though.
-  class PolicyfileServiceError < StandardError
-  end
-
-  class PolicyfileNotFound < PolicyfileServiceError
-  end
-
-  class LockfileNotFound < PolicyfileServiceError
-  end
-
-  class MalformedLockfile < PolicyfileServiceError
-  end
-
-  class GitError < PolicyfileServiceError
-  end
-
-  class ExportDirNotEmpty < PolicyfileServiceError
-  end
-
-  class InvalidPolicyArchive < PolicyfileServiceError
-  end
-
-  class PolicyfileNestedException < PolicyfileServiceError
-
-    include NestedExceptionWithInspector
-
-  end
-
-  class PolicyfileDownloadError < PolicyfileNestedException
-  end
-
-  class PolicyfileInstallError < PolicyfileNestedException
-  end
-
-  class PolicyfileUpdateError < PolicyfileNestedException
-  end
-
-  class PolicyfilePushArchiveError < PolicyfileNestedException
-  end
-
-  class PolicyfilePushError < PolicyfileNestedException
-  end
-
-  class PolicyfileExportRepoError < PolicyfileNestedException
-  end
-
-  class PolicyfileListError < PolicyfileNestedException
-  end
-
-  class PolicyfileCleanError < PolicyfileNestedException
-  end
-
-  class DeletePolicyGroupError < PolicyfileNestedException
-  end
-
-  class DeletePolicyError < PolicyfileNestedException
-  end
-  class PolicyCookbookCleanError < PolicyfileNestedException
-  end
-
-  class UndeleteError < PolicyfileNestedException
-  end
-
-  class ChefRunnerError < StandardError
-
-    include NestedExceptionWithInspector
-
-  end
-
-  class CookbookNotFound < ChefRunnerError; end
-
-  class ChefConvergeError < ChefRunnerError; end
-
-end
-
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##
+# Exceptions for Service classes have more complex behaviors and more
+# dependencies, so they are split into their own file here.
+##
+
+require 'chef-dk/service_exception_inspectors'
+
+module ChefDK
+
+  module NestedExceptionWithInspector
+
+    attr_reader :cause
+    attr_reader :inspector
+
+    def initialize(message, cause)
+      super(message)
+      @message = message
+      @inspector = inspector_for(cause)
+      @cause = cause
+    end
+
+    def reason
+      "(#{cause.class.name}) #{inspector.message}"
+    end
+
+    def extended_error_info
+      inspector.extended_error_info
+    end
+
+    def message
+      @message
+    end
+
+    def to_s
+      "#{message}\nCaused by: #{reason}"
+    end
+
+    private
+
+    def inspector_for(exception)
+      if exception.respond_to?(:response)
+        ServiceExceptionInspectors::HTTP.new(exception)
+      else
+        ServiceExceptionInspectors::Base.new(exception)
+      end
+    end
+
+  end
+
+  # Base class for errors raised by ChefDK::PolicyfileServices objects. Don't
+  # raise this directly, create a descriptively-named subclass. You can rescue
+  # this to catch all errors from PolicyfileServices objects though.
+  class PolicyfileServiceError < StandardError
+  end
+
+  class PolicyfileNotFound < PolicyfileServiceError
+  end
+
+  class LockfileNotFound < PolicyfileServiceError
+  end
+
+  class MalformedLockfile < PolicyfileServiceError
+  end
+
+  class GitError < PolicyfileServiceError
+  end
+
+  class ExportDirNotEmpty < PolicyfileServiceError
+  end
+
+  class InvalidPolicyArchive < PolicyfileServiceError
+  end
+
+  class PolicyfileNestedException < PolicyfileServiceError
+
+    include NestedExceptionWithInspector
+
+  end
+
+  class PolicyfileDownloadError < PolicyfileNestedException
+  end
+
+  class PolicyfileInstallError < PolicyfileNestedException
+  end
+
+  class PolicyfileUpdateError < PolicyfileNestedException
+  end
+
+  class PolicyfilePushArchiveError < PolicyfileNestedException
+  end
+
+  class PolicyfilePushError < PolicyfileNestedException
+  end
+
+  class PolicyfileExportRepoError < PolicyfileNestedException
+  end
+
+  class PolicyfileListError < PolicyfileNestedException
+  end
+
+  class PolicyfileCleanError < PolicyfileNestedException
+  end
+
+  class DeletePolicyGroupError < PolicyfileNestedException
+  end
+
+  class DeletePolicyError < PolicyfileNestedException
+  end
+  class PolicyCookbookCleanError < PolicyfileNestedException
+  end
+
+  class UndeleteError < PolicyfileNestedException
+  end
+
+  class ChefRunnerError < StandardError
+
+    include NestedExceptionWithInspector
+
+  end
+
+  class CookbookNotFound < ChefRunnerError; end
+
+  class ChefConvergeError < ChefRunnerError; end
+
+end
+