rsmp 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b02662d725fdbbddfa1da1a958136e62bba3212ebf8cef48f1f2dff57e9d90f
-  data.tar.gz: 8b09971e4ebc897f9df25ef1e32f2d1ff9fb2b3b1ae797b0725ddc2f38d67947
+  metadata.gz: f56de7518625c2ed3840b32a1169c2e565d614c987d3197f573238a97f45f24f
+  data.tar.gz: afcbab033ed8fd02cc2dfe1068ceb8891ec994ed3fbf803ef3d34ef30c2b41e3
 SHA512:
-  metadata.gz: 80779b821deeecdc6bc2fcdcb336ba7c8c8ade016ed49b1b13657f1f5fb609ff777c869cbd2019f0a5be2fd65a330255d7307c17a14f97bf28d7329340fa2c6c
-  data.tar.gz: bfd182628250547ebe8de45473ceeacbc1656fc4ebceee09e54959659cc67cb0e9d970409916c153b5921febb63e3dc83c8f51dfad9aa2d31bf1ed0b9d0375f7
+  metadata.gz: d9939dd05989a49edb1995589363187a44ce3a465d84d0f26b0624e4f8f3dde69d8eefb60e1143c1474bd5c94be3a878554e95074009e1d0385c088c319cd04a
+  data.tar.gz: 9306e2f2aef9f7a522829c76cc51e6a5d7d433ccb6f90056603342f8e7c6004886eea32a3dbe485e39e26aac5bf57370868765fe0cc377d2291e67904a98d4c6

data/.gitignore

@@ -1,4 +1,5 @@
 ignore
+log
 .DS_Store
 .rspec_status
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.3)
+    rsmp (0.1.5)
       async (~> 1.23.0)
       async-io (~> 1.27.0)
       colorize (~> 0.8.1)
@@ -29,7 +29,7 @@ GEM
     childprocess (2.0.0)
       rake (< 13.0)
     colorize (0.8.1)
-    console (1.5.0)
+    console (1.6.0)
     contracts (0.16.0)
     cucumber (3.1.2)
       builder (>= 2.1.2)

data/lib/rsmp/cli.rb

@@ -8,26 +8,45 @@ module RSMP
 		method_option :config, :type => :string, :aliases => "-c", banner: 'Path to .yaml config file'
 		method_option :id, :type => :string, :aliases => "-i", banner: 'RSMP site id'
 		method_option :supervisors, :type => :string, :aliases => "-s", banner: 'ip:port,... list of supervisor to connect to'			
+		method_option :log, :type => :string, :aliases => "-l", banner: 'Path to log file'
+		method_option :json, :type => :boolean, :aliases => "-j", banner: 'Show JSON messages in log'
 		def site
-			converted = {
-					site_settings_path: options[:config],
-					site_settings: {
-						site_id: options[:id],
-					}
-			}
-			
-  		if options[:supervisors]
-	  		options[:supervisors].split(',').each do |supervisor|
-	  			converted[:site_settings][:supervisors] ||= []
+			settings = {}
+			log_settings = { 'active' => true }
+
+			if options[:config]
+				if File.exist? options[:config]
+					settings = YAML.load_file options[:config]
+					log_settings = settings.delete 'log'
+				else
+					puts "Error: Config #{options[:config]} not found"
+					exit
+				end
+			end
+
+			if options[:id]
+				settings['site_id'] = options[:id]
+			end
+
+		if options[:supervisors]
+			options[:supervisors].split(',').each do |supervisor|
+				setting[:supervisors] ||= []
 					ip, port = supervisor.split ':'
 					ip = '127.0.0.1' if ip.empty?
 					port = '12111' if port.empty?
-					converted[:site_settings][:supervisors] << {"ip"=>ip, "port"=>port}
+					settings[:supervisors] << {"ip"=>ip, "port"=>port}
 				end
 			end
 
-			converted[:site_settings].compact!
-			RSMP::Site.new(converted).start
+			if options[:log]
+				log_settings['path'] = options[:log]
+			end
+
+			if options[:json]
+				log_settings['json'] = options[:json]
+			end
+
+			RSMP::Site.new(site_settings:settings, log_settings: log_settings).start
 		end
 
 		desc "supervisor", "Run RSMP supervisor"
@@ -35,17 +54,43 @@ module RSMP
 		method_option :id, :type => :string, :aliases => "-i", banner: 'RSMP site id'
 		method_option :ip, :type => :numeric, banner: 'IP address to listen on'			
 		method_option :port, :type => :string, :aliases => "-p", banner: 'Port to listen on'
+		method_option :log, :type => :string, :aliases => "-l", banner: 'Path to log file'
+		method_option :json, :type => :boolean, :aliases => "-j", banner: 'Show JSON messages in log'
 		def supervisor
-			converted = {
-					supervisor_settings_path: options[:config],
-					supervisor_settings: {
-						site_id: options[:id],
-						ip: options[:ip],
-						port: options[:port]
-					}
-			}
-			converted[:supervisor_settings].compact!
-			RSMP::Supervisor.new(converted).start
+			settings = {}
+			log_settings = { 'active' => true }
+
+			if options[:config]
+				if File.exist? options[:config]
+					settings = YAML.load_file options[:config]
+					log_settings = settings.delete 'log'
+				else
+					puts "Error: Config #{options[:config]} not found"
+					exit
+				end
+			end
+
+			if options[:id]
+				settings['site_id'] = options[:id]
+			end
+
+			if options[:ip]
+				settings['ip'] = options[:ip]
+			end
+
+			if options[:port]
+				settings['port'] = options[:port]
+			end
+
+			if options[:log]
+				log_settings['path'] = options[:log]
+			end
+
+			if options[:json]
+				log_settings['json'] = options[:json]
+			end
+
+			RSMP::Supervisor.new(supervisor_settings:settings,log_settings:log_settings).start
 		end
 
 	end

