itrp 0.1.0 → 0.1.5

data/lib/itrp.rb

@@ -23,7 +23,8 @@ raise %q{
 } unless ARGV.length==1
 
 HISTFILE=File.expand_path("~/.itrp_history")
-DEFAULT_PROMPT="iTRP> "
+DEFAULT_PROMPT=  "iTRP> "
+MULTILINE_PROMPT="+     "
 
 class ITRPEnv
 	attr_accessor :prompt 
@@ -89,10 +90,15 @@ class Dispatches
 		end 
 
 		# dispatch to correct plugin w/ context
+		node=nil
 		[Appenv.context, :any].uniq.collect do |ctx|
 			node  = @cmd_roots[ctx].find_node(cmdline.strip.split(' '))
-			node.enter(cmdline.strip) and return if node 
+			if not node.is_root?
+				node.enter(cmdline.strip) 
+				return
+			end
 		end
+		node.notfound(cmdline) if node.is_root?
 	end
 
 	def reload
@@ -101,7 +107,7 @@ class Dispatches
 			load(f)
 			print('.')
 		end
-		print("done\n")
+		print("done\n\n")
 	end
 
 	def help
@@ -112,14 +118,16 @@ class Dispatches
 	end
 
 	def quit
+		savehistory
+		exit 0
+	end
 
+	def savehistory
         File.open( HISTFILE, "w") do |h|
             Readline::HISTORY.to_a.uniq.each do |l|
                 h.write(l + "\n" ) 
             end
         end
-
-		exit 0
 	end
 
 
@@ -127,14 +135,28 @@ end
 
 
 dispatches = Dispatches.new()
-while cmd = Readline.readline(Appenv.prompt, true)
+multiline = [] 
+while cmd = Readline.readline(Appenv.prompt, false)
+
+	next if cmd.strip.empty? 
+
     begin
-        dispatches.invoke(cmd)
-        Readline::HISTORY.push(cmd)
+		if cmd =~ /;\s*$/ 
+			multiline << cmd.match(/(.*);/)[1] 
+			fullcmd = multiline.join() 
+			dispatches.invoke(fullcmd)
+			Readline::HISTORY.push(fullcmd + ";" )
+			dispatches.savehistory
+			Appenv.prompt = DEFAULT_PROMPT 
+			multiline = []
+		else
+			multiline << cmd 
+			Appenv.prompt = MULTILINE_PROMPT
+		end 
     rescue Exception => e 
 		if e.message == 'exit' ; exit; end
         puts "Error " + e.message 
-        puts "Error " + e.backtrace.join('\n') 
+        puts "Error " + e.backtrace.join("\n") 
     end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itrp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - vivekrajan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trisulrp
@@ -52,48 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -124,31 +110,41 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- itrp.gemspec
 - lib/cmd_base.rb
 - lib/cmd_root.rb
+- lib/handlers/agg_flow.rb
 - lib/handlers/alert.rb
 - lib/handlers/counter.rb
 - lib/handlers/delete_alerts.rb
+- lib/handlers/edges.rb
 - lib/handlers/flow.rb
 - lib/handlers/fts.rb
-- lib/handlers/getkey.rb
 - lib/handlers/getlabel.rb
+- lib/handlers/grep.rb
 - lib/handlers/help.rb
+- lib/handlers/keyspace.rb
 - lib/handlers/list.rb
 - lib/handlers/list_counters.rb
 - lib/handlers/meters.rb
+- lib/handlers/metric_summ.rb
 - lib/handlers/options.rb
+- lib/handlers/pcap.rb
+- lib/handlers/probe.rb
 - lib/handlers/query_alerts.rb
 - lib/handlers/query_flow.rb
 - lib/handlers/query_fts.rb
 - lib/handlers/query_resource.rb
-- lib/handlers/resolve.rb
 - lib/handlers/resource.rb
+- lib/handlers/searchkey.rb
 - lib/handlers/set.rb
+- lib/handlers/setlabel.rb
 - lib/handlers/timeslices.rb
 - lib/handlers/toppers.rb
+- lib/handlers/toptrend.rb
 - lib/handlers/trackers.rb
 - lib/handlers/traffic.rb
+- lib/handlers/volume.rb
 - lib/itrp.rb
 - test/helper.rb
 - test/test_itrp.rb
@@ -156,7 +152,7 @@ homepage: http://github.com/vivekrajan/itrp
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,9 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: iTRP - Command Line Interface to Trisul Network Analytics
 test_files: []

data/lib/handlers/getkey.rb

@@ -1,38 +0,0 @@
-module ITRP 
-
-class Cmd_getkey  < Cmd 
-	def initialize (e)
-		super(e)
-		@enabled_in_state = :counter
-		@attach_cmd  = ''
-		@trigger = 'getkey'
-	end
-
-
-
-	def enter(cmdline)
-
-        patt = cmdline.scan(/getkey (.*)/).flatten
-
-        print("Search [#{patt[0]}]\n")
-        req =mk_request(TRP::Message::Command::SEARCH_KEYS_REQUEST,
-                         :counter_group => appstate(:cgguid),
-                         :label  => patt[0])
-
-
-        rows = []
-        get_response_zmq(@appenv.zmq_endpt,req) do |resp|
-            resp.keys.each do |k|
-                rows << [ k.key, k.label, k.readable ]
-            end
-        end
-
-
-        table = Terminal::Table.new( :headings => %w(Key  Label Readable ), :rows => rows)
-        puts(table) 
-
-    end
-
-end
-end
-

data/lib/handlers/resolve.rb

@@ -1,34 +0,0 @@
-module ITRP
-
-class Cmd_resolve  < Cmd 
-	def initialize (e)
-		super(e)
-		@enabled_in_state = :counter
-		@attach_cmd  = ''
-		@trigger = 'resolve'
-	end
-
-	def enter(cmdline)
-
-		patt = cmdline.scan(/resolve\s+(\S*)/).flatten.first 
-
-        patt.split(',')
-
-		req =mk_request(TRP::Message::Command::KEY_LOOKUP_REQUEST,
-						 :counter_group => appstate(:cgguid),
-						 :keys  => patt.split(','))
-
-
-        rows = []
-		get_response_zmq(@appenv.zmq_endpt,req) do |resp|
-            resp.keys.each do |k|
-                rows << [ k.key, k.label, k.readable ]
-            end
-		end
-
-		table = Terminal::Table.new( :headings => %w(Key  Label Readable ), :rows => rows)
-		puts(table) 
-    end
-
-end
-end