rhcp 0.2.14 → 0.2.15

data/lib/rhcp.rb

@@ -23,7 +23,7 @@ module RHCP #:nodoc:
     
     MAJOR = 0
     MINOR = 2
-    TINY  = 14
+    TINY  = 15
 
     def Version.to_s
       [ MAJOR, MINOR, TINY ].join(".")
@@ -40,7 +40,7 @@ module RHCP #:nodoc:
     def initialize()
       # TODO do we really want to log to STDOUT per default?
       # TODO check the whole package for correct usage of loggers
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new("rhcp.log")
     end
     
     
@@ -48,4 +48,4 @@ module RHCP #:nodoc:
   
 end
 
-$logger = Logger.new(STDOUT)
+#$logger = Logger.new(STDOUT)

data/lib/rhcp/command.rb

@@ -11,6 +11,9 @@ module RHCP
       
     # TODO add metadata about the command's result (display type ("table"), column order etc.)
     
+    # a qualified name that identifies this command in a dot-separated namespace
+    attr_reader :full_name
+    
     # a unique name for this command
     attr_reader :name
 
@@ -42,7 +45,10 @@ module RHCP
     def initialize(name, description, block = nil)
       @logger = RHCP::ModuleHelper.instance().logger
       
-      @name = name
+      #@logger.info("full name : #{name}")
+      @full_name = name
+      @name = name.split(".").last
+      
       @description = description
       @block = block unless block == nil
       @params = Array.new()
@@ -132,6 +138,7 @@ module RHCP
       @logger.debug "gonna execute request >>#{request}<<"
       
       response = RHCP::Response.new()
+      
       # check all param values for plausibility
       request.param_values.each do |key,value|
         get_param(key).check_param_is_valid(request, value)
@@ -155,8 +162,6 @@ module RHCP
       # the command has been executed, so we should clear the store of collected param values
       #request.context.collected_values = {}
       
-      fire_post_exec_event(request, response)
-      
       response
     end
     
@@ -177,7 +182,6 @@ module RHCP
         # args is an array - but we need the (optional) hash on index 0
         param_values = {}
         if args.length > 0
-          $logger.debug("args: #{args}")
           param_values = args.first
         end
   
@@ -222,27 +226,6 @@ module RHCP
       }.to_json(*args)
     end
     
-    # TODO think about moving this and the whole command thing to the broker
-    def Command.register_post_exec_listener(block)        
-      @@listener = [] unless defined?(@@listener)
-      @@listener << block
-    end
-    
-    def Command.clear_post_exec_listeners()
-      @@listener = []
-    end
-    
-    def fire_post_exec_event(request, response)
-      return unless defined? @@listener
-      @@listener.each do |listener|
-        begin
-          listener.call(request, response)
-        rescue => ex
-          @logger.warn "a post-exec listener failed with the following message : #{ex}"
-        end
-      end
-    end
-
   end
 
 end

data/lib/rhcp/command_param.rb

@@ -25,6 +25,8 @@ module RHCP
     attr_reader :is_default_param
     # the key to a context value that is used for filling this parameter
     attr_reader :autofill_context_key
+    
+    attr_accessor :default_value
 
     # creates a new command parameter
     # options is a hash, possibly holding the following values (all optional)
@@ -32,6 +34,7 @@ module RHCP
     #   :allows_multiple_values   true if this parameter might be specified multiple times
     #   :lookup_method            a block that returns an array of lookup values valid for this param
     #   :is_default_param         true if this parameter is the default param for the enclosing command
+    #   :default_value            a value to use as default (who would have thought?)
     def initialize(name, description, options = Hash.new)
       @name = name
       @description = description
@@ -44,6 +47,7 @@ module RHCP
       @allows_multiple_values = options[:allows_multiple_values] || false
       @is_default_param = options[:is_default_param] || false
       @autofill_context_key = options[:autofill_context_key] || nil
+      @default_value = options[:default_value] || nil
     end
 
     # searches the context for a values that can be auto-filled

data/lib/rhcp/request.rb