data/lib/rsmp/logger.rb

@@ -3,9 +3,10 @@ module RSMP
 
     attr_accessor :settings
     
-    def initialize settings
+    def initialize settings={}
       defaults = {
         'active'=>false,
+        'path'=>nil,
         'author'=>false,
         'color'=>true,
         'site_id'=>true,
@@ -16,10 +17,26 @@ module RSMP
         'timestamp'=>true,
         'json'=>false,
         'debug'=>false,
-        'statistics'=>false
+        'statistics'=>false,
+        'hide_ip_and_port' => true
       }
-      @settings = defaults.merge settings
+      if settings
+        @settings = defaults.merge settings
+      else
+        @settings = defaults
+      end
+
       @muted = {}
+
+      setup_output_destination
+    end
+
+    def setup_output_destination
+      if @settings['path']
+        @stream = File.open(@settings['path'],'a')  # appending
+      else
+        @stream = $stdout
+      end
     end
 
     def mute ip, port
@@ -58,12 +75,9 @@ module RSMP
 
     def output level, str
       return if str.empty? || /^\s+$/.match(str)
-      streams = [$stdout]
-      #streams << $stderr if level == :error
       str = colorize level, str
-      streams.each do |stream|
-        stream.puts str
-      end
+      @stream.puts str
+      @stream.flush
     end
 
     def colorize level, str

data/lib/rsmp/site.rb

@@ -11,7 +11,7 @@ module RSMP
     def initialize options={}
       initialize_site
       handle_site_settings options
-      super options.merge log_settings: @site_settings["log"]
+      super options
       @proxies = []
       @sleep_condition = Async::Notification.new
     end
@@ -41,29 +41,8 @@ module RSMP
         'send_after_connect' => true,
         'components' => {
           'C1' => {}
-        },
-        'log' => {
-          'active' => true,
-          'color' => true,
-          'ip' => false,
-          'timestamp' => true,
-          'site_id' => true,
-          'level' => false,
-          'acknowledgements' => false,
-          'watchdogs' => false,
-          'json' => false,
-          'statistics' => false
         }
       }
-      if options[:site_settings_path]
-        if File.exist? options[:site_settings_path]
-          @site_settings.merge! YAML.load_file(options[:site_settings_path])
-        else
-          puts "Error: Config #{options[:site_settings_path]} not found, pwd"
-          exit
-        end
-      end
-
       if options[:site_settings]
         converted = options[:site_settings].map { |k,v| [k.to_s,v] }.to_h   #convert symbol keys to string keys
         converted.compact!
@@ -71,7 +50,7 @@ module RSMP
       end
 
       required = [:supervisors,:rsmp_versions,:site_id,:watchdog_interval,:watchdog_timeout,
-                  :acknowledgement_timeout,:command_response_timeout,:log]
+                  :acknowledgement_timeout,:command_response_timeout]
       check_required_settings @site_settings, required
 
       setup_components @site_settings['components']

data/lib/rsmp/supervisor.rb

@@ -8,7 +8,7 @@ module RSMP
 
     def initialize options={}
       handle_supervisor_settings options
-      super options.merge log_settings: @supervisor_settings["log"]
+      super options
       @proxies = []
       @site_id_condition = Async::Notification.new
     end
@@ -30,47 +30,21 @@ module RSMP
         'status_response_timeout' => 1,
         'status_update_timeout' => 1,
         'site_connect_timeout' => 2,
-        'site_ready_timeout' => 1,
-        'log' => {
-          'active' => true,
-          'color' => true,
-          'ip' => false,
-          'timestamp' => true,
-          'site_id' => true,
-          'level' => false,
-          'acknowledgements' => false,
-          'watchdogs' => false,
-          'json' => false
-        }
+        'site_ready_timeout' => 1
       }
-
-      if options[:supervisor_settings_path]
-        if File.exist? options[:supervisor_settings_path]
-          @supervisor_settings.merge! YAML.load_file(options[:supervisor_settings_path])
-        else
-          puts "Error: Site settings #{options[:supervisor_settings_path]} not found"
-          exit
-        end
-
-      end
       
       if options[:supervisor_settings]
         converted = options[:supervisor_settings].map { |k,v| [k.to_s,v] }.to_h   #convert symbol keys to string keys
+        converted.compact!
         @supervisor_settings.merge! converted
       end
 
       required = [:port, :rsmp_versions, :site_id, :watchdog_interval, :watchdog_timeout,
-                  :acknowledgement_timeout, :command_response_timeout, :log]
+                  :acknowledgement_timeout, :command_response_timeout]
       check_required_settings @supervisor_settings, required
 
       @rsmp_versions = @supervisor_settings["rsmp_versions"]
-      
-      # randomize site id
-      #@supervisor_settings["site_id"] = "RN+SU#{rand(9999).to_i}"
-
-      # randomize port
-      #@supervisor_settings["port"] = @supervisor_settings["port"] + rand(10).to_i
-    end
+          end
 
     def start_action
       @endpoint = Async::IO::Endpoint.tcp('0.0.0.0', @supervisor_settings["port"])
@@ -126,7 +100,7 @@ module RSMP
     end
 
     def connect socket, info
-      if @supervisor_settings['log']['hide_ip_and_port']
+      if @logger.settings['hide_ip_and_port']
         port_and_port = '********'
       else
         port_and_port = "#{info[:ip]}:#{info[:port]}"

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -357,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.