Merge pull request #502 from ripienaar/495.1

(#495) ensure errors raised will be noticed by Puppet

lib/mcollective/util/playbook/data_stores/base.rb

@@ -44,7 +44,7 @@ def from_hash(properties)
           # @param key [String] the lock name
           # @raise [StandardError] when releaging fails
           def release(key)
-            raise(NotImplementedError, "release not implemented in %s" % [self.class], caller)
+            raise(StandardError, "release not implemented in %s" % [self.class], caller)
           end
 
           # Locks a specific lock in the store
@@ -54,7 +54,7 @@ def release(key)
           # @param timeout [Integer,Float] how long to attempt to get the lock for
           # @raise [StandardError] when locking fails
           def lock(key, timeout)
-            raise(NotImplementedError, "lock not implemented in %s" % [self.class], caller)
+            raise(StandardError, "lock not implemented in %s" % [self.class], caller)
           end
 
           # Finds the members in a service
@@ -63,7 +63,7 @@ def lock(key, timeout)
           # @return [Array<String>] list of service members
           # @raise [StandardError] when the service is unknown or general error happened
           def members(key)
-            raise(NotImplementedError, "members not implemented in %s" % [self.class], caller)
+            raise(StandardError, "members not implemented in %s" % [self.class], caller)
           end
 
           # Deletes a key from a data store
@@ -72,7 +72,7 @@ def members(key)
           # @param key [String] the key to delete
           # @raise [StandardError] when deleting fails
           def delete(key)
-            raise(NotImplementedError, "delete not implemented in %s" % [self.class], caller)
+            raise(StandardError, "delete not implemented in %s" % [self.class], caller)
           end
 
           # Writes a value to the key in a data store
@@ -81,7 +81,7 @@ def delete(key)
           # @param value [String] the value to write
           # @raise [StandardError] when writing fails
           def write(key, value)
-            raise(NotImplementedError, "write not implemented in %s" % [self.class], caller)
+            raise(StandardError, "write not implemented in %s" % [self.class], caller)
           end
 
           # Reads a key from a data store
@@ -90,7 +90,7 @@ def write(key, value)
           # @return [String] string found in the data store
           # @raise [StandardError] when the key does not exist
           def read(key)
-            raise(NotImplementedError, "read not implemented in %s" % [self.class], caller)
+            raise(StandardError, "read not implemented in %s" % [self.class], caller)
           end
         end
       end

lib/mcollective/util/playbook/tasks/base.rb

@@ -28,15 +28,15 @@ def run_task(result)
           end
 
           def run
-            raise(NotImplementedError, "run not implemented", caller)
+            raise(StandardError, "run not implemented", caller)
           end
 
           def validate_configuration!
-            raise(NotImplementedError, "validate_configuration! not implemented", caller)
+            raise(StandardError, "validate_configuration! not implemented", caller)
           end
 
           def from_hash(properties)
-            raise(NotImplementedError, "from_hash not implemented", caller)
+            raise(StandardError, "from_hash not implemented", caller)
           end
         end
       end