@@ -25,15 +25,27 @@ module RHCP
       @context = context
 
       command.params.each do |param|
+        
         value_from_context = param.find_value_in_context(context)
         if value_from_context != nil          
           # if the parameter has been specified in the param values, do not override
           if ! param_values.has_key?(param.name)
             @logger.debug "pre-filling param #{param.name} with value '#{value_from_context}' (context key '#{param.autofill_context_key}')"
             param_values[param.name] = value_from_context
+          end                    
+        end
+        
+        # fill params with default values
+        if ! param_values.has_key?(param.name) and param.default_value != nil
+          if param.default_value.class == Proc
+            param_values[param.name] = param.default_value.call(param_values)          
+          else
+            param_values[param.name] = param.default_value
           end
         end
+        
       end
+      
 
       # autobox the parameters if necessary
       param_values.each do |k,v|

data/test/rhcp/command_test.rb

@@ -93,46 +93,6 @@ class CommandTest < Test::Unit::TestCase
     assert_equal the_param, command.default_param
   end
   
-  def test_listener
-    command = RHCP::Command.new("test_listener", "just some dumb command for the listener", lambda {
-      |req,res|
-      puts "While I think there could be something important to say right now, I just cannot remember what it might have been..."
-      res.result_text = "the test is working."
-    })
-    
-    @listener1_fired = false
-    @listener2_fired = false
-    
-    RHCP::Command.clear_post_exec_listeners()
-    RHCP::Command.register_post_exec_listener(lambda { |req,res| @listener1_fired = true })
-    RHCP::Command.register_post_exec_listener(lambda { |req,res| @listener2_fired = true })    
-    
-    command.execute()
-    
-    assert @listener1_fired
-    assert @listener2_fired
-  end
-  
-  def test_failing_listener
-    command = RHCP::Command.new("test_listener", "just some dumb command for the listener", lambda {
-      |req,res|
-      puts "While I think there could be something important to say right now, I just cannot remember what it might have been..."
-      res.result_text = "the test is working"
-    })
-  
-    RHCP::Command.clear_post_exec_listeners()
-    RHCP::Command.register_post_exec_listener(lambda { |req,res| raise "this listener is dying"})
-    
-    @listener1_fired = false
-    @listener2_fired = false
-    
-    response = command.execute()
-    assert_not_nil response
-    assert_equal "the test is working", response.result_text
-    assert ! @listener1_fired
-    assert ! @listener2_fired
-  end
-
   def test_enabled_through_context
     command = RHCP::Command.new("context_test", "testing the context", lambda {
       |req,res|

data/test/rhcp/rhcp.log

@@ -0,0 +1,20 @@
+# Logfile created on Sat Nov 12 22:54:42 +0100 2011 by logger.rb/22285
+D, [2011-11-12T22:54:42.004418 #8757] DEBUG -- : enabling command context_test because of context key host
+D, [2011-11-12T22:54:42.004543 #8757] DEBUG -- : initializing request test with params first_paramthing
+D, [2011-11-12T22:54:42.004588 #8757] DEBUG -- : request initialized : command 'test', params : first_param=thing
+D, [2011-11-12T22:54:42.004623 #8757] DEBUG -- : gonna execute request >>test (first_paramthing)<<
+D, [2011-11-12T22:54:42.004736 #8757] DEBUG -- : initializing request not working with params 
+D, [2011-11-12T22:54:42.004771 #8757] DEBUG -- : request initialized : command 'not working', params : 
+D, [2011-11-12T22:54:42.004802 #8757] DEBUG -- : gonna execute request >>not working ()<<
+D, [2011-11-12T22:54:42.004922 #8757] DEBUG -- : initializing request test with params first_paramthe_value
+D, [2011-11-12T22:54:42.004961 #8757] DEBUG -- : request initialized : command 'test', params : first_param=the_value
+D, [2011-11-12T22:54:42.004997 #8757] DEBUG -- : gonna execute request >>test (first_paramthe_value)<<
+D, [2011-11-12T22:54:42.005214 #8757] DEBUG -- : initializing request test with params does_not_existsingle value for non-existing param
+D, [2011-11-12T22:54:42.005256 #8757] DEBUG -- : request initialized : command 'test', params : does_not_exist=single value for non-existing param
+D, [2011-11-12T22:54:42.005291 #8757] DEBUG -- : gonna execute request >>test (does_not_existsingle value for non-existing param)<<
+D, [2011-11-12T22:54:42.005413 #8757] DEBUG -- : initializing request test with params real_paramvalue for the real paramanother value for the real param
+D, [2011-11-12T22:54:42.005452 #8757] DEBUG -- : request initialized : command 'test', params : real_param=value for the real param,another value for the real param
+D, [2011-11-12T22:54:42.005513 #8757] DEBUG -- : gonna execute request >>test (real_paramvalue for the real paramanother value for the real param)<<
+D, [2011-11-12T22:54:42.005661 #8757] DEBUG -- : initializing request test with params 
+D, [2011-11-12T22:54:42.005701 #8757] DEBUG -- : request initialized : command 'test', params : 
+D, [2011-11-12T22:54:42.005733 #8757] DEBUG -- : gonna execute request >>test ()<<

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhcp
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 2
-  - 14
-  version: 0.2.14
+  - 15
+  version: 0.2.15
 platform: ruby
 authors: 
 - Philipp Traeder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 +00:00
+date: 2011-11-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,39 +44,40 @@ extra_rdoc_files: []
 
 files: 
 - bin/rhcp_test_server
-- lib/rhcp/dispatching_broker.rb
-- lib/rhcp/context.rb
-- lib/rhcp/memcached_broker.rb
-- lib/rhcp/logging_broker.rb
-- lib/rhcp/broker.rb
+- lib/rhcp.rb
+- lib/rhcp/command_param.rb
 - lib/rhcp/response.rb
-- lib/rhcp/client/command_stub.rb
-- lib/rhcp/client/command_param_stub.rb
+- lib/rhcp/rhcp_exception.rb
+- lib/rhcp/logging_broker.rb
 - lib/rhcp/client/http_broker.rb
 - lib/rhcp/client/context_aware_broker.rb
-- lib/rhcp/command.rb
+- lib/rhcp/client/command_stub.rb
+- lib/rhcp/client/command_param_stub.rb
 - lib/rhcp/http_exporter.rb
-- lib/rhcp/rhcp_exception.rb
-- lib/rhcp/command_param.rb
+- lib/rhcp/dispatching_broker.rb
 - lib/rhcp/request.rb
-- lib/rhcp.rb
-- test/rhcp/broker_test.rb
+- lib/rhcp/broker.rb
+- lib/rhcp/context.rb
+- lib/rhcp/command.rb
+- lib/rhcp/memcached_broker.rb
 - test/rhcp/test_base.rb
+- test/rhcp/command_param_test.rb
+- test/rhcp/context_aware_broker_test.rb
+- test/rhcp/rhcp.log
+- test/rhcp/request_test.rb
+- test/rhcp/tests_for_brokers.rb
 - test/rhcp/http_exporter_test.rb
+- test/rhcp/logging_broker_test.rb
 - test/rhcp/http_test_server.rb
-- test/rhcp/response_test.rb
-- test/rhcp/command_test.rb
-- test/rhcp/tests_for_brokers.rb
-- test/rhcp/request_test.rb
+- test/rhcp/dispatching_broker_test.rb
+- test/rhcp/broker_test.rb
 - test/rhcp/client/command_param_stub_test.rb
 - test/rhcp/client/command_stub_test.rb
 - test/rhcp/http_broker_test.rb
-- test/rhcp/logging_broker_test.rb
-- test/rhcp/context_test.rb
-- test/rhcp/command_param_test.rb
+- test/rhcp/response_test.rb
 - test/rhcp/tests_for_writable_brokers.rb
-- test/rhcp/dispatching_broker_test.rb
-- test/rhcp/context_aware_broker_test.rb
+- test/rhcp/context_test.rb
+- test/rhcp/command_test.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/rhcp
 licenses: []