tg-can-controls-gateway 0.1.2 → 0.1.3

data/Rakefile

@@ -18,7 +18,7 @@ begin
     gem.add_runtime_dependency "eventmachine", ">=0.12.10"
     gem.add_runtime_dependency "applix"
     gem.add_runtime_dependency "gom-core", ">=0.1.1"
-    gem.add_runtime_dependency "gom-script"
+    gem.add_runtime_dependency "gom-script", ">=0.1.6"
     gem.add_runtime_dependency "osc", ">=0.1.4"
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/can_controls_gateway

@@ -23,6 +23,7 @@ def main argv
   service = nil
   daemon = Gom::Remote::Daemon.new(service_url, options) do |daemon, path|
     service = CcgRunner.new(path, options)
+    daemon.redirect_log service.logfile
     daemon.check_in 
   end
   daemon.background_loop(5) { service.run }

data/lib/ccg_logger.rb

@@ -5,3 +5,14 @@ module CcgLogger
   #LOGGER = Logger.new(File.join(File.dirname(__FILE__), '..', 'log/ccg.log'))
   LOGGER = Gom::Logger.new
 end
+
+module Ccg
+  def self.logger out = nil
+    if out.nil?
+      @@logger ||= Gom::Logger.new
+    else
+      out = STDOUT if(out == '-')
+      @@logger = (Gom::Logger.new out)
+    end
+  end
+end

data/lib/dispatcher.rb

@@ -26,60 +26,38 @@ module CanControlsGateway
       if my_station
       
         @events.each do |event|
-          ##
-          #CcgLogger::LOGGER.info "#{Time.now.iso8601} | Dispatcher: rca dispatching: event_type: #{event.event_type}"
-          ##
-        
           # If it is a RCA mappable event send it as RCA command...
           if EVENTS[event.event_type]
             if my_station['rci_uri']
               my_args = { 'action' => EVENTS[event.event_type] }
-              CcgLogger::LOGGER.info "#{Time.now.iso8601} |  >> Dispatcher: sending command : rci_uri: #{my_station['rci_uri']}, target: #{my_station['target']}, args: #{my_args.inspect}"
+              Ccg.logger.info "Dispatcher: sending command : rci_uri: #{my_station['rci_uri']}, target: #{my_station['target']}, args: #{my_args.inspect}"
               my_command = CanControlsGateway::RcaCommand.new my_station['rci_uri'],
                                           my_station['target'],
                                           my_args
-              CcgLogger::LOGGER.info "#{Time.now.iso8601} #{my_command.send_command}"
+              Ccg.logger.info my_command.send_command
             else
-              CcgLogger::LOGGER.info "#{Time.now.iso8601} | Device '#{my_station['device']}' not properly initialized in gom? (sender: station #{station})"
+              Ccg.logger.info "Device '#{my_station['device']}' not properly initialized in gom? (sender: station #{station})"
             end
           else
-            ##
-            #CcgLogger::LOGGER.info "#{Time.now.iso8601} | event '#{event.event_type}' not mappable to RCA command..."
-            ##
+            # ????
           end
         end
       
       else
-        #CcgLogger::LOGGER.info "#{Time.now.iso8601} | unknown station_id '#{@station_id.inspect}'"
+        # ????
       end
     
       rescue => e
         "ERROR: #{e.backtrace.join "\n\t"}"
     end
   
-    #def dispatch_osc
-    #  @events.each do |event|
-    #    if event.event_type && @station_id
-    #      ##
-    #      #CcgLogger::LOGGER.info "#{Time.now.iso8601} | Dispatcher: osc dispatching: event_type: #{event.event_type} - vector: #{event.vector}"
-    #      ##
-    #      my_osc_package = CanControlsGateway::OscPackage.new event, @station_id
-    #      my_ret         = my_osc_package.broadcast
-    #      nil
-    #    end
-    #  end
-    #end
-  
     private
-  
-      def get_raw_events
-        my_events = []
-        my_event_nodes = REXML::XPath.each(@raw_data, "/trackingdata/event") { |event|
-          my_events << CanControlsGateway::RawEvent.new(event)
-        }
-        my_events
-      end
-    
+    def get_raw_events
+      my_events = []
+      my_event_nodes = REXML::XPath.each(@raw_data, "/trackingdata/event") { |event|
+        my_events << CanControlsGateway::RawEvent.new(event)
+      }
+      my_events
+    end
   end
-
-end
+end

data/lib/osc_package.rb

@@ -15,9 +15,6 @@ module CanControlsGateway
   
     def broadcast
       my_message = prepare_message
-      ##
-      #CcgLogger::LOGGER.info "#{Time.now.iso8601} | broadcasting osc_package with vector '#{@event.vector}' and event_type '#{@event.event_type}'"
-      ##
       my_encoded_message                = my_message.encode
       BasicSocket.do_not_reverse_lookup = true
       my_socket                         = UDPSocket.new
@@ -53,4 +50,4 @@ module CanControlsGateway
   
   end
 
-end
+end

data/lib/osc_to_rca_dispatcher.rb

@@ -17,11 +17,11 @@ module CanControlsGateway
     def dispatch_rca
       return true if @event.nil?
       my_args = { 'action' => @event }
