rhcp 0.2.20 → 0.2.21

data/lib/rhcp.rb

@@ -23,7 +23,7 @@ module RHCP #:nodoc:
     
     MAJOR = 0
     MINOR = 2
-    TINY  = 20
+    TINY  = 21
 
     def Version.to_s
       [ MAJOR, MINOR, TINY ].join(".")

data/lib/rhcp/command.rb

@@ -177,11 +177,7 @@ module RHCP
           get_param(key).check_param_is_valid(request, value)
         end
       rescue Exception => ex
-        if (/undefined\sparameter/.match(ex.message))
-          raise RHCP::RhcpException.new(ex.message) unless @accepts_extra_params or @ignores_extra_params
-        else
-          raise ex 
-        end
+        raise unless /undefined\sparameter/.match(ex.message)
       end
 
       # check that we've got all mandatory params
@@ -199,9 +195,6 @@ module RHCP
         response.mark_as_error(ex.to_s, ex.backtrace.join("\n"))
       end
 
-      # the command has been executed, so we should clear the store of collected param values
-      #request.context.collected_values = {}
-      
       response
     end
     
@@ -210,7 +203,40 @@ module RHCP
       execute_request(req)
     end
     
-    def add_as_instance_method(the_instance, additional_param_values = {})
+    def execute_from_ruby_args(args, additional_params, block)
+      # args is an array - but we need the (optional) hash on index 0
+      param_values = {}
+      if args.length > 0
+        param_values = args.first
+        if param_values.class == String && default_param != nil
+          $logger.debug "autoboxing for #{default_param.name}"
+          param_values = {
+            default_param.name => param_values
+          }
+        end
+      end
+      if defined?(block) and self.params.select { |p| p.name == "block" }.size > 0
+        param_values["block"] = block
+      end
+
+      # we need to carry along the context
+      the_broker = Thread.current['broker']
+      
+      param_values.merge! additional_params
+
+      request = RHCP::Request.new(self, param_values, the_broker.context)
+      response = the_broker.execute(request)
+
+      if (response.status != RHCP::Response::Status::OK) then        
+        #$logger.error("#{response.error_text}\n#{response.error_detail}")
+        e = RhcpException.new(response.error_text)
+        e.set_backtrace(response.error_detail)
+        raise e
+      end
+      response.data
+    end
+    
+    def add_as_instance_method(the_instance, additional_params = {})
       rhcp_command = self
       command_name = rhcp_command.name
   
@@ -219,34 +245,7 @@ module RHCP
         the_instance.class.send(:remove_method, command_name.to_sym)
       end
       the_instance.class.send(:define_method, command_name.to_sym) do |*args|
-        # args is an array - but we need the (optional) hash on index 0
-        param_values = {}
-        if args.length > 0
-          param_values = args.first
-        end
-  
-        # we need to carry along the context
-        the_broker = Thread.current['broker']
-        
-        param_values.merge! additional_param_values
-  
-        #param_values["host"] = @hostname if self.class.to_s == "HostController"
-        
-        request = RHCP::Request.new(rhcp_command, param_values, the_broker.context)
-        
-        response = the_broker.execute(request)
-  
-        if (response.status != RHCP::Response::Status::OK) then
-          # TODO actually, it would be nice if we could log the details into a file and show only the message
-          filtered_error_detail = response.error_detail.split("\n").select do |line|
-            /lib\/plugins\//.match(line)
-          end.join("\n")
-          
-          $logger.error("#{response.error_text}\n#{response.error_detail}")
-          #$logger.error("#{response.error_text}")
-          raise RuntimeError.new(response.error_text)
-        end
-        response.data
+        execute_from_ruby_args(args, additional_params)
       end
     end
     

data/lib/rhcp/rhcp_exception.rb

@@ -1,6 +1,13 @@
 module RHCP
   
-  class RhcpException < Exception
+  class RhcpException < StandardError
+    
+    def initialize(msg, detail = nil)
+      e = super(msg)
+      e.set_backtrace(detail) if detail
+      e
+    end
+    
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhcp
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 2
-  - 20
-  version: 0.2.20
+  - 21
+  version: 0.2.21
 platform: ruby
 authors: 
 - Philipp T.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-24 00:00:00 Z
+date: 2013-03-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json