-      CcgLogger::LOGGER.info "#{Time.now.iso8601} |  >> OscToRcaDispatcher: sending command : rci_uri: #{STATION['rci_uri']}, target: #{STATION['target']}, args: #{my_args.inspect}"
+      Ccg.logger.info "OscToRcaDispatcher: sending command : rci_uri: #{STATION['rci_uri']}, target: #{STATION['target']}, args: #{my_args.inspect}"
       my_command = CanControlsGateway::RcaCommand.new STATION['rci_uri'],
                                                       STATION['target'],
                                                       my_args
-      CcgLogger::LOGGER.info "#{Time.now.iso8601} #{my_command.send_command}"
+      Ccg.logger.info my_command.send_command
     end
     
     private

data/lib/runner.rb

@@ -15,7 +15,7 @@ class CcgRunner < Gom::Remote::Entry
   }
 
   include OAttr
-  oattr :incoming_osc_port, :device, :valve
+  oattr :incoming_osc_port, :device, :valve, :logfile
 
   def self.instance
     @@instance
@@ -26,6 +26,7 @@ class CcgRunner < Gom::Remote::Entry
     @path = path
     @options = Defaults.merge(gnode @path).merge(options)
     puts "options: #{@options.inspect}"
+    (Ccg::logger logfile)
 
     # FIXIT: legacy! pushing config values from GOM to global variable!!!
     STATION['port'] = Integer(incoming_osc_port)
@@ -48,10 +49,10 @@ class CcgRunner < Gom::Remote::Entry
       raise "NOT Starting servers since port cannot be determined"
     end
 
-    puts "#{Time.now.iso8601} |  ++ Starting servers"
+    Ccg.logger.info "Starting servers"
     EventMachine::threadpool_size = 20
     EventMachine::run do
-      puts "#{Time.now.iso8601} |  ++   * UdpServer (port: #{port}) ..."
+      Ccg.logger.info "UdpServer (port: #{port}) ..."
       EventMachine::open_datagram_socket('0.0.0.0', port, UdpServer)
       # TODO place http server component for GNP callbacks here...
     end
@@ -71,26 +72,3 @@ class CcgRunner < Gom::Remote::Entry
     puts " -- can-controls-valve now: #{valve}"
   end
 end
-
-__END__
-
-  def _fill_settings
-    CcgLogger::LOGGER.info "#{Time.now.iso8601} |  ++ Initializing settings ..."
-    my_gom = RestFs::Client.new GOM_ROOT
-    
-    my_res = my_gom.retrieve("#{STATION['device']}:rci_uri")
-    if my_res
-      STATION['rci_uri'] = my_res['attribute']['value']
-      CcgLogger::LOGGER.info "#{Time.now.iso8601} |  ++ setting rci_uri for station #{STATION['device']} => #{STATION['rci_uri'].inspect}"
-      
-      my_port_res = my_gom.retrieve("#{STATION['device']}/hid:port")
-      if my_port_res
-        STATION['port'] = my_port_res['attribute']['value']
-      else
-        CcgLogger::LOGGER.info "#{Time.now.iso8601} |  ++ device's hid:port #{STATION['device']}/hid:port not found in gom"
-      end
-    else
-      CcgLogger::LOGGER.info "#{Time.now.iso8601} |  ++ device's rci_uri #{STATION['device']}:rci_uri not found in gom"
-    end
-  end
-  

data/lib/server.rb

@@ -7,41 +7,28 @@ require 'osc_to_rca_dispatcher'
 module UdpServer
   
   def post_init
-    CcgLogger::LOGGER.info "#{Time.now.iso8601} |  ++     ... server started"
+    Ccg.logger.info "... server started"
   end
 
   def receive_data(data)
     return unless(CcgRunner.instance.valve == :open)
 
-    ##
-    #CcgLogger::LOGGER.info "#{Time.now.iso8601} |  >> raw incoming data: ----------------------"
-    #CcgLogger::LOGGER.info data.inspect
-    #CcgLogger::LOGGER.info " --------------------------------------------"
-    ##
-    
-    #port, ip = Socket.unpack_sockaddr_in(get_peername)
-    #CcgLogger::LOGGER.info "#{Time.now.iso8601} |  >> UdpServer:  sender: #{ip}, #{port}"
-    
     # RCA
     rca_dispatching = proc {
       begin 
         my_dispatcher = CanControlsGateway::OscToRcaDispatcher.new data
-        #CcgLogger::LOGGER.info my_dispatcher.event.inspect
         my_dispatcher.dispatch_rca
       rescue Exception => e
         puts " ## #{e}\n -> #{e.backtrace.join "\n    "}"
       end
     }
     rca_callback = proc { |result|
-      #if result
-      #  CcgLogger::LOGGER.info "#{Time.now.iso8601} |  >> UdpServer:  result is: #{result.inspect}"
-      #end
     }
     EventMachine::defer rca_dispatching, rca_callback
   end
   
   def unbind
-    CcgLogger::LOGGER.info "#{Time.now.iso8601} |  -- UdpServer stopped"
+    Ccg.logger.info "UdpServer stopped"
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tg-can-controls-gateway
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - art+com/andreas marr
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.1.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: osc